Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clipping box interim redesign #6838

Merged
merged 17 commits into from
Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
# Change Log

#### next release (8.4.1)
#### next release (8.3.10)

- 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.
- [The next improvement]

#### 8.4.0 - 2023-12-01

- **Breaking change:** Replaced `node-sass` with (dart) `sass`
- You will need to update your `TerriaMap` to use `sass` instead of `node-sass`.
- Added `apiColumns` to `ApiTableCatalogItem` - this can now be used to specify `responseDataPath` per table column.
- `ArcGisMapServerCatalogItem` will now use "pre-cached tiles" if available if no (or all) `layers` are specified.

#### 8.3.9 - 2023-11-24

- **Breaking change:** new Search Provider model
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 v16, v18 and v20 are supported
- NodeJS v14 or v16 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
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ The template will replace all occurrences of `{{property}}` with the value of th

The result is:

<img src="../img/template.png">
<img src="./img/template.png">

instead of:

<img src="../img/no_template.png">
<img src="./img/no_template.png">

You can provide a template to use for the name of the collapsible section (eg. to replace `RGB` in the example above), like so:

Expand Down Expand Up @@ -150,7 +150,7 @@ If `{{Pixel Value}}` equals to `150` and `{{feature.data.layerId}}` to `2`, the

For features with time-varying table-based data structures (eg. CSV, SOS2, SDMX-JSON, if there is a time column), the feature info panel also includes a chart of the data over time, eg.

<img src="../img/feature_info_with_time_series.png">
<img src="./img/feature_info_with_time_series.png">

You can place this chart in your template using `{{terria.timeSeries.chart}}`. Alternatively, you can access the following component information:

Expand Down
21 changes: 15 additions & 6 deletions doc/contributing/problems-and-solutions.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,23 @@ nvm install 16
nvm use 16
```

### Problem
---

When building TerriaMap/TerriaJS I see the following error
### Problem

```
Error: error:0308010C:digital envelope routines::unsupported
```
Python errors when building NodeJS dependencies (eg `node-sass`). This is common on M1/M2 macs.

### Solution

Update to TerriaJS 8.4.1.
You may need to install Python2 to build NodeJS dependencies (like `node-sass`)

We recommend using [`pyenv`](https://github.com/pyenv/pyenv#installation) to install Python2.

Follow installation instructions [here](https://github.com/pyenv/pyenv#installation).

Then run the following to install Python 2.7.18 and use it:

```bash
pyenv install 2.7.18
pyenv shell 2.7.18
```
23 changes: 23 additions & 0 deletions lib/Core/arraysAreEqual.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
"use strict";

var defined = require("terriajs-cesium/Source/Core/defined").default;

function arraysAreEqual(left, right) {
if (left === right) {
return true;
}

if (!defined(left) || !defined(right) || left.length !== right.length) {
return false;
}

for (var i = 0; i < left.length; ++i) {
if (left[i] !== right[i]) {
return false;
}
}

return true;
}

module.exports = arraysAreEqual;
19 changes: 0 additions & 19 deletions lib/Core/arraysAreEqual.ts

This file was deleted.

17 changes: 0 additions & 17 deletions lib/Core/setsAreEqual.ts

This file was deleted.

7 changes: 0 additions & 7 deletions lib/Map/DragPoints/DragPoints.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,6 @@ DragPoints.prototype.setUp = function () {
}
};

/**
* Destroy drag points helper. The instance becomes unusable after calling destroy.
*/
DragPoints.prototype.destroy = function () {
this._dragPointsHelper.destroy();
};

/**
* The drag count is an indication of how long the user dragged for. If it's really small, perhaps the user clicked,
* but a mousedown/mousemove/mouseup event trio was triggered anyway. It solves a problem where in leaflet the click
Expand Down
Loading
Loading