Merge branch 'main' into cog-imagery-provider

TerriaJS · Dec 15, 2023 · 9011eba · 9011eba
2 parents 0c3faaf + f6739a7
commit 9011eba
Show file tree

Hide file tree

Showing 56 changed files with 1,917 additions and 439 deletions.
diff --git a/.babelrc b/.babelrc
@@ -7,7 +7,7 @@
         "useBuiltIns": "usage"
       }
     ],
-    "@babel/preset-react",
+    ["@babel/preset-react", { "runtime": "automatic" }],
     ["@babel/typescript", { "allowNamespaces": true }]
   ],
   "plugins": [

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+# Update .prettierignore whenever this file changes
 docs/
 node_modules/
 .idea/
@@ -17,6 +18,7 @@ package-lock.json
 *.swp
 dist
 .history/
+ts-out/
 
 # Catalog index generation files
 catalog-index*.json
diff --git a/.prettierignore b/.prettierignore
@@ -20,6 +20,7 @@ package-lock.json
 *.swp
 dist
 .history/
+ts-out/
 
 # Catalog index generation files
 catalog-index*.json

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,9 +1,36 @@
 # Change Log
 
-#### next release (8.3.10)
+#### next release (8.5.0)
 
+- **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`
+  - 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

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -64,7 +64,7 @@ reports via email addressed to at least 2 of the following community leaders:
 
 - Ana Belgun: ana.belgun@data61.csiro.au
 - Stephen Davies: stephen.davies@data61.csiro.au
-- Mats Henrikson: mats.henrikson@data61.csiro.au
+- Nick Forbes-Smith: nick.forbes-smith@data61.csiro.au
 - Peter Hassall: peter.hassall@data61.csiro.au
 
 All complaints will be reviewed and investigated promptly and fairly.

diff --git a/README.md b/README.md
@@ -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)

diff --git a/buildprocess/configureWebpack.js b/buildprocess/configureWebpack.js
@@ -126,7 +126,7 @@ function configureWebpack(
                 useBuiltIns: "usage"
               }
             ],
-            "@babel/preset-react",
+            ["@babel/preset-react", { runtime: "automatic" }],
             ["@babel/typescript", { allowNamespaces: true }]
           ],
           plugins: [

diff --git a/doc/connecting-to-data/customizing-data-appearance/feature-info-template.md b/doc/connecting-to-data/customizing-data-appearance/feature-info-template.md
@@ -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:
 
@@ -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:
 

diff --git a/doc/contributing/problems-and-solutions.md b/doc/contributing/problems-and-solutions.md
@@ -80,23 +80,14 @@ nvm install 16
 nvm use 16
 ```
 
----
-
 ### Problem
 
-Python errors when building NodeJS dependencies (eg `node-sass`). This is common on M1/M2 macs.
-
-### Solution
-
-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.
+When building TerriaMap/TerriaJS I see the following error
 
-Follow installation instructions [here](https://github.com/pyenv/pyenv#installation).
+```
+Error: error:0308010C:digital envelope routines::unsupported
+```
 
-Then run the following to install Python 2.7.18 and use it:
+### Solution
 
-```bash
-pyenv install 2.7.18
-pyenv shell 2.7.18
-```
+Update to TerriaJS 8.4.1.
diff --git a/lib/Core/arraysAreEqual.js b/lib/Core/arraysAreEqual.js
diff --git a/lib/Core/arraysAreEqual.ts b/lib/Core/arraysAreEqual.ts
@@ -0,0 +1,19 @@
+import isDefined from "./isDefined";
+
+export default function arraysAreEqual<T>(left: T[], right: T[]) {
+  if (left === right) {
+    return true;
+  }
+
+  if (!isDefined(left) || !isDefined(right) || left.length !== right.length) {
+    return false;
+  }
+
+  for (var i = 0; i < left.length; ++i) {
+    if (left[i] !== right[i]) {
+      return false;
+    }
+  }
+
+  return true;
+}
diff --git a/lib/Core/setsAreEqual.ts b/lib/Core/setsAreEqual.ts
@@ -0,0 +1,17 @@
+export function setsAreEqual<T>(left: Set<T> | T[], right: Set<T> | T[]) {
+  if (Array.isArray(left)) left = new Set(left);
+
+  if (Array.isArray(right)) right = new Set(right);
+
+  if (left === right) {
+    return true;
+  }
+
+  if (left.size !== right.size) {
+    return false;
+  }
+
+  const union = new Set([...left, ...right]);
+
+  return union.size === left.size && union.size === right.size;
+}
diff --git a/lib/Map/DragPoints/DragPoints.js b/lib/Map/DragPoints/DragPoints.js
@@ -43,6 +43,13 @@ 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