Merge branch 'main' of https://github.com/TerriaJS/terriajs into rer3…

…d_from_8.7.9
bioretics · Nov 15, 2024 · 5a8a89e · 5a8a89e
2 parents 500c26d + 1217b82
commit 5a8a89e
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 20 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,8 @@
 
 #### next release (8.7.9)
 
+- Properly initialize react ref in functional components
+- Add NominatimSearchProvider.
 - [The next improvement]
 
 #### 8.7.8 - 2024-11-01

diff --git a/doc/customizing/search-providers.md b/doc/customizing/search-providers.md
@@ -151,6 +151,30 @@ It can be configured using following options
 }
 ```
 
+### NominatimSearchProvider
+
+`type: nominatim-search-provider`
+
+Nominatim uses OpenStreetMap data to find locations on Earth.
+It can be configured using following options
+
+| Name           | Required | Type       | Default     | Description                                                                                 |
+| -------------- | -------- | ---------- | ----------- | ------------------------------------------------------------------------------------------- |
+| `countryCodes` | no       | **string** | `undefined` | A comma-separated list of country codes (ISO 3166-1alpha2) to prioritize the search results |
+| `maxResults`   | no       | **number** | 5           | The maximum number of results to return                                                     |
+
+**Example**
+
+```json
+{
+    "id": "search-provider/nominatim",
+    "type": "nominatim-search-provider",
+    "name": "Nominatim",
+    "flightDurationSeconds": 2,
+    "minCharacters": 3
+}
+```
+
 ### Implementing new location search provider
 
 Implementing new location search provider is similar to implementing new `CatalogItems` and `CatalogGroups`. Each of them should be based on the usage of one of the mixins

diff --git a/lib/Models/Catalog/CatalogReferences/ThreddsItemReference.ts b/lib/Models/Catalog/CatalogReferences/ThreddsItemReference.ts
@@ -121,7 +121,6 @@ export default class ThreddsItemReference extends UrlMixin(
     );
     if (model === undefined) return;
     this.setThreddsStrata(model);
-    _previousTarget = model;
     return model;
   }
 }
diff --git a/lib/Models/Catalog/Ckan/CkanItemReference.ts b/lib/Models/Catalog/Ckan/CkanItemReference.ts
@@ -388,7 +388,6 @@ export default class CkanItemReference extends UrlMixin(
     }
 
     if (model === undefined) return;
-    _previousTarget = model;
     await this.setCkanStrata(model);
 
     model.setTrait(CommonStrata.definition, "name", this.name);

diff --git a/lib/Models/Catalog/Esri/ArcGisPortalItemReference.ts b/lib/Models/Catalog/Esri/ArcGisPortalItemReference.ts
@@ -350,7 +350,6 @@ export default class ArcGisPortalItemReference extends AccessControlMixin(
     );
 
     if (model === undefined) return;
-    _previousTarget = model;
     await this.setArcgisStrata(model);
 
     const defintionStratum = this.strata.get(CommonStrata.definition);

diff --git a/lib/ReactViews/Tools/ItemSearchTool/SearchResults.tsx b/lib/ReactViews/Tools/ItemSearchTool/SearchResults.tsx
@@ -1,6 +1,6 @@
 import { observer } from "mobx-react";
 import Mustache from "mustache";
-import React, { useState } from "react";
+import React, { useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useVirtual } from "react-virtual";
 import styled from "styled-components";
@@ -28,7 +28,7 @@ const SearchResults: React.FC<SearchResultsProps> = (props) => {
     currentMapEffect.is === "highlightSingleResult"
       ? currentMapEffect.result
       : undefined;
-  const parentRef = React.createRef<HTMLDivElement>();
+  const parentRef = useRef<HTMLDivElement>(null);
   const list = useVirtual({
     size: results.length,
     parentRef,

diff --git a/lib/ReactViews/Tools/PedestrianMode/MouseTooltip.tsx b/lib/ReactViews/Tools/PedestrianMode/MouseTooltip.tsx
@@ -1,4 +1,4 @@
-import React, { createRef, useEffect } from "react";
+import React, { useEffect, useRef } from "react";
 import styled from "styled-components";
 import Cartesian2 from "terriajs-cesium/Source/Core/Cartesian2";
 import Scene from "terriajs-cesium/Source/Scene/Scene";
@@ -11,7 +11,7 @@ type MouseTooltipProps = {
 
 const MouseTooltip: React.FC<MouseTooltipProps> = (props) => {
   const { scene, text } = props;
-  const tooltipText = createRef<typeof TooltipText>();
+  const tooltipText = useRef<typeof TooltipText>(null);
 
   useEffect(function tooltipFollowMouse() {
     const setTooltipPosition = (position: { x: number; y: number }) => {

diff --git a/wwwroot/languages/ca/translation.json b/wwwroot/languages/ca/translation.json
@@ -712,7 +712,8 @@
       "carto-v3": "Carto V3",
       "i3s": "I3S",
       "esri-imageServer": "Esri ArcGIS ImageServer (capa única)",
-      "cesium-ion": "Cesium ion"
+      "cesium-ion": "Cesium ion",
+      "cog": "Geotiff optimitzat al núvol (COG)"
     },
     "printWindow": {
       "errorTitle": "Error d'impressió",
@@ -2090,6 +2091,9 @@
       "name": "Esri ArcGIS ImageServer",
       "invalidUrlMessage": "No s'ha pogut carregar el punt final de l'ArcGis ImageServer perquè l'element del catàleg no té una \"url\".",
       "invalidServiceMessage": "S'ha produït un error en invocar ArcGIS Image Service. La resposta del servidor no sembla ser un document Image Service vàlid."
+    },
+    "cogCatalogItem": {
+      "experimentalReprojectionWarning": "Aquest COG no es està en una projecció nativa (EPG:4326 o EPSG:3857). La reprojecció és experimental i pot ser que no funcioni com s'esperava. Si teniu el control de les dades d'origen, us recomanem que torneu a projectar a EPSG:4326 o EPSG:3857 mitjançant GDAL o similar."
     }
   },
   "deltaTool": {

diff --git a/wwwroot/languages/cs/translation.json b/wwwroot/languages/cs/translation.json
@@ -650,7 +650,7 @@
     "expand": "Rozbalit",
     "download": "Stáhnout",
     "loading": "Načítání dat grafu...",
-    "noData": "Nebyla nalezena žádná data grafu.",
+    "noData": "Nenalezeny žádné údaje, které by bylo možné zobrazit v tabulce.",
     "showItemInChart": "Zobrazit {{value}} v tabulce"
   },
   "viewModels": {
@@ -737,7 +737,8 @@
       "carto-v3": "Carto V3",
       "i3s": "I3S",
       "esri-imageServer": "Esri ArcGIS ImageServer (jedna vrstva)",
-      "cesium-ion": "Ionty cesia"
+      "cesium-ion": "Ionty cesia",
+      "cog": "Geotiff optimalizovaný pro cloud"
     },
     "printWindow": {
       "errorTitle": "Chyba tisku",
@@ -1404,7 +1405,7 @@
       "missingUrlTitle": "Nelze načíst GetCapabilities",
       "missingUrlMessage": "Nepodařilo se načíst dokument GetCapabilities služby WFS (Web Feature Service), protože položka katalogu nemá `url`.",
       "noLayerFoundTitle": "Nenalezena žádná vrstva",
-      "noLayerFoundMessage": "WFS datová sada '{{name}}' nemá žádné vrstvy odpovídající '{{typeNames}}'. Buď byl soubor katalogu nastaven nesprávně, nebo se změnil server WFS.",
+      "noLayerFoundMessage": "Datová sada WFS '{{name}}' nemá žádné vrstvy odpovídající '{{typeNames}}'. {{suggested}} {{line}}{{line}}Buď byl katalogový soubor nastaven nesprávně, nebo se změnil server WFS.",
       "reachedMaxFeatureLimit": "Varování: Tato vrstva dosáhla limitu funkcí WFS ({{maxFeatures}})"
     },
     "webMapServiceCatalogGroup": {
@@ -1673,7 +1674,7 @@
           "start": {
             "selectableDimensions": {
               "start": {
-                "name": "Start"
+                "name": "Spustit"
               },
               "stop": {
                 "name": "Stop"
@@ -1811,16 +1812,16 @@
                 "range": "{{value1}} až {{value2}}",
                 "selectableDimensions": {
                   "remove": {
-                    "value": "Odebrat"
+                    "value": "Odstranit"
                   },
                   "start": {
-                    "name": "Start"
+                    "name": "Spustit"
                   },
                   "stop": {
                     "name": "Stop"
                   }
                 },
-                "noValue": "Bez hodnoty"
+                "noValue": "(Bez hodnoty)"
               }
             }
           },
@@ -1829,7 +1830,7 @@
           },
           "styleType": {
             "name": "Typ",
-            "undefinedLabel": "Upřesněte prosím",
+            "undefinedLabel": "Prosím upřesněte",
             "constant": {
               "name": "Bez stylu"
             },
@@ -1843,13 +1844,13 @@
           "enum": {
             "selectableDimensions": {
               "enum": {
-                "noValue": "Žádná hodnota",
+                "noValue": "(Bez hodnoty)",
                 "selectableDimensions": {
                   "value": {
                     "name": "Hodnota"
                   },
                   "remove": {
-                    "value": "Odebrat"
+                    "value": "Odstranit"
                   }
                 },
                 "add": {
@@ -2014,7 +2015,7 @@
             "name": "Hodnota"
           },
           "remove": {
-            "value": "Odebrat"
+            "value": "Odstranit"
           },
           "add": {
             "value": "Přidat barvu"
@@ -2089,6 +2090,9 @@
       "invalidUrlMessage": "Nelze načíst koncový bod ArcGis ImageServer, protože položka katalogu nemá `url`.",
       "invalidServiceTitle": "Neplatná služba ArcGIS Image Service",
       "rasterFunction": "Rastrová funkce"
+    },
+    "cogCatalogItem": {
+      "experimentalReprojectionWarning": "Tento COG není v nativní projekci (EPSG:4326 nebo EPSG:3857). Reprojekce je experimentální a nemusí fungovat podle očekávání. Pokud máte kontrolu nad zdrojovými daty, doporučujeme reprojekci do EPSG:4326 nebo EPSG:3857 pomocí GDAL nebo podobného nástroje."
     }
   },
   "deltaTool": {
@@ -2230,7 +2234,7 @@
     "enabled": "Povoleno",
     "disabled": "Vypnuto",
     "colorAdd": "Přidat",
-    "colorRemove": "Odebrat",
+    "colorRemove": "Odstranit",
     "invalid": "Neplatné"
   }
 }