Merge pull request #6838 from TerriaJS/zoom-to-clipping-box

Clipping box interim redesign
TerriaJS · Dec 6, 2023 · 401ccaa · 401ccaa
2 parents 800241b + 9271ec6
commit 401ccaa
Show file tree

Hide file tree

Showing 33 changed files with 1,048 additions and 550 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -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

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 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)

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,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
+```
diff --git a/lib/Core/arraysAreEqual.js b/lib/Core/arraysAreEqual.js
@@ -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;
diff --git a/lib/Core/arraysAreEqual.ts b/lib/Core/arraysAreEqual.ts
diff --git a/lib/Core/setsAreEqual.ts b/lib/Core/setsAreEqual.ts
diff --git a/lib/Map/DragPoints/DragPoints.js b/lib/Map/DragPoints/DragPoints.js
@@ -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