bruce-models 2.1.0 → 2.1.2
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/bruce-models.es5.js +121 -276
- package/dist/bruce-models.es5.js.map +1 -1
- package/dist/bruce-models.umd.js +120 -275
- package/dist/bruce-models.umd.js.map +1 -1
- package/dist/lib/common/cache.js +66 -187
- package/dist/lib/common/cache.js.map +1 -1
- package/dist/lib/entity/getters/entity-filter-getter.js +13 -3
- package/dist/lib/entity/getters/entity-filter-getter.js.map +1 -1
- package/dist/lib/entity/getters/entity-globe.js +27 -67
- package/dist/lib/entity/getters/entity-globe.js.map +1 -1
- package/dist/types/common/cache.d.ts +0 -2
- package/dist/types/entity/getters/entity-globe.d.ts +1 -2
- package/package.json +1 -1
package/dist/lib/common/cache.js
CHANGED
|
@@ -11,246 +11,125 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.CacheControl = void 0;
|
|
13
13
|
const localforage_1 = require("localforage");
|
|
14
|
-
const
|
|
15
|
-
class
|
|
14
|
+
const CACHE_VERSION_PREFIX = "v2_";
|
|
15
|
+
class CacheUtil {
|
|
16
16
|
constructor(id) {
|
|
17
|
-
this.memory = Object.create(null);
|
|
18
|
-
if (!id) {
|
|
19
|
-
id = "BRUCE_UI_MODELS_CACHE_DICT_" + object_utils_1.ObjectUtils.UId();
|
|
20
|
-
}
|
|
21
|
-
this.id = id;
|
|
22
17
|
this.store = localforage_1.default.createInstance({
|
|
23
|
-
name: id
|
|
18
|
+
name: CACHE_VERSION_PREFIX + id,
|
|
24
19
|
});
|
|
20
|
+
this.inMemoryPromises = {};
|
|
21
|
+
this.keyVersions = {};
|
|
25
22
|
}
|
|
26
|
-
|
|
27
|
-
return this.id;
|
|
28
|
-
}
|
|
29
|
-
GetItems() {
|
|
23
|
+
Set(key, value, duration = 300000) {
|
|
30
24
|
return __awaiter(this, void 0, void 0, function* () {
|
|
31
|
-
if (
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
// We can clean this every first time we load.
|
|
39
|
-
const now = new Date().getTime();
|
|
40
|
-
for (const item of raw) {
|
|
41
|
-
if (item.duration > -1 && (now - item.created) / 1000 > item.duration) {
|
|
42
|
-
if (item.inMemory) {
|
|
43
|
-
this.memory[item.key] = null;
|
|
44
|
-
delete this.memory[item.key];
|
|
45
|
-
}
|
|
46
|
-
else {
|
|
47
|
-
yield this.store.removeItem(item.key);
|
|
48
|
-
}
|
|
49
|
-
}
|
|
25
|
+
if (value instanceof Promise) {
|
|
26
|
+
this.inMemoryPromises[key] = value;
|
|
27
|
+
const currentVersion = (this.keyVersions[key] = (this.keyVersions[key] || 0) + 1);
|
|
28
|
+
value
|
|
29
|
+
.then((resolvedValue) => {
|
|
30
|
+
if (this.keyVersions[key] === currentVersion) {
|
|
31
|
+
this.Set(key, resolvedValue, duration);
|
|
50
32
|
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
});
|
|
56
|
-
}
|
|
57
|
-
GetKeys() {
|
|
58
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
59
|
-
return (yield this.GetItems()).map(x => "" + x.key);
|
|
60
|
-
});
|
|
61
|
-
}
|
|
62
|
-
Set(key, value, duration) {
|
|
63
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
64
|
-
key = "" + key;
|
|
65
|
-
const items = yield this.GetItems();
|
|
66
|
-
const itemIndex = items.findIndex(x => x.key == key);
|
|
67
|
-
if (itemIndex > -1) {
|
|
68
|
-
const item = items[itemIndex];
|
|
69
|
-
if (item.inMemory) {
|
|
70
|
-
this.memory[item.key] = null;
|
|
71
|
-
delete this.memory[item.key];
|
|
72
|
-
}
|
|
73
|
-
else {
|
|
74
|
-
yield this.store.removeItem(item.key);
|
|
75
|
-
}
|
|
76
|
-
items.splice(itemIndex, 1);
|
|
77
|
-
}
|
|
78
|
-
const item = {
|
|
79
|
-
key: key,
|
|
80
|
-
duration: duration,
|
|
81
|
-
created: new Date().getTime(),
|
|
82
|
-
inMemory: false
|
|
83
|
-
};
|
|
84
|
-
// Short duration, keep in memory.
|
|
85
|
-
if (duration < 60) {
|
|
86
|
-
item.inMemory = true;
|
|
87
|
-
this.memory[item.key] = value;
|
|
88
|
-
}
|
|
89
|
-
// Let's resolve and store the value in local-storage.
|
|
90
|
-
// If resolution crashes then we'll keep retaining that in memory.
|
|
91
|
-
else if (value instanceof Promise) {
|
|
92
|
-
value.then((x) => __awaiter(this, void 0, void 0, function* () {
|
|
93
|
-
try {
|
|
94
|
-
const items = yield this.GetItems();
|
|
95
|
-
const item = items.find(x => x.key == key);
|
|
96
|
-
if (!item) {
|
|
97
|
-
console.log("Item was removed from cache before promise resolved.", key, items);
|
|
98
|
-
return;
|
|
99
|
-
}
|
|
100
|
-
try {
|
|
101
|
-
yield this.store.setItem(item.key, x);
|
|
102
|
-
item.inMemory = false;
|
|
103
|
-
this.memory[item.key] = null;
|
|
104
|
-
delete this.memory[item.key];
|
|
105
|
-
yield this.store.setItem(this.id, items);
|
|
106
|
-
}
|
|
107
|
-
catch (e) {
|
|
108
|
-
console.warn(e);
|
|
109
|
-
}
|
|
33
|
+
})
|
|
34
|
+
.catch((error) => {
|
|
35
|
+
if (this.keyVersions[key] === currentVersion) {
|
|
36
|
+
this.Set(key, error, duration);
|
|
110
37
|
}
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
})
|
|
115
|
-
item.inMemory = true;
|
|
116
|
-
this.memory[item.key] = value;
|
|
38
|
+
})
|
|
39
|
+
.finally(() => {
|
|
40
|
+
delete this.inMemoryPromises[key];
|
|
41
|
+
});
|
|
117
42
|
}
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
this.memory[item.key] = value;
|
|
125
|
-
console.warn(e);
|
|
126
|
-
}
|
|
43
|
+
else {
|
|
44
|
+
const item = {
|
|
45
|
+
value,
|
|
46
|
+
expiry: Date.now() + duration,
|
|
47
|
+
};
|
|
48
|
+
yield this.store.setItem(key, item);
|
|
127
49
|
}
|
|
128
|
-
items.push(item);
|
|
129
|
-
yield this.store.setItem(this.id, items);
|
|
130
|
-
this.items = items;
|
|
131
50
|
});
|
|
132
51
|
}
|
|
133
|
-
|
|
52
|
+
Get(key) {
|
|
134
53
|
return __awaiter(this, void 0, void 0, function* () {
|
|
135
|
-
key
|
|
136
|
-
|
|
137
|
-
const index = items.findIndex(x => x.key == key);
|
|
138
|
-
if (index >= 0) {
|
|
139
|
-
const item = items[index];
|
|
140
|
-
if (item.inMemory) {
|
|
141
|
-
this.memory[item.key] = null;
|
|
142
|
-
delete this.memory[item.key];
|
|
143
|
-
}
|
|
144
|
-
else {
|
|
145
|
-
this.store.removeItem(item.key);
|
|
146
|
-
}
|
|
147
|
-
items.splice(index, 1);
|
|
148
|
-
this.store.setItem(this.id, items);
|
|
54
|
+
if (this.inMemoryPromises[key]) {
|
|
55
|
+
return this.inMemoryPromises[key];
|
|
149
56
|
}
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
Clear() {
|
|
154
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
155
|
-
const items = yield this.GetItems();
|
|
156
|
-
for (const item of items) {
|
|
157
|
-
if (item.inMemory) {
|
|
158
|
-
this.store.removeItem(item.key);
|
|
159
|
-
}
|
|
57
|
+
const item = (yield this.store.getItem(key));
|
|
58
|
+
if (!item) {
|
|
59
|
+
return null;
|
|
160
60
|
}
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
61
|
+
if (Date.now() > item.expiry) {
|
|
62
|
+
yield this.store.removeItem(key);
|
|
63
|
+
return null;
|
|
64
|
+
}
|
|
65
|
+
return item.value;
|
|
164
66
|
});
|
|
165
67
|
}
|
|
166
|
-
|
|
68
|
+
ClearCache(pattern, mode = "equals") {
|
|
167
69
|
return __awaiter(this, void 0, void 0, function* () {
|
|
168
|
-
|
|
169
|
-
const
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
70
|
+
const keys = yield this.store.keys();
|
|
71
|
+
const checkFuncs = {
|
|
72
|
+
equals: (key) => key === pattern,
|
|
73
|
+
contains: (key) => key.includes(pattern),
|
|
74
|
+
startswith: (key) => key.startsWith(pattern),
|
|
75
|
+
};
|
|
76
|
+
const check = checkFuncs[mode];
|
|
77
|
+
if (!check) {
|
|
78
|
+
throw new Error("Invalid mode");
|
|
174
79
|
}
|
|
175
|
-
|
|
176
|
-
|
|
80
|
+
for (const key of keys) {
|
|
81
|
+
if (check(key)) {
|
|
82
|
+
yield this.store.removeItem(key);
|
|
83
|
+
}
|
|
177
84
|
}
|
|
178
|
-
const
|
|
179
|
-
|
|
180
|
-
|
|
85
|
+
for (const key in this.inMemoryPromises) {
|
|
86
|
+
if (check(key)) {
|
|
87
|
+
delete this.inMemoryPromises[key];
|
|
88
|
+
this.keyVersions[key]++;
|
|
89
|
+
}
|
|
181
90
|
}
|
|
182
|
-
return raw;
|
|
183
91
|
});
|
|
184
92
|
}
|
|
185
93
|
}
|
|
186
94
|
class CacheControl {
|
|
187
95
|
constructor(id) {
|
|
188
96
|
this.Disabled = false;
|
|
189
|
-
this.data = new
|
|
97
|
+
this.data = new CacheUtil(id);
|
|
190
98
|
}
|
|
191
99
|
/**
|
|
192
100
|
* @param id
|
|
193
101
|
* @param data
|
|
194
102
|
* @param duration seconds to keep the data in cache. -1 for infinite.
|
|
195
103
|
*/
|
|
196
|
-
Set(id, data, duration =
|
|
104
|
+
Set(id, data, duration = 300) {
|
|
197
105
|
return __awaiter(this, void 0, void 0, function* () {
|
|
198
|
-
|
|
106
|
+
const durationMs = duration === -1 ? undefined : duration * 1000;
|
|
107
|
+
return this.data.Set(String(id), data, durationMs);
|
|
199
108
|
});
|
|
200
109
|
}
|
|
201
110
|
Get(id) {
|
|
202
111
|
return __awaiter(this, void 0, void 0, function* () {
|
|
203
|
-
return this.data.
|
|
112
|
+
return (yield this.data.Get(String(id)));
|
|
204
113
|
});
|
|
205
114
|
}
|
|
206
115
|
Clear() {
|
|
207
116
|
return __awaiter(this, void 0, void 0, function* () {
|
|
208
|
-
return this.data.
|
|
117
|
+
return this.data.ClearCache("");
|
|
209
118
|
});
|
|
210
119
|
}
|
|
211
120
|
Remove(id) {
|
|
212
121
|
return __awaiter(this, void 0, void 0, function* () {
|
|
213
|
-
return this.data.
|
|
122
|
+
return this.data.ClearCache(String(id), "equals");
|
|
214
123
|
});
|
|
215
124
|
}
|
|
216
125
|
RemoveByStartsWith(text) {
|
|
217
126
|
return __awaiter(this, void 0, void 0, function* () {
|
|
218
|
-
|
|
219
|
-
for (const item of items) {
|
|
220
|
-
if (item.key.startsWith(text)) {
|
|
221
|
-
yield this.data.Remove(item.key);
|
|
222
|
-
}
|
|
223
|
-
}
|
|
127
|
+
return this.data.ClearCache(text, "startswith");
|
|
224
128
|
});
|
|
225
129
|
}
|
|
226
130
|
RemoveByContains(text) {
|
|
227
131
|
return __awaiter(this, void 0, void 0, function* () {
|
|
228
|
-
|
|
229
|
-
for (const item of items) {
|
|
230
|
-
if (item.key.includes(text)) {
|
|
231
|
-
yield this.data.Remove(item.key);
|
|
232
|
-
}
|
|
233
|
-
}
|
|
234
|
-
});
|
|
235
|
-
}
|
|
236
|
-
GetKeys() {
|
|
237
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
238
|
-
if (this.Disabled) {
|
|
239
|
-
return [];
|
|
240
|
-
}
|
|
241
|
-
const items = yield this.data.GetItems();
|
|
242
|
-
return items.map(x => x.key);
|
|
243
|
-
});
|
|
244
|
-
}
|
|
245
|
-
GetValues() {
|
|
246
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
247
|
-
if (this.Disabled) {
|
|
248
|
-
return [];
|
|
249
|
-
}
|
|
250
|
-
const items = yield this.data.GetItems();
|
|
251
|
-
const keys = items.map(x => x.key);
|
|
252
|
-
const values = yield Promise.all(keys.map(key => this.data.GetData(key)));
|
|
253
|
-
return values.filter(x => x != null);
|
|
132
|
+
return this.data.ClearCache(text, "contains");
|
|
254
133
|
});
|
|
255
134
|
}
|
|
256
135
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../src/common/cache.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAsC;
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../src/common/cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -195,6 +195,7 @@ var EntityFilterGetter;
|
|
|
195
195
|
let retryDelay = 0;
|
|
196
196
|
let prevFirstId = "";
|
|
197
197
|
let prevLastId = "";
|
|
198
|
+
let prevTicks = 0;
|
|
198
199
|
while ((!this.viewCenter || !this.viewRect) && this.getterLoopId == loopId) {
|
|
199
200
|
yield delay(RETRY_DELAY_INCREMENT);
|
|
200
201
|
}
|
|
@@ -224,8 +225,12 @@ var EntityFilterGetter;
|
|
|
224
225
|
}
|
|
225
226
|
const curCell = cells[curCellIndex];
|
|
226
227
|
if (curCell.IsFetched()) {
|
|
228
|
+
curCell.Fetching = false;
|
|
227
229
|
curCellIndex += 1;
|
|
228
|
-
if (
|
|
230
|
+
if (cells[curCellIndex]) {
|
|
231
|
+
cells[curCellIndex].Fetching = true;
|
|
232
|
+
}
|
|
233
|
+
else {
|
|
229
234
|
curCellIndex = null;
|
|
230
235
|
}
|
|
231
236
|
(_b = this.onScanUpdate) === null || _b === void 0 ? void 0 : _b.Trigger(cells);
|
|
@@ -265,6 +270,7 @@ var EntityFilterGetter;
|
|
|
265
270
|
// Only mark as fetched when ALL pages are done.
|
|
266
271
|
if (entities.length <= 0) {
|
|
267
272
|
curCell.Fetched = true;
|
|
273
|
+
curCell.Fetching = false;
|
|
268
274
|
(_d = this.onScanUpdate) === null || _d === void 0 ? void 0 : _d.Trigger(cells);
|
|
269
275
|
continue;
|
|
270
276
|
}
|
|
@@ -273,11 +279,15 @@ var EntityFilterGetter;
|
|
|
273
279
|
const first = (_f = (_e = entities[0]) === null || _e === void 0 ? void 0 : _e.Bruce) === null || _f === void 0 ? void 0 : _f.ID;
|
|
274
280
|
const last = (_h = (_g = entities[entities.length - 1]) === null || _g === void 0 ? void 0 : _g.Bruce) === null || _h === void 0 ? void 0 : _h.ID;
|
|
275
281
|
if (prevFirstId == first && prevLastId == last) {
|
|
276
|
-
|
|
282
|
+
prevTicks += 1;
|
|
283
|
+
if (prevTicks > 3) {
|
|
284
|
+
break;
|
|
285
|
+
}
|
|
277
286
|
}
|
|
278
287
|
else {
|
|
279
288
|
prevFirstId = first;
|
|
280
289
|
prevLastId = last;
|
|
290
|
+
prevTicks = 0;
|
|
281
291
|
}
|
|
282
292
|
}
|
|
283
293
|
curCell.FetchPageIndex++;
|
|
@@ -286,7 +296,7 @@ var EntityFilterGetter;
|
|
|
286
296
|
retryDelay = 0;
|
|
287
297
|
}
|
|
288
298
|
catch (e) {
|
|
289
|
-
console.
|
|
299
|
+
console.error(e);
|
|
290
300
|
// Request failed so let's add a delay and try again soon.
|
|
291
301
|
retryDelay += RETRY_DELAY_INCREMENT;
|
|
292
302
|
retryAttempts -= 1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-filter-getter.js","sourceRoot":"","sources":["../../../../src/entity/getters/entity-filter-getter.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAoC;AAGpC,0DAAsD;AAGtD,sCAAmC;AACnC,iDAA6C;AAG7C,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAC/B,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAC7B,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAClC,MAAM,kBAAkB,GAAG,EAAE,CAAC;AAE9B,MAAM,iBAAiB;IAKnB,YAAY,MAAgB,EAAE,SAAiB,EAAE,SAAiB;QAC9D,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;CACJ;AAED,SAAe,KAAK,CAAC,YAAoB;;QACrC,OAAO,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACvB,UAAU,CAAC,GAAG,EAAE;gBACZ,GAAG,EAAE,CAAC;YACV,CAAC,EAAE,YAAY,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;IACP,CAAC;CAAA;AAED;;;;GAIG;AACH,IAAiB,kBAAkB,
|
|
1
|
+
{"version":3,"file":"entity-filter-getter.js","sourceRoot":"","sources":["../../../../src/entity/getters/entity-filter-getter.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAoC;AAGpC,0DAAsD;AAGtD,sCAAmC;AACnC,iDAA6C;AAG7C,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAC/B,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAC7B,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAClC,MAAM,kBAAkB,GAAG,EAAE,CAAC;AAE9B,MAAM,iBAAiB;IAKnB,YAAY,MAAgB,EAAE,SAAiB,EAAE,SAAiB;QAC9D,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;CACJ;AAED,SAAe,KAAK,CAAC,YAAoB;;QACrC,OAAO,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACvB,UAAU,CAAC,GAAG,EAAE;gBACZ,GAAG,EAAE,CAAC;YACV,CAAC,EAAE,YAAY,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;IACP,CAAC;CAAA;AAED;;;;GAIG;AACH,IAAiB,kBAAkB,CAgUlC;AAhUD,WAAiB,kBAAkB;IAC/B,IAAY,OAGX;IAHD,WAAY,OAAO;QACf,gCAAqB,CAAA;QACrB,8BAAmB,CAAA;IACvB,CAAC,EAHW,OAAO,GAAP,0BAAO,KAAP,0BAAO,QAGlB;IAOD,MAAa,MAAM;QA2Cf,YACI,GAAiB,EACjB,QAA8B,EAC9B,MAAc,EACd,SAAkB,EAClB,UAA6B,EAC7B,MAAgB;YAhDZ,aAAQ,GAAsC,IAAI,CAAC;YAQpD,qBAAgB,GAA+B,EAAE,CAAC;YACjD,kBAAa,GAAmC,IAAI,CAAC;YAQrD,iBAAY,GAAwC,IAAI,CAAC;YAUzD,0BAAqB,GAAoB,IAAI,CAAC;YAC9C,UAAK,GAA0B,IAAI,CAAC;YACpC,oBAAe,GAAmC,EAAE,CAAC;YACrD,iBAAY,GAAW,CAAC,CAAC;YAKzB,WAAM,GAAkB,IAAI,CAAC;YAC7B,cAAS,GAAG,CAAC,CAAC;YACd,cAAS,GAAG,MAAM,CAAC;YAEnB,aAAQ,GAA2B,IAAI,CAAC;YACxC,eAAU,GAAsB,IAAI,CAAC;YAUzC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;YACf,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;YACrB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;YAC9B,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;YACpD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;YACzB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;YAC7B,IAAI,CAAC,YAAY,EAAE,CAAC;QACxB,CAAC;QAxDD,IAAW,QAAQ;YACf,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAChB,IAAI,CAAC,QAAQ,GAAG,IAAI,wBAAU,EAAoB,CAAC;aACtD;YACD,OAAO,IAAI,CAAC,QAAQ,CAAC;QACzB,CAAC;QAID,IAAW,aAAa;YACpB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;gBACrB,IAAI,CAAC,aAAa,GAAG,IAAI,wBAAU,EAAiB,CAAC;aACxD;YACD,OAAO,IAAI,CAAC,aAAa,CAAC;QAC9B,CAAC;QAGD,IAAW,YAAY;YACnB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;gBACpB,IAAI,CAAC,YAAY,GAAG,IAAI,wBAAU,EAAsB,CAAC;aAC5D;YACD,OAAO,IAAI,CAAC,YAAY,CAAC;QAC7B,CAAC;QAoCD;;;;WAIG;QACK,cAAc;YAClB,OAAO,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACzD,CAAC;QAEO,WAAW;YACf,IAAI,CAAC,eAAe,EAAE,CAAC;YACvB,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE;gBAChE,IAAI,CAAC,YAAY,EAAE,CAAC;gBACpB,IAAI,CAAC,eAAe,EAAE,CAAC;YAC3B,CAAC,CAAC,CAAC;QACP,CAAC;QAEO,eAAe;;YACnB,MAAA,IAAI,CAAC,qBAAqB,+CAA1B,IAAI,EAA2B;QACnC,CAAC;QAEM,YAAY;YACf,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC7C,CAAC;QAEM,eAAe,CAAC,UAAkB,EAAE,QAAkB,EAAE,SAAiB,EAAE,SAAiB;YAC/F,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,IAAI,iBAAiB,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;YACzF,IAAI,CAAC,WAAW,EAAE,CAAC;QACvB,CAAC;QAEM,eAAe,CAAC,UAAkB;YACrC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,GAAQ,IAAI,CAAC;YAC7C,OAAO,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACxC,IAAI,CAAC,WAAW,EAAE,CAAC;QACvB,CAAC;QAEO,YAAY;YAChB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;YAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;YACtC,IAAI,QAAQ,IAAI,GAAG,EAAE;gBACjB,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,mBAAmB,EAAE;oBAC/D,OAAO;iBACV;gBACD,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,mBAAmB,EAAE;oBACjE,OAAO;iBACV;gBACD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBACzB,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;aACzB;QACL,CAAC;QAEO,WAAW;YACf,MAAM,MAAM,GAAa,EAAE,CAAC;YAC5B,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YACxC,IAAI,SAAS,GAAG,IAAI,CAAC;YACrB,IAAI,SAAS,GAAG,IAAI,CAAC;YACrB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;gBACtD,IAAI,QAAQ,EAAE;oBACV,IAAI,SAAS,IAAI,IAAI,IAAI,SAAS,GAAG,QAAQ,CAAC,SAAS,EAAE;wBACrD,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;qBAClC;oBACD,IAAI,SAAS,IAAI,IAAI,IAAI,SAAS,GAAG,QAAQ,CAAC,SAAS,EAAE;wBACrD,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;qBAClC;oBAED,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC;oBACrC,IAAI,YAAY,EAAE;wBACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;4BAC1C,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;4BACpC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;gCAC/B,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;6BAC5B;yBACJ;qBACJ;iBACJ;aACJ;YAED,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;gBACxB,6CAA6C;gBAC7C,IAAI,CAAC,KAAK,GAAG,IAAI,0BAAW,CAAC,IAAI,EAAE,CAAC;gBACpC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;gBACrB,IAAI,CAAC,SAAS,GAAW,SAAS,CAAC;gBACnC,IAAI,CAAC,SAAS,GAAW,SAAS,CAAC;gBACnC,IAAI,CAAC,YAAY,EAAE,CAAC;gBACpB,IAAI,CAAC,eAAe,EAAE,CAAC;gBACvB,IAAI,CAAC,WAAW,EAAE,CAAC;aACtB;iBACI;gBACD,IAAI,CAAC,YAAY,IAAI,CAAC,CAAC;gBACvB,IAAI,CAAC,eAAe,EAAE,CAAC;aAC1B;QACL,CAAC;QAEO,UAAU,CAAC,MAAqB;;YACpC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;YAC3C,MAAA,IAAI,CAAC,aAAa,0CAAE,OAAO,CAAC,MAAM,EAAE;QACxC,CAAC;QAEO,eAAe;YACnB,2CAA2C;YAC3C,IAAI,CAAC,YAAY,IAAI,CAAC,CAAC;YACvB,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC;YACjC,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;YAE5C,IAAI,OAAO,CAAC,GAAS,EAAE;;gBACnB,qFAAqF;gBACrF,4DAA4D;gBAC5D,8DAA8D;gBAC9D,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;gBAEjB,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC;gBAClC,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC;gBAClC,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;gBACjC,IAAI,aAAa,GAAG,kBAAkB,CAAC;gBACvC,IAAI,UAAU,GAAG,CAAC,CAAC;gBACnB,IAAI,WAAW,GAAW,EAAE,CAAC;gBAC7B,IAAI,UAAU,GAAW,EAAE,CAAC;gBAC5B,IAAI,SAAS,GAAG,CAAC,CAAC;gBAElB,OAAO,CAAC,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,YAAY,IAAI,MAAM,EAAE;oBACxE,MAAM,KAAK,CAAC,qBAAqB,CAAC,CAAC;iBACtC;gBACD,IAAI,IAAI,CAAC,YAAY,IAAI,MAAM,EAAE;oBAC7B,OAAO;iBACV;gBACD,MAAM,GAAG,GAAW,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;gBACtC,IAAI,GAAG,GAAG,UAAU,IAAI,CAAC,GAAG,GAAG,UAAU,IAAI,UAAU,GAAG,CAAC,CAAC,EAAE;oBAC1D,OAAO;iBACV;gBAED,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACxD,MAAA,IAAI,CAAC,YAAY,0CAAE,OAAO,CAAC,KAAK,EAAE;gBAClC,IAAI,YAAY,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBAE/C,IAAI,cAAc,GAAG,KAAK,CAAC;gBAC3B,IAAI,aAAa,GAAG,KAAK,CAAC;gBAE1B,IAAI,KAAK,GAAG,CAAC,CAAA;gBACb,OAAO,aAAa,GAAG,CAAC,IAAI,YAAY,IAAI,IAAI,EAAE;oBAC9C,IAAI,UAAU,GAAG,CAAC,EAAE;wBAChB,MAAM,KAAK,CAAC,UAAU,CAAC,CAAC;qBAC3B;oBACD,IAAI,IAAI,CAAC,YAAY,IAAI,MAAM,EAAE;wBAC7B,MAAM;qBACT;oBAED,IAAI,CAAC,cAAc,EAAE;wBACjB,IAAI,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;wBAC5D,cAAc,GAAG,IAAI,CAAC;qBACzB;oBAED,MAAM,OAAO,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC;oBACpC,IAAI,OAAO,CAAC,SAAS,EAAE,EAAE;wBACrB,OAAO,CAAC,QAAQ,GAAG,KAAK,CAAC;wBACzB,YAAY,IAAI,CAAC,CAAC;wBAClB,IAAI,KAAK,CAAC,YAAY,CAAC,EAAE;4BACrB,KAAK,CAAC,YAAY,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC;yBACvC;6BACI;4BACD,YAAY,GAAG,IAAI,CAAC;yBACvB;wBACD,MAAA,IAAI,CAAC,YAAY,0CAAE,OAAO,CAAC,KAAK,EAAE;wBAClC,SAAS;qBACZ;oBAED,IAAI;wBACA,IAAI,EAAC,QAAQ,EAAC,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC;4BAClC,GAAG,EAAE,IAAI,CAAC,GAAG;4BACb,MAAM,EAAE;gCACJ,QAAQ,EAAE,SAAS;gCACnB,SAAS,EAAG,OAAO,CAAC,cAAc;gCAClC,YAAY,EAAE,IAAI,CAAC,MAAM;gCACzB,QAAQ,EAAE,IAAI,CAAC,MAAM;gCACrB,MAAM,EAAE,OAAO,CAAC,SAAS,EAAE;gCAC3B,SAAS,EAAE,SAAG,CAAC,UAAU,CAAC,GAAG;gCAC7B,oBAAoB,EAAE,IAAI,CAAC,UAAU;6BACxC;4BACD,MAAM,EAAE,IAAI,CAAC,MAAM;4BACnB,GAAG,EAAE;gCACD,OAAO,EAAE,IAAI;6BAChB;yBACJ,CAAC,CAAC;wBAEH,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;wBACxC,IAAI,aAAa,IAAI,SAAS,IAAI,QAAQ,EAAE;4BACxC,MAAA,IAAI,CAAC,QAAQ,0CAAE,OAAO,CAAC,QAAQ,EAAE;yBACpC;wBACD,IAAI,IAAI,CAAC,YAAY,IAAI,MAAM,EAAE;4BAC7B,MAAM;yBACT;wBACD,IAAI,QAAQ,CAAC,MAAM,EAAE;4BACjB,KAAK,IAAI,QAAQ,CAAC,MAAM,CAAC;yBAC5B;wBACD,IAAI,CAAC,aAAa,EAAE;4BAChB,IAAI,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;4BAC3D,aAAa,GAAG,IAAI,CAAC;yBACxB;wBAED,gDAAgD;wBAChD,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC,EAAG;4BACvB,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;4BACvB,OAAO,CAAC,QAAQ,GAAG,KAAK,CAAC;4BACzB,MAAA,IAAI,CAAC,YAAY,0CAAE,OAAO,CAAC,KAAK,EAAE;4BAClC,SAAS;yBACZ;wBAED,0EAA0E;wBAC1E,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;4BACrB,MAAM,KAAK,eAAG,QAAQ,CAAC,CAAC,CAAC,0CAAE,KAAK,0CAAE,EAAE,CAAC;4BACrC,MAAM,IAAI,eAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,0CAAE,KAAK,0CAAE,EAAE,CAAC;4BACtD,IAAI,WAAW,IAAI,KAAK,IAAI,UAAU,IAAI,IAAI,EAAE;gCAC5C,SAAS,IAAI,CAAC,CAAC;gCACf,IAAI,SAAS,GAAG,CAAC,EAAE;oCACf,MAAM;iCACT;6BACJ;iCACI;gCACD,WAAW,GAAG,KAAK,CAAC;gCACpB,UAAU,GAAG,IAAI,CAAC;gCAClB,SAAS,GAAG,CAAC,CAAC;6BACjB;yBACJ;wBACD,OAAO,CAAC,cAAc,EAAE,CAAC;wBAEzB,0EAA0E;wBAC1E,aAAa,GAAG,kBAAkB,CAAC;wBACnC,UAAU,GAAG,CAAC,CAAC;qBAClB;oBACD,OAAO,CAAC,EAAE;wBACN,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;wBAEjB,0DAA0D;wBAC1D,UAAU,IAAI,qBAAqB,CAAC;wBACpC,aAAa,IAAI,CAAC,CAAC;qBACtB;oBAED,MAAM,KAAK,CAAC,kBAAkB,CAAC,CAAC;iBACnC;gBAED,IAAI,aAAa,EAAE;oBACf,IAAI,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;iBAC7D;gBACD,IAAI,cAAc,EAAE;oBAChB,IAAI,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;iBAC9D;YACL,CAAC,CAAA,CAAC,CAAC;QACP,CAAC;KACJ;IApTY,yBAAM,SAoTlB,CAAA;AACL,CAAC,EAhUgB,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAgUlC"}
|
|
@@ -14,6 +14,7 @@ var EntityGlobe;
|
|
|
14
14
|
this.IsFetched = null;
|
|
15
15
|
this.FetchPageIndex = 0;
|
|
16
16
|
this.Boundaries = null;
|
|
17
|
+
this.Fetching = false;
|
|
17
18
|
}
|
|
18
19
|
GetBounds() {
|
|
19
20
|
// Entity data works in -180 to 180 range.
|
|
@@ -40,85 +41,44 @@ var EntityGlobe;
|
|
|
40
41
|
class Grid {
|
|
41
42
|
constructor() {
|
|
42
43
|
this.cells = {};
|
|
43
|
-
this.patches = [];
|
|
44
44
|
}
|
|
45
45
|
GetCellsForView(viewRect) {
|
|
46
|
+
const cells = [];
|
|
47
|
+
const minLat = viewRect.south;
|
|
48
|
+
const minLon = viewRect.west;
|
|
49
|
+
const maxLat = viewRect.north;
|
|
50
|
+
const maxLon = viewRect.east;
|
|
46
51
|
const MAX_CELLS = 150;
|
|
47
|
-
const { south: minLat, west: minLon, north: maxLat, east: maxLon } = viewRect;
|
|
48
52
|
const cellDegreeSize = getCellSizeFromHeight(viewRect.alt);
|
|
49
|
-
const
|
|
50
|
-
const
|
|
51
|
-
const
|
|
52
|
-
const
|
|
53
|
-
|
|
54
|
-
const
|
|
55
|
-
const addCell = (x, y) => {
|
|
56
|
-
const lon1 = x * cellDegreeSize + curMinLon;
|
|
57
|
-
const lat1 = y * cellDegreeSize + curMinLat;
|
|
58
|
-
const lon2 = lon1 + cellDegreeSize;
|
|
59
|
-
const lat2 = lat1 + cellDegreeSize;
|
|
60
|
-
const [id, cell] = getOrCreateCell(this.cells, cellDegreeSize, lon1, lon2, lat1, lat2);
|
|
61
|
-
/*
|
|
62
|
-
{
|
|
63
|
-
const cell_bounds = { south: lat1, west: lon1, north: lat2, east: lon2 };
|
|
64
|
-
const subcells = [];
|
|
65
|
-
for (const id of intersections) {
|
|
66
|
-
const c = this.cells[id].GetBounds();
|
|
67
|
-
if (contains(c, cell_bounds)) {
|
|
68
|
-
cell.Fetched = true;
|
|
69
|
-
return;
|
|
70
|
-
}
|
|
71
|
-
if (intersects(c, cell_bounds)) {
|
|
72
|
-
const cropped = crop(c, cell.GetBounds());
|
|
73
|
-
subcells.push(cropped);
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
|
-
let filled = 0;
|
|
77
|
-
while (subcells.length > 0) {
|
|
78
|
-
const c = subcells.pop();
|
|
79
|
-
filled += area(c);
|
|
80
|
-
for (const s of subcells) {
|
|
81
|
-
filled -= intersection(s, c);
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
if (filled + Number.EPSILON * 2 > area(cell.GetBounds())) {
|
|
85
|
-
cell.Fetched = true;
|
|
86
|
-
return;
|
|
87
|
-
}
|
|
88
|
-
|
|
89
|
-
let [x2, y2] = max;
|
|
90
|
-
x2 = Math.max(x2, lon2);
|
|
91
|
-
y2 = Math.max(y2, lat2);
|
|
92
|
-
max = [x2, y2];
|
|
93
|
-
}
|
|
94
|
-
*/
|
|
95
|
-
ids.push(id);
|
|
96
|
-
cells.push(cell);
|
|
97
|
-
cells[id] = cell;
|
|
98
|
-
};
|
|
53
|
+
const curMinLon = floorValueToCellSize(cellDegreeSize, minLon);
|
|
54
|
+
const curMinLat = floorValueToCellSize(cellDegreeSize, minLat);
|
|
55
|
+
const width = (maxLon - curMinLon) / cellDegreeSize;
|
|
56
|
+
const height = (maxLat - curMinLat) / cellDegreeSize;
|
|
57
|
+
const centerX = (minLon + maxLon) / 2;
|
|
58
|
+
const centerY = (minLat + maxLat) / 2;
|
|
99
59
|
for (let x = 0; x < width; x++) {
|
|
100
60
|
for (let y = 0; y < height; y++) {
|
|
101
|
-
|
|
102
|
-
|
|
61
|
+
const lon = x * cellDegreeSize + curMinLon;
|
|
62
|
+
const lat = y * cellDegreeSize + curMinLat;
|
|
63
|
+
const [id, cell] = getOrCreateCell(this.cells, cellDegreeSize, lon, lon + cellDegreeSize, lat, lat + cellDegreeSize);
|
|
64
|
+
cells.push(cell);
|
|
65
|
+
if (cells.length > MAX_CELLS) {
|
|
103
66
|
break;
|
|
104
67
|
}
|
|
105
68
|
}
|
|
106
69
|
}
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
70
|
+
// Sort cells so that the ones closest to the center are first
|
|
71
|
+
cells.sort((a, b) => {
|
|
72
|
+
const aCenterX = (a.Boundaries.minLongitude + a.Boundaries.maxLongitude) / 2;
|
|
73
|
+
const aCenterY = (a.Boundaries.minLatitude + a.Boundaries.maxLatitude) / 2;
|
|
74
|
+
const bCenterX = (b.Boundaries.minLongitude + b.Boundaries.maxLongitude) / 2;
|
|
75
|
+
const bCenterY = (b.Boundaries.minLatitude + b.Boundaries.maxLatitude) / 2;
|
|
76
|
+
const aDist = Math.sqrt(Math.pow(aCenterX - centerX, 2) + Math.pow(aCenterY - centerY, 2));
|
|
77
|
+
const bDist = Math.sqrt(Math.pow(bCenterX - centerX, 2) + Math.pow(bCenterY - centerY, 2));
|
|
78
|
+
return aDist - bDist;
|
|
79
|
+
});
|
|
111
80
|
return cells;
|
|
112
81
|
}
|
|
113
|
-
intersections(withRect) {
|
|
114
|
-
return this.patches
|
|
115
|
-
.filter(([rect, _]) => intersects(rect, withRect))
|
|
116
|
-
.map(([_, ids]) => ids)
|
|
117
|
-
.reduce((all, ids) => {
|
|
118
|
-
all.push(...ids);
|
|
119
|
-
return all;
|
|
120
|
-
}, []);
|
|
121
|
-
}
|
|
122
82
|
}
|
|
123
83
|
EntityGlobe.Grid = Grid;
|
|
124
84
|
})(EntityGlobe = exports.EntityGlobe || (exports.EntityGlobe = {}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-globe.js","sourceRoot":"","sources":["../../../../src/entity/getters/entity-globe.ts"],"names":[],"mappings":";;;AAEA;;;;GAIG;AACH,IAAiB,WAAW,
|
|
1
|
+
{"version":3,"file":"entity-globe.js","sourceRoot":"","sources":["../../../../src/entity/getters/entity-globe.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,12 +10,11 @@ export declare namespace EntityGlobe {
|
|
|
10
10
|
IsFetched: () => boolean;
|
|
11
11
|
FetchPageIndex: number;
|
|
12
12
|
Boundaries: Bounds.IBounds;
|
|
13
|
+
Fetching: boolean;
|
|
13
14
|
GetBounds(): Bounds.IReqBounds;
|
|
14
15
|
}
|
|
15
16
|
class Grid {
|
|
16
17
|
private cells;
|
|
17
|
-
private patches;
|
|
18
18
|
GetCellsForView(viewRect: Bounds.IReqBounds): Cell[];
|
|
19
|
-
private intersections;
|
|
20
19
|
}
|
|
21
20
|
}
|