@igo2/geo 18.0.0-next.1 → 18.0.0-next.11

package/locale/fr.geo.json

@@ -103,16 +103,21 @@
           "GPX": "GPX",
           "KML": "KML",
           "Shapefile": "Shapefile",
-          "CSVcomma": "CSV (séparateur virgule)",
-          "CSVsemicolon": "CSV (compatible Excel)",
+          "CSV": "CSV",
+          "Excel": "Excel",
           "URL": "Lien externe"
         },
+        "separator": "Séparateur",
+        "csv.separator": {
+          "auto": "Détection Automatique",
+          "comma": "Virgule",
+          "semicolon": "Point-virgule"
+        },
         "gpx.error.poly": {
           "title": "GPX en erreur",
           "text": "Le format GPX ne permet pas de stocker les polygones"
         },
         "encoding": {
-          "LATIN1": "LATIN-1",
           "UTF8": "UTF-8"
         },
         "combinedLayers": "couchesCombinees"
@@ -219,9 +224,26 @@
         "drawFeature": ""
       },
       "layer": {
+        "layer": "Couche",
+        "name": "Nom de la couche",
+        "group": {
+          "name": "Nom du groupe",
+          "create": "Créer un groupe",
+          "rename": "Renommer le groupe",
+          "hide": "Masquer le groupe",
+          "hideChildren": "Masquer par un groupe",
+          "show": "Afficher le groupe"
+        },
+        "type": {
+          "raster": "Imagerie",
+          "vector": "Vectoriel",
+          "measure": "Mesure",
+          "draw": "Dessin"
+        },
         "hideLayer": "Masquer la couche",
         "hideSelectedLayers": "Masquer les couches sélectionnées",
         "notInResolution": "La couche n'est pas visible à l'échelle active. Veuillez zoomer ou dézoomer pour la visualiser.",
+        "unavailableLayer": "Couche non disponible",
         "lowerLayer": "Mettre en arrière",
         "filterLowerLayer": "Le déplacement arrière se fait toujours selon l'ordre de la carte!",
         "filterPlaceholder": "Filtrer la liste de couches",
@@ -239,6 +261,7 @@
         "removeLayer": "Retirer la couche de la carte",
         "removeSelectedLayers": "Retirer les couches sélectionnées de la carte",
         "removeSelectedLayersRestriction": "Certaines couches sélectionnées ne peuvent être supprimées",
+        "deleteLayer": "Supprimer la couche",
         "showFeaturesList": "Afficher la liste des entités",
         "showLayer": "Afficher la couche",
         "showSelectedLayers": "Afficher les couches sélectionnées",
@@ -349,102 +372,100 @@
         },
         "showNorthArrow": "Afficher la flèche du nord"
       },
-      "directionsForm": {
-        "stopLayer": "Itinéraire - Arrêts",
-        "routeLayer": "Itinéraire - Tracé",
-        "start": "Début",
-        "intermediate": "Intermédiaire",
-        "end": "Fin",
-        "directionsBtn": "Obtenir l'itinéraire",
-        "resetDirectionsBtn": "Supprimer l'itinéraire",
-        "zoomRoute": "Zoomer sur l'itinéraire",
-        "null": "",
+      "directions": {
+        "buttons": {
+          "copyDirections": "Copier l'itinéraire dans le presse-papier",
+          "copyLink": "Copier le lien dans le presse-papier",
+          "downloadDirections": "Télécharger l'itinéraire",
+          "message": {
+            "copyDirections": "Itinéraire copié dans le presse papier",
+            "copyLink": "Lien copié dans le presse papier"
+          },
+          "resetStops": "Réinitialiser les arrêts",
+          "zoomOnRoute": "Cadrer sur l'itinéraire"
+        },
         "directions": "Itinéraire",
-        "raiseStop": "Prioriser l'arrêt",
-        "lowerStop": "Reporter l'arrêt plus loin dans le parcours",
-        "addStop": "Ajouter un arrêt",
-        "clearStop": "Réinitialiser cet arrêt",
-        "moveStop": "Déplacer cet arrêt",
-        "removeStop": "Supprimer l'arrêt",
-        "drivingOptions": "Choix d'itinéraires",
-        "summary": "Résumé de l'itinéraire",
-        "stopsList": "Liste des lieux d'arrêts",
-        "instructions": "Indications",
-        "copy": "Copier l'itinéraire",
-        "geolocate": "Utiliser sa localisation comme point d'arrêt",
-        "link": "Lien",
-        "print": "Imprimer",
-        "dialog": {
-          "copyMsg": "Itinéraire copié dans le presse-papier",
-          "copyMsgLink": "Le lien de l'itinéraire est copié dans le presse-papier",
-          "copyTitle": "Itinéraire"
+        "directionsText": {
+          "link": "Lien",
+          "stopList": "Arrêts",
+          "summary": "Résumé"
         },
-        "toggleActive": "Activer le contrôle d'itinéraire",
-        "toggleType": "Inclure les chemins forestiers",
         "forestRoadsWarning": {
           "title": "Avertissement",
           "text": "Certains chemins forestiers peuvent être impraticables ou non carrossables."
+        },
+        "input": {
+          "addStop": "Ajouter une destination",
+          "clearStop": "Réinitialiser l'arrêt",
+          "currentPosition": "Utiliser l'emplacement actuel",
+          "end": "Destination",
+          "intermediate": "Arrêt intermédiaire",
+          "moveStop": "Déplacer l'arrêt",
+          "placeholder": "Cliquez sur la carte ou effectuez une recherche",
+          "removeStop": "Supprimer l'arrêt",
+          "start": "Point de départ"
+        },
+        "layer": {
+          "stops": "Itinéraire - Arrêts",
+          "route": "Itinéraire - Tracé"
+        },
+        "results": {
+          "direction": {
+            "n": "nord",
+            "ne": "nord-est",
+            "e": "est",
+            "se": "sud-est",
+            "s": "sud",
+            "sw": "sud-ouest",
+            "w": "ouest",
+            "nw": "nord-ouest"
+          },
+          "maneuverModifier": {
+            "uturn": "demi-tour",
+            "sharp right": "fortement à droite",
+            "right": "à droite",
+            "slight right": "légèrement à droite",
+            "sharp left": "fortement à gauche",
+            "left": "à gauche",
+            "slight left": "légèrement à gauche",
+            "straight": "tout droit"
+          },
+          "maneuverType": {
+            "arrive": {
+              "lastStep": "Vous êtes arrivé à destination, {{name}}",
+              "intermediate": "Vous êtes arrivé à un point intermédiaire, {{name}}"
+            },
+            "continue": "Continuer sur {{name}}",
+            "depart": "Aller en direction {{maneuverBearing}} sur {{name}}",
+            "end of road": "À la fin de la route, tourner {{maneuverModifier}} sur {{name}}",
+            "exit roundabout": "Continuer sur {{name}}",
+            "fork": {
+              "left": "Garder la gauche sur {{name}}",
+              "right": "Garder la droite sur {{name}}",
+              "else": "Continuer sur {{name}}"
+            },
+            "merge": "Continuer sur {{name}}",
+            "new name": "Continuer en direction {{maneuverBearing}} sur {{name}}",
+            "notification": "",
+            "off ramp": "Prendre la sortie {{maneuverModifier}}",
+            "on ramp": "Prendre l'entrée {{maneuverModifier}}",
+            "rotary": "",
+            "roundabout": "Au rond-point, prendre la sortie vers {{name}}",
+            "roundabout turn": "",
+            "turn": {
+              "straight": "Continuer {{maneuverModifier}} sur {{name}}",
+              "uturn": "Faire {{maneuverModifier}} sur {{name}}",
+              "else": "Tourner {{maneuverModifier}} sur {{name}}"
+            }
+          },
+          "routeOptions": "Choix d'itinéraires",
+          "stepTitleTooltip": "Cadrer sur le lieu"
+        },
+        "toggle": {
+          "activateControl": "Activer les contrôles",
+          "type": "Inclure les chemins forestiers"
         }
       },
-      "directions": {
-        "uturn": "demi-tour",
-        "sharp right": "fortement à droite",
-        "right": "droite",
-        "slight right": "légèrement à droite",
-        "sharp left": "fortement à gauche",
-        "left": "gauche",
-        "slight left": "légèrement à gauche",
-        "straight": "tout droit",
-        "turn": {
-          "straight": "Continuer sur {{route}}",
-          "uturn": "Faire demi-tour sur {{route}}",
-          "else": "Tourner {{aggregatedDirection}} sur {{route}}"
-        },
-        "new name": "Continuer en direction {{translatedDirection}} sur {{route}}",
-        "depart": "Aller en direction {{translatedDirection}} sur {{route}}",
-        "arrive": {
-          "lastStep": "Vous êtes arrivé {{coma}} {{aggregatedDirection}}",
-          "intermediate": "Vous atteignez le point intermédiaire sur {{route}}"
-        },
-        "merge": "Continuer sur {{route}}",
-        "on ramp": "Prendre l'entrée d'autoroute {{aggregatedDirection}}",
-        "off ramp": "Prendre la sortie d'autoroute {{aggregatedDirection}}",
-        "fork": {
-          "left": "Garder la gauche sur {{route}}",
-          "right": "Garder la droite sur {{route}}",
-          "else": "Continuer sur {{route}}"
-        },
-        "end of road": "À la fin de la route, tourner {{translatedModifier}} sur {{route}}",
-        "use lane": "Prendre la voie de ...",
-        "continue": {
-          "notUturn": "Continuer sur {{route}}"
-        },
-        "roundabout": "Au rond-point, prendre la {{exit}}{{cntSuffix}} sortie vers {{route}}",
-        "rotary": "Rond-point rotary ...",
-        "roundabout turn": "Rond-point, prendre la ...",
-        "exit roundabout": "Poursuivre vers {{route}}",
-        "notification": "notification ...",
-        "uturnText": "Faire demi-tour et continuer en direction {{translatedDirection}} sur {{route}}",
-        "unknown": "???",
-
-        "cntSuffix": {
-          "first": "ère",
-          "secondAndMore": "e"
-        },
-        "modifier": {
-          "prefix": "à "
-        }
-      },
-      "cardinalPoints": {
-        "n": "nord",
-        "ne": "nord-est",
-        "e": "est",
-        "se": "sud-est",
-        "s": "sud",
-        "sw": "sud-ouest",
-        "w": "ouest",
-        "nw": "nord-ouest"
-      },
       "search": {
         "placeholder": "Rechercher une localisation ou une couche de données",
         "emptyType.placeholder": "Veuillez choisir un type de recherche",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igo2/geo",
-  "version": "18.0.0-next.1",
+  "version": "18.0.0-next.11",
   "description": "IGO Library",
   "author": "IGO Community",
   "keywords": [
@@ -40,8 +40,7 @@
     "nosleep.js": "^0.12.0",
     "ts-cacheable": "^1.0.6",
     "ts-md5": "^1.3.0",
-    "tslib": "^2.6.0",
-    "windows-1252": "^3.0.4"
+    "tslib": "^2.6.0"
   },
   "peerDependencies": {
     "@angular/animations": "^18.0.0",
@@ -51,10 +50,10 @@
     "@angular/material": "^18.0.0",
     "@angular/material-moment-adapter": "^18.0.0",
     "@angular/platform-browser": "^18.0.0",
-    "@igo2/auth": "^18.0.0-next.1",
-    "@igo2/common": "^18.0.0-next.1",
-    "@igo2/core": "^18.0.0-next.1",
-    "@igo2/utils": "^18.0.0-next.1",
+    "@igo2/auth": "^18.0.0-next.11",
+    "@igo2/common": "^18.0.0-next.11",
+    "@igo2/core": "^18.0.0-next.11",
+    "@igo2/utils": "^18.0.0-next.11",
     "@mat-datetimepicker/core": "~14.0.0",
     "file-saver": "^2.0.2",
     "flexsearch": "0.7.21",

package/src/_index.scss

@@ -1,2 +1,3 @@
-@forward './lib/search/search-bar/search-bar.theming.scss' as search-bar-* show search-bar-color,
+@forward './lib/search/search-bar/search-bar.theming.scss' as search-bar-* show
+    search-bar-color,
   search-bar-density, search-bar-theme;

package/src/geo-theme.scss

@@ -14,7 +14,7 @@
   @include draw-theme.igo-draw-theming($theme);
   @include feature-theme.igo-feature-theming($theme);
   @include filter-theme.igo-filter-theming($theme);
-  @include layer-theme.igo-layer-theming($theme);
+  @include layer-theme.themes($theme);
   @include map-theme.igo-map-theming($theme);
   @include measure-theme.igo-measure-theming($theme);
   @include search-theme.theme($theme);

package/src/lib/directions/directions-inputs/directions-inputs.theming.scss

@@ -0,0 +1,21 @@
+@use 'sass:map';
+@use '@angular/material' as mat;
+
+@mixin igo-directions-inputs-theming($theme) {
+  @include density($theme);
+}
+
+@mixin density($theme) {
+  $density: mat.m2-get-density-config($theme);
+
+  $theme: map.merge(
+    $theme,
+    (
+      density: $density - 5
+    )
+  );
+
+  igo-directions-inputs .prefix-actions {
+    @include mat.icon-button-density($theme);
+  }
+}

package/src/lib/directions/directions.theming.scss

@@ -1,6 +1,8 @@
 @use './directions-results/directions-results.theming' as
   directions-results-theme;
+@use './directions-inputs/directions-inputs.theming' as directions-inputs-theme;
 
 @mixin igo-directions-theming($theme) {
   @include directions-results-theme.igo-directions-results-theming($theme);
+  @include directions-inputs-theme.igo-directions-inputs-theming($theme);
 }

package/src/lib/layer/layer-group/layer-group.theme.scss

@@ -0,0 +1,28 @@
+@use 'sass:map';
+@use '@angular/material' as mat;
+
+@mixin theme($theme) {
+  @include color($theme);
+}
+
+@mixin color($theme) {
+  $background: map.get($theme, background);
+  $foreground: map.get($theme, foreground);
+  igo-layer-group {
+    background-color: mat.m2-get-color-from-palette($background, card);
+
+    button {
+      &.mat-default {
+        mat-icon {
+          color: mat.m2-get-color-from-palette($foreground, base);
+        }
+      }
+
+      &.disabled {
+        mat-icon {
+          color: mat.m2-get-color-from-palette($foreground, disabled);
+        }
+      }
+    }
+  }
+}

package/src/lib/layer/layer-item/layer-item.theme.scss

@@ -6,28 +6,31 @@
 }
 
 @mixin color($theme) {
+  $background: map.get($theme, background);
   $foreground: map.get($theme, foreground);
-  $primary: map.get($theme, primary);
-  $accent: map.get($theme, accent);
 
   igo-layer-item {
-    &.igo-layer-item-focused > mat-list-item {
-      background-color: mat.m2-get-color-from-palette($accent, lighter);
-      color: mat.m2-get-color-from-palette($primary, default-contrast);
-    }
+    background-color: mat.m2-get-color-from-palette($background, card);
 
     button {
-      &:not(.mat-primary) {
+      &.mat-default {
         mat-icon {
           color: mat.m2-get-color-from-palette($foreground, base);
         }
       }
 
-      mat-icon {
-        &.disabled {
+      &.disabled {
+        mat-icon {
           color: mat.m2-get-color-from-palette($foreground, disabled);
         }
       }
     }
+
+    .unavailable-layer {
+      background-color: mat.m2-get-color-from-palette(
+        $background,
+        disabled-list-option
+      );
+    }
   }
 }

package/src/lib/layer/layer-legend/layer-legend.theme.scss

@@ -0,0 +1,30 @@
+@use 'sass:map';
+@use '@angular/material' as mat;
+
+@mixin theme($theme) {
+  @include color($theme);
+  @include density($theme);
+}
+
+@mixin color($theme) {
+  $primary: map.get($theme, primary);
+
+  igo-layer-legend img:after {
+    border-top-color: mat.m2-get-color-from-palette($primary);
+  }
+}
+
+@mixin density($theme) {
+  $density: mat.m2-get-density-config($theme);
+
+  $theme: map.merge(
+    $theme,
+    (
+      density: $density - 3
+    )
+  );
+
+  igo-layer-legend {
+    @include mat.form-field-density($theme);
+  }
+}

package/src/lib/layer/layer-list/layer-list.theme.scss

@@ -0,0 +1,50 @@
+@use 'sass:map';
+@use '@angular/material' as mat;
+
+@mixin theme($theme) {
+  @include color($theme);
+}
+
+@mixin color($theme) {
+  $accent: map.get($theme, accent);
+  $hoveredColor: mat.m2-get-color-from-palette($accent, default);
+
+  igo-layer-list {
+    mat-tree-node {
+      &.--selected,
+      &.--dragged {
+        igo-layer-group,
+        igo-layer-item {
+          background-color: mat.m2-get-color-from-palette($accent, lighter);
+          color: mat.m2-get-color-from-palette($accent, default-contrast);
+        }
+      }
+
+      &.--children-selected {
+        igo-layer-group,
+        igo-layer-item {
+          background-color: adjust-color(
+            $color: mat.m2-get-color-from-palette($accent, lighter),
+            $lightness: 8%
+          );
+          color: mat.m2-get-color-from-palette($accent, default-contrast);
+        }
+      }
+
+      &.--drag-hover {
+        &::after {
+          border-color: $hoveredColor !important;
+        }
+      }
+    }
+
+    // Workaround, the hover freeze when a tree is expanded when dragging
+    mat-tree:not(.--dragging) {
+      mat-tree-node {
+        &:hover::after {
+          border-color: $hoveredColor;
+        }
+      }
+    }
+  }
+}

package/src/lib/layer/layer-unavailable/layer-unavailable.theme.scss

@@ -0,0 +1,19 @@
+@use 'sass:map';
+@use '@angular/material' as mat;
+
+@mixin theme($theme) {
+  @include color($theme);
+}
+
+@mixin color($theme) {
+  $background: map.get($theme, background);
+
+  igo-layer-unavailable {
+    .unavailable-layer {
+      background-color: mat.m2-get-color-from-palette(
+        $background,
+        disabled-list-option
+      );
+    }
+  }
+}

package/src/lib/layer/layer-viewer/_layer-viewer.theme.scss

@@ -0,0 +1,16 @@
+@use 'sass:map';
+@use '@angular/material' as mat;
+
+@mixin theme($theme) {
+  @include color($theme);
+}
+
+@mixin color($theme) {
+  $accent: map.get($theme, accent);
+
+  igo-layer-viewer {
+    .active-background {
+      background-color: mat.m2-get-color-from-palette($accent, 50);
+    }
+  }
+}

package/src/lib/layer/layer-visibility-button/layer-visibility-button.theme.scss

@@ -0,0 +1,27 @@
+@use 'sass:map';
+@use '@angular/material' as mat;
+
+@mixin theme($theme) {
+  @include color($theme);
+}
+
+@mixin color($theme) {
+  $foreground: map.get($theme, foreground);
+
+  igo-layer-visibility-button {
+    button {
+      &.mat-default {
+        mat-icon {
+          color: mat.m2-get-color-from-palette($foreground, base);
+        }
+      }
+
+      &.out-of-range,
+      &.disabled {
+        mat-icon {
+          color: mat.m2-get-color-from-palette($foreground, disabled);
+        }
+      }
+    }
+  }
+}

package/src/lib/layer/layer.theming.scss

@@ -1,10 +1,21 @@
 @use '@angular/material' as mat;
-@use './layer-legend/layer-legend.theming.scss' as layer-legend;
+@use './layer-legend/layer-legend.theme.scss' as layer-legend;
 @use './layer-list-tool/layer-list-tool.theming.scss' as layer-list-tool;
+@use './layer-unavailable/layer-unavailable.theme.scss' as layer-unavailable;
+@use './layer-visibility-button/layer-visibility-button.theme.scss' as
+  layer-visibility-button;
+@use './layer-viewer/layer-viewer.theme' as layer-viewer;
 @use './layer-item/layer-item.theme.scss' as layer-item;
+@use './layer-group/layer-group.theme.scss' as layer-group;
+@use './layer-list/layer-list.theme.scss' as layer-list;
 
-@mixin igo-layer-theming($theme) {
-  @include layer-legend.igo-layer-legend-theming($theme);
+@mixin themes($theme) {
+  @include layer-legend.theme($theme);
   @include layer-list-tool.theme($theme);
   @include layer-item.theme($theme);
+  @include layer-group.theme($theme);
+  @include layer-list.theme($theme);
+  @include layer-unavailable.theme($theme);
+  @include layer-viewer.theme($theme);
+  @include layer-visibility-button.theme($theme);
 }

package/esm2022/lib/layer/layer-list/layer-list-binding.directive.mjs

@@ -1,70 +0,0 @@
-import { Directive, Optional, Self } from '@angular/core';
-import { RouteService } from '@igo2/core/route';
-import { combineLatest } from 'rxjs';
-import { debounceTime, map } from 'rxjs/operators';
-import { MapService } from '../../map/shared/map.service';
-import { LayerListComponent } from './layer-list.component';
-import * as i0 from "@angular/core";
-import * as i1 from "./layer-list.component";
-import * as i2 from "../../map/shared/map.service";
-import * as i3 from "@igo2/core/route";
-export class LayerListBindingDirective {
-    mapService;
-    route;
-    component;
-    layersOrResolutionChange$$;
-    layersVisibility$$;
-    constructor(component, mapService, route) {
-        this.mapService = mapService;
-        this.route = route;
-        this.component = component;
-    }
-    ngOnInit() {
-        // Override input layers
-        // this.component.layers = [];
-        this.layersOrResolutionChange$$ = combineLatest([
-            this.mapService.getMap().layers$,
-            this.mapService.getMap().viewController.resolution$
-        ])
-            .pipe(debounceTime(10))
-            .subscribe((bunch) => {
-            const shownLayers = bunch[0].filter((layer) => {
-                return layer.showInLayerList === true;
-            });
-            this.component.layers = shownLayers;
-            this.setLayersVisibilityStatus(shownLayers, this.component.excludeBaseLayers);
-        });
-    }
-    setLayersVisibilityStatus(layers, excludeBaseLayers) {
-        if (this.layersVisibility$$ !== undefined) {
-            this.layersVisibility$$.unsubscribe();
-            this.layersVisibility$$ = undefined;
-        }
-        this.layersVisibility$$ = combineLatest(layers
-            .filter((layer) => layer.baseLayer !== excludeBaseLayers)
-            .map((layer) => layer.visible$))
-            .pipe(map((visibles) => visibles.every(Boolean)))
-            .subscribe((allLayersAreVisible) => (this.component.layersAreAllVisible = allLayersAreVisible));
-    }
-    ngOnDestroy() {
-        this.layersOrResolutionChange$$.unsubscribe();
-        if (this.layersVisibility$$ !== undefined) {
-            this.layersVisibility$$.unsubscribe();
-            this.layersVisibility$$ = undefined;
-        }
-    }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.2", ngImport: i0, type: LayerListBindingDirective, deps: [{ token: i1.LayerListComponent, self: true }, { token: i2.MapService }, { token: i3.RouteService, optional: true }], target: i0.ɵɵFactoryTarget.Directive });
-    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "18.2.2", type: LayerListBindingDirective, isStandalone: true, selector: "[igoLayerListBinding]", ngImport: i0 });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.2", ngImport: i0, type: LayerListBindingDirective, decorators: [{
-            type: Directive,
-            args: [{
-                    selector: '[igoLayerListBinding]',
-                    standalone: true
-                }]
-        }], ctorParameters: () => [{ type: i1.LayerListComponent, decorators: [{
-                    type: Self
-                }] }, { type: i2.MapService }, { type: i3.RouteService, decorators: [{
-                    type: Optional
-                }] }] });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGF5ZXItbGlzdC1iaW5kaW5nLmRpcmVjdGl2ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2dlby9zcmMvbGliL2xheWVyL2xheWVyLWxpc3QvbGF5ZXItbGlzdC1iaW5kaW5nLmRpcmVjdGl2ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsU0FBUyxFQUFxQixRQUFRLEVBQUUsSUFBSSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTdFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUVoRCxPQUFPLEVBQWdCLGFBQWEsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUNuRCxPQUFPLEVBQUUsWUFBWSxFQUFFLEdBQUcsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRW5ELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUUxRCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQzs7Ozs7QUFNNUQsTUFBTSxPQUFPLHlCQUF5QjtJQU8xQjtJQUNZO0lBUGQsU0FBUyxDQUFxQjtJQUM5QiwwQkFBMEIsQ0FBZTtJQUNqRCxrQkFBa0IsQ0FBZTtJQUVqQyxZQUNVLFNBQTZCLEVBQzdCLFVBQXNCLEVBQ1YsS0FBbUI7UUFEL0IsZUFBVSxHQUFWLFVBQVUsQ0FBWTtRQUNWLFVBQUssR0FBTCxLQUFLLENBQWM7UUFFdkMsSUFBSSxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUM7SUFDN0IsQ0FBQztJQUVELFFBQVE7UUFDTix3QkFBd0I7UUFDeEIsOEJBQThCO1FBQzlCLElBQUksQ0FBQywwQkFBMEIsR0FBRyxhQUFhLENBQUM7WUFDOUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxPQUFPO1lBQ2hDLElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLENBQUMsY0FBYyxDQUFDLFdBQVc7U0FDcEQsQ0FBQzthQUNDLElBQUksQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUFDLENBQUM7YUFDdEIsU0FBUyxDQUFDLENBQUMsS0FBd0IsRUFBRSxFQUFFO1lBQ3RDLE1BQU0sV0FBVyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxLQUFZLEVBQUUsRUFBRTtnQkFDbkQsT0FBTyxLQUFLLENBQUMsZUFBZSxLQUFLLElBQUksQ0FBQztZQUN4QyxDQUFDLENBQUMsQ0FBQztZQUNILElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxHQUFHLFdBQVcsQ0FBQztZQUNwQyxJQUFJLENBQUMseUJBQXlCLENBQzVCLFdBQVcsRUFDWCxJQUFJLENBQUMsU0FBUyxDQUFDLGlCQUFpQixDQUNqQyxDQUFDO1FBQ0osQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDO0lBRU8seUJBQXlCLENBQy9CLE1BQWUsRUFDZixpQkFBMEI7UUFFMUIsSUFBSSxJQUFJLENBQUMsa0JBQWtCLEtBQUssU0FBUyxFQUFFLENBQUM7WUFDMUMsSUFBSSxDQUFDLGtCQUFrQixDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQ3RDLElBQUksQ0FBQyxrQkFBa0IsR0FBRyxTQUFTLENBQUM7UUFDdEMsQ0FBQztRQUNELElBQUksQ0FBQyxrQkFBa0IsR0FBRyxhQUFhLENBQ3JDLE1BQU07YUFDSCxNQUFNLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLEtBQUssQ0FBQyxTQUFTLEtBQUssaUJBQWlCLENBQUM7YUFDeEQsR0FBRyxDQUFDLENBQUMsS0FBWSxFQUFFLEVBQUUsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQ3pDO2FBQ0UsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLFFBQW1CLEVBQUUsRUFBRSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQzthQUMzRCxTQUFTLENBQ1IsQ0FBQyxtQkFBNEIsRUFBRSxFQUFFLENBQy9CLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxtQkFBbUIsR0FBRyxtQkFBbUIsQ0FBQyxDQUM3RCxDQUFDO0lBQ04sQ0FBQztJQUVELFdBQVc7UUFDVCxJQUFJLENBQUMsMEJBQTBCLENBQUMsV0FBVyxFQUFFLENBQUM7UUFDOUMsSUFBSSxJQUFJLENBQUMsa0JBQWtCLEtBQUssU0FBUyxFQUFFLENBQUM7WUFDMUMsSUFBSSxDQUFDLGtCQUFrQixDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQ3RDLElBQUksQ0FBQyxrQkFBa0IsR0FBRyxTQUFTLENBQUM7UUFDdEMsQ0FBQztJQUNILENBQUM7dUdBM0RVLHlCQUF5QjsyRkFBekIseUJBQXlCOzsyRkFBekIseUJBQXlCO2tCQUpyQyxTQUFTO21CQUFDO29CQUNULFFBQVEsRUFBRSx1QkFBdUI7b0JBQ2pDLFVBQVUsRUFBRSxJQUFJO2lCQUNqQjs7MEJBT0ksSUFBSTs7MEJBRUosUUFBUSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IERpcmVjdGl2ZSwgT25EZXN0cm95LCBPbkluaXQsIE9wdGlvbmFsLCBTZWxmIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5cbmltcG9ydCB7IFJvdXRlU2VydmljZSB9IGZyb20gJ0BpZ28yL2NvcmUvcm91dGUnO1xuXG5pbXBvcnQgeyBTdWJzY3JpcHRpb24sIGNvbWJpbmVMYXRlc3QgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IGRlYm91bmNlVGltZSwgbWFwIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuXG5pbXBvcnQgeyBNYXBTZXJ2aWNlIH0gZnJvbSAnLi4vLi4vbWFwL3NoYXJlZC9tYXAuc2VydmljZSc7XG5pbXBvcnQgeyBMYXllciB9IGZyb20gJy4uL3NoYXJlZC9sYXllcnMvbGF5ZXInO1xuaW1wb3J0IHsgTGF5ZXJMaXN0Q29tcG9uZW50IH0gZnJvbSAnLi9sYXllci1saXN0LmNvbXBvbmVudCc7XG5cbkBEaXJlY3RpdmUoe1xuICBzZWxlY3RvcjogJ1tpZ29MYXllckxpc3RCaW5kaW5nXScsXG4gIHN0YW5kYWxvbmU6IHRydWVcbn0pXG5leHBvcnQgY2xhc3MgTGF5ZXJMaXN0QmluZGluZ0RpcmVjdGl2ZSBpbXBsZW1lbnRzIE9uSW5pdCwgT25EZXN0cm95IHtcbiAgcHJpdmF0ZSBjb21wb25lbnQ6IExheWVyTGlzdENvbXBvbmVudDtcbiAgcHJpdmF0ZSBsYXllcnNPclJlc29sdXRpb25DaGFuZ2UkJDogU3Vic2NyaXB0aW9uO1xuICBsYXllcnNWaXNpYmlsaXR5JCQ6IFN1YnNjcmlwdGlvbjtcblxuICBjb25zdHJ1Y3RvcihcbiAgICBAU2VsZigpIGNvbXBvbmVudDogTGF5ZXJMaXN0Q29tcG9uZW50LFxuICAgIHByaXZhdGUgbWFwU2VydmljZTogTWFwU2VydmljZSxcbiAgICBAT3B0aW9uYWwoKSBwcml2YXRlIHJvdXRlOiBSb3V0ZVNlcnZpY2VcbiAgKSB7XG4gICAgdGhpcy5jb21wb25lbnQgPSBjb21wb25lbnQ7XG4gIH1cblxuICBuZ09uSW5pdCgpIHtcbiAgICAvLyBPdmVycmlkZSBpbnB1dCBsYXllcnNcbiAgICAvLyB0aGlzLmNvbXBvbmVudC5sYXllcnMgPSBbXTtcbiAgICB0aGlzLmxheWVyc09yUmVzb2x1dGlvbkNoYW5nZSQkID0gY29tYmluZUxhdGVzdChbXG4gICAgICB0aGlzLm1hcFNlcnZpY2UuZ2V0TWFwKCkubGF5ZXJzJCxcbiAgICAgIHRoaXMubWFwU2VydmljZS5nZXRNYXAoKS52aWV3Q29udHJvbGxlci5yZXNvbHV0aW9uJFxuICAgIF0pXG4gICAgICAucGlwZShkZWJvdW5jZVRpbWUoMTApKVxuICAgICAgLnN1YnNjcmliZSgoYnVuY2g6IFtMYXllcltdLCBudW1iZXJdKSA9PiB7XG4gICAgICAgIGNvbnN0IHNob3duTGF5ZXJzID0gYnVuY2hbMF0uZmlsdGVyKChsYXllcjogTGF5ZXIpID0+IHtcbiAgICAgICAgICByZXR1cm4gbGF5ZXIuc2hvd0luTGF5ZXJMaXN0ID09PSB0cnVlO1xuICAgICAgICB9KTtcbiAgICAgICAgdGhpcy5jb21wb25lbnQubGF5ZXJzID0gc2hvd25MYXllcnM7XG4gICAgICAgIHRoaXMuc2V0TGF5ZXJzVmlzaWJpbGl0eVN0YXR1cyhcbiAgICAgICAgICBzaG93bkxheWVycyxcbiAgICAgICAgICB0aGlzLmNvbXBvbmVudC5leGNsdWRlQmFzZUxheWVyc1xuICAgICAgICApO1xuICAgICAgfSk7XG4gIH1cblxuICBwcml2YXRlIHNldExheWVyc1Zpc2liaWxpdHlTdGF0dXMoXG4gICAgbGF5ZXJzOiBMYXllcltdLFxuICAgIGV4Y2x1ZGVCYXNlTGF5ZXJzOiBib29sZWFuXG4gICkge1xuICAgIGlmICh0aGlzLmxheWVyc1Zpc2liaWxpdHkkJCAhPT0gdW5kZWZpbmVkKSB7XG4gICAgICB0aGlzLmxheWVyc1Zpc2liaWxpdHkkJC51bnN1YnNjcmliZSgpO1xuICAgICAgdGhpcy5sYXllcnNWaXNpYmlsaXR5JCQgPSB1bmRlZmluZWQ7XG4gICAgfVxuICAgIHRoaXMubGF5ZXJzVmlzaWJpbGl0eSQkID0gY29tYmluZUxhdGVzdChcbiAgICAgIGxheWVyc1xuICAgICAgICAuZmlsdGVyKChsYXllcikgPT4gbGF5ZXIuYmFzZUxheWVyICE9PSBleGNsdWRlQmFzZUxheWVycylcbiAgICAgICAgLm1hcCgobGF5ZXI6IExheWVyKSA9PiBsYXllci52aXNpYmxlJClcbiAgICApXG4gICAgICAucGlwZShtYXAoKHZpc2libGVzOiBib29sZWFuW10pID0+IHZpc2libGVzLmV2ZXJ5KEJvb2xlYW4pKSlcbiAgICAgIC5zdWJzY3JpYmUoXG4gICAgICAgIChhbGxMYXllcnNBcmVWaXNpYmxlOiBib29sZWFuKSA9PlxuICAgICAgICAgICh0aGlzLmNvbXBvbmVudC5sYXllcnNBcmVBbGxWaXNpYmxlID0gYWxsTGF5ZXJzQXJlVmlzaWJsZSlcbiAgICAgICk7XG4gIH1cblxuICBuZ09uRGVzdHJveSgpIHtcbiAgICB0aGlzLmxheWVyc09yUmVzb2x1dGlvbkNoYW5nZSQkLnVuc3Vic2NyaWJlKCk7XG4gICAgaWYgKHRoaXMubGF5ZXJzVmlzaWJpbGl0eSQkICE9PSB1bmRlZmluZWQpIHtcbiAgICAgIHRoaXMubGF5ZXJzVmlzaWJpbGl0eSQkLnVuc3Vic2NyaWJlKCk7XG4gICAgICB0aGlzLmxheWVyc1Zpc2liaWxpdHkkJCA9IHVuZGVmaW5lZDtcbiAgICB9XG4gIH1cbn1cbiJdfQ==