Updates

package.json

@@ -31,43 +31,43 @@
   ],
   "homepage": "https://github.com/FlorianTimm/QuerschnittsEditor#readme",
   "dependencies": {
-    "@types/chosen-js": "^1.8.2",
-    "@types/jquery": "^3.5.5",
-    "@types/jqueryui": "^1.12.15",
-    "@types/node": "^14.17.2",
-    "@types/proj4": "^2.5.0",
+    "@types/chosen-js": "^1.8.3",
+    "@types/jquery": "^3.5.6",
+    "@types/jqueryui": "^1.12.16",
+    "@types/node": "^16.4.7",
+    "@types/proj4": "^2.5.2",
     "babel-polyfill": "^6.26.0",
-    "caniuse-lite": "^1.0.30001233",
+    "caniuse-lite": "^1.0.30001248",
     "chosen-js": "^1.8.7",
-    "clean-webpack-plugin": "^3.0.0",
-    "core-js": "^3.13.1",
-    "css-loader": "^5.2.6",
+    "clean-webpack-plugin": "^4.0.0-alpha.0",
+    "core-js": "^3.16.0",
+    "css-loader": "^6.2.0",
     "file-loader": "^6.2.0",
-    "html-webpack-plugin": "^5.3.1",
+    "html-webpack-plugin": "^5.3.2",
     "jquery": "^3.6.0",
     "jquery-ui": "^1.12.1",
     "jquery-ui-bundle": "^1.12.1-migrate",
-    "ol": "^6.5.0",
-    "proj4": "^2.7.2",
-    "regenerator-runtime": "^0.13.7",
+    "ol": "^6.6.1",
+    "proj4": "^2.7.5",
+    "regenerator-runtime": "^0.13.9",
     "src": "^1.1.2",
-    "style-loader": "^2.0.0",
-    "ts-loader": "^8.3.0",
-    "webpack": "^5.38.1"
+    "style-loader": "^3.2.1",
+    "ts-loader": "^9.2.4",
+    "webpack": "^5.47.1"
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.1",
-    "@types/chai": "^4.2.18",
-    "@types/mocha": "^8.2.2",
-    "@types/ol": "^6.5.0",
+    "@types/chai": "^4.2.21",
+    "@types/mocha": "^9.0.0",
+    "@types/ol": "^6.5.3",
     "chai": "^4.3.4",
-    "copy-webpack-plugin": "^7.0.0",
-    "cssnano": "^4.1.11",
-    "mini-css-extract-plugin": "^1.6.0",
-    "mocha": "^8.4.0",
+    "copy-webpack-plugin": "^9.0.1",
+    "cssnano": "^5.0.7",
+    "mini-css-extract-plugin": "^2.1.0",
+    "mocha": "^9.0.3",
     "nyc": "^15.1.0",
     "source-map-support": "^0.5.19",
-    "ts-node": "^9.1.1",
-    "typescript": "^4.3.2"
+    "ts-node": "^10.1.0",
+    "typescript": "^4.3.5"
   }
 }

src/css/index.css

@@ -6,7 +6,7 @@ body,
     width: 100%;
     margin: 0;
     padding: 0;
-    background-image: url('../img/background_blur.jpg');
+    background-image: url('~../img/background_blur.jpg');
     background-repeat: no-repeat;
     background-size: cover;
     background-attachment: fixed;

src/ts/Klassen/ToolBox.ts

@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
+import { LineString, MultiLineString, Point, Polygon } from "ol/geom";
+import VectorSource from "ol/source/Vector";
 import { Daten } from "../Daten";
 import { Abschnitt } from "../Objekte/Abschnitt";
 import { VectorLayer } from "../openLayers/Layer";
@@ -23,7 +25,7 @@ export abstract class ToolBox {
     /** Liste aller Radiobuttons */
     protected radioButtons: { tool: Tool, radio: HTMLInputElement }[] = []
     protected formid: string;
-    protected layer: VectorLayer[] = [];
+    protected layer: VectorLayer<VectorSource<Point | Polygon | MultiLineString | LineString>>[] = [];
     static liste: { [objektKlasse: string]: ToolBox } = {};
     stopped: boolean;
     private static selectBox: HTMLSelectElement;

src/ts/Objekte/Abschnitt.ts

@@ -44,7 +44,7 @@ export class Abschnitt extends Feature<LineString> {
 
     private _feature: any;
     private punkte: LinienPunkt[];
-    static layer: VectorLayer;
+    static layer: VectorLayer<VectorSource<LineString>>;
 
     private constructor() {
         super();
@@ -66,7 +66,7 @@ export class Abschnitt extends Feature<LineString> {
         }
     }
 
-    public static getLayer(map?: Map): VectorLayer {
+    public static getLayer(map?: Map): VectorLayer<VectorSource<LineString>> {
         if (!Abschnitt.layer) {
             let achsen_style = function (feature: FeatureLike, resolution: number): Style[] {
                 let abschnitt = feature as Abschnitt;

src/ts/Objekte/Aufbaudaten.ts

@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
+import { Point } from "ol/geom";
 import { Klartext } from "./Klartext";
 import { SekundaerObjekt } from "./prototypes/SekundaerObjekt";
 
@@ -9,7 +10,7 @@ import { SekundaerObjekt } from "./prototypes/SekundaerObjekt";
  * @version 2019.10.29
  * @license GPL-3.0-or-later
 */
-export class Aufbau extends SekundaerObjekt {
+export class Aufbau extends SekundaerObjekt<null> {
 	public getObjektKlassenName(): string {
 		return "Otschicht";
 	}
@@ -55,6 +56,26 @@ export class Aufbau extends SekundaerObjekt {
 		return this.schichtnr;
 	}
 
+	getArtNeu() {
+		return this.artneu;
+	}
+
+	getMaterial1() {
+		return this.material1;
+	}
+
+	getMaterial2() {
+		return this.material2;
+	}
+
+	getMaterial3() {
+		return this.material3;
+	}
+
+	isDeckschicht(): boolean {
+		return this.decksch == '1'
+	}
+
 	// Setter
 
 	public getVst() {
@@ -72,4 +93,8 @@ export class Aufbau extends SekundaerObjekt {
 	public setBst(bst: number) {
 		this.bst = bst;
 	}
+
+	public setDeckschicht(decksch: boolean) {
+		this.decksch = decksch ? '1' : '0';
+	}
 }

src/ts/Objekte/Aufstellvorrichtung.ts

@@ -20,6 +20,7 @@ import { Klartext } from './Klartext';
 import { PunktObjekt } from './prototypes/PunktObjekt';
 import { Zeichen } from './Zeichen';
 import { CONFIG } from '../../config/config'
+import VectorSource from "ol/source/Vector";
 
 /**
  * Aufstellvorrichtung
@@ -29,7 +30,7 @@ import { CONFIG } from '../../config/config'
 */
 export class Aufstellvorrichtung extends PunktObjekt implements InfoToolOverlay {
     static loadErControlCounter: number = 0;
-    static layer: VectorLayer;
+    static layer: VectorLayer<VectorSource<Point | LineString>>;
     static select: SelectInteraction;
 
     private overlay: Overlay;
@@ -55,7 +56,7 @@ export class Aufstellvorrichtung extends PunktObjekt implements InfoToolOverlay
         return 'black';
     }
 
-    static getLayer(map?: Map): VectorLayer {
+    static getLayer(map?: Map): VectorLayer<VectorSource<Point | LineString>> {
         if (!Aufstellvorrichtung.layer) {
             Aufstellvorrichtung.layer = Aufstellvorrichtung.createLayer(map);
         }
@@ -486,7 +487,7 @@ export class Aufstellvorrichtung extends PunktObjekt implements InfoToolOverlay
             stopEvent: false
         });
 
-        this.overlay.on("click", () => {
+        this.overlay.getElement().addEventListener("click", () => {
             this.hideOverlay(map);
             return false;
         });

src/ts/Objekte/Dokument.ts

@@ -9,7 +9,7 @@ import { SekundaerObjekt } from "./prototypes/SekundaerObjekt";
  * @version 2020.01.28
  * @license GPL-3.0-or-later
 */
-export class Dokument extends SekundaerObjekt {
+export class Dokument extends SekundaerObjekt<null> {
     protected art: Klartext
     protected beschreib: string
     protected standort: string

src/ts/Objekte/QuerStation.ts

@@ -2,7 +2,7 @@
 
 import { Map } from 'ol';
 import Feature from 'ol/Feature';
-import { Point } from 'ol/geom';
+import { LineString, Point } from 'ol/geom';
 import MultiLineString from 'ol/geom/MultiLineString';
 import VectorSource from 'ol/source/Vector';
 import { Stroke, Style } from 'ol/style';
@@ -30,7 +30,7 @@ export class QuerStation {
     private _querschnitte: { [streifen: string]: { [streifennr: number]: Querschnitt } } = {};
     private linienPunkte: LinienPunkt[];
     public aufbaudatenLoaded: Promise<{ [fid: string]: Aufbau[] }>;
-    private static layerStation: VectorLayer;
+    private static layerStation: VectorLayer<VectorSource<MultiLineString | Point>>;
 
     constructor(abschnitt: Abschnitt, vst: number, bst: number) {
         this.daten = Daten.getInstanz();
@@ -120,17 +120,17 @@ export class QuerStation {
         let letzter = this.linienPunkte[this.linienPunkte.length - 1];
         let statTrenn = [];
         statTrenn.push([Vektor.sum(letzter.getCoordinates(), Vektor.multi(letzter.seitlicherVektorAmPunkt, 30)), Vektor.sum(letzter.getCoordinates(), Vektor.multi(letzter.seitlicherVektorAmPunkt, -30))]);
-        QuerStation.layerStation.getSource().addFeature(new Feature({ geom: new Point(letzter.getCoordinates()) }));
+        QuerStation.layerStation.getSource().addFeature(new Feature<Point>({ geom: new Point(letzter.getCoordinates()) }));
         if (this.vst == 0) {
             statTrenn.push([Vektor.sum(erster.getCoordinates(), Vektor.multi(erster.seitlicherVektorAmPunkt, 30)), Vektor.sum(erster.getCoordinates(), Vektor.multi(erster.seitlicherVektorAmPunkt, -30))]);
-            QuerStation.layerStation.getSource().addFeature(new Feature({ geom: new Point(erster.getCoordinates()) }));
+            QuerStation.layerStation.getSource().addFeature(new Feature<Point>({ geom: new Point(erster.getCoordinates()) }));
         }
 
         if (this.linie) {
             this.linie.setCoordinates(statTrenn)
         } else {
             this.linie = new MultiLineString(statTrenn);
-            let feat = new Feature({
+            let feat = new Feature<MultiLineString>({
                 geometry: this.linie,
                 objekt: this,
             });

src/ts/Objekte/Querschnittsdaten.ts

@@ -3,7 +3,7 @@
 import { Feature, Map } from 'ol';
 import { Condition, never, singleClick } from 'ol/events/condition';
 import { FeatureLike } from 'ol/Feature';
-import { MultiLineString, Polygon } from 'ol/geom';
+import { LineString, MultiLineString, Polygon } from 'ol/geom';
 import VectorSource from 'ol/source/Vector';
 import { Fill, Stroke, Style, Text } from 'ol/style';
 import { Daten } from '../Daten';
@@ -25,7 +25,7 @@ import { QuerStation } from './QuerStation';
  * @version 2020.04.22
  * @license GPL-3.0-or-later
 */
-export class Querschnitt extends PrimaerObjekt implements InfoToolEditable {
+export class Querschnitt extends PrimaerObjekt<Polygon> implements InfoToolEditable {
     private _aufbaudaten: Aufbau[] = null;
     public trenn: Feature<MultiLineString>;
 
@@ -47,8 +47,8 @@ export class Querschnitt extends PrimaerObjekt implements InfoToolEditable {
     private streifennr: number = null;
     private hasSekObj: number = null;
     private static loadErControlCounter: number = 0;
-    private static layerTrenn: VectorLayer;
-    private static layerQuer: VectorLayer;
+    private static layerTrenn: VectorLayer<VectorSource<MultiLineString>>;
+    private static layerQuer: VectorLayer<VectorSource<Polygon>>;
     private static selectFlaechen: SelectInteraction;
     private static selectLinien: SelectInteraction;
     private static selectLinienCondition: Condition = singleClick;

src/ts/Objekte/StrassenAusPunkt.ts

@@ -13,6 +13,8 @@ import { PublicWFS } from '../PublicWFS';
 import { Abschnitt } from './Abschnitt';
 import { Klartext } from './Klartext';
 import { PunktObjekt } from './prototypes/PunktObjekt';
+import VectorSource from "ol/source/Vector";
+import { LineString, Point } from "ol/geom";
 
 /**
  * Strassenausstrattung (punktuell)
@@ -35,7 +37,7 @@ export class StrassenAusPunkt extends PunktObjekt {
         return 'black';
     }
 
-    static getLayer(map?: Map): VectorLayer {
+    static getLayer(map?: Map): VectorLayer<VectorSource<Point | LineString>> {
         if (!StrassenAusPunkt.layer) {
             StrassenAusPunkt.layer = StrassenAusPunkt.createLayer(map);
         }

src/ts/Objekte/Zeichen.ts

@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
+import { Point } from "ol/geom";
 import { Klartext } from "./Klartext";
 import { SekundaerObjekt } from "./prototypes/SekundaerObjekt";
 
@@ -9,7 +10,7 @@ import { SekundaerObjekt } from "./prototypes/SekundaerObjekt";
  * @version 2019.10.29
  * @license GPL-3.0-or-later
 */
-export class Zeichen extends SekundaerObjekt {
+export class Zeichen extends SekundaerObjekt<null> {
     private hasSekObj: string = null;
     private stvoznr: Klartext = null;
     private sort: number = null;

src/ts/Objekte/prototypes/Objekt.ts

@@ -13,7 +13,7 @@ import { CONFIG_WFS } from '../../../config/config_wfs'
  * @version 2020.04.03
  * @license GPL-3.0-or-later
 */
-export abstract class Objekt extends Feature<Polygon | Point | LineString> {
+export abstract class Objekt<GeometryType extends Polygon | Point | LineString> extends Feature<GeometryType> {
 	protected kherk: Klartext = null;
 	protected baujahrGew: string = null;
 	protected abnahmeGew: string = null;

src/ts/Objekte/prototypes/PObjektMitDateien.ts

@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
+import { LineString, Point, Polygon } from 'ol/geom';
 import { PublicWFS } from '../../PublicWFS';
 import { Dokument } from '../Dokument';
 import { PrimaerObjekt } from './PrimaerObjekt';
@@ -10,7 +11,7 @@ import { PrimaerObjekt } from './PrimaerObjekt';
  * @version 2020.01.28
  * @license GPL-3.0-or-later
 */
-export abstract class PObjektMitDokument extends PrimaerObjekt {
+export abstract class PObjektMitDokument<GeometryType extends Polygon | Point | LineString> extends PrimaerObjekt<GeometryType> {
     protected dateien: Dokument[] = [];
     protected dateienLoaded: Promise<Dokument[]>;
 

src/ts/Objekte/prototypes/PrimaerObjekt.ts

@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
+import { LineString, Point, Polygon } from "ol/geom";
 import { InfoToolSelectable } from "../../Tools/InfoTool";
 import { Objekt } from "./Objekt";
 
@@ -9,7 +10,7 @@ import { Objekt } from "./Objekt";
  * @version 2020.01.28
  * @license GPL-3.0-or-later
 */
-export abstract class PrimaerObjekt extends Objekt implements InfoToolSelectable {
+export abstract class PrimaerObjekt<GeometryType extends Polygon | Point | LineString> extends Objekt<GeometryType> implements InfoToolSelectable {
 	protected abschnittOderAst: string = null;
 	protected vst: number = null;
 	protected bst: number = null;

src/ts/Objekte/prototypes/PunktObjekt.ts

@@ -19,7 +19,7 @@ import { PObjektMitDokument } from "./PObjektMitDateien";
  * @version 2020.04.03
  * @license GPL-3.0-or-later
 */
-export abstract class PunktObjekt extends PObjektMitDokument implements InfoToolEditable {
+export abstract class PunktObjekt extends PObjektMitDokument<Point | LineString> implements InfoToolEditable {
     protected vabstVst: number;
     protected vabstBst: number;
     protected rlageVst: Klartext;
@@ -85,9 +85,9 @@ export abstract class PunktObjekt extends PObjektMitDokument implements InfoTool
     }
 
 
-    protected static createLayer(map?: Map): VectorLayer {
-        let layer = new VectorLayer({
-            source: new VectorSource(),
+    protected static createLayer(map?: Map): VectorLayer<VectorSource<Point | LineString>> {
+        let layer = new VectorLayer<VectorSource<Point | LineString>>({
+            source: new VectorSource<Point | LineString>(),
             opacity: 0.7,
         });
         layer.setStyle((feat: FeatureLike, resolution: number) => {

src/ts/Objekte/prototypes/SekundaerObjekt.ts

@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
+import { LineString, Point, Polygon } from "ol/geom";
 import { Klartext } from "../Klartext";
 import { Objekt } from "./Objekt";
 
@@ -9,7 +10,7 @@ import { Objekt } from "./Objekt";
  * @version 2020.01.28
  * @license GPL-3.0-or-later
 */
-export abstract class SekundaerObjekt extends Objekt {
+export abstract class SekundaerObjekt<GeometryType extends Polygon | LineString | Point> extends Objekt<GeometryType> {
 	protected parent: Klartext = null;
 
 	getParent(): Klartext {