@deck.gl/carto 8.6.3 → 8.6.7
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/dist/dist.dev.js +396 -207
- package/dist/es5/api/index.js +21 -21
- package/dist/es5/api/maps-api-common.js +14 -10
- package/dist/es5/api/maps-api-common.js.map +1 -1
- package/dist/es5/api/maps-client.js +158 -99
- package/dist/es5/api/maps-client.js.map +1 -1
- package/dist/es5/api/maps-v3-client.js +308 -193
- package/dist/es5/api/maps-v3-client.js.map +1 -1
- package/dist/es5/basemap.js +1 -1
- package/dist/es5/basemap.js.map +1 -1
- package/dist/es5/config.js +25 -23
- package/dist/es5/config.js.map +1 -1
- package/dist/es5/index.js +45 -45
- package/dist/es5/layers/carto-bqtiler-layer.js +41 -6
- package/dist/es5/layers/carto-bqtiler-layer.js.map +1 -1
- package/dist/es5/layers/carto-layer.js +211 -132
- package/dist/es5/layers/carto-layer.js.map +1 -1
- package/dist/es5/layers/carto-sql-layer.js +41 -6
- package/dist/es5/layers/carto-sql-layer.js.map +1 -1
- package/dist/es5/style/color-bins-style.js +16 -11
- package/dist/es5/style/color-bins-style.js.map +1 -1
- package/dist/es5/style/color-categories-style.js +43 -14
- package/dist/es5/style/color-categories-style.js.map +1 -1
- package/dist/es5/style/color-continuous-style.js +16 -11
- package/dist/es5/style/color-continuous-style.js.map +1 -1
- package/dist/es5/style/palette.js +25 -13
- package/dist/es5/style/palette.js.map +1 -1
- package/dist/es5/style/utils.js +14 -7
- package/dist/es5/style/utils.js.map +1 -1
- package/dist/esm/api/maps-client.js +30 -24
- package/dist/esm/api/maps-client.js.map +1 -1
- package/dist/esm/api/maps-v3-client.js +60 -52
- package/dist/esm/api/maps-v3-client.js.map +1 -1
- package/dist/esm/layers/carto-bqtiler-layer.js +2 -2
- package/dist/esm/layers/carto-bqtiler-layer.js.map +1 -1
- package/dist/esm/layers/carto-layer.js +7 -5
- package/dist/esm/layers/carto-layer.js.map +1 -1
- package/dist/esm/layers/carto-sql-layer.js +2 -2
- package/dist/esm/layers/carto-sql-layer.js.map +1 -1
- package/dist/esm/style/color-bins-style.js +7 -6
- package/dist/esm/style/color-bins-style.js.map +1 -1
- package/dist/esm/style/color-categories-style.js +8 -7
- package/dist/esm/style/color-categories-style.js.map +1 -1
- package/dist/esm/style/color-continuous-style.js +7 -6
- package/dist/esm/style/color-continuous-style.js.map +1 -1
- package/dist/esm/style/utils.js +3 -1
- package/dist/esm/style/utils.js.map +1 -1
- package/dist.min.js +1 -1
- package/package.json +7 -7
|
@@ -1,10 +1,30 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
3
5
|
Object.defineProperty(exports, "__esModule", {
|
|
4
6
|
value: true
|
|
5
7
|
});
|
|
6
8
|
exports.default = void 0;
|
|
7
9
|
|
|
10
|
+
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
11
|
+
|
|
12
|
+
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
13
|
+
|
|
14
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
15
|
+
|
|
16
|
+
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
17
|
+
|
|
18
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
19
|
+
|
|
20
|
+
var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
|
|
21
|
+
|
|
22
|
+
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
23
|
+
|
|
24
|
+
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
25
|
+
|
|
26
|
+
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
27
|
+
|
|
8
28
|
var _core = require("@deck.gl/core");
|
|
9
29
|
|
|
10
30
|
var _geoLayers = require("@deck.gl/geo-layers");
|
|
@@ -17,12 +37,20 @@ var _mapsApiCommon = require("../api/maps-api-common");
|
|
|
17
37
|
|
|
18
38
|
var _config = require("../config");
|
|
19
39
|
|
|
20
|
-
|
|
40
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
41
|
+
|
|
42
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
43
|
+
|
|
44
|
+
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
|
|
45
|
+
|
|
46
|
+
function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
|
|
47
|
+
|
|
48
|
+
var defaultProps = {
|
|
21
49
|
data: null,
|
|
22
50
|
type: null,
|
|
23
51
|
onDataLoad: {
|
|
24
52
|
type: 'function',
|
|
25
|
-
value: data
|
|
53
|
+
value: function value(data) {},
|
|
26
54
|
compare: false
|
|
27
55
|
},
|
|
28
56
|
onDataError: {
|
|
@@ -40,161 +68,212 @@ const defaultProps = {
|
|
|
40
68
|
}
|
|
41
69
|
};
|
|
42
70
|
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
apiVersion: null
|
|
48
|
-
};
|
|
49
|
-
}
|
|
71
|
+
var CartoLayer = function (_CompositeLayer) {
|
|
72
|
+
(0, _inherits2.default)(CartoLayer, _CompositeLayer);
|
|
73
|
+
|
|
74
|
+
var _super = _createSuper(CartoLayer);
|
|
50
75
|
|
|
51
|
-
|
|
52
|
-
|
|
76
|
+
function CartoLayer() {
|
|
77
|
+
(0, _classCallCheck2.default)(this, CartoLayer);
|
|
78
|
+
return _super.apply(this, arguments);
|
|
53
79
|
}
|
|
54
80
|
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
81
|
+
(0, _createClass2.default)(CartoLayer, [{
|
|
82
|
+
key: "initializeState",
|
|
83
|
+
value: function initializeState() {
|
|
84
|
+
this.state = {
|
|
85
|
+
data: null,
|
|
86
|
+
apiVersion: null
|
|
87
|
+
};
|
|
88
|
+
}
|
|
89
|
+
}, {
|
|
90
|
+
key: "isLoaded",
|
|
91
|
+
get: function get() {
|
|
92
|
+
return this.getSubLayers().length > 0 && (0, _get2.default)((0, _getPrototypeOf2.default)(CartoLayer.prototype), "isLoaded", this);
|
|
93
|
+
}
|
|
94
|
+
}, {
|
|
95
|
+
key: "_checkProps",
|
|
96
|
+
value: function _checkProps(props) {
|
|
97
|
+
var type = props.type,
|
|
98
|
+
credentials = props.credentials,
|
|
99
|
+
connection = props.connection,
|
|
100
|
+
geoColumn = props.geoColumn,
|
|
101
|
+
columns = props.columns;
|
|
69
102
|
|
|
70
|
-
|
|
103
|
+
var localCreds = _objectSpread(_objectSpread({}, (0, _config.getDefaultCredentials)()), credentials);
|
|
71
104
|
|
|
72
|
-
|
|
73
|
-
_core.log.assert(type === _mapsApiCommon.MAP_TYPES.QUERY || type === _mapsApiCommon.MAP_TYPES.TILESET, "Invalid type ".concat(type, ". Use type MAP_TYPES.QUERY or MAP_TYPES.TILESET for apiVersion ").concat(apiVersion));
|
|
105
|
+
var apiVersion = localCreds.apiVersion;
|
|
74
106
|
|
|
75
|
-
_core.log.assert(
|
|
107
|
+
_core.log.assert(Object.values(_api.API_VERSIONS).includes(apiVersion), "Invalid apiVersion ".concat(apiVersion, ". Use API_VERSIONS enum."));
|
|
76
108
|
|
|
77
|
-
|
|
109
|
+
if (apiVersion === _api.API_VERSIONS.V1 || apiVersion === _api.API_VERSIONS.V2) {
|
|
110
|
+
_core.log.assert(type === _mapsApiCommon.MAP_TYPES.QUERY || type === _mapsApiCommon.MAP_TYPES.TILESET, "Invalid type ".concat(type, ". Use type MAP_TYPES.QUERY or MAP_TYPES.TILESET for apiVersion ").concat(apiVersion));
|
|
78
111
|
|
|
79
|
-
|
|
80
|
-
} else if (apiVersion === _api.API_VERSIONS.V3) {
|
|
81
|
-
_core.log.assert(connection, 'Missing mandatory connection parameter');
|
|
112
|
+
_core.log.assert(!connection, "Connection prop is not supported for apiVersion ".concat(apiVersion));
|
|
82
113
|
|
|
83
|
-
|
|
114
|
+
_core.log.assert(!geoColumn, "geoColumn prop is not supported for apiVersion ".concat(apiVersion));
|
|
84
115
|
|
|
85
|
-
|
|
86
|
-
|
|
116
|
+
_core.log.assert(!columns, "columns prop is not supported for apiVersion ".concat(apiVersion));
|
|
117
|
+
} else if (apiVersion === _api.API_VERSIONS.V3) {
|
|
118
|
+
_core.log.assert(connection, 'Missing mandatory connection parameter');
|
|
87
119
|
|
|
88
|
-
_core.log.assert(
|
|
89
|
-
|
|
120
|
+
_core.log.assert(Object.values(_mapsApiCommon.MAP_TYPES).includes(type), "Invalid type ".concat(type, ". Use MAP_TYPES enum."));
|
|
121
|
+
|
|
122
|
+
if (type !== _mapsApiCommon.MAP_TYPES.TABLE) {
|
|
123
|
+
_core.log.assert(!geoColumn, "geoColumn prop is only supported for type ".concat(_mapsApiCommon.MAP_TYPES.TABLE));
|
|
124
|
+
|
|
125
|
+
_core.log.assert(!columns, "columns prop is only supported for type ".concat(_mapsApiCommon.MAP_TYPES.TABLE));
|
|
126
|
+
}
|
|
90
127
|
|
|
91
|
-
|
|
92
|
-
|
|
128
|
+
if (columns) {
|
|
129
|
+
_core.log.assert(Array.isArray(columns), 'columns prop must be an Array');
|
|
130
|
+
}
|
|
93
131
|
}
|
|
94
132
|
}
|
|
95
|
-
}
|
|
133
|
+
}, {
|
|
134
|
+
key: "updateState",
|
|
135
|
+
value: function updateState(_ref) {
|
|
136
|
+
var props = _ref.props,
|
|
137
|
+
oldProps = _ref.oldProps,
|
|
138
|
+
changeFlags = _ref.changeFlags;
|
|
96
139
|
|
|
97
|
-
|
|
98
|
-
props,
|
|
99
|
-
oldProps,
|
|
100
|
-
changeFlags
|
|
101
|
-
}) {
|
|
102
|
-
this._checkProps(props);
|
|
140
|
+
this._checkProps(props);
|
|
103
141
|
|
|
104
|
-
|
|
142
|
+
var shouldUpdateData = changeFlags.dataChanged || props.connection !== oldProps.connection || props.geoColumn !== oldProps.geoColumn || JSON.stringify(props.columns) !== JSON.stringify(oldProps.columns) || props.type !== oldProps.type || JSON.stringify(props.credentials) !== JSON.stringify(oldProps.credentials);
|
|
105
143
|
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
144
|
+
if (shouldUpdateData) {
|
|
145
|
+
this.setState({
|
|
146
|
+
data: null,
|
|
147
|
+
apiVersion: null
|
|
148
|
+
});
|
|
111
149
|
|
|
112
|
-
|
|
150
|
+
this._updateData();
|
|
151
|
+
}
|
|
113
152
|
}
|
|
114
|
-
}
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
153
|
+
}, {
|
|
154
|
+
key: "_updateData",
|
|
155
|
+
value: function () {
|
|
156
|
+
var _updateData2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee() {
|
|
157
|
+
var _this$props, type, source, connection, credentials, geoColumn, columns, localConfig, apiVersion, data;
|
|
158
|
+
|
|
159
|
+
return _regenerator.default.wrap(function _callee$(_context) {
|
|
160
|
+
while (1) {
|
|
161
|
+
switch (_context.prev = _context.next) {
|
|
162
|
+
case 0:
|
|
163
|
+
_context.prev = 0;
|
|
164
|
+
_this$props = this.props, type = _this$props.type, source = _this$props.data, connection = _this$props.connection, credentials = _this$props.credentials, geoColumn = _this$props.geoColumn, columns = _this$props.columns;
|
|
165
|
+
localConfig = _objectSpread(_objectSpread({}, (0, _config.getDefaultCredentials)()), credentials);
|
|
166
|
+
apiVersion = localConfig.apiVersion;
|
|
167
|
+
|
|
168
|
+
if (!(apiVersion === _api.API_VERSIONS.V3)) {
|
|
169
|
+
_context.next = 10;
|
|
170
|
+
break;
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
_context.next = 7;
|
|
174
|
+
return (0, _api.getData)({
|
|
175
|
+
type: type,
|
|
176
|
+
source: source,
|
|
177
|
+
connection: connection,
|
|
178
|
+
credentials: credentials,
|
|
179
|
+
geoColumn: geoColumn,
|
|
180
|
+
columns: columns
|
|
181
|
+
});
|
|
182
|
+
|
|
183
|
+
case 7:
|
|
184
|
+
data = _context.sent;
|
|
185
|
+
_context.next = 17;
|
|
186
|
+
break;
|
|
187
|
+
|
|
188
|
+
case 10:
|
|
189
|
+
if (!(apiVersion === _api.API_VERSIONS.V1 || apiVersion === _api.API_VERSIONS.V2)) {
|
|
190
|
+
_context.next = 16;
|
|
191
|
+
break;
|
|
192
|
+
}
|
|
193
|
+
|
|
194
|
+
_context.next = 13;
|
|
195
|
+
return (0, _api.getDataV2)({
|
|
196
|
+
type: type,
|
|
197
|
+
source: source,
|
|
198
|
+
credentials: credentials
|
|
199
|
+
});
|
|
200
|
+
|
|
201
|
+
case 13:
|
|
202
|
+
data = _context.sent;
|
|
203
|
+
_context.next = 17;
|
|
204
|
+
break;
|
|
205
|
+
|
|
206
|
+
case 16:
|
|
207
|
+
_core.log.assert("Unknow apiVersion ".concat(apiVersion, ". Use API_VERSIONS enum."));
|
|
208
|
+
|
|
209
|
+
case 17:
|
|
210
|
+
this.setState({
|
|
211
|
+
data: data,
|
|
212
|
+
apiVersion: apiVersion
|
|
213
|
+
});
|
|
214
|
+
this.props.onDataLoad(data);
|
|
215
|
+
_context.next = 28;
|
|
216
|
+
break;
|
|
217
|
+
|
|
218
|
+
case 21:
|
|
219
|
+
_context.prev = 21;
|
|
220
|
+
_context.t0 = _context["catch"](0);
|
|
221
|
+
|
|
222
|
+
if (!this.props.onDataError) {
|
|
223
|
+
_context.next = 27;
|
|
224
|
+
break;
|
|
225
|
+
}
|
|
226
|
+
|
|
227
|
+
this.props.onDataError(_context.t0);
|
|
228
|
+
_context.next = 28;
|
|
229
|
+
break;
|
|
230
|
+
|
|
231
|
+
case 27:
|
|
232
|
+
throw _context.t0;
|
|
233
|
+
|
|
234
|
+
case 28:
|
|
235
|
+
case "end":
|
|
236
|
+
return _context.stop();
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
}, _callee, this, [[0, 21]]);
|
|
240
|
+
}));
|
|
241
|
+
|
|
242
|
+
function _updateData() {
|
|
243
|
+
return _updateData2.apply(this, arguments);
|
|
151
244
|
}
|
|
152
245
|
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
246
|
+
return _updateData;
|
|
247
|
+
}()
|
|
248
|
+
}, {
|
|
249
|
+
key: "renderLayers",
|
|
250
|
+
value: function renderLayers() {
|
|
251
|
+
var _this$state = this.state,
|
|
252
|
+
data = _this$state.data,
|
|
253
|
+
apiVersion = _this$state.apiVersion;
|
|
254
|
+
var type = this.props.type;
|
|
255
|
+
if (!data) return null;
|
|
256
|
+
var updateTriggers = this.props.updateTriggers;
|
|
257
|
+
var layer;
|
|
258
|
+
|
|
259
|
+
if (apiVersion === _api.API_VERSIONS.V1 || apiVersion === _api.API_VERSIONS.V2 || type === _mapsApiCommon.MAP_TYPES.TILESET) {
|
|
260
|
+
layer = _geoLayers.MVTLayer;
|
|
161
261
|
} else {
|
|
162
|
-
|
|
262
|
+
layer = _layers.GeoJsonLayer;
|
|
163
263
|
}
|
|
164
|
-
}
|
|
165
|
-
}
|
|
166
264
|
|
|
167
|
-
|
|
168
|
-
const {
|
|
169
|
-
data,
|
|
170
|
-
apiVersion
|
|
171
|
-
} = this.state;
|
|
172
|
-
const {
|
|
173
|
-
type
|
|
174
|
-
} = this.props;
|
|
175
|
-
if (!data) return null;
|
|
176
|
-
const {
|
|
177
|
-
updateTriggers
|
|
178
|
-
} = this.props;
|
|
179
|
-
let layer;
|
|
180
|
-
|
|
181
|
-
if (apiVersion === _api.API_VERSIONS.V1 || apiVersion === _api.API_VERSIONS.V2 || type === _mapsApiCommon.MAP_TYPES.TILESET) {
|
|
182
|
-
layer = _geoLayers.MVTLayer;
|
|
183
|
-
} else {
|
|
184
|
-
layer = _layers.GeoJsonLayer;
|
|
185
|
-
}
|
|
265
|
+
var props = _objectSpread({}, this.props);
|
|
186
266
|
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
}
|
|
267
|
+
delete props.data;
|
|
268
|
+
return new layer(props, this.getSubLayerProps({
|
|
269
|
+
id: "carto-".concat(layer.layerName),
|
|
270
|
+
data: data,
|
|
271
|
+
updateTriggers: updateTriggers
|
|
272
|
+
}));
|
|
273
|
+
}
|
|
274
|
+
}]);
|
|
275
|
+
return CartoLayer;
|
|
276
|
+
}(_core.CompositeLayer);
|
|
198
277
|
|
|
199
278
|
exports.default = CartoLayer;
|
|
200
279
|
CartoLayer.layerName = 'CartoLayer';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/layers/carto-layer.js"],"names":["defaultProps","data","type","onDataLoad","value","compare","onDataError","optional","credentials","connection","geoColumn","columns","CartoLayer","CompositeLayer","initializeState","state","apiVersion","isLoaded","getSubLayers","length","_checkProps","props","localCreds","log","assert","Object","values","API_VERSIONS","includes","V1","V2","MAP_TYPES","QUERY","TILESET","V3","TABLE","Array","isArray","updateState","oldProps","changeFlags","shouldUpdateData","dataChanged","JSON","stringify","setState","_updateData","source","localConfig","err","renderLayers","updateTriggers","layer","MVTLayer","GeoJsonLayer","getSubLayerProps","id","layerName"],"mappings":"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","sourcesContent":["import {CompositeLayer, log} from '@deck.gl/core';\nimport {MVTLayer} from '@deck.gl/geo-layers';\nimport {GeoJsonLayer} from '@deck.gl/layers';\nimport {getData, getDataV2, API_VERSIONS} from '../api';\nimport {MAP_TYPES} from '../api/maps-api-common';\nimport {getDefaultCredentials} from '../config';\n\nconst defaultProps = {\n // (String, required): data resource to load. table name, sql query or tileset name.\n data: null,\n // (Enum (MAP_TYPES), required)\n type: null,\n onDataLoad: {type: 'function', value: data => {}, compare: false},\n onDataError: {type: 'function', value: null, compare: false, optional: true},\n\n // override carto credentials for the layer, set to null to read from default\n credentials: null,\n\n /*********************/\n /* API v3 PARAMETERS */\n /**********************/\n // (String, required): connection name at CARTO platform\n connection: null,\n\n // (String, optional): name of the `geo_column` in the CARTO platform. Use this override the default column ('geom'), from which the geometry information should be fetched.\n geoColumn: null,\n\n // (Array<String>, optional): names of columns to fetch. By default, all columns are fetched.\n columns: {type: 'array', value: null}\n};\n\nexport default class CartoLayer extends CompositeLayer {\n initializeState() {\n this.state = {\n data: null,\n apiVersion: null\n };\n }\n\n get isLoaded() {\n return this.getSubLayers().length > 0 && super.isLoaded;\n }\n\n _checkProps(props) {\n const {type, credentials, connection, geoColumn, columns} = props;\n const localCreds = {...getDefaultCredentials(), ...credentials};\n const {apiVersion} = localCreds;\n\n log.assert(\n Object.values(API_VERSIONS).includes(apiVersion),\n `Invalid apiVersion ${apiVersion}. Use API_VERSIONS enum.`\n );\n\n if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n log.assert(\n type === MAP_TYPES.QUERY || type === MAP_TYPES.TILESET,\n `Invalid type ${type}. Use type MAP_TYPES.QUERY or MAP_TYPES.TILESET for apiVersion ${apiVersion}`\n );\n log.assert(!connection, `Connection prop is not supported for apiVersion ${apiVersion}`);\n log.assert(!geoColumn, `geoColumn prop is not supported for apiVersion ${apiVersion}`);\n log.assert(!columns, `columns prop is not supported for apiVersion ${apiVersion}`);\n } else if (apiVersion === API_VERSIONS.V3) {\n log.assert(connection, 'Missing mandatory connection parameter');\n log.assert(\n Object.values(MAP_TYPES).includes(type),\n `Invalid type ${type}. Use MAP_TYPES enum.`\n );\n if (type !== MAP_TYPES.TABLE) {\n log.assert(!geoColumn, `geoColumn prop is only supported for type ${MAP_TYPES.TABLE}`);\n log.assert(!columns, `columns prop is only supported for type ${MAP_TYPES.TABLE}`);\n }\n if (columns) {\n log.assert(Array.isArray(columns), 'columns prop must be an Array');\n }\n }\n }\n\n updateState({props, oldProps, changeFlags}) {\n this._checkProps(props);\n const shouldUpdateData =\n changeFlags.dataChanged ||\n props.connection !== oldProps.connection ||\n props.geoColumn !== oldProps.geoColumn ||\n JSON.stringify(props.columns) !== JSON.stringify(oldProps.columns) ||\n props.type !== oldProps.type ||\n JSON.stringify(props.credentials) !== JSON.stringify(oldProps.credentials);\n\n if (shouldUpdateData) {\n this.setState({data: null, apiVersion: null});\n this._updateData();\n }\n }\n\n async _updateData() {\n try {\n const {type, data: source, connection, credentials, geoColumn, columns} = this.props;\n const localConfig = {...getDefaultCredentials(), ...credentials};\n const {apiVersion} = localConfig;\n\n let data;\n\n if (apiVersion === API_VERSIONS.V3) {\n data = await getData({\n type,\n source,\n connection,\n credentials,\n geoColumn,\n columns\n });\n } else if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n data = await getDataV2({type, source, credentials});\n } else {\n log.assert(`Unknow apiVersion ${apiVersion}. Use API_VERSIONS enum.`);\n }\n\n this.setState({data, apiVersion});\n this.props.onDataLoad(data);\n } catch (err) {\n if (this.props.onDataError) {\n this.props.onDataError(err);\n } else {\n throw err;\n }\n }\n }\n\n renderLayers() {\n const {data, apiVersion} = this.state;\n const {type} = this.props;\n\n if (!data) return null;\n\n const {updateTriggers} = this.props;\n\n let layer;\n\n if (\n apiVersion === API_VERSIONS.V1 ||\n apiVersion === API_VERSIONS.V2 ||\n type === MAP_TYPES.TILESET\n ) {\n layer = MVTLayer;\n } else {\n layer = GeoJsonLayer;\n }\n\n const props = {...this.props};\n delete props.data;\n\n // eslint-disable-next-line new-cap\n return new layer(\n props,\n this.getSubLayerProps({\n id: `carto-${layer.layerName}`,\n data,\n updateTriggers\n })\n );\n }\n}\n\nCartoLayer.layerName = 'CartoLayer';\nCartoLayer.defaultProps = defaultProps;\n"],"file":"carto-layer.js"}
|
|
1
|
+
{"version":3,"sources":["../../../src/layers/carto-layer.js"],"names":["defaultProps","data","type","onDataLoad","value","compare","onDataError","optional","credentials","connection","geoColumn","columns","CartoLayer","state","apiVersion","getSubLayers","length","props","localCreds","log","assert","Object","values","API_VERSIONS","includes","V1","V2","MAP_TYPES","QUERY","TILESET","V3","TABLE","Array","isArray","oldProps","changeFlags","_checkProps","shouldUpdateData","dataChanged","JSON","stringify","setState","_updateData","source","localConfig","updateTriggers","layer","MVTLayer","GeoJsonLayer","getSubLayerProps","id","layerName","CompositeLayer"],"mappings":"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","sourcesContent":["import {CompositeLayer, log} from '@deck.gl/core';\nimport {MVTLayer} from '@deck.gl/geo-layers';\nimport {GeoJsonLayer} from '@deck.gl/layers';\nimport {getData, getDataV2, API_VERSIONS} from '../api';\nimport {MAP_TYPES} from '../api/maps-api-common';\nimport {getDefaultCredentials} from '../config';\n\nconst defaultProps = {\n // (String, required): data resource to load. table name, sql query or tileset name.\n data: null,\n // (Enum (MAP_TYPES), required)\n type: null,\n onDataLoad: {type: 'function', value: data => {}, compare: false},\n onDataError: {type: 'function', value: null, compare: false, optional: true},\n\n // override carto credentials for the layer, set to null to read from default\n credentials: null,\n\n /*********************/\n /* API v3 PARAMETERS */\n /**********************/\n // (String, required): connection name at CARTO platform\n connection: null,\n\n // (String, optional): name of the `geo_column` in the CARTO platform. Use this override the default column ('geom'), from which the geometry information should be fetched.\n geoColumn: null,\n\n // (Array<String>, optional): names of columns to fetch. By default, all columns are fetched.\n columns: {type: 'array', value: null}\n};\n\nexport default class CartoLayer extends CompositeLayer {\n initializeState() {\n this.state = {\n data: null,\n apiVersion: null\n };\n }\n\n get isLoaded() {\n return this.getSubLayers().length > 0 && super.isLoaded;\n }\n\n _checkProps(props) {\n const {type, credentials, connection, geoColumn, columns} = props;\n const localCreds = {...getDefaultCredentials(), ...credentials};\n const {apiVersion} = localCreds;\n\n log.assert(\n Object.values(API_VERSIONS).includes(apiVersion),\n `Invalid apiVersion ${apiVersion}. Use API_VERSIONS enum.`\n );\n\n if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n log.assert(\n type === MAP_TYPES.QUERY || type === MAP_TYPES.TILESET,\n `Invalid type ${type}. Use type MAP_TYPES.QUERY or MAP_TYPES.TILESET for apiVersion ${apiVersion}`\n );\n log.assert(!connection, `Connection prop is not supported for apiVersion ${apiVersion}`);\n log.assert(!geoColumn, `geoColumn prop is not supported for apiVersion ${apiVersion}`);\n log.assert(!columns, `columns prop is not supported for apiVersion ${apiVersion}`);\n } else if (apiVersion === API_VERSIONS.V3) {\n log.assert(connection, 'Missing mandatory connection parameter');\n log.assert(\n Object.values(MAP_TYPES).includes(type),\n `Invalid type ${type}. Use MAP_TYPES enum.`\n );\n if (type !== MAP_TYPES.TABLE) {\n log.assert(!geoColumn, `geoColumn prop is only supported for type ${MAP_TYPES.TABLE}`);\n log.assert(!columns, `columns prop is only supported for type ${MAP_TYPES.TABLE}`);\n }\n if (columns) {\n log.assert(Array.isArray(columns), 'columns prop must be an Array');\n }\n }\n }\n\n updateState({props, oldProps, changeFlags}) {\n this._checkProps(props);\n const shouldUpdateData =\n changeFlags.dataChanged ||\n props.connection !== oldProps.connection ||\n props.geoColumn !== oldProps.geoColumn ||\n JSON.stringify(props.columns) !== JSON.stringify(oldProps.columns) ||\n props.type !== oldProps.type ||\n JSON.stringify(props.credentials) !== JSON.stringify(oldProps.credentials);\n\n if (shouldUpdateData) {\n this.setState({data: null, apiVersion: null});\n this._updateData();\n }\n }\n\n async _updateData() {\n try {\n const {type, data: source, connection, credentials, geoColumn, columns} = this.props;\n const localConfig = {...getDefaultCredentials(), ...credentials};\n const {apiVersion} = localConfig;\n\n let data;\n\n if (apiVersion === API_VERSIONS.V3) {\n data = await getData({\n type,\n source,\n connection,\n credentials,\n geoColumn,\n columns\n });\n } else if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n data = await getDataV2({type, source, credentials});\n } else {\n log.assert(`Unknow apiVersion ${apiVersion}. Use API_VERSIONS enum.`);\n }\n\n this.setState({data, apiVersion});\n this.props.onDataLoad(data);\n } catch (err) {\n if (this.props.onDataError) {\n this.props.onDataError(err);\n } else {\n throw err;\n }\n }\n }\n\n renderLayers() {\n const {data, apiVersion} = this.state;\n const {type} = this.props;\n\n if (!data) return null;\n\n const {updateTriggers} = this.props;\n\n let layer;\n\n if (\n apiVersion === API_VERSIONS.V1 ||\n apiVersion === API_VERSIONS.V2 ||\n type === MAP_TYPES.TILESET\n ) {\n layer = MVTLayer;\n } else {\n layer = GeoJsonLayer;\n }\n\n const props = {...this.props};\n delete props.data;\n\n // eslint-disable-next-line new-cap\n return new layer(\n props,\n this.getSubLayerProps({\n id: `carto-${layer.layerName}`,\n data,\n updateTriggers\n })\n );\n }\n}\n\nCartoLayer.layerName = 'CartoLayer';\nCartoLayer.defaultProps = defaultProps;\n"],"file":"carto-layer.js"}
|
|
@@ -7,25 +7,60 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
});
|
|
8
8
|
exports.default = void 0;
|
|
9
9
|
|
|
10
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
11
|
+
|
|
12
|
+
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
13
|
+
|
|
14
|
+
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
15
|
+
|
|
16
|
+
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
17
|
+
|
|
18
|
+
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
19
|
+
|
|
20
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
21
|
+
|
|
10
22
|
var _core = require("@deck.gl/core");
|
|
11
23
|
|
|
12
24
|
var _cartoLayer = _interopRequireDefault(require("./carto-layer"));
|
|
13
25
|
|
|
14
26
|
var _api = require("../api");
|
|
15
27
|
|
|
16
|
-
|
|
28
|
+
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
|
|
29
|
+
|
|
30
|
+
function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
|
|
31
|
+
|
|
32
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
33
|
+
|
|
34
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
35
|
+
|
|
36
|
+
var defaultProps = _objectSpread(_objectSpread({}, _cartoLayer.default.defaultProps), {}, {
|
|
17
37
|
type: _api.MAP_TYPES.QUERY,
|
|
18
38
|
uniqueIdProperty: 'cartodb_id'
|
|
19
|
-
};
|
|
39
|
+
});
|
|
40
|
+
|
|
41
|
+
var CartoSQLLayer = function (_CartoLayer) {
|
|
42
|
+
(0, _inherits2.default)(CartoSQLLayer, _CartoLayer);
|
|
43
|
+
|
|
44
|
+
var _super = _createSuper(CartoSQLLayer);
|
|
20
45
|
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
46
|
+
function CartoSQLLayer() {
|
|
47
|
+
var _this;
|
|
48
|
+
|
|
49
|
+
(0, _classCallCheck2.default)(this, CartoSQLLayer);
|
|
50
|
+
|
|
51
|
+
for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
52
|
+
args[_key] = arguments[_key];
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
_this = _super.call.apply(_super, [this].concat(args));
|
|
24
56
|
|
|
25
57
|
_core.log.warn('CartoSQLLayer will be removed in future versions. Use CartoLayer with type=MAP_TYPES.QUERY and apiVersion=API_VERSIONS.V2')();
|
|
58
|
+
|
|
59
|
+
return _this;
|
|
26
60
|
}
|
|
27
61
|
|
|
28
|
-
|
|
62
|
+
return (0, _createClass2.default)(CartoSQLLayer);
|
|
63
|
+
}(_cartoLayer.default);
|
|
29
64
|
|
|
30
65
|
exports.default = CartoSQLLayer;
|
|
31
66
|
CartoSQLLayer.layerName = 'CartoSQLLayer';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/layers/carto-sql-layer.js"],"names":["defaultProps","CartoLayer","type","MAP_TYPES","QUERY","uniqueIdProperty","CartoSQLLayer","
|
|
1
|
+
{"version":3,"sources":["../../../src/layers/carto-sql-layer.js"],"names":["defaultProps","CartoLayer","type","MAP_TYPES","QUERY","uniqueIdProperty","CartoSQLLayer","args","log","warn","layerName"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;;;;;;;;;AAEA,IAAMA,YAAY,mCACbC,oBAAWD,YADE;AAEhBE,EAAAA,IAAI,EAAEC,eAAUC,KAFA;AAGhBC,EAAAA,gBAAgB,EAAE;AAHF,EAAlB;;IAMqBC,a;;;;;AACnB,2BAAqB;AAAA;;AAAA;;AAAA,sCAANC,IAAM;AAANA,MAAAA,IAAM;AAAA;;AACnB,oDAASA,IAAT;;AAEAC,cAAIC,IAAJ,CACE,2HADF;;AAHmB;AAMpB;;;EAPwCR,mB;;;AAU3CK,aAAa,CAACI,SAAd,GAA0B,eAA1B;AACAJ,aAAa,CAACN,YAAd,GAA6BA,YAA7B","sourcesContent":["import {log} from '@deck.gl/core';\nimport CartoLayer from './carto-layer';\nimport {MAP_TYPES} from '../api';\n\nconst defaultProps = {\n ...CartoLayer.defaultProps,\n type: MAP_TYPES.QUERY,\n uniqueIdProperty: 'cartodb_id'\n};\n\nexport default class CartoSQLLayer extends CartoLayer {\n constructor(...args) {\n super(...args);\n\n log.warn(\n 'CartoSQLLayer will be removed in future versions. Use CartoLayer with type=MAP_TYPES.QUERY and apiVersion=API_VERSIONS.V2'\n )();\n }\n}\n\nCartoSQLLayer.layerName = 'CartoSQLLayer';\nCartoSQLLayer.defaultProps = defaultProps;\n"],"file":"carto-sql-layer.js"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
4
4
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
@@ -13,17 +13,22 @@ var _palette = _interopRequireWildcard(require("./palette"));
|
|
|
13
13
|
|
|
14
14
|
var _utils = require("./utils");
|
|
15
15
|
|
|
16
|
-
function
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
16
|
+
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
17
|
+
|
|
18
|
+
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
19
|
+
|
|
20
|
+
function colorBins(_ref) {
|
|
21
|
+
var attr = _ref.attr,
|
|
22
|
+
domain = _ref.domain,
|
|
23
|
+
_ref$colors = _ref.colors,
|
|
24
|
+
colors = _ref$colors === void 0 ? _palette.DEFAULT_PALETTE : _ref$colors,
|
|
25
|
+
_ref$nullColor = _ref.nullColor,
|
|
26
|
+
nullColor = _ref$nullColor === void 0 ? _palette.NULL_COLOR : _ref$nullColor;
|
|
22
27
|
(0, _utils.assert)(Array.isArray(domain), 'Expected "domain" to be an array of numbers');
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
return d
|
|
26
|
-
|
|
28
|
+
var palette = typeof colors === 'string' ? (0, _palette.default)(colors, domain.length) : colors;
|
|
29
|
+
var color = (0, _d3Scale.scaleThreshold)().domain(domain).range(palette);
|
|
30
|
+
return function (d) {
|
|
31
|
+
var value = (0, _utils.getAttrValue)(attr, d);
|
|
27
32
|
return Number.isFinite(value) ? color(value) : nullColor;
|
|
28
33
|
};
|
|
29
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/style/color-bins-style.js"],"names":["colorBins","attr","domain","colors","DEFAULT_PALETTE","nullColor","NULL_COLOR","Array","isArray","palette","length","color","range","d","value","Number","isFinite"],"mappings":";;;;;;;;;AAAA;;AACA;;AACA
|
|
1
|
+
{"version":3,"sources":["../../../src/style/color-bins-style.js"],"names":["colorBins","attr","domain","colors","DEFAULT_PALETTE","nullColor","NULL_COLOR","Array","isArray","palette","length","color","range","d","value","Number","isFinite"],"mappings":";;;;;;;;;AAAA;;AACA;;AACA;;;;;;AAEe,SAASA,SAAT,OAKZ;AAAA,MAJDC,IAIC,QAJDA,IAIC;AAAA,MAHDC,MAGC,QAHDA,MAGC;AAAA,yBAFDC,MAEC;AAAA,MAFDA,MAEC,4BAFQC,wBAER;AAAA,4BADDC,SACC;AAAA,MADDA,SACC,+BADWC,mBACX;AACD,qBAAOC,KAAK,CAACC,OAAN,CAAcN,MAAd,CAAP,EAA8B,6CAA9B;AAEA,MAAMO,OAAO,GAAG,OAAON,MAAP,KAAkB,QAAlB,GAA6B,sBAAWA,MAAX,EAAmBD,MAAM,CAACQ,MAA1B,CAA7B,GAAiEP,MAAjF;AAEA,MAAMQ,KAAK,GAAG,+BACXT,MADW,CACJA,MADI,EAEXU,KAFW,CAELH,OAFK,CAAd;AAIA,SAAO,UAAAI,CAAC,EAAI;AACV,QAAMC,KAAK,GAAG,yBAAab,IAAb,EAAmBY,CAAnB,CAAd;AACA,WAAOE,MAAM,CAACC,QAAP,CAAgBF,KAAhB,IAAyBH,KAAK,CAACG,KAAD,CAA9B,GAAwCT,SAA/C;AACD,GAHD;AAID","sourcesContent":["import {scaleThreshold} from 'd3-scale';\nimport getPalette, {DEFAULT_PALETTE, NULL_COLOR} from './palette';\nimport {assert, getAttrValue} from './utils';\n\nexport default function colorBins({\n attr,\n domain,\n colors = DEFAULT_PALETTE,\n nullColor = NULL_COLOR\n}) {\n assert(Array.isArray(domain), 'Expected \"domain\" to be an array of numbers');\n\n const palette = typeof colors === 'string' ? getPalette(colors, domain.length) : colors;\n\n const color = scaleThreshold()\n .domain(domain)\n .range(palette);\n\n return d => {\n const value = getAttrValue(attr, d);\n return Number.isFinite(value) ? color(value) : nullColor;\n };\n}\n"],"file":"color-bins-style.js"}
|