Skip to content

Commit 048d6b5

Browse files
authored
Update angular and clr (#291)
* fix(map-ol): use default values to get ol projection * refactor(demo-maps): add WGS84 to proj example * build: update ol, proj4 and luxon * build: update @angular/cdk to ^19.2.19 * BREAKING CHANGE: update to angular v20 * BREAKING CHANGE: update to angular 21 and @clr/angular 18 * fix: remove @cds/core, run ng generate @clr/angular:migrate-v18 and fix some changes manually * fix(ngx-ukis-ui-clarity): run schematics commonjs and remove test for old Module * fix(ngx-ukis-ui-clarity): ExpressionChanged in test of LayerentryComponent * fix(ngx-ukis-ui-clarity): LayerentryComponent set expanded of layer * test(map-cesium): fix viewer.scene instance not Scene
1 parent e0a87a8 commit 048d6b5

91 files changed

Lines changed: 5896 additions & 6145 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CHANGELOG.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
### Breaking Changes
2-
- Update angular from `^18.2.8` to `^19.2.13`
2+
- Update angular from `^18.2.8` to `^21.2.13`
3+
- Update @clr/angular from `^17.12.2` to `18.1.0` which uses angular v21
4+
- Remove @cds/core all features are now in @clr/angular e.g. cds-icon.
35
- Patch `jsonix` when using `@dlr-eoc/utils-ogc` or `@dlr-eoc/services-ogc`, see [jsonix 3.0.0.patch](patches/jsonix+3.0.0.patch) and use `patch-package`.
4-
- Update OpenLayers from `v9.2.4` to `v10.5.0` see [OpenLayers releases](https://github.com/openlayers/openlayers/releases) for all changes.
6+
- Update OpenLayers from `v9.2.4` to `v10.9.0` see [OpenLayers releases](https://github.com/openlayers/openlayers/releases) for all changes.
57
- Update maplibre from `^4.5.0` to `^5.24.0` see [maplibre releases](https://github.com/maplibre/maplibre-gl-js/releases) for all changes.
68
- Update three.js from `^0.137.5` to `^0.176.0` see [three releases](https://github.com/mrdoob/three.js/releases) for all changes.
79
- Update [@cesium/engine](https://github.com/CesiumGS/cesium/tree/main/packages/engine) from `^17.0.0` to `^22.3.0` and [@cesium/widgets](https://github.com/CesiumGS/cesium/tree/main/packages/widgets) from `^12.0.0` to `^14.3.0` (cesium from `1.129` to `1.138`) see [cesium changelog](https://github.com/CesiumGS/cesium/blob/1.138/CHANGES.md) for all changes.
@@ -42,6 +44,7 @@
4244

4345
* **@dlr-eoc/ngx-ukis-ui-clarity:**
4446
- Add missing code for `<ngx-ukis-global-alert>`, `<ngx-ukis-global-progress>` and `<ngx-ukis-header>`. This was lost by the conversion from `@dlr-eoc/core-ui` to `@dlr-eoc/ngx-ukis-ui-clarity`.
47+
- Fix `ukis-layerentry` set expanded based on layer expanded object. E.g. `expanded: { tab: 'settings', expanded: false }`.
4548

4649
* **@dlr-eoc/services-ogc:**
4750
* **@dlr-eoc/utils-ogc:**
@@ -59,6 +62,7 @@
5962
* **@dlr-eoc/map-ol:**
6063
- Use 8 stops for all OpenLayers `transformExtent()` functions to sample more points along the edges for better results. Should have only minimal perf hit. This corrects some calculations of extents from WGS84 to other projections. For example, in `setProjection`, new extents for layers are more precise and layers are no longer clipped.
6164
- Allow to update `tms` vector layer with no style set.
65+
- Fix `getOlProjection` use the default values ​​from `olGetProjection` so `axisOrientation`, `metersPerUnit` and `getPointResolution` are correctly adjusted. This was not the case for `EPSG:4326`.
6266

6367
### Features
6468
- Remove `standalone: true` Angular directives, components and pipes are now standalone by default since version 19.

DEVELOPMENT.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ Example:
7878
"@angular/core": "<main version>",
7979
"@angular/cdk": "<main version>",
8080
"@clr/angular": "<main version>",
81-
"@cds/core": "<main version>",
8281
"@clr/ui": "<main version>",
8382
"rxjs": "<main version>",
8483
"md5": "<main version>"

TUTORIALS.md

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ cd project-tutorial-map
3434
- At the moment Clarity does not support angular schematics ([github ng add issue](https://github.com/vmware-clarity/ng-clarity/issues/120)). Therefore Clarity has to be installed manually. For the versions also see ukis-frontend-libraries [package.json](package.json)
3535
- Run
3636
```
37-
npm install @cds/core@<version> @clr/angular@<version> @clr/ui@<version>
37+
npm install @clr/angular@<version> @clr/ui@<version>
3838
```
3939

4040
- Add Clarity Styles: This is done later by adding the UKIS Theme
@@ -60,7 +60,12 @@ export const appConfig: ApplicationConfig = {
6060

6161
e.g. in AppComponent
6262
```
63-
import { coreCollectionIcons, essentialCollectionIcons, ClarityIcons } from '@cds/core/icon';
63+
import { coreCollectionIcons, essentialCollectionIcons, ClarityIcons } from '@clr/angular/icon';
64+
import { ClrIcon } from '@clr/angular';
65+
66+
@Component({
67+
imports: [ClrIcon,...]
68+
})
6469
6570
ClarityIcons.addIcons(...coreCollectionIcons);
6671
ClarityIcons.addIcons(...essentialCollectionIcons);
@@ -226,7 +231,13 @@ More information about this library can be found [in the layer-control library f
226231
### 2. Extend the import in the example-view.component.ts:
227232
```
228233
import { LayersService, Layer, WmtsLayer, RasterLayer } from '@dlr-eoc/services-layers';
229-
import { ClarityIcons, layersIcon} from '@cds/core/icon';
234+
import { ClarityIcons, layersIcon} from '@clr/angular/icon';
235+
import { ClrIcon } from '@clr/angular';
236+
237+
@Component({
238+
imports: [ClrIcon,...]
239+
})
240+
230241
ClarityIcons.addIcons(...[layersIcon]);
231242
```
232243

angular.json

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,29 @@
744744
},
745745
"schematics": {
746746
"@schematics/angular:component": {
747-
"style": "scss"
747+
"style": "scss",
748+
"type": "component"
749+
},
750+
"@schematics/angular:directive": {
751+
"type": "directive"
752+
},
753+
"@schematics/angular:service": {
754+
"type": "service"
755+
},
756+
"@schematics/angular:guard": {
757+
"typeSeparator": "."
758+
},
759+
"@schematics/angular:interceptor": {
760+
"typeSeparator": "."
761+
},
762+
"@schematics/angular:module": {
763+
"typeSeparator": "."
764+
},
765+
"@schematics/angular:pipe": {
766+
"typeSeparator": "."
767+
},
768+
"@schematics/angular:resolver": {
769+
"typeSeparator": "."
748770
}
749771
},
750772
"cli": {

0 commit comments

Comments
 (0)