Skip to content

Commit 76418fd

Browse files
Merge pull request #138 from GeoTIFF/refactor-2023-winter
almost there!
2 parents b0b3f74 + c4a7831 commit 76418fd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1052
-938
lines changed

.eslintrc.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,19 @@
1111
},
1212
"plugins": ["@typescript-eslint/eslint-plugin", "prettier"],
1313
"extends": [
14-
"prettier",
15-
"plugin:@typescript-eslint/eslint-recommended",
16-
"plugin:@typescript-eslint/recommended",
17-
"eslint-config-prettier/@typescript-eslint"
14+
"plugin:prettier/recommended"
1815
],
1916
"ignorePatterns": ["dist", "webpack.config.js"],
2017
"rules": {
2118
"@typescript-eslint/ban-ts-comment": "warn",
2219
"arrow-parens": ["error", "as-needed"],
2320
"comma-dangle": ["error", { "objects": "never" }],
24-
"indent": ["error", 2],
2521
"linebreak-style": ["error", "unix"],
2622
"no-console": "off",
2723
"no-multiple-empty-lines": "error",
2824
"no-unused-vars": ["error", { "args": "none" }],
2925
"no-var": "error",
30-
"object-curly-spacing": ["error", "always", { "objectsInObjects": false }],
26+
"object-curly-spacing": ["error", "always", { "objectsInObjects": true }],
3127
"prefer-arrow-callback": "error",
3228
"prefer-const": "error",
3329
"prefer-rest-params": "error",

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,4 @@ georaster-layer-for-leaflet.*
8080

8181
# backup files
8282
*bak*
83-
83+
*.tgz

ADVANCED.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,7 @@ new GeoRasterLayer({
4646
mask: { type: "FeatureCollection", features: [ /* .. */] }, // a GeoJSON for the world's oceans
4747
mask_strategy: "outside"
4848
});
49-
```
49+
```
50+
51+
# Turbo Mode
52+
You can enable turbo mode, which will in some cases lead to better performance. However, it is experimental, so should be tested first on your data before using in production. Internally, it uses [proj-turbo](https://github.com/DanielJDufour/proj-turbo).

package.json

Lines changed: 53 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "georaster-layer-for-leaflet",
3-
"version": "3.10.0",
3+
"version": "4.1.0-0",
44
"description": "Display GeoTIFFs and soon other types of raster on your Leaflet Map",
55
"type": "module",
66
"main": "dist/v3/webpack/bundle/georaster-layer-for-leaflet.min.js",
@@ -21,20 +21,21 @@
2121
"clean": "rimraf dist",
2222
"b": "npm run build",
2323
"build:ts:source": "npx mkdirp ./dist/v3/ts/source/. && cp -r ./src/* ./dist/v3/ts/source/.",
24-
"build:ts:types": "tsc --emitDeclarationOnly",
24+
"build:ts:types": "tsc --emitDeclarationOnly --moduleResolution node --skipLibCheck",
2525
"build:babel": "npm run build:babel:esm && npm run build:babel:cjs",
26-
"build:babel:esm": "npx babel --extensions \".ts\" --plugins @babel/plugin-proposal-export-namespace-from --plugins @babel/plugin-proposal-optional-chaining --presets @babel/preset-typescript ./src/georaster-layer-for-leaflet.ts --out-dir ./dist/v3/babel/esm",
27-
"build:babel:cjs": "npx babel --extensions \".ts\" --plugins @babel/plugin-transform-modules-commonjs --plugins @babel/plugin-proposal-optional-chaining --plugins @babel/plugin-proposal-export-namespace-from --presets @babel/preset-typescript ./src/georaster-layer-for-leaflet.ts --out-dir dist/v3/babel/cjs",
26+
"build:babel:esm": "npx babel --extensions \".ts\" --plugins @babel/plugin-transform-export-namespace-from --plugins @babel/plugin-transform-optional-chaining --presets @babel/preset-typescript ./src/georaster-layer-for-leaflet.ts --out-dir ./dist/v3/babel/esm",
27+
"build:babel:cjs": "npx babel --extensions \".ts\" --plugins @babel/plugin-transform-modules-commonjs --plugins @babel/plugin-transform-optional-chaining --plugins @babel/plugin-transform-export-namespace-from --presets @babel/preset-typescript ./src/georaster-layer-for-leaflet.ts --out-dir dist/v3/babel/cjs",
2828
"build:webpack:bundle": "WEBPACK_OUTPUT_PATH=\"$PWD/dist/v3/webpack/bundle/\" webpack",
2929
"build:webpack:lite": "LITE=true WEBPACK_OUTPUT_PATH=\"$PWD/dist/v3/webpack/lite/\" webpack",
30+
"clean:webpack:bundle": "rimraf $PWD/dist/v3/webpack/bundle",
3031
"copy:legacy": "npm run copy:legacy:min && npm run copy:legacy:lite && npm run copy:legacy:cjs && npm run copy:legacy:esm && npm run copy:legacy:types",
3132
"copy:legacy:min": "cp ./dist/v3/webpack/bundle/* ./dist/.",
3233
"copy:legacy:lite": "cp ./dist/v3/webpack/lite/* ./dist/.",
3334
"copy:legacy:cjs": "cp ./dist/v3/babel/cjs/georaster-layer-for-leaflet.js ./dist/georaster-layer-for-leaflet.bundle.js",
3435
"copy:legacy:esm": "cp ./dist/v3/babel/esm/georaster-layer-for-leaflet.js ./dist/georaster-layer-for-leaflet.js",
3536
"copy:legacy:types": "cp -r ./dist/v3/ts/types/* ./dist/.",
3637
"build": "npm run clean && npm run build:ts:source && npm run build:ts:types && npm run build:babel:esm && npm run build:babel:cjs && npm run build:webpack:bundle && npm run build:webpack:lite && npm run copy:legacy",
37-
"dev": "concurrently \"npm run serve\" \"npm run build:webpack:bundle:old -- --watch\" ",
38+
"dev": "concurrently \"npm run serve\" \"npm run clean:webpack:bundle && npm run build:webpack:bundle -- --watch\" ",
3839
"f": "npm run format",
3940
"format": "prettier --write ./src/georaster-layer-for-leaflet.ts webpack.config.js && npm run fix",
4041
"fix": "eslint ./src/georaster-layer-for-leaflet.ts --fix",
@@ -67,41 +68,58 @@
6768
},
6869
"homepage": "https://github.com/GeoTIFF/georaster-layer-for-leaflet#readme",
6970
"dependencies": {
70-
"@types/geojson": "^7946.0.10",
71-
"@types/node": "^18.7.13",
72-
"chroma-js": "^1.4.1",
73-
"geo-extent": "^0.11.0",
74-
"geocanvas": "^0.3.1",
75-
"pixel-utils": "^0.7.0",
76-
"proj4-fully-loaded": "^0.1.0",
77-
"regenerator-runtime": "^0.13.9",
78-
"reproject-bbox": "^0.4.1",
79-
"snap-bbox": "^0.2.0",
80-
"utm-utils": "^0.1.0"
71+
"@types/geojson": "^7946.0.14",
72+
"bbox-fns": "^0.20.2",
73+
"fast-max": "^0.5.1",
74+
"fast-min": "^0.4.0",
75+
"geo-extent": "^1.5.0",
76+
"geoaffine": "^0.2.0",
77+
"georaster-stack": "^0.4.8",
78+
"geotiff-epsg-code": "^0.3.1",
79+
"geotiff-read-bbox": "^2.2.0",
80+
"geowarp": "^1.26.1",
81+
"geowarp-canvas": "^0.2.0",
82+
"memoizee": "^0.4.15",
83+
"pixel-utils": "^0.9.0",
84+
"proj4": "^2.10.0",
85+
"proj4-collect": "^0.0.2",
86+
"proj4-fully-loaded": "^0.2.0",
87+
"proj4-merge": "^0.1.1",
88+
"regenerator-runtime": "^0.14.1",
89+
"snap-bbox": "^0.5.0",
90+
"spatial-reference-system": "^0.5.2",
91+
"utm-utils": "^0.6.1",
92+
"xdim": "^1.10.1"
8193
},
8294
"devDependencies": {
83-
"@babel/cli": "^7.18.10",
84-
"@babel/core": "^7.18.13",
85-
"@babel/plugin-transform-template-literals": "^7.18.9",
86-
"@babel/preset-env": "^7.18.10",
87-
"@babel/preset-typescript": "^7.18.6",
88-
"@types/chroma-js": "^2.1.4",
89-
"@types/leaflet": "^1.7.11",
90-
"@typescript-eslint/eslint-plugin": "^4.33.0",
91-
"@typescript-eslint/parser": "^4.33.0",
92-
"babel-loader": "^8.2.5",
93-
"concurrently": "^5.3.0",
95+
"@babel/cli": "^7.23.9",
96+
"@babel/core": "^7.23.9",
97+
"@babel/plugin-transform-export-namespace-from": "^7.23.4",
98+
"@babel/plugin-transform-optional-chaining": "^7.23.4",
99+
"@babel/plugin-transform-template-literals": "^7.23.3",
100+
"@babel/preset-env": "^7.23.9",
101+
"@babel/preset-typescript": "^7.23.3",
102+
"@types/leaflet": "^1.9.8",
103+
"@typescript-eslint/eslint-plugin": "^6.20.0",
104+
"@typescript-eslint/parser": "^6.20.0",
105+
"babel-loader": "^9.1.3",
106+
"concurrently": "^8.2.2",
94107
"envisage": "^0.1.0",
95-
"eslint": "^7.32.0",
96-
"eslint-config-prettier": "^7.2.0",
97-
"eslint-plugin-prettier": "^3.4.1",
108+
"eslint": "^8.56.0",
109+
"eslint-config-prettier": "^9.1.0",
110+
"eslint-plugin-prettier": "^5.1.3",
98111
"geojson": "^0.5.0",
112+
"georaster": "^1.6.0",
113+
"leaflet": "^1.9.4",
114+
"mkdirp": "^3.0.1",
99115
"null-loader": "^4.0.1",
100-
"prettier": "^2.7.1",
101-
"rimraf": "^3.0.2",
102-
"typescript": "^4.8.2",
103-
"webpack": "^5.74.0",
104-
"webpack-cli": "^4.10.0"
116+
"prettier": "^3.2.5",
117+
"reproject-geojson": "^0.5.0",
118+
"rimraf": "^5.0.5",
119+
"to-canvas": "^0.2.0",
120+
"typescript": "^5.3.3",
121+
"webpack": "^5.90.1",
122+
"webpack-cli": "^5.1.4"
105123
},
106124
"peerDependencies": {
107125
"georaster": "*",

0 commit comments

Comments
 (0)