Skip to content

Commit 0082272

Browse files
authored
Issue 267 (#268)
* build: fix syntax of npmrc * docs: update tutorial for ng new with custom cli version * feat (map-ol): remove dependency on CDs #267 * feat (ngx-ukis-utilities): new library for angular utilities #267 * BREAKING CHANGE: remove DynamicComponent from core-ui #267 * BREAKING CHANGE: remove exported pipes from layer-control #267 * refactor: replace things from core-ui with ngx-ukis-utilities #267 * refactor (services-layers): replace things from core-ui with ngx-ukis-utilities #267 * docs: add missing change for map-ol #267 * ci: use map-ol to check for npm tag not core-ui #267 * docs: remove core-ui from readme * build: new npm lock * fix (map-maplibre): replaced TypedStyleLayer with StyleLayer * fix (ngx-ukis-utilities): add missing peer dependency #267 * test (services-layers): fix check for l.properties * feat: add new library ngx-ukis-ui-clarity * fix (ngx-ukis-ui-clarity): path in karma conf * BREAKING CHANGE: move core-ui, layer-control, map-tools, user-info to ngx-ukis-ui-clarity #267 * fix (ukis-libraries-scripts): add missing dev dependency * build: fix lock file * feat (ukis-libraries-scripts): use strictNullChecks * fix (ukis-libraries-scripts): build deps graph and sort also if all dependencies (peerDependencies) are used * fix (ngx-ukis-ui-clarity): build has deps so run all builds before test * refactor: use npm script to run library scripts * fix (ukis-libraries-scripts): check platform for npm * fix (base-layers-raster): remove unnecessary peer dependencies * refactor (ngx-ukis-utilities): adjust docs and remove unused files from the library generation * build: fix not set version for last prereleases * docs: adjust create prerelease * build: set ukis version
1 parent 6f6b5e1 commit 0082272

261 files changed

Lines changed: 8005 additions & 6664 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.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ inputs:
44
npmPackageName: # id of input
55
description: "The npm package to get the latest version from the npm registry."
66
required: false
7-
default: "@dlr-eoc/core-ui"
7+
default: "@dlr-eoc/map-ol"
88
npmPackageTags:
99
description: "A List of tags. Use this instead of npmPackageName if you can't get the tags from the package."
1010
required: false

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# chmod +x index.sh or git update-index --chmod=+x index.sh
66

77

8-
#NPM_PACKAGE_NAME=@dlr-eoc/core-ui
8+
#NPM_PACKAGE_NAME=@dlr-eoc/map-ol
99
#PACKAGE_PATH="./package.json"
1010
#TAG="v7.3.1"
1111
#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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
outputs:
5656
VERSION_TAG: ${{ steps.get-tag.outputs.result }}
5757

58-
# check if the tag is already published - uses @dlr-eoc/core-ui for test
58+
# check if the tag is already published - uses @dlr-eoc/map-ol for test
5959
checkTagOnNpm:
6060
runs-on: ubuntu-latest
6161
needs: checkTitelTag
@@ -72,7 +72,7 @@ jobs:
7272
- run: rm -f .npmrc
7373
- uses: ./.github/actions/check-tag-on-npm
7474
with:
75-
npmPackageName: "@dlr-eoc/core-ui"
75+
npmPackageName: "@dlr-eoc/map-ol"
7676
tag: ${{ needs.checkTitelTag.outputs.VERSION_TAG }}
7777

7878
# check out the tag, build packages and store them as artifacts

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- run: rm -f .npmrc
2121
- uses: ./.github/actions/check-tag-on-npm
2222
with:
23-
npmPackageName: "@dlr-eoc/core-ui"
23+
npmPackageName: "@dlr-eoc/map-ol"
2424
tag: "${{ github.ref }}"
2525

2626
# create Release on tag push https://github.com/softprops/action-gh-release

.npmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// .npmrc
1+
;// .npmrc
22
registry=https://registry.npmjs.org/
33
;@dlr-eoc:registry=https://npm.pkg.github.com
44

CHANGELOG.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,21 @@
66
- Update three.js from `^0.137.5` to `^0.176.0` see [three releases](https://github.com/mrdoob/three.js/releases) for all changes.
77
- 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.
88

9+
- Renamed `@dlr-eoc/core-ui` to `@dlr-eoc/ngx-ukis-ui-clarity`
10+
- Moved `@dlr-eoc/layer-control` to `@dlr-eoc/ngx-ukis-ui-clarity`. Import the components from there now.
11+
- Moved `@dlr-eoc/map-tools` to `@dlr-eoc/ngx-ukis-ui-clarity`. Import the components from there now.
12+
- Moved `@dlr-eoc/user-info` to `@dlr-eoc/ngx-ukis-ui-clarity`. Import the components from there now.
13+
14+
* **@dlr-eoc/core-ui:**
15+
- 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).
16+
17+
* **@dlr-eoc/layer-control:**
18+
- 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).
19+
920
### Bug Fixes
21+
* **@dlr-eoc/map-maplibre:**
22+
- Replaced `TypedStyleLayer` with `StyleLayer` because `TypedStyleLayer` is not exported anymore.
23+
1024
* **@dlr-eoc/services-ogc:**
1125
* **@dlr-eoc/utils-ogc:**
1226
* **@dlr-eoc/demo-maps:**
@@ -22,6 +36,19 @@
2236

2337
### Features
2438
- Remove `standalone: true` Angular directives, components and pipes are now standalone by default since version 19.
39+
40+
* **@dlr-eoc/ngx-ukis-ui-clarity:**
41+
- New UKIS library for ui-clarity related things was added.
42+
- 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).
43+
44+
* **@dlr-eoc/ngx-ukis-utilities:**
45+
- New UKIS library for angular utilities was added.
46+
- Export `DynamicComponent` which have been in `@dlr-eoc/core-ui`
47+
- Export some pipes which have been in `@dlr-eoc/layer-control`
48+
49+
* **@dlr-eoc/map-ol:**
50+
- Remove dependency on @cds/core [Issue #267](https://github.com/dlr-eoc/ukis-frontend-libraries/issues/267).
51+
2552
* **@dlr-eoc/services-layers:**
2653
- Add `properties` attribute to Layer type
2754

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ Example:
186186

187187
```
188188
### Features
189-
* **@dlr-eoc/map-tools:** SV: added projection switch. See mariss client for example.
189+
* **@dlr-eoc/ngx-ukis-ui-clarity (map-tools):** SV: added projection switch. See mariss client for example.
190190
### Bug Fixes
191191
* **@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
192192
* **@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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,9 @@ You can check this with `[semver](https://github.com/npm/node-semver#readme) 7.2
173173
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
174174

175175
To create a new prerelease, you only have to create a new version from your current branch
176-
- `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.
177-
- 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>`).
176+
- `npm version prerelease --preid=next -m "prerelease message" --workspace=projects --include-workspace-root=true --workspaces-update=false --no-git-tag-version` (premajor | preminor | prepatch).
177+
- 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`.
178+
Add the Changes `git add . && git commit -m "build: set ukis version"` and create a new tag. `git tag -a <(v)version> -m "<description>`).
178179
And then `git push origin --tags` which will trigger the [Pre Release](.github/workflows/pre-release-package.yml) workflow.
179180
**Before doing this you should [locally test and build](#further-you-can-test-and-build-locally)!!!** to prevent failed workflows but created tags.
180181

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<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
1+
<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
22
========================
33

44
![CI](https://github.com/dlr-eoc/ukis-frontend-libraries/workflows/Test%20and%20Build%20CI/badge.svg)
@@ -70,12 +70,12 @@ Then run:
7070
- See [Adding Clarity to an Angular project](https://clarity.design/documentation/get-started#seedProjectAngular)
7171
- If you use Clarity Core also [add the icons manually](https://core.clarity.design/foundation/icons/)
7272

73-
4. Run the ng add command for the UKIS core-ui
74-
- `ng add @dlr-eoc/core-ui --project=<appName> [options]`
73+
4. Run the ng add command for the ngx-ukis-ui-clarity
74+
- `ng add @dlr-eoc/ngx-ukis-ui-clarity --project=<appName> [options]`
7575
- --routing=boolean // set up your project with [routing](https://angular.io/guide/router)
76-
- [for more information see core-ui ng-add](projects/core-ui/schematics/ng-add/schema.json)
76+
- [for more information see ngx-ukis-ui-clarity ng-add](projects/ngx-ukis-ui-clarity/schematics/ng-add/schema.json)
7777

78-
5. [See layout structure of the core-ui](projects/core-ui/README.md#layout-structure-of-the-core-ui)
78+
5. [See layout structure of the ngx-ukis-ui-clarity](projects/ngx-ukis-ui-clarity/core-ui.md#layout-structure-of-the-core-ui)
7979

8080
6. [See clarity get-started to use their components](https://clarity.design/documentation/get-started)
8181

TUTORIALS.md

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Creating a basic web map application
22
## Introduction
3-
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/).
3+
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/).
44

55
## Requirements
66
For this tutorial to work you need a code editor of your choice (e.g. Visual Studio Code) and npm installed.
77

8-
## Setting up UKIS core-ui
8+
## Setting up ngx-ukis-ui-clarity
99
### 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).
1010
For this you have to install `@angular/cli` in this specific Version first.
1111
- See ukis-frontend-libraries package.json [version of @angular/core](package.json)
@@ -17,6 +17,13 @@ npm install -g @angular/cli@<version>
1717
```
1818
ng new project-tutorial-map --style=scss --standalone=true --routing=false
1919
```
20+
21+
or locally installed `@angular/cli` with `npx`
22+
23+
```
24+
npx @angular/cli@<version> new project-tutorial-map --style=scss --standalone=true --routing=false
25+
```
26+
2027
- We do not need angular routing, so decline the prompt with `N`
2128

2229
### 2. Move into the directory
@@ -71,25 +78,25 @@ For more information see
7178
- [Adding Clarity to an Existing Angular Application](https://clarity.design/pages/developing#adding-clarity-to-an-existing-angular-application)
7279

7380

74-
### 4. Run the ng add command for the UKIS core-ui
81+
### 4. Run the ng add command for the ngx-ukis-ui-clarity
7582
- First you have to match the dependency of rxjs ([for ukis-frontend-libraries](package.json)), to do this you need to run
7683
```
7784
npm install rxjs@<version>
7885
```
7986
- Then run
8087
```
81-
ng add @dlr-eoc/core-ui@<version> --project=project-tutorial-map
88+
ng add @dlr-eoc/ngx-ukis-ui-clarity@<version> --project=project-tutorial-map
8289
```
8390
to add files and styles from ukis-frontend-libraries in the desired version.
8491

8592
- Answer the promt with `Y`
86-
- In this tutorial more additional options of the core-ui ng add like routing are not required.
87-
- [for more information see core-ui ng-add](projects/core-ui/schematics/ng-add/schema.json)
93+
- In this tutorial more additional options of the ngx-ukis-ui-clarity like routing are not required.
94+
- [for more information see ngx-ukis-ui-clarity ng-add](projects/ngx-ukis-ui-clarity/schematics/ng-add/schema.json)
8895

8996
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!
9097
```
91-
npm install @dlr-eoc/core-ui@<version> --force
92-
ng generate @dlr-eoc/core-ui:ng-add --project=project-tutorial-map
98+
npm install @dlr-eoc/ngx-ukis-ui-clarity@<version> --force
99+
ng generate @dlr-eoc/ngx-ukis-ui-clarity:ng-add --project=project-tutorial-map
93100
```
94101

95102
### 5. Start and view the application
@@ -101,7 +108,7 @@ ng generate @dlr-eoc/core-ui:ng-add --project=project-tutorial-map
101108
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).
102109
### 1. Add the following libraries:
103110
```
104-
npm install @dlr-eoc/map-ol @dlr-eoc/layer-control @dlr-eoc/base-layers-raster
111+
npm install @dlr-eoc/map-ol @dlr-eoc/ngx-ukis-ui-clarity @dlr-eoc/base-layers-raster
105112
```
106113

107114
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)
118125
### 3. Add the following to example-view.component.ts:
119126
```
120127
import { MapOlComponent, MapOlService } from '@dlr-eoc/map-ol';
121-
import { LayerControlComponent, BaseLayerControlComponent} from '@dlr-eoc/layer-control';
128+
import { LayerControlComponent, BaseLayerControlComponent} from '@dlr-eoc/ngx-ukis-ui-clarity';
122129
import { LayersService } from '@dlr-eoc/services-layers';
123130
import { MapStateService } from '@dlr-eoc/services-map-state';
124131
import { IMapControls } from '@dlr-eoc/map-ol';

0 commit comments

Comments
 (0)