Skip to content

Commit 7be1f0a

Browse files
DerpDerp
authored andcommitted
A web worker fix for Apple browsers
(They're gonna render slower, sorry)
1 parent 963be4b commit 7be1f0a

File tree

8 files changed

+9362
-4502
lines changed

8 files changed

+9362
-4502
lines changed

index.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

package-lock.json

Lines changed: 9050 additions & 4243 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 23 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -20,45 +20,35 @@
2020
"license": "MIT",
2121
"source": "./src/index.html",
2222
"output": "global",
23-
"parcel": {
24-
"targets": {
25-
"main": {
26-
"includeNodeModules": []
27-
}
28-
}
29-
},
3023
"dependencies": {
3124
"@babel/preset-env": "^7.26.0",
32-
"@parcel/babel-preset-env": "^2.13.3",
33-
"@parcel/config-webextension": "^2.13.3",
25+
"@parcel/babel-preset-env": "^2.14.4",
26+
"@parcel/config-webextension": "^2.14.4",
27+
"@parcel/optimizer-blob-url": "^2.14.4",
3428
"@parcel/service-worker": "^2.14.4",
35-
"@sakitam-gis/kriging": "*",
36-
"@swc/helpers": "^0.5.15",
37-
"@turf/distance": "^6.0.1",
38-
"@turf/explode": "^5.1.0",
39-
"@zuzak/owo": "^1.15.0",
40-
"babel-core": "*",
41-
"babel-loader": "*",
42-
"babel-preset-es2015": "*",
43-
"file-saver": "*",
44-
"intersects": "*",
45-
"jquery": "*",
46-
"jquery-ui": "*",
47-
"json-loader": "^0.5.7",
48-
"jsonfn": "^0.31.0",
49-
"leaflet": "^1.5",
29+
"@sakitam-gis/kriging": "^0.1.0",
30+
"@swc/helpers": "^0.5.17",
31+
"@turf/distance": "^7.2.0",
32+
"@turf/explode": "^7.2.0",
33+
"babel-core": "^4.7.16",
34+
"babel-loader": "^10.0.0",
35+
"babel-preset-es2015": "^6.24.1",
36+
"file-saver": "^2.0.5",
37+
"intersects": "^2.7.2",
38+
"jquery": "^3.7.1",
39+
"jquery-ui": "^1.14.1",
40+
"leaflet": "^1.9.4",
5041
"leaflet-routing-machine": "^3.2.12",
51-
"ndjson-cli": "^0.3.1",
42+
"npm": "^11.3.0",
5243
"parcel": "^2.14.4",
53-
"point-in-polygon": "*",
44+
"playwright": "^1.52.0",
45+
"point-in-polygon": "^1.1.0",
5446
"rimraf": "^6.0.1",
55-
"tap": "^12.0.0",
56-
"tap-spec": "^5.0.0",
47+
"tap": "^21.1.0",
48+
"tap-spec": "^2.2.2",
5749
"tinyqueue": "^2.0.0",
58-
"tsc": "^2.0.4",
5950
"turf-point": "^2.0.1",
60-
"typescript": "^5.7.3",
61-
"webpack-node-externals": "^3.0.0",
51+
"typescript": "^5.8.3",
6252
"yargs": "*",
6353
"zlib": "^1.0.5"
6454
},
@@ -67,14 +57,15 @@
6757
"@parcel/optimizer-esbuild": "^2.14.4",
6858
"@parcel/packager-raw-url": "^2.14.4",
6959
"@parcel/reporter-bundle-analyzer": "^2.14.4",
60+
"@parcel/transformer-inline": "^2.14.4",
7061
"@parcel/transformer-inline-string": "^2.14.4",
7162
"@parcel/transformer-webmanifest": "^2.14.4",
7263
"bash": "^0.0.1",
7364
"cp": "^0.2.0",
7465
"dotnet": "^1.1.4",
7566
"fs": "^0.0.1-security",
7667
"geo2svg": "^1.0.3",
77-
"make": "*",
68+
"make": "^0.0.0",
7869
"mime-types": "^3.0.1",
7970
"ncp": "^2.0.0",
8071
"path": "^0.12.7",

src/API.ts

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import * as pip from 'point-in-polygon';
22
import * as kriging from '@sakitam-gis/kriging';
33
import {default as regions, Region} from "./Regions";
4+
import krig from './PredictorWorker';
45

56
const width = 256 / 7;
67
const height = width * Math.sqrt(3) / 2;
@@ -103,29 +104,29 @@ export default class API {
103104
public batchOwnership(worker: Worker | null, tests: { x: number, y: number, region: string }[]): Promise<number[]> {
104105
const thi = this;
105106

106-
// if (worker == null) return new Promise<number[]>(resolve => {
107-
// setTimeout(() => {
108-
// resolve(krig(
109-
// {
110-
// tests: tests,
111-
// mapControl: this.mapControl,
112-
// variogram:
113-
// {
114-
// t: thi.variogram.t,
115-
// x: thi.variogram.x,
116-
// y: thi.variogram.y,
117-
// nugget: thi.variogram.nugget,
118-
// range: thi.variogram.range,
119-
// sill: thi.variogram.sill,
120-
// A: thi.variogram.A,
121-
// n: thi.variogram.n,
122-
// K: thi.variogram.K,
123-
// M: thi.variogram.M,
124-
// }
125-
// }));
126-
// }, 0);
127-
// });
128-
// else
107+
if (worker == null) return new Promise<number[]>(resolve => {
108+
setTimeout(() => {
109+
resolve(krig(
110+
{
111+
tests: tests,
112+
mapControl: this.mapControl,
113+
variogram:
114+
{
115+
t: thi.variogram.t,
116+
x: thi.variogram.x,
117+
y: thi.variogram.y,
118+
nugget: thi.variogram.nugget,
119+
range: thi.variogram.range,
120+
sill: thi.variogram.sill,
121+
A: thi.variogram.A,
122+
n: thi.variogram.n,
123+
K: thi.variogram.K,
124+
M: thi.variogram.M,
125+
}
126+
}));
127+
}, 0);
128+
});
129+
else
129130
return new Promise<number[]>(resolve => {
130131
worker.onmessage = async (d) => resolve(d.data);
131132

0 commit comments

Comments
 (0)