Skip to content

Commit fc903da

Browse files
steinkobbensteinkobben
authored
HTM-1725: Terrain opacity (#1043)
* create terrain translucency component and set method * Make terrain translucency configurable * combine terrain tools * Set smaller width for collapsed expansion panel and use transition * fix lint * add reset button * use opacity instead of translucency and save current terrain opacity * add translations * show opacity as percentage * create test cases * Use component titles and add tooltip * give expansion panel width based content * Format terrain opacity control * remove state="new" from old translations * remove unnecessary code * change nearfarscalar
1 parent 1c59f5e commit fc903da

35 files changed

+531
-190
lines changed

‎projects/admin-core/assets/locale/messages.admin-core.de.xlf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,10 @@
130130
<source>Terrain layer toggle</source>
131131
<target>Geländeebene Umschalter</target>
132132
</trans-unit>
133+
<trans-unit id="admin-core.application.component-terrain-opacity" datatype="html">
134+
<source>Terrain opacity</source>
135+
<target>Geländeopazität</target>
136+
</trans-unit>
133137
<trans-unit id="admin-core.application.components" datatype="html">
134138
<source>Components</source>
135139
<target>Komponenten</target>

‎projects/admin-core/assets/locale/messages.admin-core.en.xlf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,9 @@
9898
<trans-unit id="admin-core.application.component-terrain-layer-toggle" datatype="html">
9999
<source>Terrain layer toggle</source>
100100
</trans-unit>
101+
<trans-unit id="admin-core.application.component-terrain-opacity" datatype="html">
102+
<source>Terrain opacity</source>
103+
</trans-unit>
101104
<trans-unit id="admin-core.application.components" datatype="html">
102105
<source>Components</source>
103106
</trans-unit>

‎projects/admin-core/assets/locale/messages.admin-core.nl.xlf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,10 @@
130130
<source>Terrain layer toggle</source>
131131
<target>Terreinlaagkiezer</target>
132132
</trans-unit>
133+
<trans-unit id="admin-core.application.component-terrain-opacity" datatype="html">
134+
<source>Terrain opacity</source>
135+
<target>Terrein ondoorzichtigheid</target>
136+
</trans-unit>
133137
<trans-unit id="admin-core.application.components" datatype="html">
134138
<source>Components</source>
135139
<target>Componenten</target>

‎projects/admin-core/src/lib/application/components/components.module.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,6 @@ export class ComponentsModule {
6666
configurationComponentService.registerConfigurationComponents(BaseComponentTypeEnum.HEADER, $localize `:@@admin-core.application.component-header:Header`, HeaderComponentConfigComponent);
6767
configurationComponentService.registerConfigurationComponents(BaseComponentTypeEnum.GEOLOCATION, $localize `:@@admin-core.application.component-geolocation:Geolocation`, GeolocationConfigComponent);
6868
configurationComponentService.registerConfigurationComponents(BaseComponentTypeEnum.INFO, $localize `:@@admin-core.application.component-info:Info`, InfoConfigComponent);
69+
configurationComponentService.registerConfigurationComponents(BaseComponentTypeEnum.TERRAIN_OPACITY, $localize `:@@admin-core.application.component-terrain-opacity:Terrain opacity`, BaseComponentConfigComponent);
6970
}
7071
}

‎projects/api/src/lib/models/base-component-type.enum.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ export enum BaseComponentTypeEnum {
2121
TERRAIN_LAYER_TOGGLE = 'TERRAIN_LAYER_TOGGLE',
2222
HEADER = 'HEADER',
2323
INFO = 'INFO',
24+
TERRAIN_OPACITY = 'TERRAIN_OPACITY',
2425
}

‎projects/core/assets/icons/tools/terrain.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎projects/core/assets/locale/messages.core.de.xlf‎

Lines changed: 41 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -878,61 +878,61 @@
878878
<source>You are logged in <x id="PH" equiv-text="userLabel"/> but do not have proper roles to access the application. Please contact your administrator.</source>
879879
<target>Sie sind als <x id="PH" equiv-text="userLabel"/> angemeldet, haben jedoch nicht die erforderlichen Rollen, um auf die Anwendung zuzugreifen. Bitte kontaktieren Sie Ihren Administrator.</target>
880880
</trans-unit>
881-
<trans-unit id="core.password-reset-form.title" datatype="html">
882-
<source>Reset Password</source>
883-
<target>Passwort zurücksetzen</target>
884-
</trans-unit>
885-
<trans-unit id="core.password-reset-form.username" datatype="html">
886-
<source>Username</source>
887-
<target>Benutzername</target>
888-
</trans-unit>
889-
<trans-unit id="core.password-reset-form.newpassword" datatype="html">
890-
<source>New Password</source>
891-
<target>Neues Passwort</target>
892-
</trans-unit>
893881
<trans-unit id="core.password-reset-form.confirmedpassword" datatype="html">
894882
<source>Confirm Password</source>
895883
<target>Passwort bestätigen</target>
896884
</trans-unit>
897-
<trans-unit id="core.password-reset-form.error.username-invalid" datatype="html">
898-
<source>Username is invalid</source>
899-
<target>Benutzername ist ungültig</target>
885+
<trans-unit id="core.password-reset-form.error-reset" datatype="html">
886+
<source>Error resetting password: <x id="PH" equiv-text="error?.error?.message || error?.message || error.toString())"/></source>
887+
<target>Fehler beim Zurücksetzen des Passworts: <x id="PH" equiv-text="(error?.error?.message || error?.message || error.toString())"/></target>
888+
</trans-unit>
889+
<trans-unit id="core.password-reset-form.error-saving" datatype="html">
890+
<source>Error saving password, please check your token, username and password and try again.</source>
891+
<target>Fehler beim Speichern des Passworts, bitte überprüfen Sie Ihr Token, Ihren Benutzernamen und Ihr Passwort und versuchen Sie es erneut.</target>
892+
</trans-unit>
893+
<trans-unit id="core.password-reset-form.error.need-match" datatype="html">
894+
<source>Passwords need to match</source>
895+
<target>Passwörter müssen übereinstimmen</target>
900896
</trans-unit>
901897
<trans-unit id="core.password-reset-form.error.password-tooshort" datatype="html">
902-
<source>Password shorter than <x id="INTERPOLATION" equiv-text="passwordResetForm.controls.newPassword.errors?.['minlength'].requiredLength"/></source>
903-
<target>Passwort kürzer als <x id="INTERPOLATION" equiv-text="passwordResetForm.controls.newPassword.errors?.['minlength'].requiredLength"/></target>
898+
<source>Password shorter than <x id="INTERPOLATION" equiv-text="{{ passwordResetForm.controls.newPassword.errors?.[&apos;minlength&apos;].requiredLength }}"/> </source>
899+
<target>Passwort kürzer als <x id="INTERPOLATION" equiv-text="passwordResetForm.controls.newPassword.errors?.[&apos;minlength&apos;].requiredLength"/></target>
904900
</trans-unit>
905901
<trans-unit id="core.password-reset-form.error.password-toosimple" datatype="html">
906902
<source>Password too short or too easily guessable</source>
907903
<target>Passwort zu kurz oder zu einfach zu erraten</target>
908904
</trans-unit>
909-
<trans-unit id="core.password-reset-form.error.need-match" datatype="html">
910-
<source>Passwords need to match</source>
911-
<target>Passwörter müssen übereinstimmen</target>
912-
</trans-unit>
913905
<trans-unit id="core.password-reset-form.error.token-expired" datatype="html">
914906
<source>Your password reset token is invalid or has expired.</source>
915907
<target>Ihr Passwort-Reset-Token ist ungültig oder abgelaufen.</target>
916908
</trans-unit>
917-
<trans-unit id="core.password-reset-form.success" datatype="html">
918-
<source>Password successfully reset, you can now log in with your new password.</source>
919-
<target>Passwort erfolgreich zurückgesetzt, Sie können sich jetzt mit Ihrem neuen Passwort anmelden.</target>
909+
<trans-unit id="core.password-reset-form.error.username-invalid" datatype="html">
910+
<source>Username is invalid</source>
911+
<target>Benutzername ist ungültig</target>
920912
</trans-unit>
921-
<trans-unit id="core.password-reset-form.error-saving" datatype="html">
922-
<source>Error saving password, please check your token, username and password and try again.</source>
923-
<target>Fehler beim Speichern des Passworts, bitte überprüfen Sie Ihr Token, Ihren Benutzernamen und Ihr Passwort und versuchen Sie es erneut.</target>
913+
<trans-unit id="core.password-reset-form.newpassword" datatype="html">
914+
<source>New Password</source>
915+
<target>Neues Passwort</target>
924916
</trans-unit>
925-
<trans-unit id="core.password-reset-form.error-reset" datatype="html">
926-
<source>Error resetting password: <x id="PH" equiv-text="(error?.error?.message || error?.message || error.toString())"/></source>
927-
<target>Fehler beim Zurücksetzen des Passworts: <x id="PH" equiv-text="(error?.error?.message || error?.message || error.toString())"/></target>
917+
<trans-unit id="core.password-reset-form.return" datatype="html">
918+
<source>Return to Login</source>
919+
<target>Zurück zum Login</target>
928920
</trans-unit>
929921
<trans-unit id="core.password-reset-form.save" datatype="html">
930922
<source>Save new password</source>
931923
<target>Neues Passwort speichern</target>
932924
</trans-unit>
933-
<trans-unit id="core.password-reset-form.return" datatype="html">
934-
<source>Return to Login</source>
935-
<target>Zurück zum Login</target>
925+
<trans-unit id="core.password-reset-form.success" datatype="html">
926+
<source>Password successfully reset, you can now log in with your new password.</source>
927+
<target>Passwort erfolgreich zurückgesetzt, Sie können sich jetzt mit Ihrem neuen Passwort anmelden.</target>
928+
</trans-unit>
929+
<trans-unit id="core.password-reset-form.title" datatype="html">
930+
<source>Reset Password</source>
931+
<target>Passwort zurücksetzen</target>
932+
</trans-unit>
933+
<trans-unit id="core.password-reset-form.username" datatype="html">
934+
<source>Username</source>
935+
<target>Benutzername</target>
936936
</trans-unit>
937937
<trans-unit id="core.print.a3" datatype="html">
938938
<source>A3</source>
@@ -1094,6 +1094,14 @@
10941094
<source>Restore panel height</source>
10951095
<target>Panelhöhe wiederherstellen</target>
10961096
</trans-unit>
1097+
<trans-unit id="core.terrain-controls.model" datatype="html">
1098+
<source>Terrain model</source>
1099+
<target>Geländemodell</target>
1100+
</trans-unit>
1101+
<trans-unit id="core.terrain-controls.opacity" datatype="html">
1102+
<source>Terrain opacity</source>
1103+
<target>Geländeopazität</target>
1104+
</trans-unit>
10971105
<trans-unit id="core.terrain-layer-toggle.ellipsoid" datatype="html">
10981106
<source>WGS84 Ellipsoid</source>
10991107
<target>WGS84 Ellipsoid</target>

‎projects/core/assets/locale/messages.core.en.xlf‎

Lines changed: 48 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -659,6 +659,48 @@
659659
<trans-unit id="core.login.insufficient-rights-error" datatype="html">
660660
<source>You are logged in <x id="PH" equiv-text="userLabel"/> but do not have proper roles to access the application. Please contact your administrator.</source>
661661
</trans-unit>
662+
<trans-unit id="core.password-reset-form.confirmedpassword" datatype="html">
663+
<source>Confirm Password</source>
664+
</trans-unit>
665+
<trans-unit id="core.password-reset-form.error-reset" datatype="html">
666+
<source>Error resetting password: <x id="PH" equiv-text="error?.error?.message || error?.message || error.toString())"/></source>
667+
</trans-unit>
668+
<trans-unit id="core.password-reset-form.error-saving" datatype="html">
669+
<source>Error saving password, please check your token, username and password and try again.</source>
670+
</trans-unit>
671+
<trans-unit id="core.password-reset-form.error.need-match" datatype="html">
672+
<source>Passwords need to match</source>
673+
</trans-unit>
674+
<trans-unit id="core.password-reset-form.error.password-tooshort" datatype="html">
675+
<source>Password shorter than <x id="INTERPOLATION" equiv-text="{{ passwordResetForm.controls.newPassword.errors?.[&apos;minlength&apos;].requiredLength }}"/> </source>
676+
</trans-unit>
677+
<trans-unit id="core.password-reset-form.error.password-toosimple" datatype="html">
678+
<source>Password too short or too easily guessable</source>
679+
</trans-unit>
680+
<trans-unit id="core.password-reset-form.error.token-expired" datatype="html">
681+
<source>Your password reset token is invalid or has expired.</source>
682+
</trans-unit>
683+
<trans-unit id="core.password-reset-form.error.username-invalid" datatype="html">
684+
<source>Username is invalid</source>
685+
</trans-unit>
686+
<trans-unit id="core.password-reset-form.newpassword" datatype="html">
687+
<source>New Password</source>
688+
</trans-unit>
689+
<trans-unit id="core.password-reset-form.return" datatype="html">
690+
<source>Return to Login</source>
691+
</trans-unit>
692+
<trans-unit id="core.password-reset-form.save" datatype="html">
693+
<source>Save new password</source>
694+
</trans-unit>
695+
<trans-unit id="core.password-reset-form.success" datatype="html">
696+
<source>Password successfully reset, you can now log in with your new password.</source>
697+
</trans-unit>
698+
<trans-unit id="core.password-reset-form.title" datatype="html">
699+
<source>Reset Password</source>
700+
</trans-unit>
701+
<trans-unit id="core.password-reset-form.username" datatype="html">
702+
<source>Username</source>
703+
</trans-unit>
662704
<trans-unit id="core.print.a3" datatype="html">
663705
<source>A3</source>
664706
</trans-unit>
@@ -779,6 +821,12 @@
779821
<trans-unit id="core.shared.restore-panel-height" datatype="html">
780822
<source>Restore panel height</source>
781823
</trans-unit>
824+
<trans-unit id="core.terrain-controls.model" datatype="html">
825+
<source>Terrain model</source>
826+
</trans-unit>
827+
<trans-unit id="core.terrain-controls.opacity" datatype="html">
828+
<source>Terrain opacity</source>
829+
</trans-unit>
782830
<trans-unit id="core.terrain-layer-toggle.ellipsoid" datatype="html">
783831
<source>WGS84 Ellipsoid</source>
784832
</trans-unit>
@@ -909,48 +957,6 @@
909957
<trans-unit id="core.user-login-check-viewer-message" datatype="html">
910958
<source>You are logged out and might need to login again</source>
911959
</trans-unit>
912-
<trans-unit id="core.password-reset-form.title" datatype="html">
913-
<source>Reset Password</source>
914-
</trans-unit>
915-
<trans-unit id="core.password-reset-form.username" datatype="html">
916-
<source>Username</source>
917-
</trans-unit>
918-
<trans-unit id="core.password-reset-form.newpassword" datatype="html">
919-
<source>New Password</source>
920-
</trans-unit>
921-
<trans-unit id="core.password-reset-form.confirmedpassword" datatype="html">
922-
<source>Confirm Password</source>
923-
</trans-unit>
924-
<trans-unit id="core.password-reset-form.error.username-invalid" datatype="html">
925-
<source>Username is invalid</source>
926-
</trans-unit>
927-
<trans-unit id="core.password-reset-form.error.password-tooshort" datatype="html">
928-
<source>Password shorter than <x id="INTERPOLATION" equiv-text="passwordResetForm.controls.newPassword.errors?.['minlength'].requiredLength"/></source>
929-
</trans-unit>
930-
<trans-unit id="core.password-reset-form.error.password-toosimple" datatype="html">
931-
<source>Password too short or too easily guessable</source>
932-
</trans-unit>
933-
<trans-unit id="core.password-reset-form.error.need-match" datatype="html">
934-
<source>Passwords need to match</source>
935-
</trans-unit>
936-
<trans-unit id="core.password-reset-form.error.token-expired" datatype="html">
937-
<source>Your password reset token is invalid or has expired.</source>
938-
</trans-unit>
939-
<trans-unit id="core.password-reset-form.success" datatype="html">
940-
<source>Password successfully reset, you can now log in with your new password.</source>
941-
</trans-unit>
942-
<trans-unit id="core.password-reset-form.error-saving" datatype="html">
943-
<source>Error saving password, please check your token, username and password and try again.</source>
944-
</trans-unit>
945-
<trans-unit id="core.password-reset-form.error-reset" datatype="html">
946-
<source>Error resetting password: <x id="PH" equiv-text="(error?.error?.message || error?.message || error.toString())"/></source>
947-
</trans-unit>
948-
<trans-unit id="core.password-reset-form.save" datatype="html">
949-
<source>Save new password</source>
950-
</trans-unit>
951-
<trans-unit id="core.password-reset-form.return" datatype="html">
952-
<source>Return to Login</source>
953-
</trans-unit>
954960
</body>
955961
</file>
956962
</xliff>

0 commit comments

Comments
 (0)