Merge pull request #29 from slub/dev-integrateImportApi

Integrate new Georef Service API

Author: jacmendt

Build/src/apps/admin/Evaluation.jsx

@@ -9,7 +9,7 @@ import { transformExtent } from "ol/proj";
 import SettingsProvider from "../../SettingsProvider";
 import Map2D from "../../components/Map2D/Map2D";
 import LoadingBar from "../../components/LoadingBar/LoadingBar";
-import { queryTransformationTry } from "../../util/apiGeo";
+import { queryTransformationPreview } from "../../util/apiGeo";
 import LayerRectifiedImage from "../../components/LayerRectifiedImage/LayerRectifiedImage";
 import SelectTransformations from "./components/SelectTransformations/SelectTransformations";
 import TransformationItem from "./components/TransformationItem/TransformationItem";
@@ -25,10 +25,8 @@ export const Evaluation = () => {
   const handleClickPreview = async (transformation) => {
     if (!isLoading) {
       setIsLoading(true);
-      const response = await queryTransformationTry(
-        transformation.map_id,
-        transformation.params,
-        transformation.clip !== undefined ? transformation.clip : undefined
+      const response = await queryTransformationPreview(
+        transformation.transformation_id
       );
 
       setCurrentPreview(

Build/src/apps/admin/components/TransformationItem/TransformationItem.jsx

@@ -29,7 +29,7 @@ function ValidationButton({ validation, onSelect }) {
     >
       {["valid", "invalid"].map((v) => (
         <MenuItem key={v} onClick={() => onSelect(v)}>
-          Setze Validation auf "{v}"
+          Setze Validation auf &quot;{v}&quot;
         </MenuItem>
       ))}
     </DropdownButton>
@@ -78,11 +78,11 @@ export const TransformationItem = (props) => {
 
   const handleSubmitNewValidation = (o) => {
     const newJob = {
-      task_name:
+      name:
         o.validationValue === "valid"
           ? "transformation_set_valid"
           : "transformation_set_invalid",
-      task: {
+      description: {
         comment: o.comment,
         transformation_id: o.transformationId,
       },

Build/src/apps/apps/UnreferencedMaps.jsx

@@ -97,6 +97,10 @@ export const UnreferencedMaps = () => {
                 </span>
                 <span className="map-meta-value">{map.map_type}</span>
               </p>
+              <p>
+                <span className="map-meta-label">ID: </span>
+                <span className="map-meta-value">{map.map_id}</span>
+              </p>
             </div>
             <div className="map-links">
               <a

Build/src/apps/georeferencer/components/Toolbar/Controller.js

@@ -13,7 +13,6 @@ import VectorLayer from "ol/layer/Vector";
 import VectorSource from "ol/source/Vector";
 import round from "lodash.round";
 import Observer from "../../../../util/observer";
-import { initializeSupportedCRS } from "../../../../util/geo";
 import {
     createClipPolygonStyle,
     createGcpDefaultStyle,
@@ -24,6 +23,7 @@ import {
     activateDelGcpAction,
     activateDrawClipAction,
 } from "./actions";
+import { DEFAULT_PROJ } from "../../util/util.js";
 
 /**
  * Transforms the given pixel coordinates to geo pixel coordinate system.
@@ -204,8 +204,6 @@ export class Controller extends Observer {
      * This function initial loads the data to the vector source
      */
     loadData() {
-        initializeSupportedCRS();
-
         // Add ground control points to the map
         if (this.params_.gcps.length > 0) {
             for (let i = 0, l = this.params_.gcps.length; i < l; i++) {
@@ -224,7 +222,7 @@ export class Controller extends Observer {
                     new Point(
                         transform(
                             this.params_.gcps[i].target,
-                            this.params_.target,
+                            DEFAULT_PROJ,
                             this.trgMap_.getView().getProjection()
                         )
                     )
@@ -238,7 +236,7 @@ export class Controller extends Observer {
         // Add the clip polygon to the map
         if (this.clip_) {
             const newFeature = new GeoJSON().readFeature(this.clip_, {
-                dataProjection: this.clip_.crs.properties.name,
+                dataProjection: DEFAULT_PROJ,
                 featureProjection: this.trgMap_.getView().getProjection(),
             });
 
@@ -343,7 +341,7 @@ export class Controller extends Observer {
                 target: transform(
                     trgFt.getGeometry().getCoordinates(),
                     this.trgMap_.getView().getProjection(),
-                    this.params_.target
+                    DEFAULT_PROJ
                 ),
             });
         }
@@ -363,17 +361,12 @@ export class Controller extends Observer {
                 : undefined;
 
         if (clipFeature !== undefined) {
-            return Object.assign(
-                new GeoJSON().writeGeometryObject(clipFeature.getGeometry(), {
-                    dataProjection: "EPSG:4326",
+            return new GeoJSON().writeGeometryObject(
+                clipFeature.getGeometry(),
+                {
+                    dataProjection: DEFAULT_PROJ,
                     featureProjection: "EPSG:3857",
                     decimals: 9,
-                }),
-                {
-                    crs: {
-                        type: "name",
-                        properties: { name: "EPSG:4326" },
-                    },
                 }
             );
         } else {

Build/src/apps/georeferencer/components/Toolbar/Toolbar.jsx

@@ -9,6 +9,7 @@ import { useRecoilValue, useSetRecoilState, useRecoilState } from "recoil";
 import queryString from "query-string";
 import {
   postTransformation,
+  queryTransformationPreview,
   queryTransformationTry,
 } from "../../../../util/apiGeo";
 import { translate } from "../../../../util/util";
@@ -117,7 +118,13 @@ export const Toolbar = () => {
   // Handle get rectified image
   const handleClickRectifiedImage = () => {
     const fetchData = async (map_id, params) => {
-      const rectifiedImageParams = await queryTransformationTry(map_id, params);
+      const rectifiedImageParams =
+        refController.current.hasParamsOrClipChanged() ||
+        selectedAlgorithm !== transformation.params.algorithm ||
+        transformation?.overwrites === undefined ||
+        transformation.overwrites === 0
+          ? await queryTransformationTry(map_id, params)
+          : await queryTransformationPreview(transformation.overwrites);
       setIsLoading(false);
       setRectifiedImageParams(rectifiedImageParams);
     };
@@ -202,15 +209,24 @@ export const Toolbar = () => {
       targetViewParams !== null
     ) {
       refController.current = new Controller({
-        clip: transformation.clip,
+        clip:
+          transformation?.clip !== undefined && transformation?.clip !== null
+            ? {
+                type: transformation.clip.type,
+                coordinates: transformation.clip.coordinates,
+              }
+            : undefined,
         onSetHelperMsg: (newHelperMsg) => {
           setNotification({
             id: "toolbar-info",
             type: "info",
             text: newHelperMsg,
           });
         },
-        params: transformation.params,
+        params: {
+          algorithm: transformation.params.algorithm,
+          gcps: transformation.params.gcps,
+        },
         sourceMap: sourceViewParams.map,
         targetMap: targetViewParams.map,
       });
@@ -224,6 +240,9 @@ export const Toolbar = () => {
           () => {}
         )
       );
+
+      // restore algorithm setting from transformation
+      setActiveAlgorithm(transformation.params.algorithm);
     }
   }, [
     transformation,

Build/src/apps/georeferencer/util/util.js

@@ -4,11 +4,11 @@
  * This file is subject to the terms and conditions defined in
  * file 'LICENSE.txt', which is part of this source code package.
  */
-import { initializeSupportedCRS } from "../../../util/geo";
 import { boundingExtent } from "ol/extent";
-import { toLonLat } from "ol/proj";
 import GeoJSON from "ol/format/GeoJSON";
 
+export const DEFAULT_PROJ = "EPSG:4326";
+
 /**
  * Extracts a extent from a given transformation. The extent is always computed in EPSG:4326
  * @param {{
@@ -28,28 +28,11 @@ import GeoJSON from "ol/format/GeoJSON";
  * @returns {[number, number, number, number]}
  */
 export function geoJsonExtentFromTransformation(transformation) {
-    initializeSupportedCRS();
-
     const { params, clip } = transformation;
-    let points = [];
-
-    // Transform gcp target points to LonLat points
-    if (params.gcps.length > 0) {
-        const targetSrs = params.target;
-        points = [...params.gcps.map((gcp) => toLonLat(gcp.target, targetSrs))];
-    }
-
-    // Transform clip points to LonLat Points
-    if (clip !== null && clip !== undefined) {
-        const targetSrs =
-            clip.crs !== undefined ? clip.crs.properties.name : "EPSG:4326";
-        points = [
-            ...points,
-            clip.coordinates[0].map((c) =>
-                targetSrs !== "EPSG:4326" ? toLonLat(c, targetSrs) : c
-            ),
-        ];
-    }
+    const points = [
+        ...params.gcps.map((gcp) => gcp.target),
+        ...(clip !== undefined && clip !== null ? clip.coordinates[0] : []),
+    ];
 
     return points.length > 0 ? boundingExtent(points) : null;
 }
@@ -60,15 +43,10 @@ export function geoJsonExtentFromTransformation(transformation) {
  * @returns {[number, number, number, number]}
  */
 export function geoJsonExtentFromGeoJsonPolygon(geojsonPolygon) {
-    initializeSupportedCRS();
-
-    const targetSrs =
-        geojsonPolygon.crs !== undefined
-            ? geojsonPolygon.crs.properties.name
-            : "EPSG:4326";
     const polygon = new GeoJSON().readGeometry(geojsonPolygon, {
-        dataProjection: targetSrs,
-        featureProjection: "EPSG:4326",
+        dataProjection: DEFAULT_PROJ,
+        featureProjection: DEFAULT_PROJ,
     });
+
     return polygon.getExtent();
 }

Build/src/apps/georeferencer/views/GeoreferenceView/GeoreferenceView.jsx

@@ -25,6 +25,25 @@ import {
 } from "../../util/util";
 import "./GeoreferenceView.scss";
 
+const parseTransformation = (transformation) => {
+  // remove all but the required properties from the clip and the transformation
+  return {
+    map_id: transformation.map_id,
+    clip:
+      transformation?.clip !== undefined && transformation.clip !== null
+        ? {
+            type: transformation.clip.type,
+            coordinates: transformation.clip.coordinates,
+          }
+        : undefined,
+    overwrites: transformation.transformation_id,
+    params: {
+      algorithm: transformation?.params?.algorithm ?? "affine",
+      gcps: transformation?.params?.gcps ?? [],
+    },
+  };
+};
+
 export const GeoreferenceView = (props) => {
   const { urlsOsmBaseMap, urlNominatim } = props;
   const setTransformation = useSetRecoilState(transformationState);
@@ -41,14 +60,22 @@ export const GeoreferenceView = (props) => {
     const qs = queryString.parse(location.search);
 
     if (qs.map_id !== undefined) {
-      const transformationData = await queryTransformationForMapId(qs.map_id);
+      const { transformations, additional_properties } =
+        await queryTransformationForMapId(qs.map_id);
+      const {
+        active_transformation_id,
+        extent: transf_extent,
+        pending_jobs,
+      } = additional_properties;
+
       const metadata = await queryDocument(qs.map_id);
+
       let extent =
-        transformationData.extent !== null
-          ? geoJsonExtentFromGeoJsonPolygon(transformationData.extent)
+        transf_extent !== null
+          ? geoJsonExtentFromGeoJsonPolygon(transf_extent)
           : null;
 
-      if (transformationData.pending_jobs) {
+      if (pending_jobs) {
         setNotification({
           id: "georeference-view",
           type: "warning",
@@ -60,31 +87,22 @@ export const GeoreferenceView = (props) => {
       const targetTransformationId =
         qs.transformation_id !== undefined
           ? parseInt(qs.transformation_id)
-          : transformationData.active_transformation_id;
+          : active_transformation_id;
 
-      if (
-        transformationData.transformations.length > 0 &&
-        targetTransformationId !== null
-      ) {
-        const activeTransformation = transformationData.transformations.find(
+      if (transformations.length > 0 && targetTransformationId !== null) {
+        const activeTransformation = transformations.find(
           (t) => t.transformation_id === targetTransformationId
         );
+
         extent = geoJsonExtentFromTransformation(activeTransformation);
 
-        setTransformation({
-          map_id: activeTransformation.map_id,
-          clip: activeTransformation.clip,
-          overwrites: activeTransformation.transformation_id,
-          params: activeTransformation.params,
-        });
-      } else if (transformationData.active_transformation_id === null) {
+        setTransformation(parseTransformation(activeTransformation));
+      } else if (active_transformation_id === null) {
         setTransformation({
           map_id: qs.map_id,
           clip: null,
           overwrites: 0,
           params: {
-            source: "pixel",
-            target: transformationData.default_srs,
             algorithm: "affine",
             gcps: [],
           },

Build/src/components/LayerRectifiedImage/LayerRectifiedImage.jsx

@@ -38,7 +38,7 @@ export const LayerRectifiedImage = (props) => {
     // Init and add the layer
     const layer = new Tile({
       source: new TileWMS({
-        url: wmsUrl.split("?")[0],
+        url: wmsUrl,
         params: {
           LAYERS: layerName,
           VERSION: "1.1.1",