package.json

@@ -1,7 +1,7 @@
 {
   "name": "farmmaps-lib-app",
   "version": "4.2.0",
-  "scripts": {
+  "scripts":   {
     "ng": "ng",
     "start": "ng serve",
     "build": "ng build",
@@ -10,16 +10,16 @@
     "e2e": "ng e2e"
   },
   "private": true,
-  "dependencies": {
+  "dependencies":   {
-    "@angular/animations": "^15.2.10",
+    "@angular/animations": "^14.1.3",
-    "@angular/common": "^15.2.10",
+    "@angular/common": "^14.1.3",
-    "@angular/compiler": "^15.2.10",
+    "@angular/compiler": "^14.1.3",
-    "@angular/core": "^15.2.10",
+    "@angular/core": "^14.1.3",
     "@angular-eslint/eslint-plugin": "^15.2.1",
-    "@angular/forms": "^15.2.10",
+    "@angular/forms": "^14.1.3",
-    "@angular/platform-browser": "^15.2.10",
+    "@angular/platform-browser": "^14.1.3",
-    "@angular/platform-browser-dynamic": "^15.2.10",
+    "@angular/platform-browser-dynamic": "^14.1.3",
-    "@angular/router": "^15.2.10",
+    "@angular/router": "^14.1.3",
     "@farmmaps/common": "file:dist/common",
     "@farmmaps/common-map": "file:dist/common-map",
     "@farmmaps/common-map3d": "file:dist/common-map3d",
@@ -40,8 +40,8 @@
     "https-browserify": "^1.0.0",
     "moment": "^2.29.4",
     "ngrx-store-localstorage": "^14",
-    "ngx-avatars": "1.4.0",
+    "ngx-avatar": "^4.1.0",
-    "ngx-clipboard": "^15.1.0",
+    "ngx-clipboard": "^14.0.1",
     "ngx-image-cropper": "^3.3.5",
     "ngx-uploadx": "^5.2.0",
     "ol": "~6.3.1",
@@ -56,13 +56,13 @@
     "util": "^0.12.4",
     "zone.js": "~0.11.4"
   },
-  "devDependencies": {
+  "devDependencies":   {
     "@angular-builders/custom-webpack": "^14",
-    "@angular-devkit/build-angular": "^15.2.10",
+    "@angular-devkit/build-angular": "^14.1.3",
-    "@angular/cli": "^15.2.10",
+    "@angular/cli": "^14.1.3",
-    "@angular/compiler-cli": "^15.2.10",
+    "@angular/compiler-cli": "^14.1.3",
-    "@angular/language-service": "^15.2.10",
+    "@angular/language-service": "^14.1.3",
-    "@angular/localize": "^15.2.10",
+    "@angular/localize": "^14.1.3",
     "@types/arcgis-rest-api": "^10.4.5",
     "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "^2.0.9",
@@ -81,9 +81,9 @@
     "karma-coverage-istanbul-reporter": "^3.0.3",
     "karma-jasmine": "^5.1.0",
     "karma-jasmine-html-reporter": "^2.0.0",
-    "ng-packagr": "^15.2.2",
+    "ng-packagr": "^14.1.0",
     "protractor": "~7.0.0",
     "ts-node": "^8.8.1",
-    "typescript": "~4.8.2"
+    "typescript": "~4.6.4"
   }
 }

projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.scss

@@ -1,3 +1,6 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
+
 .gps-location {
   display:none; 
 }
@@ -11,7 +14,7 @@
 }
 
 .tolerance {
-  fill: var(--bs-primary);
+  fill: $primary;
   fill-opacity:0.4;
 }
 
@@ -20,20 +23,20 @@
 }
 
 .border {
-  fill: var(--bs-white);
+  fill: $white;
 }
 
 .center {
-  fill: var(--bs-primary);
+  fill: $primary;
 }
 
 .stop1 {
-  stop-color: var(--bs-primary);
+  stop-color: $primary;
   stop-opacity:1;
 }
 
 .stop2 {
-  stop-color:var(--bs-primary);
+  stop-color:$primary;
   stop-opacity: 0;
 }
 

projects/common-map/src/fm-map/components/aol/pan-to-location/pan-to-location.component.scss

@@ -1,8 +1,11 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
+
 .gps-location {
   display:block; 
   width:2.5em;
   height:2.5em;
-  background-color: var(--bs-body-bg);
+  background-color: $body-bg;
   background-size: contain;
   margin-top:0.5em;
   border-radius: 1.75em;
@@ -14,15 +17,15 @@
 }
 
 .pan-to {
-  fill: var(--bs-secondary);
+  fill: $secondary;
 }
 
 div.gps-location:hover .pan-to {
-  fill: var(--bs-white);
+  fill: $white;
 }
 
 .pan-to-centered {
-  fill: var(--bs-primary);
+  fill: $primary;
 }
 
 div.gps-location:hover .pan-to-centered {
@@ -30,5 +33,5 @@ div.gps-location:hover .pan-to-centered {
 }
 
 .pan-to.pan-to-disabled {
-  fill: var(--bs-gray-300);
+  fill: $gray-300;
 }

projects/common-map/src/fm-map/components/aol/rotation-reset/rotation-reset.component.scss

@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .compass {
   width:2.5em;
   height:2.5em;
@@ -11,7 +13,7 @@
 
 #north {
   display: none;
-  fill:var(--bs-black);
+  fill:$black;
 }
 
 #top-l {
@@ -31,23 +33,23 @@
 }
 
 div.compass:hover #top-l {
-  fill:var(--bs-white);
+  fill:$white;
 }
 
 div.compass:hover #top-r {
-  fill:var(--bs-gray-300);
+  fill:$gray-300;
 }
 
 div.compass:hover #bottom-l {
-  fill:var(--bs-gray-300);
+  fill:$gray-300;
 }
 
 div.compass:hover #bottom-r {
-  fill:var(--bs-white);
+  fill:$white;
 }
 
 div.compass:hover #north {
-  fill:var(--bs-white);
+  fill:$white;
 }
 
 .compass-n {    

projects/common-map/src/fm-map/components/feature-list-container/feature-list-container.component.scss

@@ -1,10 +1,14 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+
 .row {
-  border-bottom: 1px solid var(--bs-gray-500);
+  border-bottom: 1px solid $gray-500;
   user-select: none;
 }
 
 .row.selected {
-  background-color: var(--bs-gray-100);
+  background-color: $gray-100;
 }
 
 @media screen and (min-width: 44rem)  {

projects/common-map/src/fm-map/components/feature-list-cropfield/feature-list-cropfield.component.scss

@@ -1,20 +1,22 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 fm-map-feature-list-feature-container {
   width:100%;
   pointer-events:none;
 }
 
 .row {
-  border-bottom: 1px solid var(--bs-gray-500);
+  border-bottom: 1px solid $gray-500;
   user-select: none;
   padding-left:1.5rem;
 }
 
 .row.selected {
-  background-color: var(--bs-gray-100);
+  background-color: $gray-100;
 }
 
 .cropfields {
-  border-top: 1px solid var(--bs-gray-500);
+  border-top: 1px solid $gray-500;
   margin-left: -1.25rem;
   margin-right: -1.25rem;
 }

projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.scss

@@ -1,20 +1,22 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 fm-map-feature-list-feature-container {
   width:100%;
   pointer-events:none;
 }
 
 .row {
-  border-bottom: 1px solid var(--bs-gray-500);
+  border-bottom: 1px solid $gray-500;
   user-select: none;
   padding-left:1.5rem;
 }
 
 .row.selected {
-  background-color: var(--bs-gray-100);
+  background-color: $gray-100;
 }
 
 .farms {
-  border-top: 1px solid var(--bs-gray-500);
+  border-top: 1px solid $gray-500;
   margin-left: -1.25rem;
   margin-right: -1.25rem;
 }

projects/common-map/src/fm-map/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.scss

@@ -1,3 +1,7 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+
 .card-title {
   font-size: 1rem;
   white-space: nowrap;

projects/common-map/src/fm-map/components/feature-list-feature-croppingscheme/feature-list-feature-croppingscheme.component.scss

@@ -1,3 +1,7 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+
 .card-title {
   font-size: 1rem;
   white-space: nowrap;

projects/common-map/src/fm-map/components/feature-list-feature/feature-list-feature.component.scss

@@ -1,3 +1,7 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+
 .card-title {
   font-size: 1rem;
   white-space: nowrap;

projects/common-map/src/fm-map/components/feature-list/feature-list.component.scss

@@ -1,13 +1,15 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 fm-map-feature-list-feature-container {
   width: 100%;
   pointer-events: none;
 }
 
 .row {
-  border-bottom: 1px solid var(--bs-gray-500);
+  border-bottom: 1px solid $gray-500;
   user-select: none;
 }
 
 .row.selected {
-  background-color: var(--bs-gray-100);
+  background-color: $gray-100;
 }

projects/common-map/src/fm-map/components/item-list-item/item-list-item.component.scss

@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .widget {
   padding:0.8rem;
   height:100%;

projects/common-map/src/fm-map/components/item-list/item-list.component.scss

@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .widget-container {
   overflow:auto;
   margin-bottom:1rem;
@@ -5,7 +7,7 @@
 
 .widget {
   position:relative;
-  border: 1px solid var(--bs-gray-500);
+  border: 1px solid $gray-500;
   user-select: none;
   display:inline-block;
   width:50%;
@@ -26,7 +28,7 @@
 }
 
 .widget:hover {
-  background-color: var(--bs-gray-100);
+  background-color: $gray-100;
 }
 
 .widget-container {

projects/common-map/src/fm-map/components/item-widget-list/item-widget-list.component.scss

@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .widget-container {
   overflow:auto;
   margin-bottom:1rem;
@@ -5,7 +7,7 @@
 
 .widget {
   position:relative;
-  border: 1px solid var(--bs-gray-500);
+  border: 1px solid $gray-500;
   user-select: none;
   display:inline-block;
   width:50%;
@@ -26,7 +28,7 @@
 }
 
 .widget:hover {
-  background-color: var(--bs-gray-100);
+  background-color: $gray-100;
 }
 
 .widget-container {

projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.scss

@@ -1,15 +1,18 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
+
 .layer-switcher {  
   display:block; 
   width:2.5em;
   height:2.5em;
-  background-color: var(--bs-body-bg);
+  background-color: $body-bg;
   background-size: contain;
   margin-top:0.5em;
   text-align: center;
   line-height: 2.5em; 
   border-radius: 1.75em;
   padding: 0;
-  color: var(--bs-secondary);
+  color: $secondary;
 }
 
 .layer-switcher i {
@@ -21,7 +24,7 @@
 }
 
 .layers {
-  color:var(--bs-secondary);
+  color:$secondary;
   position: absolute;
   overflow: hidden;
   bottom: -1em;

projects/common-map/src/fm-map/components/map-search/map-search.component.scss

@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 div.map-search {
   position: absolute;
   top: 0.5rem;
@@ -104,7 +106,7 @@ div.map-search.searchcollapsed button[type="submit"] {
 }
 
 .form-control, .form-control:focus {
-  border-color: var(--bs-secondary);
+  border-color: $secondary;
 }
 
 

projects/common-map/src/fm-map/components/map/map.component.scss

@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 aol-map { position:absolute;width:100%;height:calc( 100vh );}
 
 .arrow {
@@ -193,7 +195,7 @@ timespan.menuVisible {
   width: 4rem;
   overflow: hidden;
   text-overflow: ellipsis;
-  color: var(--bs-primary);
+  color: $primary;
 }
 
 .shortcut-icon > .farm-icon {

projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.scss

@@ -1,9 +1,13 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+
 .row {
-  border-bottom: 1px solid var(--bs-gray-500);
+  border-bottom: 1px solid $gray-500;
   user-select: none;
 }
 
 .row:hover {
-  background-color: var(--bs-gray-100);
+  background-color: $gray-100;
 }
 

projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.scss

@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .big-icon {
   width: 100%;
   color: white;

projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.scss

@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .big-icon {
   width: 100%;
   color: white;

projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.scss

@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .big-icon {
   width: 100%;
   color: white;

projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.scss

@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .big-icon {
   width: 100%;
   color: white;

projects/common-map/src/fm-map/components/selected-item/selected-item.component.scss

@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .big-icon {
   width: 100%;
   color: white;

projects/common-map/src/test.ts

@@ -9,6 +9,8 @@ import {
   platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';
 
+declare const require: any;
+
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
@@ -16,3 +18,7 @@ getTestBed().initTestEnvironment(
     teardown: { destroyAfterEach: false }
 }
 );
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);

projects/common-map/tsconfig.lib.json

@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
+    "target": "es2020",
     "module": "es2015",
     "moduleResolution": "node",
     "declaration": true,

projects/common-map/tsconfig.lib.prod.json

@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
+    "target": "es2020",
     "module": "es2015",
     "moduleResolution": "node",
     "declaration": true,

projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.scss

@@ -1,15 +1,17 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .twotreed {
   display:block; 
   width:2.5em;
   height:2.5em;
-  background-color: var(--bs-body-bg);
+  background-color: $body-bg;
   background-size: contain;
   margin-top:0.5em;
   text-align: center;
   line-height: 2.5em; 
   border-radius: 1.75em;
   padding: 0;
-  color: var(--bs-secondary);
+  color: $secondary;
 }
 
 .fa-spinner {

projects/common-map3d/src/test.ts

@@ -8,6 +8,13 @@ import {
   platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';
 
+declare const require: {
+  context(path: string, deep?: boolean, filter?: RegExp): {
+    keys(): string[];
+    <T>(id: string): T;
+  };
+};
+
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
@@ -15,3 +22,7 @@ getTestBed().initTestEnvironment(
     teardown: { destroyAfterEach: false }
 }
 );
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);

projects/common/package-lock.json

@@ -19,7 +19,7 @@
         "angular-oauth2-oidc": ">=13.0.0",
         "bootstrap": ">=4.4.1",
         "moment": ">=2.27.0",
-        "ngx-avatars": ">=1.5.0",
+        "ngx-avatar": ">=4.1.0",
         "ngx-clipboard": ">=14.0.1",
         "ngx-image-cropper": ">=3.3.5",
         "ngx-uploadx": ">=5.1.0",

projects/common/package.json

@@ -18,8 +18,8 @@
     "ngx-uploadx": ">=5.1.0",
     "angular-oauth2-oidc": ">=13.0.0",
     "moment": ">=2.27.0",
-    "ngx-avatars": "1.4.0",
+    "ngx-avatar": ">=4.1.0",
     "ngx-image-cropper": ">=3.3.5",
-    "ngx-clipboard": ">=15.1.0"
+    "ngx-clipboard": ">=14.0.1"
   }
 }

projects/common/src/fm/common.module.ts

@@ -68,7 +68,7 @@ import { BackButtonComponent } from './components/back-button/back-button.compon
 import { EditImageModalComponent } from './components/edit-image-modal/edit-image-modal.component';
 import { AvatarComponent } from './components/avatar/avatar.component';
 import { ItemLinkComponent } from './components/item-link/item-link.component';
-import { AvatarModule } from 'ngx-avatars';
+import { AvatarModule } from 'ngx-avatar';
 import { ImageCropperModule } from 'ngx-image-cropper';
 
 export const FM_COMMON_STARTPAGE = new InjectionToken<string>('fm-common-startpage');

projects/common/src/fm/components/app/app.component.scss

@@ -1,3 +1,9 @@
+/* Import Bootstrap & Fonts */
+
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+
 // custom styles
 
 .btn:focus {
@@ -10,7 +16,7 @@
 
 .form-control:focus {
   box-shadow: none;
-  border-color: var(--bs-input-border-color);
+  border-color: $input-border-color;
 }
 
 

projects/common/src/fm/components/avatar/avatar.component.html

@@ -1,10 +1,10 @@
 <span class="avatar-container" [title]="name">
-	<ngx-avatars 
+	<ngx-avatar 
 		class="farmmaps-avatar"
 		[src]="src" 
 		[name]="name" 
 		[size]="size"
 		[round]='true'
 		>
-	</ngx-avatars>
+	</ngx-avatar>
 </span>

projects/common/src/fm/components/back-button/back-button.component.scss

@@ -1,10 +1,12 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .back-button {
   cursor: default;
-  color: var(--bs-primary);
+  color: $primary;
   display: block;  
 }
 
 .back-button:hover {
   cursor: pointer;
-  color: var(--bs-secondary);
+  color: $secondary;
 }

projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.component.scss

@@ -1,3 +1,7 @@
+/* Import Bootstrap & Fonts */
+
+@import "~bootstrap/scss/bootstrap.scss";
+
 div.resumable-file-upload {
   position: fixed;
   right: 0px;
@@ -72,7 +76,7 @@ div.card-header span.fa {
   }
 
 .upload-file.busy > div > span.fa-times {
-  color: var(--bs-danger);
+  color: $danger;
   width: 20px;
   display: inline-block;
   vertical-align: middle;
@@ -90,7 +94,7 @@ div.card-header span.fa {
   }
 
   .upload-file > div.errormessage {
-    color: var(--bs-danger);
+    color: $danger;
     display: none;
   }
 

projects/common/src/test.ts

@@ -9,6 +9,8 @@ import {
   platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';
 
+declare const require: any;
+
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
@@ -16,3 +18,7 @@ getTestBed().initTestEnvironment(
     teardown: { destroyAfterEach: false }
 }
 );
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);

projects/common/tsconfig.lib.json

@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
+    "target": "es2020",
     "module": "es2015",
     "moduleResolution": "node",
     "declaration": true,

projects/common/tsconfig.lib.prod.json

@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
+    "target": "es2020",
     "module": "es2015",
     "moduleResolution": "node",
     "declaration": true,

projects/ngx-openlayers/src/test.ts

@@ -5,7 +5,13 @@ import 'zone.js/testing';
 import { getTestBed } from '@angular/core/testing';
 import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
 
+declare const require: any;
+
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
   teardown: { destroyAfterEach: true },
 });
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);

projects/ngx-openlayers/tsconfig.lib.json

@@ -3,6 +3,7 @@
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
     "declarationMap": true,
+    "target": "es2020",
     "declaration": true,
     "inlineSources": true,
     "types": [],

src/app/landingpage/landingpage.component.scss

@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 /*!
  * Start Bootstrap - Landing Page v5.0.8 (https://startbootstrap.com/themes/landing-page)
  * Copyright 2013-2020 Start Bootstrap

src/app/menu/menu.component.scss

@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .menu-card {
     padding-left:7px;
     padding-right:7px;
@@ -27,7 +29,7 @@
     width: 4rem;
     overflow: hidden;
     text-overflow: ellipsis;
-    color: var(--bs-primary);
+    color: $primary;
   }
   
   .shortcut-icon > .farm-icon {

src/test.ts

@@ -7,6 +7,8 @@ import {
   platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';
 
+declare const require: any;
+
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
@@ -14,3 +16,7 @@ getTestBed().initTestEnvironment(
     teardown: { destroyAfterEach: false }
 }
 );
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);

tsconfig.json

@@ -13,7 +13,7 @@
     "allowSyntheticDefaultImports": true,
     "importHelpers": true,
     "skipLibCheck": true,
-    "target": "ES2022",
+    "target": "es2020",
     "typeRoots": [
       "node_modules/@types"
     ],
@@ -34,8 +34,7 @@
       ],
       "ngx-openlayers/*": [
         "dist/ngx-openlayers/*"
-      ]
+      ],
-    },
+    }
-    "useDefineForClassFields": false
   }
 }