@vcmap/ui 5.0.2 → 5.1.0-rc.1

package/src/components/vector-properties/VcsFeatureEditingWindow.vue

@@ -0,0 +1,392 @@
+<template>
+  <v-sheet>
+    <VcsFormSection
+      v-if="session.type === SessionType.SELECT"
+      heading="components.editor.modifyHeader"
+      :action-button-list-overflow-count="5"
+      :header-actions="availableModifyActions"
+    >
+      <div class="px-1">
+        <VcsFeatureTransforms
+          v-if="currentTransformationMode"
+          :transformation-mode="currentTransformationMode"
+          :feature-properties="featureProperties"
+          :allow-z-input="is3D"
+        />
+        <div v-else class="px-1 py-1">
+          {{ $t('components.editor.modifyInfo') }}
+        </div>
+      </div>
+    </VcsFormSection>
+    <VcsFormSection heading="components.editor.styleHeader" v-if="showStyle">
+      <VcsFeatureStyleComponent :feature-properties="featureProperties" />
+    </VcsFormSection>
+    <VcsVectorPropertiesComponent
+      :value="featureProperties"
+      :show3-d-properties="is3D"
+      @propertyChange="updateFeatureProperties"
+      :value-default="defaultVectorProperties"
+      :properties="availableVectorProperties"
+      :show-dividers="false"
+      :expandable="expandableVectorProperties"
+      :start-open="startOpenVectorProperties"
+      :show-reset="showResetVectorProperties"
+    />
+  </v-sheet>
+</template>
+
+<script>
+  import { VSheet } from 'vuetify/lib';
+  import { inject, ref, watch, onUnmounted, provide, computed } from 'vue';
+  import {
+    CesiumMap,
+    GeometryType,
+    SessionType,
+    TransformationMode,
+    VectorProperties,
+  } from '@vcmap/core';
+  import VcsFeatureStyleComponent from '../style/VcsFeatureStyleComponent.vue';
+  import VcsFeatureTransforms from './VcsFeatureTransforms.vue';
+  import VcsVectorPropertiesComponent, {
+    genericVectorProperties,
+    pointVectorProperties,
+    nonPointVectorProperties,
+  } from './VcsVectorPropertiesComponent.vue';
+  import VcsFormSection from '../form-inputs-controls/VcsFormSection.vue';
+
+  /**
+   * @typedef {Object} EditorManager
+   * @property {import("vue").ShallowRef<import("@vcmap/core").Layer|undefined>} currentLayer
+   * @property {import("vue").ShallowRef<import("ol").Feature[]>} currentFeatures
+   * @property {import("vue").ShallowRef<import("@vcmap/core").EditGeometrySession | import("@vcmap/core").EditFeaturesSession | undefined>} currentEditSession
+   * @property {import("vue").ShallowRef<import("@vcmap/core").SelectFeaturesSession | import("@vcmap/core").CreateFeatureSession<import("@vcmap/core").GeometryType> | undefined>} currentSession
+   * @property {function():Promise<void>} placeCurrentFeaturesOnTerrain
+   * @property {function():void} stopEditing
+   * @property {function(import("ol").Feature=):Promise<void>|void} startEditSession
+   * @property {function(import("@vcmap/core").TransformationMode, import("ol").Feature[]=):Promise<void>|void} startTransformSession
+   */
+
+  export const EditorTransformationIcons = {
+    [TransformationMode.TRANSLATE]: 'mdi-axis-arrow',
+    [TransformationMode.ROTATE]: 'mdi-rotate-3d-variant',
+    [TransformationMode.SCALE]: 'mdi-arrow-top-right-bottom-left',
+    [TransformationMode.EXTRUDE]: '$vcsWall',
+  };
+
+  /**
+   * Returns a Set with all geometry types of the provided features
+   * @param {import("ol").Feature[]} features Array of ol features
+   * @returns {Set<GeometryType>} Set with GeometryTypes
+   */
+  function getGeometryTypes(features) {
+    return new Set(
+      features.map(
+        (f) =>
+          f.getGeometry()?.get('_vcsGeomType') ?? f.getGeometry()?.getType(),
+      ),
+    );
+  }
+
+  /**
+   * Returns the allowed transformation modes for the provided geometry types and number of features. Rotate is e.g. not allowed for a single point but for multiple points.
+   * @param {Set<GeometryType>} geometryTypes A set with all geometry types of the features.
+   * @param {number} nFeatures The number of the features.
+   * @returns {Array<TransformationMode>} The allowed transformation modes.
+   */
+  export function getAllowedEditorTransformationModes(
+    geometryTypes,
+    nFeatures,
+  ) {
+    const isSinglePoint =
+      nFeatures === 1 && geometryTypes.has(GeometryType.Point);
+    const isSingleCircle =
+      nFeatures === 1 && geometryTypes.has(GeometryType.Circle);
+    const isBboxSelected = geometryTypes.has(GeometryType.BBox);
+    return [
+      TransformationMode.TRANSLATE,
+      ...(isSinglePoint || isSingleCircle || isBboxSelected
+        ? []
+        : [TransformationMode.ROTATE]),
+      ...(isSinglePoint || isSingleCircle ? [] : [TransformationMode.SCALE]),
+    ];
+  }
+
+  /**
+   * @description A drawing window used for displaying selected features from editor sessions. A manger must be provided.
+   * @vue-prop {Array<string>} [allowedVectorProperties=['altitudeMode', 'extrudedHeight', 'classificationType']] - The vector properties that should be displayed.
+   * @vue-prop {boolean} [expandableVectorProperties=false] - Whether the vector properties should be expandable.
+   * @vue-prop {boolean} [startOpenVectorProperties=false] - Whether the vector properties should be expended initially. Only used when expandableVectorProperties is true.
+   * @vue-prop {boolean} [showResetVectorProperties=true] - Whether the reset button should be shown.
+   * @vue-prop {boolean} [showStyle=true] - Whether the style component should be shown.
+   */
+  export default {
+    components: {
+      VcsFeatureTransforms,
+      VSheet,
+      VcsFormSection,
+      VcsVectorPropertiesComponent,
+      VcsFeatureStyleComponent,
+    },
+    name: 'VcsFeatureEditingWindow',
+    props: {
+      allowedVectorProperties: {
+        type: Array,
+        default: () => [
+          'altitudeMode',
+          'heightAboveGround',
+          'extrudedHeight',
+          'classificationType',
+        ],
+      },
+      expandableVectorProperties: {
+        type: Boolean,
+        default: false,
+      },
+      startOpenVectorProperties: {
+        type: Boolean,
+        default: false,
+      },
+      showResetVectorProperties: {
+        type: Boolean,
+        default: true,
+      },
+      showStyle: {
+        type: Boolean,
+        default: true,
+      },
+    },
+    setup(props) {
+      const vcsApp = inject('vcsApp');
+      /** @type {EditorManager} */
+      const editorManager = inject('manager');
+      const {
+        currentFeatures: features,
+        currentSession: session,
+        currentEditSession: editSession,
+        currentLayer: layer,
+      } = editorManager;
+
+      const availableModifyActions = ref([]);
+      const availableVectorProperties = ref([]);
+
+      provide('features', features);
+      const featureProperties = ref();
+
+      watch(
+        features,
+        () => {
+          featureProperties.value =
+            layer.value.vectorProperties.getValuesForFeatures(features.value);
+        },
+        { immediate: true },
+      );
+
+      /**
+       * Sets the changed vector property options on the features. Also handles side effects.
+       * @param {import("@vcmap/core").VectorPropertiesOptions} update New property values from user input.
+       */
+      async function updateFeatureProperties(update) {
+        const extrusionLikePropertyKeys = [
+          'extrudedHeight',
+          'skirt',
+          'storeysAboveGround',
+          'storeysBelowGround',
+          'storeyHeightsAboveGround',
+          'storeyHeightsBelowGround',
+        ];
+        const setsExtrusionLikePropertyKeys =
+          !!extrusionLikePropertyKeys.filter(
+            (key) => Object.keys(update).includes(key) && !!update[key],
+          ).length;
+        if (
+          setsExtrusionLikePropertyKeys &&
+          featureProperties.value.altitudeMode !== 'absolute'
+        ) {
+          update.altitudeMode = 'absolute';
+        } else if (update.altitudeMode === 'clampToGround') {
+          extrusionLikePropertyKeys
+            .filter((key) => !!featureProperties.value[key])
+            .forEach((key) => {
+              update[key] = 0;
+            });
+        }
+        // when in create mode and changing altitude mode, this is triggered, but currentFeatures is empty array.
+        if (update.altitudeMode === 'absolute' && features?.length) {
+          await editorManager.placeCurrentFeaturesOnTerrain();
+        }
+
+        layer.value.vectorProperties.setValuesForFeatures(
+          update,
+          features.value,
+        );
+        featureProperties.value =
+          layer.value.vectorProperties.getValuesForFeatures(features.value);
+      }
+
+      const is3D = ref(false);
+
+      function updateIs3D() {
+        is3D.value = vcsApp.maps.activeMap instanceof CesiumMap;
+      }
+      const mapActivatedListener =
+        vcsApp.maps.mapActivated.addEventListener(updateIs3D);
+      updateIs3D();
+
+      const isGeometryEditing = computed(
+        () => editSession.value?.type === SessionType.EDIT_GEOMETRY,
+      );
+
+      const currentTransformationMode = ref();
+      let editModeListener = () => {};
+      watch(
+        editSession,
+        () => {
+          editModeListener();
+          currentTransformationMode.value = editSession.value?.mode || null;
+          if (currentTransformationMode.value) {
+            editModeListener = editSession.value.modeChanged.addEventListener(
+              (mode) => {
+                currentTransformationMode.value = mode;
+              },
+            );
+          }
+        },
+        { immediate: true },
+      );
+
+      function toggleTransformationSession(mode) {
+        if (
+          currentTransformationMode.value &&
+          currentTransformationMode.value === mode
+        ) {
+          editorManager.stopEditing();
+        } else {
+          editorManager.startTransformSession(mode);
+        }
+      }
+
+      function toggleEditGeometrySession() {
+        if (isGeometryEditing.value) {
+          editorManager.stopEditing();
+        } else {
+          editorManager.startEditSession();
+        }
+      }
+
+      /**
+       * @description Returns the current geometry types and the number of selected features.
+       * @type {import("vue").ComputedRef<{ types: Set<GeometryType>, nFeatures: number }>}
+       */
+      const currentGeometryTypes = computed(() => ({
+        types: getGeometryTypes(features.value),
+        nFeatures: features.value.length,
+      }));
+
+      function getAllowedModifyActions() {
+        const allowedModes = getAllowedEditorTransformationModes(
+          currentGeometryTypes.value.types,
+          currentGeometryTypes.value.nFeatures,
+        );
+
+        const allowedActions = allowedModes.map((mode) => {
+          return {
+            name: mode,
+            title: `components.editor.${mode}`,
+            icon: EditorTransformationIcons[mode],
+            active: computed(() => currentTransformationMode.value === mode),
+            callback: () => {
+              toggleTransformationSession(mode);
+            },
+          };
+        });
+
+        if (features.value.length === 1) {
+          allowedActions.unshift({
+            name: 'editGeometry',
+            title: `components.editor.edit`,
+            icon: '$vcsEditVertices',
+            active: isGeometryEditing,
+            callback: () => {
+              toggleEditGeometrySession();
+            },
+          });
+        }
+
+        return allowedActions;
+      }
+
+      function getAllowedVectorProperties() {
+        const properties = genericVectorProperties.filter((p) =>
+          props.allowedVectorProperties.includes(p),
+        );
+        const geomTypes = currentGeometryTypes.value.types;
+
+        const hasPoint = geomTypes.has(GeometryType.Point);
+        if (!hasPoint) {
+          nonPointVectorProperties.forEach((p) => {
+            if (props.allowedVectorProperties.includes(p)) {
+              properties.push(p);
+            }
+          });
+          properties.push('classificationType');
+        }
+
+        if (hasPoint && geomTypes.size === 1) {
+          pointVectorProperties.forEach((p) => {
+            if (props.allowedVectorProperties.includes(p)) {
+              properties.push(p);
+            }
+          });
+        }
+
+        return properties;
+      }
+
+      const geometryTypesWatcher = watch(
+        currentGeometryTypes,
+        (curr, prev) => {
+          if (
+            curr.types.size !== prev?.types.size ||
+            ![...curr.types].every((value) => prev?.types.has(value)) ||
+            (curr.nFeatures > 1 && prev.nFeatures === 1) ||
+            (prev.nFeatures > 1 && curr.nFeatures === 1)
+          ) {
+            availableModifyActions.value = getAllowedModifyActions();
+            availableVectorProperties.value = getAllowedVectorProperties();
+          }
+        },
+        { immediate: true },
+      );
+
+      const propsWatcher = watch(
+        () => props.allowedVectorProperties,
+        () => {
+          availableVectorProperties.value = getAllowedVectorProperties();
+        },
+      );
+
+      onUnmounted(() => {
+        mapActivatedListener();
+        editModeListener();
+        geometryTypesWatcher();
+        propsWatcher();
+        editorManager.stopEditing();
+      });
+
+      return {
+        featureProperties,
+        session,
+        SessionType,
+        currentTransformationMode,
+        TransformationMode,
+        availableModifyActions,
+        availableVectorProperties,
+        is3D,
+        updateFeatureProperties,
+        defaultVectorProperties: VectorProperties.getDefaultOptions(),
+      };
+    },
+  };
+</script>
+
+<style scoped></style>

package/src/components/vector-properties/VcsFeatureEditingWindow.vue.d.ts

@@ -0,0 +1,87 @@
+/**
+ * Returns the allowed transformation modes for the provided geometry types and number of features. Rotate is e.g. not allowed for a single point but for multiple points.
+ * @param {Set<GeometryType>} geometryTypes A set with all geometry types of the features.
+ * @param {number} nFeatures The number of the features.
+ * @returns {Array<TransformationMode>} The allowed transformation modes.
+ */
+export function getAllowedEditorTransformationModes(geometryTypes: Set<GeometryType>, nFeatures: number): Array<TransformationMode>;
+export namespace EditorTransformationIcons {
+    let translate: string;
+    let rotate: string;
+    let scale: string;
+    let extrude: string;
+}
+declare const _default: import("vue").DefineComponent<{
+    allowedVectorProperties: {
+        type: ArrayConstructor;
+        default: () => string[];
+    };
+    expandableVectorProperties: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    startOpenVectorProperties: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    showResetVectorProperties: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    showStyle: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+}, {
+    featureProperties: import("vue").Ref<any>;
+    session: import("vue").ShallowRef<import("@vcmap/core").SelectFeaturesSession | import("@vcmap/core").CreateFeatureSession<GeometryType> | undefined>;
+    SessionType: typeof SessionType;
+    currentTransformationMode: import("vue").Ref<any>;
+    TransformationMode: typeof TransformationMode;
+    availableModifyActions: import("vue").Ref<never[]>;
+    availableVectorProperties: import("vue").Ref<never[]>;
+    is3D: import("vue").Ref<boolean>;
+    updateFeatureProperties: (update: import("@vcmap/core").VectorPropertiesOptions) => Promise<void>;
+    defaultVectorProperties: import("@vcmap/core").VectorPropertiesOptions;
+}, {}, {}, {}, import("vue/types/v3-component-options.js").ComponentOptionsMixin, import("vue/types/v3-component-options.js").ComponentOptionsMixin, {}, string, Readonly<import("vue").ExtractPropTypes<{
+    allowedVectorProperties: {
+        type: ArrayConstructor;
+        default: () => string[];
+    };
+    expandableVectorProperties: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    startOpenVectorProperties: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    showResetVectorProperties: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    showStyle: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+}>>, {
+    allowedVectorProperties: unknown[];
+    expandableVectorProperties: boolean;
+    startOpenVectorProperties: boolean;
+    showResetVectorProperties: boolean;
+    showStyle: boolean;
+}>;
+export default _default;
+export type EditorManager = {
+    currentLayer: import("vue").ShallowRef<import("@vcmap/core").Layer | undefined>;
+    currentFeatures: import("vue").ShallowRef<import("ol").Feature[]>;
+    currentEditSession: import("vue").ShallowRef<import("@vcmap/core").EditGeometrySession | import("@vcmap/core").EditFeaturesSession | undefined>;
+    currentSession: import("vue").ShallowRef<import("@vcmap/core").SelectFeaturesSession | import("@vcmap/core").CreateFeatureSession<import("@vcmap/core").GeometryType> | undefined>;
+    placeCurrentFeaturesOnTerrain: () => Promise<void>;
+    stopEditing: () => void;
+    startEditSession: (arg0: import("ol").Feature | undefined) => Promise<void> | void;
+    startTransformSession: (arg0: import("@vcmap/core").TransformationMode, arg1: import("ol").Feature[] | undefined) => Promise<void> | void;
+};
+import { GeometryType } from '@vcmap/core';
+import { TransformationMode } from '@vcmap/core';
+import { SessionType } from '@vcmap/core';

package/src/components/vector-properties/VcsFeatureTransforms.vue

@@ -0,0 +1,217 @@
+<template>
+  <v-sheet>
+    <v-container class="pl-0 pr-1 py-1">
+      <v-row
+        no-gutters
+        v-if="transformationMode === TransformationMode.TRANSLATE"
+      >
+        <v-col>
+          <VcsTextField
+            type="number"
+            placeholder="0"
+            prefix="X"
+            v-model.number="xValue"
+            unit="m"
+            @keydown.enter.prevent="translate"
+          />
+        </v-col>
+        <v-col>
+          <VcsTextField
+            type="number"
+            placeholder="0"
+            prefix="Y"
+            v-model.number="yValue"
+            unit="m"
+            @keydown.enter.prevent="translate"
+          />
+        </v-col>
+        <v-col>
+          <VcsTextField
+            type="number"
+            placeholder="0"
+            prefix="Z"
+            v-model.number="zValue"
+            unit="m"
+            :disabled="
+              !allowZInput || featureProperties.altitudeMode !== 'absolute'
+            "
+            @keydown.enter.prevent="translate"
+          />
+        </v-col>
+        <v-col class="d-flex justify-end align-center">
+          <VcsButton @click="translate">
+            <v-icon>mdi-check</v-icon>
+          </VcsButton>
+        </v-col>
+        <v-col cols="1" class="d-flex justify-end align-center">
+          <VcsButton
+            @click="placeOnTerrain"
+            tooltip="components.editor.placeOnTerrain"
+            :disabled="
+              !allowZInput || featureProperties.altitudeMode !== 'absolute'
+            "
+          >
+            <v-icon>$vcsGround</v-icon>
+          </VcsButton>
+        </v-col>
+      </v-row>
+      <v-row no-gutters v-if="transformationMode === TransformationMode.ROTATE">
+        <v-col cols="3">
+          <VcsTextField
+            type="number"
+            v-model.number="xValue"
+            placeholder="0"
+            unit="°"
+            @keydown.enter.prevent="rotate"
+          />
+        </v-col>
+        <v-col class="d-flex justify-end align-center">
+          <VcsButton @click="rotate">
+            <v-icon>mdi-check</v-icon>
+          </VcsButton>
+        </v-col>
+        <v-col cols="1" class="d-flex justify-end align-center">
+          <VcsButton @click="ccw" tooltip="components.editor.ccw">
+            <v-icon>$vcsRotateLeft</v-icon>
+          </VcsButton>
+        </v-col>
+        <v-col cols="1" class="d-flex justify-end align-center">
+          <VcsButton @click="cw" tooltip="components.editor.cw">
+            <v-icon>$vcsRotateRight</v-icon>
+          </VcsButton>
+        </v-col>
+      </v-row>
+      <v-row no-gutters v-if="transformationMode === TransformationMode.SCALE">
+        <v-col cols="3">
+          <VcsTextField
+            prefix="X"
+            v-model.number="xValue"
+            placeholder="1"
+            @keydown.enter.prevent="scale"
+          />
+        </v-col>
+        <v-col cols="3">
+          <VcsTextField
+            prefix="Y"
+            v-model.number="yValue"
+            placeholder="1"
+            @keydown.enter.prevent="scale"
+          />
+        </v-col>
+        <v-col class="d-flex justify-end align-center">
+          <VcsButton @click="scale">
+            <v-icon>mdi-check</v-icon>
+          </VcsButton>
+        </v-col>
+      </v-row>
+    </v-container>
+  </v-sheet>
+</template>
+
+<script>
+  import { Math as CesiumMath } from '@vcmap-cesium/engine';
+  import { TransformationMode } from '@vcmap/core';
+  import { VSheet, VContainer, VRow, VCol, VIcon } from 'vuetify/lib';
+  import { inject, ref, watch } from 'vue';
+  import VcsButton from '../buttons/VcsButton.vue';
+  import VcsTextField from '../form-inputs-controls/VcsTextField.vue';
+
+  /**
+   * A component to handle transforms applied to features of an editor manager. Must have a manager provided.
+   * @vue-prop {string} transformationMode
+   * @vue-prop {import("@vcmap/core").VectorPropertiesOptions} featureProperties,
+   * @vue-prop {boolean} [allowZInput=false]
+   */
+  export default {
+    components: {
+      VcsButton,
+      VSheet,
+      VContainer,
+      VRow,
+      VCol,
+      VIcon,
+      VcsTextField,
+    },
+    props: {
+      transformationMode: {
+        type: String,
+        required: true,
+      },
+      featureProperties: {
+        type: Object,
+        required: true,
+      },
+      allowZInput: {
+        type: Boolean,
+        default: false,
+      },
+    },
+    name: 'VcsFeatureTransforms',
+    setup(props) {
+      /** @type {import("./VcsFeatureEditingWindow.vue").EditorManager} */
+      const manager = inject('manager');
+
+      const showTranslate = ref(false);
+      const showRotate = ref(false);
+      const showScale = ref(false);
+      const xValue = ref(null);
+      const yValue = ref(null);
+      const zValue = ref(null);
+
+      function resetInputs() {
+        xValue.value = null;
+        yValue.value = null;
+        zValue.value = null;
+      }
+
+      watch(
+        () => props.transformationMode,
+        () => {
+          resetInputs();
+        },
+      );
+
+      return {
+        showTranslate,
+        showRotate,
+        showScale,
+        TransformationMode,
+        xValue,
+        yValue,
+        zValue,
+        async translate() {
+          manager.currentEditSession.value.translate(
+            xValue.value ?? 0,
+            yValue.value ?? 0,
+            zValue.value ?? 0,
+          );
+          resetInputs();
+        },
+        async rotate() {
+          manager.currentEditSession.value.rotate(
+            CesiumMath.toRadians(xValue.value ?? 0),
+          );
+          xValue.value = null;
+        },
+        async cw() {
+          manager.currentEditSession.value.rotate(-CesiumMath.PI_OVER_TWO);
+        },
+        async ccw() {
+          manager.currentEditSession.value.rotate(CesiumMath.PI_OVER_TWO);
+        },
+        async scale() {
+          manager.currentEditSession.value.scale(
+            xValue.value ?? 1,
+            yValue.value ?? 1,
+          );
+          resetInputs();
+        },
+        placeOnTerrain() {
+          manager.placeCurrentFeaturesOnTerrain();
+        },
+      };
+    },
+  };
+</script>
+
+<style scoped></style>