Merge branch 'main' into 3601-my-location-error

Author: na9da

.eslintrc .eslintrc.js.eslintrc renamed to .eslintrc.js

@@ -1,75 +1,78 @@
-{
-  "root": true,
-  "extends": [
+"use strict";
+
+module.exports = {
+  root: true,
+  extends: [
     "eslint:recommended",
     // https://github.com/typescript-eslint/typescript-eslint/blob/v6/packages/eslint-plugin/src/configs/recommended.ts
     "plugin:@typescript-eslint/recommended",
     "plugin:react/recommended",
     "plugin:react-hooks/recommended",
     "prettier"
   ],
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "requireConfigFile": false,
-    "ecmaVersion": 2019,
-    "ecmaFeatures": {
-      "jsx": true,
-      "modules": true,
-      "legacyDecorators": true
+  parser: "@typescript-eslint/parser",
+  parserOptions: {
+    requireConfigFile: false,
+    ecmaVersion: 2019,
+    ecmaFeatures: {
+      jsx: true,
+      modules: true,
+      legacyDecorators: true
     }
   },
-  "env": {
-    "browser": true,
-    "commonjs": true,
-    "es6": true
+  env: {
+    browser: true,
+    commonjs: true,
+    es6: true
   },
-  "ignorePatterns": ["*.scss.d.ts"],
-  "plugins": ["react", "react-hooks", "@typescript-eslint"],
-  "globals": {
-    "process": true
+  ignorePatterns: ["*.scss.d.ts", "/lib/ThirdParty"],
+  plugins: ["react", "react-hooks", "@typescript-eslint"],
+  globals: {
+    process: true
   },
-  "settings": {
-    "react": {
-      "version": "detect"
+  settings: {
+    react: {
+      version: "detect"
     }
   },
-  "rules": {
+  rules: {
+    // TODO: re-enable the disabled @typescript-eslint rules.
     "@typescript-eslint/no-explicit-any": "off",
     "@typescript-eslint/no-namespace": "off",
-    "@typescript-eslint/no-non-null-asserted-optional-chain": "off",
     "@typescript-eslint/no-this-alias": "off",
     "@typescript-eslint/no-var-requires": "off",
     "@typescript-eslint/unified-signatures": "error",
     "react-hooks/exhaustive-deps": "error",
-    "react/jsx-boolean-value": ["error", "never", { "always": [] }],
+    "react/jsx-boolean-value": ["error", "never", { always: [] }],
     "react/no-arrow-function-lifecycle": "error",
     "react/no-invalid-html-attribute": "error",
     "react/jsx-no-useless-fragment": "error",
     "react/jsx-no-constructed-context-values": "error",
     "react/jsx-fragments": ["error", "syntax"],
-    "react/jsx-no-duplicate-props": ["error", { "ignoreCase": true }],
+    "react/jsx-no-duplicate-props": ["error", { ignoreCase: true }],
     "react/jsx-pascal-case": [
       "error",
       {
-        "allowAllCaps": true,
-        "ignore": []
+        allowAllCaps: true,
+        ignore: []
       }
     ],
     "react/no-danger": "warn",
     "react/no-did-update-set-state": "error",
     "react/no-will-update-set-state": "error",
     "react/self-closing-comp": "error",
-    "react/jsx-no-undef": ["error", { "allowGlobals": true }],
+    "react/jsx-no-undef": ["error", { allowGlobals: true }],
 
     /*Possible Errors */
     "no-console": "off",
     "no-inner-declarations": [1, "functions"],
 
     /* Best Practices */
-    "eqeqeq": ["error"],
+    eqeqeq: ["error"],
     "no-alert": ["error"],
     "no-caller": ["error"],
     "no-div-regex": ["error"],
+    "no-empty": ["error", { allowEmptyCatch: true }],
     "no-eval": ["error"],
     "no-extend-native": ["error"],
     "no-fallthrough": 0,
@@ -86,29 +89,29 @@
     "no-return-assign": ["error"],
     "no-script-url": ["error"],
     "no-sequences": ["error"],
-    "radix": "error",
+    radix: "error",
 
     /* Strict Mode */
-    "strict": [0, "global"],
+    strict: [0, "global"],
 
     /* Variables */
     "no-label-var": 1,
     "@typescript-eslint/no-unused-vars": [
       "warn",
       {
-        "args": "all",
-        "argsIgnorePattern": "^_",
-        "varsIgnorePattern": "^_",
-        "caughtErrors": "all",
-        "caughtErrorsIgnorePattern": "^_",
-        "destructuredArrayIgnorePattern": "^_",
-        "ignoreRestSiblings": true
+        args: "all",
+        argsIgnorePattern: "^_",
+        varsIgnorePattern: "^_",
+        caughtErrors: "all",
+        caughtErrorsIgnorePattern: "^_",
+        destructuredArrayIgnorePattern: "^_",
+        ignoreRestSiblings: true
       }
     ],
-    "camelcase": [
+    camelcase: [
       0,
       {
-        "properties": "always"
+        properties: "always"
       }
     ],
     "no-array-constructor": "error",
@@ -118,12 +121,12 @@
     /* See https://stackoverflow.com/questions/64646248/eslintrc-js-for-react-17-and-jsx-without-import-react/64646593#64646593 */
     "react/jsx-uses-react": "off",
     "react/react-in-jsx-scope": "off",
-    "react/no-unknown-property": ["error", { "ignore": ["css"] }]
+    "react/no-unknown-property": ["error", { ignore: ["css"] }]
   },
-  "overrides": [
+  overrides: [
     {
-      "files": ["**/*.ts", "**/*.tsx"],
-      "rules": {
+      files: ["**/*.ts", "**/*.tsx"],
+      rules: {
         /* The no-useless-constructor needs to be disabled for
             the @typescript-eslint-rule. */
         "no-useless-constructor": "off",
@@ -135,4 +138,4 @@
       }
     }
   ]
-}
+};

CHANGES.md

@@ -1,12 +1,18 @@
 # Change Log
 
-#### next release (8.7.11)
+#### next release (8.7.12)
 
-- Explicitly set prettier tab-width
-- Move release guide from README.md to RELEASE_GUIDE.md
+- support URL parameters in a GetLegendGraphic request for a layer without a style configured
 - Enhanced error processing for obtaining user location
 - [The next improvement]
 
+#### 8.7.11 - 2024-12-18
+
+- Explicitly set prettier tab-width
+- Move release guide from README.md to RELEASE_GUIDE.md
+- Add `clampToGround` to `KmlCatalogItemTraits` (defaults to `true`) - this is now passed to `KmlDataSource.load`. Terria no longer clamps polygon geometries to terrain manually. All clamping logic is now handled by Cesium.
+- Add `dataSourceUri` to `KmlCatalogItemTraits` - Overrides the url to use for resolving relative links and other KML network features
+
 #### 8.7.10 - 2024-11-29
 
 - Add OpenStreetMap as a basemap option.
@@ -227,6 +233,11 @@
 - Fix share links with picked features from `ProtomapsImageryProvider`
 - Added on screen attribution and Google logo for Google Photorealistic 3D Tiles.
 - Add `hideDefaultDescription` to `CatalogMemberTraits` - if true, then no generic default description will be shown when `description` is empty.
+- Add `hideDefaultDescription` to `CatalogMemberTraits` - if true, then no generic default description will be shown when `description` is empty.
+- Add `clampPolygonsToGround` to `KmlCatalogItemTraits` (defaults to true`)
+- [The next improvement]
+- Added on screen attribution and Google logo for Google Photorealistic 3D Tiles.
+- Add `hideDefaultDescription` to `CatalogMemberTraits` - if true, then no generic default description will be shown when `description` is empty.
 
 #### 8.3.6 - 2023-10-03
 

CODE_OF_CONDUCT.md

@@ -60,12 +60,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement. Please send these
-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
-- Nick Forbes-Smith: nick.forbes-smith@data61.csiro.au
-- Peter Hassall: peter.hassall@data61.csiro.au
+reports via email to support@terria.io.
 
 All complaints will be reviewed and investigated promptly and fairly.
 

CONTRIBUTORS.md

@@ -66,3 +66,4 @@ The following people have contributed to TerriaJS:
 - [Peter A. Jonsson](https://github.com/pjonsson)
 - [Giovanni Lughi](https://github.com/glughi)
 - [Andrew Cleland](https://github.com/aclel)
+- [Sidney Gijzen](https://github.com/sidneygijzen)

buildprocess/.eslintrc

@@ -0,0 +1,11 @@
+"use strict";
+
+module.exports = {
+  env: {
+    browser: false,
+    node: true
+  },
+  rules: {
+    "no-sync": 0
+  }
+};

buildprocess/.eslintrc.js

@@ -142,7 +142,7 @@ Run any of these tasks with `yarn gulp <task name>` from within the TerriaJS dir
 - `build` - Builds a non-minified version of the TerriaJS tests. This task may take 10 seconds or more, which is the main reason for the next task.
 - `watch` - Starts the same as `build` but then it stays running and watches for changes to any TerriaJS or Cesium source file that was pulled in to the build. When a change to any of these files is detected, a fast incremental build is automatically kicked off. The incremental build is much faster than the full rebuild because dependencies between source files are cached.
 - `release` - The same as `build` except that it also minifies the build tests.
-- `lint` - Runs ESLint on the files in the `lib` folder and reports any problems. The ESLint rules are defined in the `.eslintrc` file in the root directory of TerriaJS. A stricter set of rules is also find in the `.eslintrc` file in `lib/ReactViews`.
+- `lint` - Runs ESLint on the files in the `lib` folder and reports any problems. The ESLint rules are defined in the `.eslintrc.js` file in the root directory of TerriaJS.
 - `docs` - Generates the user guide and reference documentation. The user guide is served at `http://localhost:3002/doc/guide/` and the reference documentation is at `http://localhost:3002/doc/reference/`.
 - `make-schema` - Generates [JSON Schema](http://json-schema.org/) for the TerriaJS [Initialization Files](../customizing/initialization-files.md) from the source code. The schema is written to `wwwroot/schema`.
 - `test` - Detects browsers available on the local system and launches the test suite in each. The results are reported on the command line.

doc/contributing/development-environment.md

@@ -26,6 +26,7 @@ nav:
       - Cross-Origin Resource Sharing: connecting-to-data/cross-origin-resource-sharing.md
       - Catalog Groups: connecting-to-data/catalog-groups.md
       - Catalog Items: connecting-to-data/catalog-items.md
+      - Item Search: connecting-to-data/item-search/indexed-item-search.md
       - Customizing Data Appearance:
           - Overview: connecting-to-data/customizing-data-appearance/overview.md
           - Imagery Data: connecting-to-data/customizing-data-appearance/imagery-data.md

doc/mkdocs.yml

@@ -45,16 +45,18 @@ gulp.task("watch-specs", function (done) {
 
 gulp.task("lint", function (done) {
   var runExternalModule = require("./buildprocess/runExternalModule");
+  var path = require("path");
 
-  runExternalModule("eslint/bin/eslint.js", [
+  const eslintDir = path.dirname(require.resolve("eslint/package.json"));
+  const eslintExecutable = path.join(eslintDir, "bin", "eslint.js");
+  runExternalModule(eslintExecutable, [
     "lib",
     "test",
     "--ext",
     ".jsx,.js,.ts,.tsx",
-    "--ignore-pattern",
-    "lib/ThirdParty",
     "--max-warnings",
-    "0"
+    "0",
+    "--report-unused-disable-directives"
   ]);
 
   done();

gulpfile.js

@@ -1,4 +1,6 @@
-export const getUriWithoutPath = (anyUri: uri.URI) => {
+import type URI from "urijs";
+
+export const getUriWithoutPath = (anyUri: URI) => {
   if (!anyUri) {
     return undefined;
   }