geojs 1.13.0 → 1.13.1
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.
- package/geo.js +37 -7
- package/geo.lean.js +37 -7
- package/geo.lean.min.js +1 -1
- package/geo.min.js +1 -1
- package/package.json +1 -1
- package/src/annotation/annotation.js +3 -0
- package/src/osmLayer.js +1 -1
- package/src/pixelmapLayer.js +1 -1
- package/src/tileLayer.js +3 -2
- package/src/util/color.js +1 -0
- package/src/util/common.js +2 -1
- package/src/util/mesh.js +1 -0
- package/src/util/polyops.js +8 -0
- package/src/webgl/layer.js +5 -0
- package/src/webgl/lookupTable2D.js +1 -0
- package/src/webgl/pointUtil.js +1 -0
- package/src/webgl/tileLayer.js +8 -0
package/geo.js
CHANGED
|
@@ -4333,6 +4333,7 @@ var _annotation = function annotation(type, args) {
|
|
|
4333
4333
|
/**
|
|
4334
4334
|
* Return actions needed for the specified state of this annotation.
|
|
4335
4335
|
*
|
|
4336
|
+
* @private
|
|
4336
4337
|
* @param {object} m_this The current annotation instance.
|
|
4337
4338
|
* @param {function} s_actions The parent actions method.
|
|
4338
4339
|
* @param {string|undefined} state The state to return actions for. Defaults
|
|
@@ -4366,6 +4367,7 @@ function continuousVerticesActions(m_this, s_actions, state, name, originalArgs)
|
|
|
4366
4367
|
/**
|
|
4367
4368
|
* Process actions to allow drawing continuous vertices for an annotation.
|
|
4368
4369
|
*
|
|
4370
|
+
* @private
|
|
4369
4371
|
* @param {object} m_this The current annotation instance.
|
|
4370
4372
|
* @param {geo.event} evt The action event.
|
|
4371
4373
|
* @param {string} name The name of this annotation.
|
|
@@ -4425,6 +4427,7 @@ function continuousVerticesProcessAction(m_this, evt, name) {
|
|
|
4425
4427
|
* that the aspect ratio of a rectangle-like selection is a specific value or
|
|
4426
4428
|
* range of values.
|
|
4427
4429
|
*
|
|
4430
|
+
* @private
|
|
4428
4431
|
* @param {number|number[]|geo.geoSize|geo.geoSize[]} ratio Either a single
|
|
4429
4432
|
* aspect ratio, a single size, or a list of allowed aspect ratios and sizes.
|
|
4430
4433
|
* For instance, 1 will require that the selection square, 2 would require
|
|
@@ -24113,7 +24116,7 @@ var _osmLayer = function osmLayer(arg) {
|
|
|
24113
24116
|
queue: m_this._queue,
|
|
24114
24117
|
overlap: m_this._options.tileOverlap,
|
|
24115
24118
|
scale: m_this._options.tileScale,
|
|
24116
|
-
url: m_this._options.url.call(m_this, urlParams.x, urlParams.y, urlParams.level || 0, m_this._options.subdomains),
|
|
24119
|
+
url: m_this._options.url.call(m_this, urlParams.x, urlParams.y, Math.max(urlParams.level || 0, 0), m_this._options.subdomains),
|
|
24117
24120
|
crossDomain: m_this._options.crossDomain
|
|
24118
24121
|
});
|
|
24119
24122
|
};
|
|
@@ -24827,7 +24830,7 @@ var _pixelmapLayer = function pixelmapLayer(arg) {
|
|
|
24827
24830
|
queue: m_this._queue,
|
|
24828
24831
|
overlap: m_this._options.tileOverlap,
|
|
24829
24832
|
scale: m_this._options.tileScale,
|
|
24830
|
-
url: m_this._options.url.call(m_this, urlParams.x, urlParams.y, urlParams.level || 0, m_this._options.subdomains),
|
|
24833
|
+
url: m_this._options.url.call(m_this, urlParams.x, urlParams.y, Math.max(urlParams.level || 0, 0), m_this._options.subdomains),
|
|
24831
24834
|
crossDomain: m_this._options.crossDomain
|
|
24832
24835
|
});
|
|
24833
24836
|
};
|
|
@@ -28123,7 +28126,7 @@ module.exports = _sceneObject;
|
|
|
28123
28126
|
* @constant
|
|
28124
28127
|
* @type {string}
|
|
28125
28128
|
*/
|
|
28126
|
-
module.exports = "
|
|
28129
|
+
module.exports = "9174d2af787e4421e022dca6933c5ee848294c1a";
|
|
28127
28130
|
|
|
28128
28131
|
/***/ }),
|
|
28129
28132
|
|
|
@@ -30766,6 +30769,7 @@ function modulo(a, b) {
|
|
|
30766
30769
|
/**
|
|
30767
30770
|
* Pick a subdomain from a list of subdomains based on a the tile location.
|
|
30768
30771
|
*
|
|
30772
|
+
* @private
|
|
30769
30773
|
* @param {number} x The x tile coordinate.
|
|
30770
30774
|
* @param {number} y The y tile coordinate.
|
|
30771
30775
|
* @param {number} z The tile layer.
|
|
@@ -30785,9 +30789,9 @@ function m_getTileSubdomain(x, y, z, subdomains) {
|
|
|
30785
30789
|
* all equivalent. The comma-separated list can have subdomains that are of
|
|
30786
30790
|
* any length; the string and range both use one-character subdomains.
|
|
30787
30791
|
*
|
|
30792
|
+
* @private
|
|
30788
30793
|
* @param {string} base The tile format string
|
|
30789
30794
|
* @returns {function} A conversion function.
|
|
30790
|
-
* @private.
|
|
30791
30795
|
*/
|
|
30792
30796
|
function m_tileUrlFromTemplate(base) {
|
|
30793
30797
|
var xPattern = /\$?\{[xX]\}/g,
|
|
@@ -31282,7 +31286,7 @@ var _tileLayer = function tileLayer(arg) {
|
|
|
31282
31286
|
y: m_this._options.tileHeight
|
|
31283
31287
|
},
|
|
31284
31288
|
queue: m_this._queue,
|
|
31285
|
-
url: m_this._options.url.call(m_this, urlParams.x, urlParams.y, urlParams.level || 0, m_this._options.subdomains)
|
|
31289
|
+
url: m_this._options.url.call(m_this, urlParams.x, urlParams.y, Math.max(urlParams.level || 0, 0), m_this._options.subdomains)
|
|
31286
31290
|
});
|
|
31287
31291
|
};
|
|
31288
31292
|
|
|
@@ -36819,6 +36823,7 @@ var m_memoizeConvertColor = {
|
|
|
36819
36823
|
* be returned quickly. If the memoization table gets over a certain size,
|
|
36820
36824
|
* just reset it.
|
|
36821
36825
|
*
|
|
36826
|
+
* @private
|
|
36822
36827
|
* @param {geo.geoColor} origColor The original color specification.
|
|
36823
36828
|
* @param {geo.geoColorObject} resultColor The result of the conversion.
|
|
36824
36829
|
* @returns {geo.geoColorObject} The `resultColor`.
|
|
@@ -37604,6 +37609,7 @@ var util = {
|
|
|
37604
37609
|
};
|
|
37605
37610
|
var layerParams = {
|
|
37606
37611
|
maxLevel: maxLevel,
|
|
37612
|
+
minLevel: Math.min(0, maxLevel),
|
|
37607
37613
|
wrapX: false,
|
|
37608
37614
|
wrapY: false,
|
|
37609
37615
|
tileOffset: function tileOffset() {
|
|
@@ -38031,7 +38037,7 @@ var util = {
|
|
|
38031
38037
|
* @param {object} target target object to modify.
|
|
38032
38038
|
* @param {object} sources object(s) to merge into the target.
|
|
38033
38039
|
* @returns {object} The merged object.
|
|
38034
|
-
* @
|
|
38040
|
+
* @memberof geo.util
|
|
38035
38041
|
*/
|
|
38036
38042
|
deepMerge: function deepMerge(target) {
|
|
38037
38043
|
for (var _len = arguments.length, sources = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
|
|
@@ -38776,6 +38782,7 @@ __webpack_require__(5637), __webpack_require__(208), __webpack_require__(269), /
|
|
|
38776
38782
|
* elements, falsy for vertices.
|
|
38777
38783
|
* @returns {geo.meshFeature.meshColoredInfo} An object with the colored mesh
|
|
38778
38784
|
* information.
|
|
38785
|
+
* @memberof geo.util
|
|
38779
38786
|
*/
|
|
38780
38787
|
function createColoredMesh(feature, elementValues) {
|
|
38781
38788
|
var util = __webpack_require__(642);
|
|
@@ -39154,6 +39161,7 @@ var AlternateOpNames = {
|
|
|
39154
39161
|
*
|
|
39155
39162
|
* @param {object[]} seglist A PolyBool segment list.
|
|
39156
39163
|
* @returns {geo.polygonList|undefined} A polygon list.
|
|
39164
|
+
* @private
|
|
39157
39165
|
*/
|
|
39158
39166
|
function seglistToPolygonList(seglist) {
|
|
39159
39167
|
// This single line doesn't arrange holes correctly
|
|
@@ -39238,6 +39246,7 @@ function seglistToPolygonList(seglist) {
|
|
|
39238
39246
|
* around 0.11 mm in ground distance.
|
|
39239
39247
|
* @param {object} seglist A seglist array as used by the polybool library.
|
|
39240
39248
|
* @returns {object} A seglist array.
|
|
39249
|
+
* @private
|
|
39241
39250
|
*/
|
|
39242
39251
|
function polygonOperationSeglist(op, epsilon, seglist) {
|
|
39243
39252
|
op = 'select' + op.charAt(0).toUpperCase() + op.slice(1);
|
|
@@ -39307,6 +39316,7 @@ function polygonOperationSeglist(op, epsilon, seglist) {
|
|
|
39307
39316
|
* @param {geo.util.polyop.spec} [opts] Options for the operation. Only used
|
|
39308
39317
|
* if poly is an object with a toPolygonList method.
|
|
39309
39318
|
* @returns {geo.polygonList} A list of polygons.
|
|
39319
|
+
* @memberof geo.util.polyops
|
|
39310
39320
|
*/
|
|
39311
39321
|
function toPolygonList(poly, mode, opts) {
|
|
39312
39322
|
mode = mode || {};
|
|
@@ -39401,6 +39411,7 @@ function toPolygonList(poly, mode, opts) {
|
|
|
39401
39411
|
* @param {geo.util.polyop.spec} [opts] Options for the operation. Only used
|
|
39402
39412
|
* if ``mode.style`` is an object with a fromPolygonList method.
|
|
39403
39413
|
* @returns {geo.polygonAny} A polygon in one of several formats.
|
|
39414
|
+
* @memberof geo.util.polyops
|
|
39404
39415
|
*/
|
|
39405
39416
|
function fromPolygonList(poly, mode, opts) {
|
|
39406
39417
|
if (mode.style.fromPolygonList) {
|
|
@@ -39439,6 +39450,7 @@ function fromPolygonList(poly, mode, opts) {
|
|
|
39439
39450
|
/**
|
|
39440
39451
|
* Use a minimum style for output to include all of the results.
|
|
39441
39452
|
*
|
|
39453
|
+
* @private
|
|
39442
39454
|
* @param {geo.polygonList} polylist A list of polygons.
|
|
39443
39455
|
* @param {string} style the proposed style.
|
|
39444
39456
|
* @returns {string} The preferred style.
|
|
@@ -39469,6 +39481,7 @@ function minimumPolygonStyle(polylist, style) {
|
|
|
39469
39481
|
* Generate the correspondence between the source polygons and the output
|
|
39470
39482
|
* polygons. A polygon corresponds if it has at least two points in common.
|
|
39471
39483
|
*
|
|
39484
|
+
* @private
|
|
39472
39485
|
* @param {geo.polygonList} poly1 First set of source polygons.
|
|
39473
39486
|
* @param {geo.polygonList} poly2 Second set of source polygons.
|
|
39474
39487
|
* @param {geo.polygonList} newpoly Output polygons.
|
|
@@ -39536,6 +39549,7 @@ function generateCorrespondence(poly1, poly2, newpoly, results) {
|
|
|
39536
39549
|
/**
|
|
39537
39550
|
* Perform a general operation of a set of polygons.
|
|
39538
39551
|
*
|
|
39552
|
+
* @private
|
|
39539
39553
|
* @param {string} op The operation to handle. One of union, intersect,
|
|
39540
39554
|
* difference, or xor.
|
|
39541
39555
|
* @param {geo.polygonAny|geo.util.polyop.spec} poly1 Either the first polygon
|
|
@@ -39619,6 +39633,7 @@ function generalOperationProcess(op, poly1, poly2, opts) {
|
|
|
39619
39633
|
/**
|
|
39620
39634
|
* Generate a polygon function for a specific operation.
|
|
39621
39635
|
*
|
|
39636
|
+
* @private
|
|
39622
39637
|
* @param {string} op The operation to handle. One of union, intersect,
|
|
39623
39638
|
* difference, or xor.
|
|
39624
39639
|
* @returns {function} a function for the polygons.
|
|
@@ -39996,7 +40011,7 @@ module.exports = _vectorFeature;
|
|
|
39996
40011
|
* @constant
|
|
39997
40012
|
* @type {string}
|
|
39998
40013
|
*/
|
|
39999
|
-
module.exports = "1.13.
|
|
40014
|
+
module.exports = "1.13.1";
|
|
40000
40015
|
|
|
40001
40016
|
/***/ }),
|
|
40002
40017
|
|
|
@@ -45150,6 +45165,7 @@ var webgl_layer = function webgl_layer() {
|
|
|
45150
45165
|
* @param {number} [opacity] If specified, set the opacity. Otherwise,
|
|
45151
45166
|
* return the opacity.
|
|
45152
45167
|
* @returns {number|this} The current opacity or the current layer.
|
|
45168
|
+
* @memberof geo.webgl.layer
|
|
45153
45169
|
*/
|
|
45154
45170
|
this.opacity = function (opacity) {
|
|
45155
45171
|
var result = s_opacity.apply(m_this, arguments);
|
|
@@ -45166,6 +45182,7 @@ var webgl_layer = function webgl_layer() {
|
|
|
45166
45182
|
* get it.
|
|
45167
45183
|
* @returns {boolean|this} either the visibility (if getting) or the layer
|
|
45168
45184
|
* (if setting).
|
|
45185
|
+
* @memberof geo.webgl.layer
|
|
45169
45186
|
*/
|
|
45170
45187
|
this.visible = function (val) {
|
|
45171
45188
|
if (val === undefined) {
|
|
@@ -45190,6 +45207,7 @@ var webgl_layer = function webgl_layer() {
|
|
|
45190
45207
|
* truthy, allow other layers to have the same z-index. Otherwise,
|
|
45191
45208
|
* ensure that other layers have distinct z-indices from this one.
|
|
45192
45209
|
* @returns {number|this}
|
|
45210
|
+
* @memberof geo.webgl.layer
|
|
45193
45211
|
*/
|
|
45194
45212
|
this.zIndex = function (zIndex, allowDuplicate) {
|
|
45195
45213
|
var result = s_zIndex.apply(m_this, arguments);
|
|
@@ -45214,6 +45232,7 @@ var webgl_layer = function webgl_layer() {
|
|
|
45214
45232
|
* @param {geo.webgl.webglRenderer} newRenderer The renderer to move to.
|
|
45215
45233
|
* @param {boolean} [rerender=false] If truthy, rerender after the switch.
|
|
45216
45234
|
* @returns {this}
|
|
45235
|
+
* @memberof geo.webgl.layer
|
|
45217
45236
|
*/
|
|
45218
45237
|
this.switchRenderer = function (newRenderer, rerender) {
|
|
45219
45238
|
if (newRenderer instanceof webglRenderer && newRenderer !== m_this.renderer()) {
|
|
@@ -45252,6 +45271,7 @@ var webgl_layer = function webgl_layer() {
|
|
|
45252
45271
|
* Initialize after the layer is added to the map.
|
|
45253
45272
|
*
|
|
45254
45273
|
* @returns {this}
|
|
45274
|
+
* @memberof geo.webgl.layer
|
|
45255
45275
|
*/
|
|
45256
45276
|
this._init = function () {
|
|
45257
45277
|
var map = m_this.map();
|
|
@@ -45963,6 +45983,7 @@ var vgl = __webpack_require__(1611);
|
|
|
45963
45983
|
* @param {vgl.renderState} renderState An object that contains the context
|
|
45964
45984
|
* used for drawing.
|
|
45965
45985
|
* @param {number} textureUnit The number of the texture unit [0-15].
|
|
45986
|
+
* @private
|
|
45966
45987
|
*/
|
|
45967
45988
|
function activateTextureUnit(renderState, textureUnit) {
|
|
45968
45989
|
if (textureUnit >= 0 && textureUnit <= 31) {
|
|
@@ -47629,6 +47650,7 @@ var pointFeature = __webpack_require__(7541);
|
|
|
47629
47650
|
* @param {this} m_this The point-like feature.
|
|
47630
47651
|
* @param {object} [arg] Feature definition object that might specify the
|
|
47631
47652
|
* primitive shape.
|
|
47653
|
+
* @memberof geo.webgl
|
|
47632
47654
|
*/
|
|
47633
47655
|
function pointUtil(m_this, arg) {
|
|
47634
47656
|
arg = arg || {};
|
|
@@ -48690,6 +48712,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
|
|
|
48690
48712
|
* Add a tile to the list of quads.
|
|
48691
48713
|
*
|
|
48692
48714
|
* @param {geo.tile} tile The tile to add and draw.
|
|
48715
|
+
* @memberof geo.webgl.tileLayer
|
|
48693
48716
|
*/
|
|
48694
48717
|
this._drawTile = function (tile) {
|
|
48695
48718
|
if (!m_quadFeature) {
|
|
@@ -48782,6 +48805,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
|
|
|
48782
48805
|
* @param {boolean} [val] If specified, change the visibility, otherwise
|
|
48783
48806
|
* return it.
|
|
48784
48807
|
* @returns {boolean|this} The current visibility or the layer.
|
|
48808
|
+
* @memberof geo.webgl.tileLayer
|
|
48785
48809
|
*/
|
|
48786
48810
|
this.visible = function (val) {
|
|
48787
48811
|
if (val === undefined) {
|
|
@@ -48806,6 +48830,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
|
|
|
48806
48830
|
* truthy, allow other layers to have the same z-index. Otherwise,
|
|
48807
48831
|
* ensure that other layers have distinct z-indices from this one.
|
|
48808
48832
|
* @returns {number|this}
|
|
48833
|
+
* @memberof geo.webgl.tileLayer
|
|
48809
48834
|
*/
|
|
48810
48835
|
this.zIndex = function (zIndex, allowDuplicate) {
|
|
48811
48836
|
if (zIndex !== undefined) {
|
|
@@ -48820,6 +48845,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
|
|
|
48820
48845
|
*
|
|
48821
48846
|
* @param {geo.event} [evt] If specified, the layer add or remove event that
|
|
48822
48847
|
* triggered this. If `undefined`, clear the quads but don't redraw.
|
|
48848
|
+
* @memberof geo.webgl.tileLayer
|
|
48823
48849
|
*/
|
|
48824
48850
|
this._clearQuads = function (evt) {
|
|
48825
48851
|
if (evt && (!evt.layer || !(evt.layer instanceof tileLayer) || !evt.layer.autoshareRenderer() || (evt.event === geo_event.layerAdd || evt.event === geo_event.layerRemove) && m_this.map().layers().every(function (l) {
|
|
@@ -48841,6 +48867,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
|
|
|
48841
48867
|
*
|
|
48842
48868
|
* @param {object} request A value to pass to the parent class.
|
|
48843
48869
|
* @returns {this}
|
|
48870
|
+
* @memberof geo.webgl.tileLayer
|
|
48844
48871
|
*/
|
|
48845
48872
|
this._update = function (request) {
|
|
48846
48873
|
s_update.call(m_this, request);
|
|
@@ -48853,6 +48880,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
|
|
|
48853
48880
|
|
|
48854
48881
|
/**
|
|
48855
48882
|
* Cleanup. This purges the texture and tile cache.
|
|
48883
|
+
* @memberof geo.webgl.tileLayer
|
|
48856
48884
|
*/
|
|
48857
48885
|
this._cleanup = function () {
|
|
48858
48886
|
var tile;
|
|
@@ -48870,6 +48898,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
|
|
|
48870
48898
|
|
|
48871
48899
|
/**
|
|
48872
48900
|
* Destroy.
|
|
48901
|
+
* @memberof geo.webgl.tileLayer
|
|
48873
48902
|
*/
|
|
48874
48903
|
this._exit = function () {
|
|
48875
48904
|
var map = m_this.map();
|
|
@@ -48884,6 +48913,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
|
|
|
48884
48913
|
|
|
48885
48914
|
/**
|
|
48886
48915
|
* Initialize after the layer is added to the map.
|
|
48916
|
+
* @memberof geo.webgl.tileLayer
|
|
48887
48917
|
*/
|
|
48888
48918
|
this._init = function () {
|
|
48889
48919
|
s_init.apply(m_this, arguments);
|
package/geo.lean.js
CHANGED
|
@@ -1332,6 +1332,7 @@ var _annotation = function annotation(type, args) {
|
|
|
1332
1332
|
/**
|
|
1333
1333
|
* Return actions needed for the specified state of this annotation.
|
|
1334
1334
|
*
|
|
1335
|
+
* @private
|
|
1335
1336
|
* @param {object} m_this The current annotation instance.
|
|
1336
1337
|
* @param {function} s_actions The parent actions method.
|
|
1337
1338
|
* @param {string|undefined} state The state to return actions for. Defaults
|
|
@@ -1365,6 +1366,7 @@ function continuousVerticesActions(m_this, s_actions, state, name, originalArgs)
|
|
|
1365
1366
|
/**
|
|
1366
1367
|
* Process actions to allow drawing continuous vertices for an annotation.
|
|
1367
1368
|
*
|
|
1369
|
+
* @private
|
|
1368
1370
|
* @param {object} m_this The current annotation instance.
|
|
1369
1371
|
* @param {geo.event} evt The action event.
|
|
1370
1372
|
* @param {string} name The name of this annotation.
|
|
@@ -1424,6 +1426,7 @@ function continuousVerticesProcessAction(m_this, evt, name) {
|
|
|
1424
1426
|
* that the aspect ratio of a rectangle-like selection is a specific value or
|
|
1425
1427
|
* range of values.
|
|
1426
1428
|
*
|
|
1429
|
+
* @private
|
|
1427
1430
|
* @param {number|number[]|geo.geoSize|geo.geoSize[]} ratio Either a single
|
|
1428
1431
|
* aspect ratio, a single size, or a list of allowed aspect ratios and sizes.
|
|
1429
1432
|
* For instance, 1 will require that the selection square, 2 would require
|
|
@@ -21112,7 +21115,7 @@ var _osmLayer = function osmLayer(arg) {
|
|
|
21112
21115
|
queue: m_this._queue,
|
|
21113
21116
|
overlap: m_this._options.tileOverlap,
|
|
21114
21117
|
scale: m_this._options.tileScale,
|
|
21115
|
-
url: m_this._options.url.call(m_this, urlParams.x, urlParams.y, urlParams.level || 0, m_this._options.subdomains),
|
|
21118
|
+
url: m_this._options.url.call(m_this, urlParams.x, urlParams.y, Math.max(urlParams.level || 0, 0), m_this._options.subdomains),
|
|
21116
21119
|
crossDomain: m_this._options.crossDomain
|
|
21117
21120
|
});
|
|
21118
21121
|
};
|
|
@@ -21826,7 +21829,7 @@ var _pixelmapLayer = function pixelmapLayer(arg) {
|
|
|
21826
21829
|
queue: m_this._queue,
|
|
21827
21830
|
overlap: m_this._options.tileOverlap,
|
|
21828
21831
|
scale: m_this._options.tileScale,
|
|
21829
|
-
url: m_this._options.url.call(m_this, urlParams.x, urlParams.y, urlParams.level || 0, m_this._options.subdomains),
|
|
21832
|
+
url: m_this._options.url.call(m_this, urlParams.x, urlParams.y, Math.max(urlParams.level || 0, 0), m_this._options.subdomains),
|
|
21830
21833
|
crossDomain: m_this._options.crossDomain
|
|
21831
21834
|
});
|
|
21832
21835
|
};
|
|
@@ -25122,7 +25125,7 @@ module.exports = _sceneObject;
|
|
|
25122
25125
|
* @constant
|
|
25123
25126
|
* @type {string}
|
|
25124
25127
|
*/
|
|
25125
|
-
module.exports = "
|
|
25128
|
+
module.exports = "9174d2af787e4421e022dca6933c5ee848294c1a";
|
|
25126
25129
|
|
|
25127
25130
|
/***/ }),
|
|
25128
25131
|
|
|
@@ -27765,6 +27768,7 @@ function modulo(a, b) {
|
|
|
27765
27768
|
/**
|
|
27766
27769
|
* Pick a subdomain from a list of subdomains based on a the tile location.
|
|
27767
27770
|
*
|
|
27771
|
+
* @private
|
|
27768
27772
|
* @param {number} x The x tile coordinate.
|
|
27769
27773
|
* @param {number} y The y tile coordinate.
|
|
27770
27774
|
* @param {number} z The tile layer.
|
|
@@ -27784,9 +27788,9 @@ function m_getTileSubdomain(x, y, z, subdomains) {
|
|
|
27784
27788
|
* all equivalent. The comma-separated list can have subdomains that are of
|
|
27785
27789
|
* any length; the string and range both use one-character subdomains.
|
|
27786
27790
|
*
|
|
27791
|
+
* @private
|
|
27787
27792
|
* @param {string} base The tile format string
|
|
27788
27793
|
* @returns {function} A conversion function.
|
|
27789
|
-
* @private.
|
|
27790
27794
|
*/
|
|
27791
27795
|
function m_tileUrlFromTemplate(base) {
|
|
27792
27796
|
var xPattern = /\$?\{[xX]\}/g,
|
|
@@ -28281,7 +28285,7 @@ var _tileLayer = function tileLayer(arg) {
|
|
|
28281
28285
|
y: m_this._options.tileHeight
|
|
28282
28286
|
},
|
|
28283
28287
|
queue: m_this._queue,
|
|
28284
|
-
url: m_this._options.url.call(m_this, urlParams.x, urlParams.y, urlParams.level || 0, m_this._options.subdomains)
|
|
28288
|
+
url: m_this._options.url.call(m_this, urlParams.x, urlParams.y, Math.max(urlParams.level || 0, 0), m_this._options.subdomains)
|
|
28285
28289
|
});
|
|
28286
28290
|
};
|
|
28287
28291
|
|
|
@@ -33818,6 +33822,7 @@ var m_memoizeConvertColor = {
|
|
|
33818
33822
|
* be returned quickly. If the memoization table gets over a certain size,
|
|
33819
33823
|
* just reset it.
|
|
33820
33824
|
*
|
|
33825
|
+
* @private
|
|
33821
33826
|
* @param {geo.geoColor} origColor The original color specification.
|
|
33822
33827
|
* @param {geo.geoColorObject} resultColor The result of the conversion.
|
|
33823
33828
|
* @returns {geo.geoColorObject} The `resultColor`.
|
|
@@ -34603,6 +34608,7 @@ var util = {
|
|
|
34603
34608
|
};
|
|
34604
34609
|
var layerParams = {
|
|
34605
34610
|
maxLevel: maxLevel,
|
|
34611
|
+
minLevel: Math.min(0, maxLevel),
|
|
34606
34612
|
wrapX: false,
|
|
34607
34613
|
wrapY: false,
|
|
34608
34614
|
tileOffset: function tileOffset() {
|
|
@@ -35030,7 +35036,7 @@ var util = {
|
|
|
35030
35036
|
* @param {object} target target object to modify.
|
|
35031
35037
|
* @param {object} sources object(s) to merge into the target.
|
|
35032
35038
|
* @returns {object} The merged object.
|
|
35033
|
-
* @
|
|
35039
|
+
* @memberof geo.util
|
|
35034
35040
|
*/
|
|
35035
35041
|
deepMerge: function deepMerge(target) {
|
|
35036
35042
|
for (var _len = arguments.length, sources = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
|
|
@@ -35775,6 +35781,7 @@ __webpack_require__(5637), __webpack_require__(208), __webpack_require__(269), /
|
|
|
35775
35781
|
* elements, falsy for vertices.
|
|
35776
35782
|
* @returns {geo.meshFeature.meshColoredInfo} An object with the colored mesh
|
|
35777
35783
|
* information.
|
|
35784
|
+
* @memberof geo.util
|
|
35778
35785
|
*/
|
|
35779
35786
|
function createColoredMesh(feature, elementValues) {
|
|
35780
35787
|
var util = __webpack_require__(642);
|
|
@@ -36153,6 +36160,7 @@ var AlternateOpNames = {
|
|
|
36153
36160
|
*
|
|
36154
36161
|
* @param {object[]} seglist A PolyBool segment list.
|
|
36155
36162
|
* @returns {geo.polygonList|undefined} A polygon list.
|
|
36163
|
+
* @private
|
|
36156
36164
|
*/
|
|
36157
36165
|
function seglistToPolygonList(seglist) {
|
|
36158
36166
|
// This single line doesn't arrange holes correctly
|
|
@@ -36237,6 +36245,7 @@ function seglistToPolygonList(seglist) {
|
|
|
36237
36245
|
* around 0.11 mm in ground distance.
|
|
36238
36246
|
* @param {object} seglist A seglist array as used by the polybool library.
|
|
36239
36247
|
* @returns {object} A seglist array.
|
|
36248
|
+
* @private
|
|
36240
36249
|
*/
|
|
36241
36250
|
function polygonOperationSeglist(op, epsilon, seglist) {
|
|
36242
36251
|
op = 'select' + op.charAt(0).toUpperCase() + op.slice(1);
|
|
@@ -36306,6 +36315,7 @@ function polygonOperationSeglist(op, epsilon, seglist) {
|
|
|
36306
36315
|
* @param {geo.util.polyop.spec} [opts] Options for the operation. Only used
|
|
36307
36316
|
* if poly is an object with a toPolygonList method.
|
|
36308
36317
|
* @returns {geo.polygonList} A list of polygons.
|
|
36318
|
+
* @memberof geo.util.polyops
|
|
36309
36319
|
*/
|
|
36310
36320
|
function toPolygonList(poly, mode, opts) {
|
|
36311
36321
|
mode = mode || {};
|
|
@@ -36400,6 +36410,7 @@ function toPolygonList(poly, mode, opts) {
|
|
|
36400
36410
|
* @param {geo.util.polyop.spec} [opts] Options for the operation. Only used
|
|
36401
36411
|
* if ``mode.style`` is an object with a fromPolygonList method.
|
|
36402
36412
|
* @returns {geo.polygonAny} A polygon in one of several formats.
|
|
36413
|
+
* @memberof geo.util.polyops
|
|
36403
36414
|
*/
|
|
36404
36415
|
function fromPolygonList(poly, mode, opts) {
|
|
36405
36416
|
if (mode.style.fromPolygonList) {
|
|
@@ -36438,6 +36449,7 @@ function fromPolygonList(poly, mode, opts) {
|
|
|
36438
36449
|
/**
|
|
36439
36450
|
* Use a minimum style for output to include all of the results.
|
|
36440
36451
|
*
|
|
36452
|
+
* @private
|
|
36441
36453
|
* @param {geo.polygonList} polylist A list of polygons.
|
|
36442
36454
|
* @param {string} style the proposed style.
|
|
36443
36455
|
* @returns {string} The preferred style.
|
|
@@ -36468,6 +36480,7 @@ function minimumPolygonStyle(polylist, style) {
|
|
|
36468
36480
|
* Generate the correspondence between the source polygons and the output
|
|
36469
36481
|
* polygons. A polygon corresponds if it has at least two points in common.
|
|
36470
36482
|
*
|
|
36483
|
+
* @private
|
|
36471
36484
|
* @param {geo.polygonList} poly1 First set of source polygons.
|
|
36472
36485
|
* @param {geo.polygonList} poly2 Second set of source polygons.
|
|
36473
36486
|
* @param {geo.polygonList} newpoly Output polygons.
|
|
@@ -36535,6 +36548,7 @@ function generateCorrespondence(poly1, poly2, newpoly, results) {
|
|
|
36535
36548
|
/**
|
|
36536
36549
|
* Perform a general operation of a set of polygons.
|
|
36537
36550
|
*
|
|
36551
|
+
* @private
|
|
36538
36552
|
* @param {string} op The operation to handle. One of union, intersect,
|
|
36539
36553
|
* difference, or xor.
|
|
36540
36554
|
* @param {geo.polygonAny|geo.util.polyop.spec} poly1 Either the first polygon
|
|
@@ -36618,6 +36632,7 @@ function generalOperationProcess(op, poly1, poly2, opts) {
|
|
|
36618
36632
|
/**
|
|
36619
36633
|
* Generate a polygon function for a specific operation.
|
|
36620
36634
|
*
|
|
36635
|
+
* @private
|
|
36621
36636
|
* @param {string} op The operation to handle. One of union, intersect,
|
|
36622
36637
|
* difference, or xor.
|
|
36623
36638
|
* @returns {function} a function for the polygons.
|
|
@@ -36995,7 +37010,7 @@ module.exports = _vectorFeature;
|
|
|
36995
37010
|
* @constant
|
|
36996
37011
|
* @type {string}
|
|
36997
37012
|
*/
|
|
36998
|
-
module.exports = "1.13.
|
|
37013
|
+
module.exports = "1.13.1";
|
|
36999
37014
|
|
|
37000
37015
|
/***/ }),
|
|
37001
37016
|
|
|
@@ -42149,6 +42164,7 @@ var webgl_layer = function webgl_layer() {
|
|
|
42149
42164
|
* @param {number} [opacity] If specified, set the opacity. Otherwise,
|
|
42150
42165
|
* return the opacity.
|
|
42151
42166
|
* @returns {number|this} The current opacity or the current layer.
|
|
42167
|
+
* @memberof geo.webgl.layer
|
|
42152
42168
|
*/
|
|
42153
42169
|
this.opacity = function (opacity) {
|
|
42154
42170
|
var result = s_opacity.apply(m_this, arguments);
|
|
@@ -42165,6 +42181,7 @@ var webgl_layer = function webgl_layer() {
|
|
|
42165
42181
|
* get it.
|
|
42166
42182
|
* @returns {boolean|this} either the visibility (if getting) or the layer
|
|
42167
42183
|
* (if setting).
|
|
42184
|
+
* @memberof geo.webgl.layer
|
|
42168
42185
|
*/
|
|
42169
42186
|
this.visible = function (val) {
|
|
42170
42187
|
if (val === undefined) {
|
|
@@ -42189,6 +42206,7 @@ var webgl_layer = function webgl_layer() {
|
|
|
42189
42206
|
* truthy, allow other layers to have the same z-index. Otherwise,
|
|
42190
42207
|
* ensure that other layers have distinct z-indices from this one.
|
|
42191
42208
|
* @returns {number|this}
|
|
42209
|
+
* @memberof geo.webgl.layer
|
|
42192
42210
|
*/
|
|
42193
42211
|
this.zIndex = function (zIndex, allowDuplicate) {
|
|
42194
42212
|
var result = s_zIndex.apply(m_this, arguments);
|
|
@@ -42213,6 +42231,7 @@ var webgl_layer = function webgl_layer() {
|
|
|
42213
42231
|
* @param {geo.webgl.webglRenderer} newRenderer The renderer to move to.
|
|
42214
42232
|
* @param {boolean} [rerender=false] If truthy, rerender after the switch.
|
|
42215
42233
|
* @returns {this}
|
|
42234
|
+
* @memberof geo.webgl.layer
|
|
42216
42235
|
*/
|
|
42217
42236
|
this.switchRenderer = function (newRenderer, rerender) {
|
|
42218
42237
|
if (newRenderer instanceof webglRenderer && newRenderer !== m_this.renderer()) {
|
|
@@ -42251,6 +42270,7 @@ var webgl_layer = function webgl_layer() {
|
|
|
42251
42270
|
* Initialize after the layer is added to the map.
|
|
42252
42271
|
*
|
|
42253
42272
|
* @returns {this}
|
|
42273
|
+
* @memberof geo.webgl.layer
|
|
42254
42274
|
*/
|
|
42255
42275
|
this._init = function () {
|
|
42256
42276
|
var map = m_this.map();
|
|
@@ -42962,6 +42982,7 @@ var vgl = __webpack_require__(1611);
|
|
|
42962
42982
|
* @param {vgl.renderState} renderState An object that contains the context
|
|
42963
42983
|
* used for drawing.
|
|
42964
42984
|
* @param {number} textureUnit The number of the texture unit [0-15].
|
|
42985
|
+
* @private
|
|
42965
42986
|
*/
|
|
42966
42987
|
function activateTextureUnit(renderState, textureUnit) {
|
|
42967
42988
|
if (textureUnit >= 0 && textureUnit <= 31) {
|
|
@@ -44628,6 +44649,7 @@ var pointFeature = __webpack_require__(7541);
|
|
|
44628
44649
|
* @param {this} m_this The point-like feature.
|
|
44629
44650
|
* @param {object} [arg] Feature definition object that might specify the
|
|
44630
44651
|
* primitive shape.
|
|
44652
|
+
* @memberof geo.webgl
|
|
44631
44653
|
*/
|
|
44632
44654
|
function pointUtil(m_this, arg) {
|
|
44633
44655
|
arg = arg || {};
|
|
@@ -45689,6 +45711,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
|
|
|
45689
45711
|
* Add a tile to the list of quads.
|
|
45690
45712
|
*
|
|
45691
45713
|
* @param {geo.tile} tile The tile to add and draw.
|
|
45714
|
+
* @memberof geo.webgl.tileLayer
|
|
45692
45715
|
*/
|
|
45693
45716
|
this._drawTile = function (tile) {
|
|
45694
45717
|
if (!m_quadFeature) {
|
|
@@ -45781,6 +45804,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
|
|
|
45781
45804
|
* @param {boolean} [val] If specified, change the visibility, otherwise
|
|
45782
45805
|
* return it.
|
|
45783
45806
|
* @returns {boolean|this} The current visibility or the layer.
|
|
45807
|
+
* @memberof geo.webgl.tileLayer
|
|
45784
45808
|
*/
|
|
45785
45809
|
this.visible = function (val) {
|
|
45786
45810
|
if (val === undefined) {
|
|
@@ -45805,6 +45829,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
|
|
|
45805
45829
|
* truthy, allow other layers to have the same z-index. Otherwise,
|
|
45806
45830
|
* ensure that other layers have distinct z-indices from this one.
|
|
45807
45831
|
* @returns {number|this}
|
|
45832
|
+
* @memberof geo.webgl.tileLayer
|
|
45808
45833
|
*/
|
|
45809
45834
|
this.zIndex = function (zIndex, allowDuplicate) {
|
|
45810
45835
|
if (zIndex !== undefined) {
|
|
@@ -45819,6 +45844,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
|
|
|
45819
45844
|
*
|
|
45820
45845
|
* @param {geo.event} [evt] If specified, the layer add or remove event that
|
|
45821
45846
|
* triggered this. If `undefined`, clear the quads but don't redraw.
|
|
45847
|
+
* @memberof geo.webgl.tileLayer
|
|
45822
45848
|
*/
|
|
45823
45849
|
this._clearQuads = function (evt) {
|
|
45824
45850
|
if (evt && (!evt.layer || !(evt.layer instanceof tileLayer) || !evt.layer.autoshareRenderer() || (evt.event === geo_event.layerAdd || evt.event === geo_event.layerRemove) && m_this.map().layers().every(function (l) {
|
|
@@ -45840,6 +45866,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
|
|
|
45840
45866
|
*
|
|
45841
45867
|
* @param {object} request A value to pass to the parent class.
|
|
45842
45868
|
* @returns {this}
|
|
45869
|
+
* @memberof geo.webgl.tileLayer
|
|
45843
45870
|
*/
|
|
45844
45871
|
this._update = function (request) {
|
|
45845
45872
|
s_update.call(m_this, request);
|
|
@@ -45852,6 +45879,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
|
|
|
45852
45879
|
|
|
45853
45880
|
/**
|
|
45854
45881
|
* Cleanup. This purges the texture and tile cache.
|
|
45882
|
+
* @memberof geo.webgl.tileLayer
|
|
45855
45883
|
*/
|
|
45856
45884
|
this._cleanup = function () {
|
|
45857
45885
|
var tile;
|
|
@@ -45869,6 +45897,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
|
|
|
45869
45897
|
|
|
45870
45898
|
/**
|
|
45871
45899
|
* Destroy.
|
|
45900
|
+
* @memberof geo.webgl.tileLayer
|
|
45872
45901
|
*/
|
|
45873
45902
|
this._exit = function () {
|
|
45874
45903
|
var map = m_this.map();
|
|
@@ -45883,6 +45912,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
|
|
|
45883
45912
|
|
|
45884
45913
|
/**
|
|
45885
45914
|
* Initialize after the layer is added to the map.
|
|
45915
|
+
* @memberof geo.webgl.tileLayer
|
|
45886
45916
|
*/
|
|
45887
45917
|
this._init = function () {
|
|
45888
45918
|
s_init.apply(m_this, arguments);
|