Issue 267

.github/actions/check-tag-on-npm/action.yml

@@ -4,7 +4,7 @@ inputs:
   npmPackageName: # id of input
     description: "The npm package to get the latest version from the npm registry."
     required: false
-    default: "@dlr-eoc/core-ui"
+    default: "@dlr-eoc/map-ol"
   npmPackageTags:
     description: "A List of tags. Use this instead of npmPackageName if you can't get the tags from the package."
     required: false

.github/actions/check-tag-on-npm/index.sh

@@ -5,7 +5,7 @@
 # chmod +x index.sh or git update-index --chmod=+x index.sh
 
 
-#NPM_PACKAGE_NAME=@dlr-eoc/core-ui
+#NPM_PACKAGE_NAME=@dlr-eoc/map-ol
 #PACKAGE_PATH="./package.json"
 #TAG="v7.3.1"
 #NPM_PACKAGE_TAGS="v0.4.0-next.1 , v0.4.0-next.2 , v0.9.0, v1.0.0, v1.0.1, v1.0.2, v1.0.3"

.github/workflows/package-main-release.yml

@@ -55,7 +55,7 @@ jobs:
     outputs:
       VERSION_TAG: ${{ steps.get-tag.outputs.result }}
 
-  # check if the tag is already published - uses @dlr-eoc/core-ui for test
+  # check if the tag is already published - uses @dlr-eoc/map-ol for test
   checkTagOnNpm:
     runs-on: ubuntu-latest
     needs: checkTitelTag
@@ -72,7 +72,7 @@ jobs:
       - run: rm -f .npmrc
       - uses: ./.github/actions/check-tag-on-npm
         with:
-          npmPackageName: "@dlr-eoc/core-ui"
+          npmPackageName: "@dlr-eoc/map-ol"
           tag: ${{ needs.checkTitelTag.outputs.VERSION_TAG }}
 
   # check out the tag, build packages and store them as artifacts

.github/workflows/package-pre-release.yml

@@ -20,7 +20,7 @@ jobs:
       - run: rm -f .npmrc
       - uses: ./.github/actions/check-tag-on-npm
         with:
-          npmPackageName: "@dlr-eoc/core-ui"
+          npmPackageName: "@dlr-eoc/map-ol"
           tag: "${{ github.ref }}"
 
   # create Release on tag push https://github.com/softprops/action-gh-release

.npmrc

@@ -1,4 +1,4 @@
-// .npmrc
+;// .npmrc
 registry=https://registry.npmjs.org/
 ;@dlr-eoc:registry=https://npm.pkg.github.com
 

CHANGELOG.md

@@ -6,7 +6,21 @@
  - Update three.js from `^0.137.5` to `^0.176.0` see [three releases](https://github.com/mrdoob/three.js/releases) for all changes.
  - Update [@cesium/engine](https://github.com/CesiumGS/cesium/tree/main/packages/engine) from `^10.1.0` to `^17.0.0` and [@cesium/widgets](https://github.com/CesiumGS/cesium/tree/main/packages/widgets) from `^7.1.0` to `^12.0.0` (cesium from `1.120` to `1.129`) see [cesium changelog](https://github.com/CesiumGS/cesium/blob/1.129/CHANGES.md) for all changes.
 
+ - Renamed `@dlr-eoc/core-ui` to `@dlr-eoc/ngx-ukis-ui-clarity`
+ - Moved `@dlr-eoc/layer-control` to `@dlr-eoc/ngx-ukis-ui-clarity`. Import the components from there now.
+ - Moved `@dlr-eoc/map-tools` to `@dlr-eoc/ngx-ukis-ui-clarity`. Import the components from there now.
+ - Moved `@dlr-eoc/user-info` to `@dlr-eoc/ngx-ukis-ui-clarity`. Import the components from there now.
+
+ * **@dlr-eoc/core-ui:**
+ - Removed `DynamicComponent` and moved it to new library `@dlr-eoc/ngx-ukis-utilities` [Issue #267](https://github.com/dlr-eoc/ukis-frontend-libraries/issues/267).
+
+ * **@dlr-eoc/layer-control:**
+ - Removed `pipes` and moved it to new library `@dlr-eoc/ngx-ukis-utilities` [Issue #267](https://github.com/dlr-eoc/ukis-frontend-libraries/issues/267).
+
 ### Bug Fixes
+* **@dlr-eoc/map-maplibre:**
+- Replaced `TypedStyleLayer` with `StyleLayer` because `TypedStyleLayer` is not exported anymore.
+
 * **@dlr-eoc/services-ogc:**
 * **@dlr-eoc/utils-ogc:**
 * **@dlr-eoc/demo-maps:**
@@ -22,6 +36,19 @@
 
 ### Features
 - Remove `standalone: true` Angular directives, components and pipes are now standalone by default since version 19.
+
+* **@dlr-eoc/ngx-ukis-ui-clarity:**
+- New UKIS library for ui-clarity related things was added.
+- It includes all components of `@dlr-eoc/layer-control`, `@dlr-eoc/map-tools`, `@dlr-eoc/user-info` [Issue #267](https://github.com/dlr-eoc/ukis-frontend-libraries/issues/267).
+
+* **@dlr-eoc/ngx-ukis-utilities:**
+- New UKIS library for angular utilities was added.
+- Export `DynamicComponent` which have been in `@dlr-eoc/core-ui`
+- Export some pipes which have been in `@dlr-eoc/layer-control`
+
+* **@dlr-eoc/map-ol:**
+- Remove dependency on @cds/core [Issue #267](https://github.com/dlr-eoc/ukis-frontend-libraries/issues/267).
+
 * **@dlr-eoc/services-layers:**
 - Add `properties` attribute to Layer type
 

CONTRIBUTING.md

@@ -186,7 +186,7 @@ Example:
 
 ```
 ### Features
-* **@dlr-eoc/map-tools:** SV: added projection switch. See mariss client for example.
+* **@dlr-eoc/ngx-ukis-ui-clarity (map-tools):** SV: added projection switch. See mariss client for example.
 ### Bug Fixes
 * **@dlr-eoc/map-ol:** SV: adjusted setProjection method. It creates a new View instance with keeping previously set settings with exception resolution-related parameters. They are calculated automatically by the OL. After applying new projection all existing layers are triggered to redraw their tiles
 * **@dlr-eoc/map-ol:** SV: created getZoom method in the map-ol.service in order to get zoom value from actual olView instance. 

DEVELOPMENT.md

@@ -173,8 +173,9 @@ You can check this with `[semver](https://github.com/npm/node-semver#readme) 7.2
 Whereby after semantic versioning the following order exists: 7.2.0 < 7.3.0-alpha.0 < 7.3.0-beta.0 < 7.3.0-next.0
 
 To create a new prerelease, you only have to create a new version from your current branch 
-- `npm version prerelease --preid=next -m "prerelease message" --workspace=projects --include-workspace-root` (premajor | preminor | prepatch). Append `--no-git-tag-version` to `npm version ...` if you want to skip creating a tag.
-- run `node scripts/library/index.js --set-source` to sync all versions and run `npm i --workspaces --include-workspace-root` to regenerate `package-lock.json` (If something failed during the npm version, remove the local tag and create a new one. `git tag -d <version> && git tag -a <(v)version> -m "<description>`).
+- `npm version prerelease --preid=next -m "prerelease message" --workspace=projects --include-workspace-root=true --workspaces-update=false --no-git-tag-version` (premajor | preminor | prepatch).
+- run `node scripts/library/index.js --set-source` to sync all versions and run `npm i --workspaces --include-workspace-root` to regenerate `package-lock.json`.
+Add the Changes `git add . && git commit -m "build: set ukis version"` and create a new tag. `git tag -a <(v)version> -m "<description>`).
 And then `git push origin --tags` which will trigger the [Pre Release](.github/workflows/pre-release-package.yml) workflow.
 **Before doing this you should [locally test and build](#further-you-can-test-and-build-locally)!!!** to prevent failed workflows but created tags.
 

README.md

@@ -1,4 +1,4 @@
-<img src="projects/core-ui/schematics/ng-add/files/src/assets/icons/icon-72x72.png" alt="UKIS Logo"> Frontend Libraries for DLR UKIS (Map) Applications
+<img src="projects/ngx-ukis-ui-clarity/schematics/ng-add/files/src/assets/icons/icon-72x72.png" alt="UKIS Logo"> Frontend Libraries for DLR UKIS (Map) Applications
 ========================
 
 ![CI](https://github.com/dlr-eoc/ukis-frontend-libraries/workflows/Test%20and%20Build%20CI/badge.svg)
@@ -70,12 +70,12 @@ Then run:
 - See [Adding Clarity to an Angular project](https://clarity.design/documentation/get-started#seedProjectAngular)
 - If you use Clarity Core also [add the icons manually](https://core.clarity.design/foundation/icons/)
 
-4. Run the ng add command for the UKIS core-ui
-- `ng add @dlr-eoc/core-ui --project=<appName> [options]` 
+4. Run the ng add command for the ngx-ukis-ui-clarity
+- `ng add @dlr-eoc/ngx-ukis-ui-clarity --project=<appName> [options]` 
   - --routing=boolean // set up your project with [routing](https://angular.io/guide/router)
-  - [for more information see core-ui ng-add](projects/core-ui/schematics/ng-add/schema.json)
+  - [for more information see ngx-ukis-ui-clarity ng-add](projects/ngx-ukis-ui-clarity/schematics/ng-add/schema.json)
 
-5. [See layout structure of the core-ui](projects/core-ui/README.md#layout-structure-of-the-core-ui)
+5. [See layout structure of the ngx-ukis-ui-clarity](projects/ngx-ukis-ui-clarity/core-ui.md#layout-structure-of-the-core-ui)
 
 6. [See clarity get-started to use their components](https://clarity.design/documentation/get-started)
 

TUTORIALS.md

@@ -1,11 +1,11 @@
 # Creating a basic web map application
 ## Introduction
-In this guide you will follow the necessary steps for creating a basic web map application with the UKIS frontend libraries. At the end you should be able to set up an UKIS application yourself and start customizing it. The application contains the [core-ui](projects/core-ui/README.md), [map-ol](projects/map-ol/README.md), [base-layers-raster](projects/base-layers-raster/README.md) and [layer-control](projects/layer-control/README.md) libraries. The finished application integrates some layers from the [EOC GeoService](https://geoservice.dlr.de/web/).
+In this guide you will follow the necessary steps for creating a basic web map application with the UKIS frontend libraries. At the end you should be able to set up an UKIS application yourself and start customizing it. The application contains the [ngx-ukis-ui-clarity](projects/ngx-ukis-ui-clarity/core-ui.md), [map-ol](projects/map-ol/README.md), [base-layers-raster](projects/base-layers-raster/README.md) and [layer-control](projects/ngx-ukis-ui-clarity/layer-control.md) libraries. The finished application integrates some layers from the [EOC GeoService](https://geoservice.dlr.de/web/).
 
 ## Requirements
 For this tutorial to work you need a code editor of your choice (e.g. Visual Studio Code) and npm installed. 
 
-## Setting up UKIS core-ui
+## Setting up ngx-ukis-ui-clarity
 ### 1. Generate a new [Angular application](https://angular.dev/cli/new) in the same Version like specified in our package.json [@angular/core](package.json).
 For this you have to install `@angular/cli` in this specific Version first. 
 - See ukis-frontend-libraries package.json [version of @angular/core](package.json) 
@@ -17,6 +17,13 @@ npm install -g @angular/cli@<version>
 ```
 ng new project-tutorial-map --style=scss --standalone=true --routing=false
 ```
+
+or locally installed `@angular/cli` with `npx`
+
+```
+npx @angular/cli@<version> new project-tutorial-map --style=scss --standalone=true --routing=false
+```
+
 - We do not need angular routing, so decline the prompt with `N`
 
 ### 2. Move into the directory
@@ -71,25 +78,25 @@ For more information see
 - [Adding Clarity to an Existing Angular Application](https://clarity.design/pages/developing#adding-clarity-to-an-existing-angular-application)
 
 
-### 4. Run the ng add command for the UKIS core-ui
+### 4. Run the ng add command for the ngx-ukis-ui-clarity
 - First you have to match the dependency of rxjs ([for ukis-frontend-libraries](package.json)), to do this you need to run
 ``` 
 npm install rxjs@<version>
 ```
 - Then run 
 ``` 
-ng add @dlr-eoc/core-ui@<version> --project=project-tutorial-map 
+ng add @dlr-eoc/ngx-ukis-ui-clarity@<version> --project=project-tutorial-map 
 ``` 
 to add files and styles from ukis-frontend-libraries in the desired version.
 
 - Answer the promt with `Y`
-- In this tutorial more additional options of the core-ui ng add like routing are not required.
-- [for more information see core-ui ng-add](projects/core-ui/schematics/ng-add/schema.json)
+- In this tutorial more additional options of the ngx-ukis-ui-clarity like routing are not required.
+- [for more information see ngx-ukis-ui-clarity ng-add](projects/ngx-ukis-ui-clarity/schematics/ng-add/schema.json)
 
 If this does not work due to incorrect versions of peer dependencies, you can fix it as described below if you are sure that the current dependencies work together!
 ``` 
-npm install @dlr-eoc/core-ui@<version> --force
-ng generate @dlr-eoc/core-ui:ng-add --project=project-tutorial-map
+npm install @dlr-eoc/ngx-ukis-ui-clarity@<version> --force
+ng generate @dlr-eoc/ngx-ukis-ui-clarity:ng-add --project=project-tutorial-map
 ``` 
 
 ### 5. Start and view the application
@@ -101,7 +108,7 @@ ng generate @dlr-eoc/core-ui:ng-add --project=project-tutorial-map
 In the following the components neccessary for the display of a web map are installed. More information can be found [in the map-ol library folder](projects/map-ol/README.md).
 ### 1. Add the following libraries:
 ```
-npm install @dlr-eoc/map-ol @dlr-eoc/layer-control @dlr-eoc/base-layers-raster
+npm install @dlr-eoc/map-ol @dlr-eoc/ngx-ukis-ui-clarity @dlr-eoc/base-layers-raster
 ```
 
 The base layers raster library is optional, but it makes it easier to add a basemap. Without a given basemap the map canvas would be empty. 
@@ -118,7 +125,7 @@ e.g. in your apps style file (src/styles.scss)
 ### 3. Add the following to example-view.component.ts:
 ```
 import { MapOlComponent, MapOlService } from '@dlr-eoc/map-ol';
-import { LayerControlComponent, BaseLayerControlComponent} from '@dlr-eoc/layer-control';
+import { LayerControlComponent, BaseLayerControlComponent} from '@dlr-eoc/ngx-ukis-ui-clarity';
 import { LayersService } from '@dlr-eoc/services-layers';
 import { MapStateService } from '@dlr-eoc/services-map-state';
 import { IMapControls } from '@dlr-eoc/map-ol';