Merge branch 'main' into feature/journey-maps-v2-route-hover

CHANGELOG.md

@@ -2,6 +2,33 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [15.6.0](https://github.com/sbb-design-systems/sbb-angular/compare/15.5.0...15.6.0) (2023-03-06)
+
+
+### Features
+
+* **angular/datepicker:** add option to prevent entering overflowing dates ([#1787](https://github.com/sbb-design-systems/sbb-angular/issues/1787)) ([58f2fcf](https://github.com/sbb-design-systems/sbb-angular/commit/58f2fcf68a2ece029e9e3363b970125a9a675663)), closes [#1761](https://github.com/sbb-design-systems/sbb-angular/issues/1761)
+* **journey-maps:** improved route hover ([#1828](https://github.com/sbb-design-systems/sbb-angular/issues/1828)) ([d8126ea](https://github.com/sbb-design-systems/sbb-angular/commit/d8126ea43dc570345d17c8f4996fc005558c643d))
+
+
+### Documentation
+
+* add deprecation note to `angular-maps` ([#1824](https://github.com/sbb-design-systems/sbb-angular/issues/1824)) ([dbafef0](https://github.com/sbb-design-systems/sbb-angular/commit/dbafef0e883ce8d1de2daa2ccb563266c9dfbad4))
+* make environment banner text configurable ([#1825](https://github.com/sbb-design-systems/sbb-angular/issues/1825)) ([ed29820](https://github.com/sbb-design-systems/sbb-angular/commit/ed298204b6be8da677f6edab40630606f9e188b3))
+
+## [15.5.0](https://github.com/sbb-design-systems/sbb-angular/compare/15.4.1...15.5.0) (2023-02-20)
+
+
+### Features
+
+* **journey-maps:** switch between 2D and 3D layers ([#1814](https://github.com/sbb-design-systems/sbb-angular/issues/1814)) ([5c4c987](https://github.com/sbb-design-systems/sbb-angular/commit/5c4c9876148fb075594e66798f0c4a512526e1fe))
+* **journey-maps:** use the new aerial style 'aerial_sbb_ki_v2' ([#1811](https://github.com/sbb-design-systems/sbb-angular/issues/1811)) ([5d842ce](https://github.com/sbb-design-systems/sbb-angular/commit/5d842ce780df9348bbbf51c823e3349bb250bcc6))
+
+
+### Bug Fixes
+
+* **deps:** update dependency @angular/cdk to v15.1.5 ([ae851c1](https://github.com/sbb-design-systems/sbb-angular/commit/ae851c1d159ae6039942d903cf61a5a97c77680a))
+
 ### [15.4.1](https://github.com/sbb-design-systems/sbb-angular/compare/15.4.0...15.4.1) (2023-02-07)
 
 * **ci:** fix publishing of npm package

package.json

@@ -50,16 +50,16 @@
   "homepage": "https://angular.app.sbb.ch",
   "schematics": "./tools/schematics/collection.json",
   "dependencies": {
-    "@angular/animations": "15.2.0",
-    "@angular/cdk": "15.2.0",
-    "@angular/common": "15.2.0",
-    "@angular/core": "15.2.0",
-    "@angular/elements": "15.2.0",
-    "@angular/forms": "15.2.0",
-    "@angular/platform-browser": "15.2.0",
-    "@angular/platform-browser-dynamic": "15.2.0",
-    "@angular/platform-server": "15.2.0",
-    "@angular/router": "15.2.0",
+    "@angular/animations": "15.2.1",
+    "@angular/cdk": "15.2.1",
+    "@angular/common": "15.2.1",
+    "@angular/core": "15.2.1",
+    "@angular/elements": "15.2.1",
+    "@angular/forms": "15.2.1",
+    "@angular/platform-browser": "15.2.1",
+    "@angular/platform-browser-dynamic": "15.2.1",
+    "@angular/platform-server": "15.2.1",
+    "@angular/router": "15.2.1",
     "@arcgis/core": "~4.20.2",
     "@stackblitz/sdk": "1.8.2",
     "maplibre-gl": "2.4.0",
@@ -69,20 +69,20 @@
   },
   "devDependencies": {
     "@actions/cache": "3.1.4",
-    "@angular-devkit/build-angular": "15.2.0",
-    "@angular-devkit/core": "15.2.0",
-    "@angular-devkit/schematics": "15.2.0",
-    "@angular-devkit/schematics-cli": "15.2.0",
+    "@angular-devkit/build-angular": "15.2.1",
+    "@angular-devkit/core": "15.2.1",
+    "@angular-devkit/schematics": "15.2.1",
+    "@angular-devkit/schematics-cli": "15.2.1",
     "@angular/bazel": "15.0.4",
-    "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#34d71bee766ad8bd1326ca5d47ae9947c78b1f56",
-    "@angular/cli": "15.2.0",
-    "@angular/compiler": "15.2.0",
-    "@angular/compiler-cli": "15.2.0",
-    "@angular/language-service": "15.2.0",
-    "@angular/localize": "15.2.0",
-    "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#1b5502d1b766b615f945d293caaebe8e017aedcc",
-    "@babel/core": "7.20.12",
-    "@babel/traverse": "7.20.13",
+    "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#1cb2d563652aafa3739c43d5e22b7fb55f058e36",
+    "@angular/cli": "15.2.1",
+    "@angular/compiler": "15.2.1",
+    "@angular/compiler-cli": "15.2.1",
+    "@angular/language-service": "15.2.1",
+    "@angular/localize": "15.2.1",
+    "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#04224157ac08d8585466d20b69c9e6bb12e2a8e3",
+    "@babel/core": "7.21.0",
+    "@babel/traverse": "7.21.2",
     "@bazel/bazelisk": "1.12.1",
     "@bazel/buildifier": "6.0.1",
     "@bazel/buildozer": "6.0.1",
@@ -99,7 +99,7 @@
     "@rollup/plugin-commonjs": "23.0.4",
     "@rollup/plugin-node-resolve": "13.3.0",
     "@rollup/plugin-typescript": "11.0.0",
-    "@schematics/angular": "15.2.0",
+    "@schematics/angular": "15.2.1",
     "@types/browser-sync": "2.26.3",
     "@types/events": "3.0.0",
     "@types/fs-extra": "11.0.1",
@@ -111,7 +111,7 @@
     "@types/jasminewd2": "2.0.10",
     "@types/mapbox__point-geometry": "0.1.2",
     "@types/marked": "^2.0.2",
-    "@types/node": "16.18.13",
+    "@types/node": "16.18.14",
     "@types/sass": "1.43.1",
     "@types/send": "0.17.1",
     "@types/yargs": "17.0.13",
@@ -121,7 +121,7 @@
     "codelyzer": "6.0.2",
     "dgeni": "^0.4.14",
     "dgeni-packages": "^0.29.3",
-    "esbuild": "0.17.10",
+    "esbuild": "0.17.11",
     "fs-extra": "11.1.0",
     "highlight.js": "^10.7.0",
     "history-server": "1.3.1",

src/angular-maps/getting-started.md

@@ -1,3 +1,13 @@
+---
+
+**sbb-esta/angular-maps is deprecated.**
+
+This package is deprecated and no longer supported. 
+
+If you're looking for a generic mapping solution, please check out [journey-maps](/journey-maps). For comprehesive functionality regarding visualization & symbology, or if you need general GIS features like editing, analysis and 3D visulization plus a tight integration with the [G-SHARP platform (geo.sbb.ch)](https://geo.sbb.ch) you will best move to the Esri [ArcGIS Maps SDK for JavaScript](https://developers.arcgis.com/javascript/latest/). The ArcGIS Maps SDK for JavaScript is a powerful mapping solution adopted in the SBB technology stack and can simply be used by referencing the [NPM package @arcgis/core](https://www.npmjs.com/package/@arcgis/core). Contact Digital Service GIS for further advise.
+
+---
+
 # Getting Started
 
 The package `@sbb-esta/angular-maps` provides a fast and easy way to integrate maps and geograhical 3D scenes into your Angular application. Continue reading in [Overview and usage](/maps/introduction/overview-and-usage) to learn more about the core concepts behind the package. [Mapping basics](/maps/introduction/mapping-basics) gives you a short introduction on what a map is and how to make good maps. Finally, the _Advanced Usage_ section (see sidebar menu) links to a few custom tailored samples on how to actually use the mapping components in your application workflows.
@@ -77,11 +87,11 @@ If you do not call `SbbEsriConfigModule.forRoot` at all, the default Esri ArcGIS
 Import the NgModule for each component you want to use:
 
 ```ts
-import { EsriWebMapModule, EsriWebSceneModule } from '@sbb-esta/angular-maps';
+import { SbbEsriWebMapModule, SbbEsriWebSceneModule } from '@sbb-esta/angular-maps';
 
 @NgModule({
   ...
-  imports: [EsriWebMapModule, EsriWebSceneModule],
+  imports: [SbbEsriWebMapModule, SbbEsriWebSceneModule],
   ...
 })
 export class TrainChooChooAppModule {}

src/showcase/app/app.component.html

@@ -35,8 +35,9 @@
       sbbIconSidebarItem
       *ngFor="let packageEntry of packages | keyvalue"
       [label]="packageEntry.value.name"
-      [title]="packageEntry.value.name"
+      [title]="packageEntry.value.isDeprecated ? 'deprecated' : packageEntry.value.name"
       [routerLink]="packageEntry.key"
+      [style.text-decoration]="packageEntry.value.isDeprecated ? 'line-through' : ''"
       routerLinkActive="sbb-active"
     >
       <sbb-icon [svgIcon]="packageEntry.value.svgIcon"></sbb-icon>

src/showcase/app/introduction/introduction.component.html

@@ -66,7 +66,13 @@ <h4>Lean</h4>
         <div class="hero">
           <img [attr.alt]="packageEntry.value.name" [attr.src]="packageEntry.value.image" />
         </div>
-        <span class="title">{{ packageEntry.value.name }}</span>
+        <span
+          class="title"
+          [title]="packageEntry.value.isDeprecated ? 'deprecated' : ''"
+          [style.text-decoration]="packageEntry.value.isDeprecated ? 'line-through' : ''"
+        >
+          {{ packageEntry.value.name }}
+        </span>
         <span class="text">{{ packageEntry.value.description }}</span>
       </a>
     </li>

src/showcase/app/shared/meta.ts

@@ -4,6 +4,7 @@ export interface ShowcaseMetaPackage {
   image: string;
   description: string;
   sections: ShowcaseMetaSection[];
+  isDeprecated?: boolean;
 }
 
 export interface ShowcaseMetaSection {
@@ -113,6 +114,7 @@ export const PACKAGES: { [key: string]: ShowcaseMetaPackage } = {
   'angular-maps': {
     name: '@sbb-esta/angular-maps',
     svgIcon: 'kom:location-pin-map-small',
+    isDeprecated: true,
     image: 'assets/maps.jpg',
     description: 'Components to display 2D/3D maps and to provide map interaction..',
     sections: [