Skip to content

Commit

Permalink
Update Gdal version from 3.8.1 to 3.8.3
Browse files Browse the repository at this point in the history
Update Emscripten version from 3.1.50 to 3.1.51
Move chai.js and mocha.js from cdn to local
  • Loading branch information
bugra9 committed Jan 22, 2024
1 parent 771bdab commit 6be706e
Show file tree
Hide file tree
Showing 12 changed files with 32,153 additions and 23 deletions.
4 changes: 2 additions & 2 deletions .info.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
"coverageUrl": "https://gdal3.js.org/coverage",
"nativeDependencies": [
{
"name": "Emscripten 3.1.50",
"name": "Emscripten 3.1.51",
"url": "https://github.com/emscripten-core/emscripten",
"licenseUrl": "https://github.com/emscripten-core/emscripten/blob/main/LICENSE"
},
{
"name": "Gdal 3.8.1",
"name": "Gdal 3.8.3",
"url": "https://github.com/OSGeo/gdal",
"licenseUrl": "https://github.com/OSGeo/gdal/blob/master/gdal/LICENSE.TXT"
},
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GDAL_VERSION = 3.8.1
GDAL_VERSION = 3.8.3
SPATIALITE_VERSION = 5.1.0
SQLITE_VERSION = 3440200
GEOS_VERSION = 3.12.1
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ PDF, PGDUMP
Note: It doesn't work with web worker.
```html
<script type="text/javascript"
src="https://cdn.jsdelivr.net/npm/gdal3.js@2.6.0/dist/package/gdal3.js"
integrity="sha384-YX2wGt/3eahcbMTqJMLm+R08S0V6fziIpLbOFa89SEf3T0vKinFC6MJv1mKYk7cx"
src="https://cdn.jsdelivr.net/npm/gdal3.js@2.7.0/dist/package/gdal3.js"
integrity="sha384-XCdiemXIuf5D00dVi5q7Zcjjwhk6EqRvhL7Em9LXc8DsDglRZic5wQZCLrVZQ9+f"
crossorigin="anonymous"
></script>
```

```js
initGdalJs({ path: 'https://cdn.jsdelivr.net/npm/gdal3.js@2.6.0/dist/package', useWorker: false }).then((Gdal) => {});
initGdalJs({ path: 'https://cdn.jsdelivr.net/npm/gdal3.js@2.7.0/dist/package', useWorker: false }).then((Gdal) => {});
```
> Example: [https://github.com/bugra9/gdal3.js/tree/master/apps/example-browser](https://github.com/bugra9/gdal3.js/tree/master/apps/example-browser)
Expand Down Expand Up @@ -243,8 +243,8 @@ GNU Lesser General Public License v2.1 or later
See [LICENSE](https://github.com/bugra9/gdal3.js/blob/master/LICENSE) to see the full text.

**Compiled with**
- [Emscripten 3.1.50](https://github.com/emscripten-core/emscripten) [(License)](https://github.com/emscripten-core/emscripten/blob/main/LICENSE)
- [Gdal 3.8.1](https://github.com/OSGeo/gdal) [(License)](https://github.com/OSGeo/gdal/blob/master/gdal/LICENSE.TXT)
- [Emscripten 3.1.51](https://github.com/emscripten-core/emscripten) [(License)](https://github.com/emscripten-core/emscripten/blob/main/LICENSE)
- [Gdal 3.8.3](https://github.com/OSGeo/gdal) [(License)](https://github.com/OSGeo/gdal/blob/master/gdal/LICENSE.TXT)
- [Proj 9.3.1](https://github.com/OSGeo/PROJ) [(License)](https://github.com/OSGeo/PROJ/blob/master/COPYING)
- [Geos 3.12.1](https://github.com/libgeos/geos) [(License)](https://github.com/libgeos/geos/blob/master/COPYING)
- [Spatialite 5.1.0](https://www.gaia-gis.it/fossil/libspatialite/index) [(License)](http://www.gnu.org/licenses/lgpl-2.1.html)
Expand Down
2 changes: 1 addition & 1 deletion apps/app-gui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gdal3.js-gui",
"version": "2.6.0",
"version": "2.7.0",
"description": "gdal3.js GUI is a open source project offering a user interface for Gdal.",
"license": "GPL-3.0-or-later",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions apps/example-browser/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
<script type="text/javascript"
src="https://cdn.jsdelivr.net/npm/gdal3.js@2.6.0/dist/package/gdal3.js"
integrity="sha384-YX2wGt/3eahcbMTqJMLm+R08S0V6fziIpLbOFa89SEf3T0vKinFC6MJv1mKYk7cx"
src="https://cdn.jsdelivr.net/npm/gdal3.js@2.7.0/dist/package/gdal3.js"
integrity="sha384-XCdiemXIuf5D00dVi5q7Zcjjwhk6EqRvhL7Em9LXc8DsDglRZic5wQZCLrVZQ9+f"
crossorigin="anonymous"
></script>
<script type="text/javascript" src="main.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion apps/example-browser/main.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
document.write("Loading...");
initGdalJs({ path: 'https://cdn.jsdelivr.net/npm/gdal3.js@2.6.0/dist/package', useWorker: false }).then((Gdal) => {
initGdalJs({ path: 'https://cdn.jsdelivr.net/npm/gdal3.js@2.7.0/dist/package', useWorker: false }).then((Gdal) => {
const count = Object.keys(Gdal.drivers.raster).length + Object.keys(Gdal.drivers.vector).length;
document.write("Number of drivers: " + count);
console.log(Gdal.drivers);
Expand Down
2 changes: 1 addition & 1 deletion apps/example-node/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"dependencies": {
"gdal3.js": "2.6.0"
"gdal3.js": "2.7.0"
}
}
10 changes: 5 additions & 5 deletions apps/example-singlefile/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
<script type="text/javascript"
src="https://cdn.jsdelivr.net/npm/gdal3.js@2.6.0/dist/package/gdal3.js"
integrity="sha384-YX2wGt/3eahcbMTqJMLm+R08S0V6fziIpLbOFa89SEf3T0vKinFC6MJv1mKYk7cx"
src="https://cdn.jsdelivr.net/npm/gdal3.js@2.7.0/dist/package/gdal3.js"
integrity="sha384-XCdiemXIuf5D00dVi5q7Zcjjwhk6EqRvhL7Em9LXc8DsDglRZic5wQZCLrVZQ9+f"
crossorigin="anonymous"
></script>
</head>
<body>
Loading...
<script type="text/javascript">
async function start() {
const workerData = await fetch('https://cdn.jsdelivr.net/npm/gdal3.js@2.6.0/dist/package/gdal3.js');
const workerData = await fetch('https://cdn.jsdelivr.net/npm/gdal3.js@2.7.0/dist/package/gdal3.js');
const workerUrl = window.URL.createObjectURL(await workerData.blob());

const paths = {
wasm: 'https://cdn.jsdelivr.net/npm/gdal3.js@2.6.0/dist/package/gdal3WebAssembly.wasm',
data: 'https://cdn.jsdelivr.net/npm/gdal3.js@2.6.0/dist/package/gdal3WebAssembly.data',
wasm: 'https://cdn.jsdelivr.net/npm/gdal3.js@2.7.0/dist/package/gdal3WebAssembly.wasm',
data: 'https://cdn.jsdelivr.net/npm/gdal3.js@2.7.0/dist/package/gdal3WebAssembly.data',
js: workerUrl,
};

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gdal3.js",
"version": "2.6.0",
"version": "2.7.0",
"description": "gdal3.js is a port of Gdal applications (**gdal_translate**, **ogr2ogr**, **gdal_rasterize**, **gdalwarp**, **gdaltransform**) to Webassembly. It allows you to convert raster and vector geospatial data to various formats and coordinate systems.",
"license": "LGPL-2.1-or-later",
"homepage": "https://gdal3.js.org",
Expand Down Expand Up @@ -39,9 +39,9 @@
"deploy": "push-dir --dir=dist --branch=gh-pages --cleanup",
"build-native": "make",
"build-src": "rollup --config rollup.config.mjs",
"build-spec": "mkdir -p build/test/specs/ && cp src/**/**/*.spec.js build/test/specs/ && cp test/*.spec.js build/test/specs/ && cp test/browser.html build/test/index.html && cp test/mocha.css build/test/mocha.css && cp -r test/data build/test/data",
"build-spec": "mkdir -p build/test/specs/ && cp src/**/**/*.spec.js build/test/specs/ && cp test/*.spec.js build/test/specs/ && cp test/browser.html build/test/index.html && cp test/mocha.css build/test/mocha.css && cp test/mocha.js build/test/mocha.js && cp test/chai.js build/test/chai.js && cp -r test/data build/test/data",
"build-gui": "cd apps/app-gui && pnpm install && pnpm run build",
"build-docs": "jsdoc --configure .jsdoc.json --verbose && cp -r build/docs/gdal3.js/2.6.0/* build/docs",
"build-docs": "jsdoc --configure .jsdoc.json --verbose && cp -r build/docs/gdal3.js/2.7.0/* build/docs",
"test-node": "nyc --reporter=json --reporter=html --report-dir=./build/coverage/node mocha",
"test-browser": "karma start .karma.conf.js",
"test-coverage": "istanbul-merge --out build/coverage/coverage-final.json build/coverage/browser/coverage-final.json build/coverage/node/coverage-final.json && nyc report --reporter html -t build/coverage --report-dir build/coverage"
Expand Down
4 changes: 2 additions & 2 deletions test/browser.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@

<div id="mocha"></div>

<script src="https://unpkg.com/chai/chai.js"></script>
<script src="https://unpkg.com/mocha/mocha.js"></script>
<script src="./chai.js"></script>
<script src="./mocha.js"></script>

<script class="mocha-init">
mocha.setup('bdd');
Expand Down
Loading

0 comments on commit 6be706e

Please sign in to comment.