Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into wms-getcap-drop-params
Browse files Browse the repository at this point in the history
  • Loading branch information
nf-s committed Dec 15, 2023
2 parents b979e4d + f6739a7 commit d661e7b
Show file tree
Hide file tree
Showing 39 changed files with 1,616 additions and 366 deletions.
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"useBuiltIns": "usage"
}
],
"@babel/preset-react",
["@babel/preset-react", { "runtime": "automatic" }],
["@babel/typescript", { "allowNamespaces": true }]
],
"plugins": [
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Update .prettierignore whenever this file changes
docs/
node_modules/
.idea/
Expand All @@ -17,6 +18,7 @@ package-lock.json
*.swp
dist
.history/
ts-out/

# Catalog index generation files
catalog-index*.json
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package-lock.json
*.swp
dist
.history/
ts-out/

# Catalog index generation files
catalog-index*.json
Expand Down
22 changes: 21 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,31 @@
# Change Log

#### next release (8.4.1)
#### next release (8.5.0)

- Fix a bug where `DragPoints` was interfering with pedstrian mode mouse movements.
- `WebMapServiceCatalogItem` will drop problematic query parameters from `url` when calling `GetCapabilities` (eg `"styles","version","format","srs","crs","format"`)
- **Breaking changes:**
- Upgrade TypeScript to 5.2
- Switch Babel configuration to new JSX transform
- Improve tsconfig files
- Update `thredds-catalog-crawler` to `0.0.6`
- [The next improvement]

#### 8.4.1 - 2023-12-08

- Temporary UX fixes for clipping box:
- An option to zoom to clipping box
- An option to re-position the clipping box
- Trigger repositioning of clipping box when the user enables clipping box for the first time
- Cursor and scale point handle changes (makes it much easier to grasp)
- More robust interaction with the box
- Fix a bug where `DragPoints` was interfering with pedstrian mode mouse movements.
- Update `webpack` to `4.47.0` to support Node >= 18 without extra command line parameters.
- Add support for multiple `urls` for `GeoJsonCatalogItem`.
- Automatically explode GeoJSON `MultiPoint` features to `Point` features.
- Add new table styling traits - `scaleByDistance` and `disableDepthTestDistance`.
- Add support for `LineString` and `MultiLineString` when using `GeoJsonCatalogItem` in `CZML` mode.

#### 8.4.0 - 2023-12-01

- **Breaking change:** Replaced `node-sass` with (dart) `sass`
Expand Down
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ reports via email addressed to at least 2 of the following community leaders:

- Ana Belgun: [email protected]
- Stephen Davies: [email protected]
- Mats Henrikson: mats.henrikson@data61.csiro.au
- Nick Forbes-Smith: nick.forbes-smith@data61.csiro.au
- Peter Hassall: [email protected]

All complaints will be reviewed and investigated promptly and fairly.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Sites we're aware of that are using TerriaJS. These are not endorsements or test

### Technical

- NodeJS v14 or v16 are supported
- NodeJS v16, v18 and v20 are supported
- Built in TypeScript & ES2020+ JavaScript, compiled with Babel to ES5.
- Supports modern browsers (recent versions of Microsoft Edge, Mozilla Firefox & Google Chrome).
- [TerriaJS Server component](https://github.com/TerriajS/TerriaJS-Server) runs in NodeJS and provides proxying for web services that don't support CORS or require authentication. Instead of using TerriaJS-Sever proxy service, an alternative proxying service URL can be specified. See [Specify an alternative proxy server URL](/doc/connecting-to-data/cross-origin-resource-sharing.md)
Expand Down
2 changes: 1 addition & 1 deletion buildprocess/configureWebpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ function configureWebpack(
useBuiltIns: "usage"
}
],
"@babel/preset-react",
["@babel/preset-react", { runtime: "automatic" }],
["@babel/typescript", { allowNamespaces: true }]
],
plugins: [
Expand Down
12 changes: 12 additions & 0 deletions doc/contributing/problems-and-solutions.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,15 @@ Then run the following to install NodeJS v16 and use it:
nvm install 16
nvm use 16
```

### Problem

When building TerriaMap/TerriaJS I see the following error

```
Error: error:0308010C:digital envelope routines::unsupported
```

### Solution

Update to TerriaJS 8.4.1.
Loading

0 comments on commit d661e7b

Please sign in to comment.