Update TerriaJS 8.7.9 from Bioretics fork

.github/workflows/ci.yml

@@ -19,16 +19,16 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: "14.x"
+          node-version-file: ".nvmrc"
       - run: npm install -g yarn@^1.19.0 && yarn install
 
       - name: Check formatting with prettier
         run: yarn prettier-check
 
       - name: Build TerriaJS tests
-        run: yarn gulp lint release -- --continue
+        run: yarn gulp lint release --continue
         env:
           NODE_OPTIONS: --max_old_space_size=4096
 

CHANGES.md

@@ -1,10 +1,91 @@
 # Change Log
 
+#### rer3d+8.1.16-2
+
+- Add control of the map from the keyboard
+- Fix clipboard
+- Improve Kml polygon visualization
+- Temporary turn off search in catalog info
+
+#### rer3d+8.1.16
+
+- Review and merge customizations from rer3d v7
+  - Set default line stroke width to 4 px
+  - Add save and load functions to SharePanel
+  - Add MeasurableTraits
+  - Clamp to ground GeoJson, Kml, Gpx
+  - Add elevation to FeatureInfo
+  - Add CoordsPanel
+  - Remove elevation error in coordinates
+  - smallUserInterface improvements
+  - Increase Leaflet max zoom level from 18 to 21
+  - Add NominatimSearchProvider
+  - Add RerSearchProvider
+  - Fix BingMapSearchProvider zoom to location
+- Add appendData trait to GeoJson
+- Add RerFeatureServerTraits traits
+- Clamp to ground lines of Measure Tool
+- Disable extra credit links
+- Set site title from config.json
+
+#### next release (8.1.17)
+
+#### next release (8.2.4)
+
+#### next release (8.2.5)
+
+#### next release (8.2.13)
+
+#### next release (8.2.14)
+
 #### next release (8.2.16)
 
+#### next release (8.2.21)
+
+- [The next improvement]
+
+#### 8.2.20 - 2022-10-20
+
+- Handle errors thrown in `ImageryProviderLeafletTileLayer.pickFeatures`. This fixes a bug where some WMTS layers break feature picking (in Leaflet/2D mode)
+
+#### 8.2.19 - 2022-10-20
+
+- Handle errors thrown in `Cesium._attachProviderCoordHooks`. This fixes a bug where some WMTS layers break feature picking.
+
+#### 8.2.18 - 2022-10-19
+
+- Fix `RelatedMaps` default broken URLs
+- Add `mergeGroupsByName` trait to `GroupTraits` - this will merge all group members with the same name
+- Fix bug with "propagate `knownContainerUniqueIds` across references and their target" - missing `runInAction`
+- Add Carto v3 Maps API support for `table` and `query` endpoint (only GeoJSON - not MVT yet)
+- Moved `activeStyle` default from `TableMixin` to `TableAutomaticStyleStratum`. The default `activeStyle` will now not pick a `hidden` `TableStyle`.
+- Pin `flexsearch` version to `0.7.21` - as incorrect types are shipped in version `0.7.31`
+- Only preload next timestep of timeseries rasters (WMS & ArcGIS MapServer) when animating the item on the map.
+- Added error message if cesium stops rendering
+- Add `enabled` to `TableStyleMapTraits` - which defaults to `true`
+- Add `TableLabelStyleTraits` - this can be used to add `LabelGraphics` to point features (table or geojson)
+- Add `TableTrailStyleTraits` - this can be used to add `PathGraphics` to time-series point features (table or geojson)
+- Added missing `proxyCatalogItemUrl` to GeoJson, Shapefile, Gltf and AssImp catalog items.
+- Added support for `OpenDataSoftCatalogGroup` with more than 100 datasets.
+- Added `refreshIntervalTemplate` to `OpenDataSoftCatalogItemTraits` - this can be used to set `refreshInterval` using Mustache template rendered on ODS Dataset JSON object.
+- Performance optimisation for time-series `TableMixin`
+- Tweak `generateCatalogIndex` to use less memory. (+ add `diffCatalogIndex.js` script to show added/removed members between two catalog index files)
+- Migrated `/#tools=1` to version 8.
+- Removed dummy function `Terria.getUserProperty`.
+- Removed unused version 7 React components.
+- Fix Cesium `stoppedRenderingMessage`
+
+#### 8.2.17 - 2022-09-23
+
+- Fix region mapping feature `rowIds` incorrect type.
+
+#### 8.2.16 - 2022-09-23
+
+- Make srsName and outputFormat for WFS requests dynamic
 - Added `excludeInactiveDatasets` to `CkanCatalogGroup` (`true` by default). This will filter out CKAN Datasets which have `state` or `data_state` (data.gov.au specific) **not** set to `"active"`.
 - Fix `isTerriaFeatureData` bug - not checking `isJsonObject`
-- [The next improvement]
+- Add `.logError()` to all usage of `updateModelFromJson` where the `Result` object is ignored
+- Move `RelatedMaps` to terriajs. They are now generated from `configParameters` (see [`doc/customizing/client-side-config.md`](./doc/customizing/client-side-config.md#relatedmap))
 
 #### 8.2.15 - 2022-09-16
 
@@ -1057,6 +1138,7 @@
 #### 8.0.0-alpha.69
 
 - **Breaking changes**:
+
   - Basemaps are now configured through catalog JSON instead of TerriaMap - see https://github.com/TerriaJS/terriajs/blob/13362e8b6e2a573b26e1697d9cfa5bae328f7cff/doc/customizing/initialization-files.md#basemaps
 
 * Updated terriajs-cesium to version 1.79.1
@@ -2793,7 +2875,7 @@
 ### 2.3.0
 
 - Share links now contain details about the picked point, picked features and currently selected feature.
-- Reorganised the display of disclaimers so that they're triggered by `CatalogGroup` and `CatalogItem` models, which trigger `terria.disclaimerEvent`, which is listened to by DisclaimerViewModel`. `DisclaimerViewModel` must be added by the map that's using Terria.
+- Reorganised the display of disclaimers so that they're triggered by `CatalogGroup` and `CatalogItem` models, which trigger `terria.disclaimerEvent`, which is listened to by DisclaimerViewModel`.`DisclaimerViewModel` must be added by the map that's using Terria.
 - Added a mechanism for hiding the source of a CatalogItem in the view info popup.
 - Added the `hideSource` flag to the init json for hiding the source of a CatalogItem in the View Info popup.
 - Fixed a bug where `CatalogMember.load` would return a new promise every time it was called, instead of retaining the one in progress.

LICENSE.md

@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-Copyright 2012-2018 CSIRO's Data61 and Contributors
+Copyright 2012 CSIRO's Data61 and Contributors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

architecture/0003-drop-ie11-support.md

@@ -95,7 +95,7 @@ via @soyarsauce
 >   the big list of who has already done so
 > - marie made another point when we last talked about this, "4.7%" or whatever
 >   the ongoing ie11 usage number is both a huge and tiny number, for someone
->   like `BIG_CORPORATE` they have the $ and resources ( & business case ) to
+>   like `BIG_CORPORATE` they have the \$ and resources ( & business case ) to
 >   save 0.5% of their users. we don't have that luxury
 > - not withstanding the fact that we're still talking official support,
 >   terriajs is open source and the community can always carry that load if they
@@ -127,6 +127,7 @@ Our options laid out by @steve9164
 3. Support IE11. We spend a week before the next TerriaJS v8 release to work on
    all the layout problems and ensure it looks nice in IE11 before each
    subsequent release.
+
 4. Deprecate IE11 support ASAP. Add dismissable message to maps warning them
    that on November 1, users will be unable to use new releases of Terria maps
    in IE11. During the deprecation window, we will not use features that IE11

buildprocess/configureWebpack.js

@@ -47,7 +47,7 @@ function configureWebpack(
     test: /\.js?$/,
     include: path.dirname(require.resolve("terriajs-cesium")),
     exclude: [
-      require.resolve("terriajs-cesium/Source/ThirdParty/zip"),
+      //require.resolve("terriajs-cesium/Source/ThirdParty/zip"),
       require.resolve("terriajs-cesium/Source/Core/buildModuleUrl"),
       require.resolve("terriajs-cesium/Source/Core/TaskProcessor")
     ],

buildprocess/diffCatalogIndex.js

@@ -0,0 +1,57 @@
+const fse = require("fs-extra");
+
+/** Print list of datasets that have been removed/added between two catalog index
+ *
+ * Usage:
+ * `node diffCatalogIndex.js path-to-old path-to-new`
+ */
+const [oldPath, newPath] = process.argv.slice(2);
+
+function sortIndex(index) {
+  return Object.keys(index)
+    .sort((a, b) => a.localeCompare(b))
+    .reduce((acc, currentKey) => {
+      acc[currentKey] = index[currentKey];
+      return acc;
+    }, {});
+}
+
+function itemPath(item, index) {
+  return (
+    (index[item.memberKnownContainerUniqueIds[0]]
+      ? itemPath(index[item.memberKnownContainerUniqueIds[0]], index) + "/"
+      : "") + item.name
+  );
+}
+
+// Sorting isn't necessary here - but it makes it easier to compare JSON objects by hand if needed
+const oldCatalogIndex = sortIndex(
+  JSON.parse(fse.readFileSync(oldPath).toString())
+);
+
+const newCatalogIndex = sortIndex(
+  JSON.parse(fse.readFileSync(newPath).toString())
+);
+
+const oldKeys = new Set(Object.keys(oldCatalogIndex));
+const newKeys = new Set(Object.keys(newCatalogIndex));
+
+console.log("Datasets which have been added");
+
+newKeys.forEach((newKey) => {
+  if (!oldKeys.has(newKey)) {
+    const item = newCatalogIndex[newKey];
+    console.log(
+      `+ ${newCatalogIndex[newKey].name} (${itemPath(item, newCatalogIndex)})`
+    );
+  }
+});
+
+console.log("\n\nDatasets which have been removed");
+
+oldKeys.forEach((oldKey) => {
+  if (!newKeys.has(oldKey)) {
+    const item = oldCatalogIndex[oldKey];
+    console.log(`- ${item.name} (${itemPath(item, oldCatalogIndex)})`);
+  }
+});