Revert "Add wmts (#1571)"

CHANGELOG.md

@@ -2,10 +2,6 @@
 
 ## [Unreleased]
 
-### Added
-
-- WMTS Services are now supported as custom user layers.
-
 ### Changed
 
 - Updated the style of bulk edit form.

src/client/package.json

@@ -31,7 +31,6 @@
     "@mui/system": "^5.16.5",
     "@mui/x-data-grid": "^7.11.1",
     "@react-hook/resize-observer": "^1.2.6",
-    "@types/proj4": "^2.5.5",
     "axios": "^1.7.1",
     "d3": "^7.9.0",
     "date-fns": "^2.30.0",

src/client/public/locale/de/common.json

@@ -337,8 +337,6 @@
   "nothingToShow": "Nichts zu zeigen",
   "np": "Keine Angabe",
   "oneSelected": "Ein Bohrung ausgewählt",
-  "onlyEPSG2056Supported": "Nur EPSG:2056 wird unterstützt.",
-  "onlyWmsAndWmtsSupported": "Nur Web Map Services (WMS) und Web Map Tile Services (WMTS) werden unterstützt.",
   "openBorehole": "offenes Bohrloch",
   "order": "Reihenfolge",
   "organic_component": "Organische Komponenten",

src/client/public/locale/en/common.json

@@ -337,8 +337,6 @@
   "nothingToShow": "Nothing to display",
   "np": "Not specified",
   "oneSelected": "One borehole selected",
-  "onlyEPSG2056Supported": "Only EPSG:2056 is supported",
-  "onlyWmsAndWmtsSupported": "Sono supportati solo i servizi WMS (Web Map Services) e WMTS (Web Map Tile Services).",
   "openBorehole": "open hole",
   "order": "Order",
   "organic_component": "Organic components",

src/client/public/locale/fr/common.json

@@ -337,8 +337,6 @@
   "nothingToShow": "Rien à montrer",
   "np": "Sans indication",
   "oneSelected": "Un forage sélectionné",
-  "onlyEPSG2056Supported": "Seulement le système de coordonnées EPSG:2056 est pris en charge.",
-  "onlyWmsAndWmtsSupported": "Seulement Web Map Services (WMS) et Web Map Tile Services (WMTS) sont pris en charge.",
   "openBorehole": "forage ouvert",
   "order": "Ordre",
   "organic_component": "Composants organiques",

src/client/public/locale/it/common.json

@@ -337,8 +337,6 @@
   "nothingToShow": "Niente da mostrare",
   "np": "Senza indicazioni",
   "oneSelected": "Una perforazione selezionata",
-  "onlyEPSG2056Supported": "È supportato solo EPSG:2056.",
-  "onlyWmsAndWmtsSupported": "Seulement Web Map Services (WMS) et Web Map Tile Services (WMTS) sont pris en charge.",
   "openBorehole": "perforazione aperta",
   "order": "Ordine",
   "organic_component": "Componenti organici",

src/client/src/api-lib/ReduxStateInterfaces.ts

@@ -14,7 +14,6 @@ export interface Setting {
 }
 
 export interface SettingData {
-  efilter: string;
   map: {
     explorer: string;
   };

src/client/src/api-lib/actions/settings.js

@@ -12,7 +12,7 @@ export function patchSettings(tree, value, key = null) {
     tree: tree,
     value: value,
   };
-  if (key) {
+  if (key !== null) {
     payload.key = key;
   }
   return fetch("/setting", payload);

src/client/src/components/map/mapComponent.jsx

@@ -18,6 +18,7 @@ import { Cluster } from "ol/source";
 import TileWMS from "ol/source/TileWMS";
 import VectorSource from "ol/source/Vector";
 import WMTS from "ol/source/WMTS";
+import WMTSTileGrid from "ol/tilegrid/WMTS";
 import proj4 from "proj4";
 import PropTypes from "prop-types";
 import { getGeojson } from "../../api-lib";
@@ -222,6 +223,8 @@ class MapComponent extends React.Component {
       opacity: 1,
       source: new WMTS({
         ...layer.conf,
+        projection: getProjection(layer.conf.projection),
+        tileGrid: new WMTSTileGrid(layer.conf.tileGrid),
       }),
       zIndex: layer.position + 1,
     });

src/client/src/pages/settings/components/editorSettingList/editorSettingList.jsx

@@ -6,7 +6,18 @@ import TranslationText from "../../../../components/legacyComponents/translation
 import * as Styled from "./styles";
 
 const EditorSettingList = props => {
-  const { data, toggleFilter, attribute, toggleField, listName, codes, toggleFieldArray, toggleFilterArray } = props;
+  const {
+    data,
+    toggleFilter,
+    attribute,
+    toggleField,
+    listName,
+    geocode,
+    codes,
+    toggleFieldArray,
+    toggleFilterArray,
+    type,
+  } = props;
 
   const { t } = useTranslation();
 
@@ -22,8 +33,15 @@ const EditorSettingList = props => {
       for (let idx = 0; idx < codes.data.layer_kind.length; idx++) {
         const element = codes.data.layer_kind[idx];
 
-        if (element.code === "Geol") {
-          return element.conf.fields[field];
+        if (element.code === geocode) {
+          if (type === "editor" && _.isObject(element.conf) && _.has(element.conf, `fields.${field}`)) {
+            return element.conf.fields[field];
+          }
+          if (type === "viewer" && _.isObject(element.conf) && _.has(element.conf, `viewerFields.${field}`)) {
+            return element.conf.viewerFields[field];
+          } else {
+            return false;
+          }
         }
       }
     }