ajout affichage des isochrones

Author: cdebarros

…tensions-openlayers-1.0.0-beta.8-492.tgz …tensions-openlayers-1.0.0-beta.8-493.tgzlib/geopf-extensions-openlayers-1.0.0-beta.8-492.tgz renamed to lib/geopf-extensions-openlayers-1.0.0-beta.8-493.tgz lib/geopf-extensions-openlayers-1.0.0-beta.8-492.tgz renamed to lib/geopf-extensions-openlayers-1.0.0-beta.8-493.tgz

@@ -12,7 +12,7 @@
   "dependencies": {
     "@edugouvfr/ngx-dsfr": "^1.12.6",
     "@gouvfr/dsfr": "^1.11.0",
-    "geopf-extensions-openlayers": "./lib/geopf-extensions-openlayers-1.0.0-beta.8-492.tgz",
+    "geopf-extensions-openlayers": "./lib/geopf-extensions-openlayers-1.0.0-beta.8-493.tgz",
     "geoportal-access-lib": "^3.4.4",
     "ol": "^10.3.1",
     "opening_hours": "^3.8.0"

package-lock.json

@@ -5,6 +5,7 @@ import Control from 'ol/control/Control';
 import { CartospIsocurve } from "geopf-extensions-openlayers/src";
 import { RightpanelService } from '../../rightpanel/rightpanel.service';
 import { LocalisationInfoComponent } from '../../rightpanel/content/localisation-info/localisation-info.component';
+import { ApicartospService } from '../../services/apicartosp.service';
 
 @Component({
   selector: 'app-isochrone-simple',
@@ -16,46 +17,140 @@ export class IsochroneSimpleComponent implements OnInit {
   @Input() map!: Map;
   control!: Control;
 
-  constructor(private elementRef: ElementRef, private rightpanelService: RightpanelService) {}
+  constructor(private elementRef: ElementRef, private rightpanelService: RightpanelService, private apicartospService: ApicartospService) {}
 
   ngOnInit() {
     this.control = new CartospIsocurve({
       position : "top-left",
       target: this.elementRef.nativeElement,
-      typologyLocations: [
-        {nom:"Hautes-Alpes", code: "05", bbox: [5.4184,44.1865,7.0771,45.1268]}, 
-        {nom:"Indre", code: "36", bbox: [0.8675,46.3471,2.2046,47.2773]}, 
-        {nom:"Nord", code: "59", bbox: [2.0677,49.9691,4.2311,51.089]} 
+      locations: [
+        {nom:"Ain", code: "01"},
+        {nom:"Aisne", code: "02"},
+        {nom:"Allier", code: "03"},
+        {nom:"Alpes-de-Haute-Provence", code: "04"},
+        {nom:"Hautes-Alpes", code: "05"},
+        {nom:"Alpes-Maritimes", code: "06"},
+        {nom:"Ardèche", code: "07"},
+        {nom:"Ardennes", code: "08"},
+        {nom:"Ariège", code: "09"},
+        {nom:"Aube", code: "10"},
+        {nom:"Aude", code: "11"},
+        {nom:"Aveyron", code: "12"},
+        {nom:"Bouches-du-Rhône", code: "13"},
+        {nom:"Calvados", code: "14"},
+        {nom:"Cantal", code: "15"},
+        {nom:"Charente", code: "16"},
+        {nom:"Charente-Maritime", code: "17"},
+        {nom:"Cher", code: "18"},
+        {nom:"Corrèze", code: "19"},
+        {nom:"Corse-du-Sud", code: "2A"},
+        {nom:"Haute-Corse", code: "2B"},
+        {nom:"Côte-d'Or", code: "21"},
+        {nom:"Côtes-d'Armor", code: "22"},
+        {nom:"Creuse", code: "23"},
+        {nom:"Dordogne", code: "24"},
+        {nom:"Doubs", code: "25"},
+        {nom:"Drôme", code: "26"},
+        {nom:"Eure", code: "27"},
+        {nom:"Eure-et-Loir", code: "28"},
+        {nom:"Finistère", code: "29"},
+        {nom:"Gard", code: "30"},
+        {nom:"Haute-Garonne", code: "31"},
+        {nom:"Gers", code: "32"},
+        {nom:"Gironde", code: "33"},
+        {nom:"Hérault", code: "34"},
+        {nom:"Ille-et-Vilaine", code: "35"},
+        {nom:"Indre", code: "36"},
+        {nom:"Indre-et-Loire", code: "37"},
+        {nom:"Isère", code: "38"},
+        {nom:"Jura", code: "39"},
+        {nom:"Landes", code: "40"},
+        {nom:"Loir-et-Cher", code: "41"},
+        {nom:"Loire", code: "42"},
+        {nom:"Haute-Loire", code: "43"},
+        {nom:"Loire-Atlantique", code: "44"},
+        {nom:"Loiret", code: "45"},
+        {nom:"Lot", code: "46"},
+        {nom:"Lot-et-Garonne", code: "47"},
+        {nom:"Lozère", code: "48"},
+        {nom:"Maine-et-Loire", code: "49"},
+        {nom:"Manche", code: "50"},
+        {nom:"Marne", code: "51"},
+        {nom:"Haute-Marne", code: "52"},
+        {nom:"Mayenne", code: "53"},
+        {nom:"Meurthe-et-Moselle", code: "54"},
+        {nom:"Meuse", code: "55"},
+        {nom:"Morbihan", code: "56"},
+        {nom:"Moselle", code: "57"},
+        {nom:"Nièvre", code: "58"},
+        {nom:"Nord", code: "59"},
+        {nom:"Oise", code: "60"},
+        {nom:"Orne", code: "61"},
+        {nom:"Pas-de-Calais", code: "62"},
+        {nom:"Puy-de-Dôme", code: "63"},
+        {nom:"Pyrénées-Atlantiques", code: "64"},
+        {nom:"Hautes-Pyrénées", code: "65"},
+        {nom:"Pyrénées-Orientales", code: "66"},
+        {nom:"Bas-Rhin", code: "67"},
+        {nom:"Haut-Rhin", code: "68"},
+        {nom:"Rhône", code: "69"},
+        {nom:"Haute-Saône", code: "70"},
+        {nom:"Saône-et-Loire", code: "71"},
+        {nom:"Sarthe", code: "72"},
+        {nom:"Savoie", code: "73"},
+        {nom:"Haute-Savoie", code: "74"},
+        {nom:"Paris", code: "75"},
+        {nom:"Seine-Maritime", code: "76"},
+        {nom:"Seine-et-Marne", code: "77"},
+        {nom:"Yvelines", code: "78"},
+        {nom:"Deux-Sèvres", code: "79"},
+        {nom:"Somme", code: "80"},
+        {nom:"Tarn", code: "81"},
+        {nom:"Tarn-et-Garonne", code: "82"},
+        {nom:"Var", code: "83"},
+        {nom:"Vaucluse", code: "84"},
+        {nom:"Vendée", code: "85"},
+        {nom:"Vienne", code: "86"},
+        {nom:"Haute-Vienne", code: "87"},
+        {nom:"Vosges", code: "88"},
+        {nom:"Yonne", code: "89"},
+        {nom:"Territoire de Belfort", code: "90"},
+        {nom:"Essonne", code: "91"},
+        {nom:"Hauts-de-Seine", code: "92"},
+        {nom:"Seine-Saint-Denis", code: "93"},
+        {nom:"Val-de-Marne", code: "94"},
+        {nom:"Val-d'Oise", code: "95"},
+        {nom:"Guyane française", code: "973"},
+        {nom:"Guadeloupe", code: "971"},
+        {nom:"Martinique", code: "972"},
+        {nom:"Réunion", code: "974"},
+        {nom:"Mayotte", code: "976"},
+        {nom:"Saint-Barthélemy", code: "977"},
+        {nom:"Saint-Martin", code: "978"},
+        {nom:"Saint-Pierre-et-Miquelon", code: "975"},
+        {nom:"Wallis-et-Futuna", code: "986"},
+        {nom:"Polynésie française", code: "987"},
+        {nom:"Nouvelle-Calédonie", code: "988"}
       ],
-      typologyLayers: [
-        {title:"CAF", layername: "CAF_isochrone20", time: "20 min"},
-        {title:"CPAM", layername: "CPAM_isochrone20", time: "20 min"},
-        {title:"France Renov'", layername: "FranceRenov_isochrone20", time: "20 min"},
-        {title:"France Service", layername: "FranceService_isochrone20", time: "20 min"},
-        {title:"France Travail", layername: "FranceTravail_isochrone20", time: "20 min"},
-        {title:"MDS", layername: "MDS_isochrone20", time: "20 min"},
-        {title:"MSA", layername: "MSA_isochrone20", time: "20 min"},
-        {title:"Point Justice CDAD", layername: "PointJustice_CDAD_isochrone20", time: "20 min"},
-        {title:"SIP", layername: "SIP_isochrone20", time: "20 min"},
-        {title:"URSSAF", layername: "URSSAF_isochrone20", time: "20 min"},
-        {title:"Carsat", layername: "carsat_isochrone20", time: "20 min"},
-        {title:"CAF", layername: "CAF_isochrone30", time: "30 min"},
-        {title:"CPAM", layername: "CPAM_isochrone30", time: "30 min"},
-        {title:"France Renov'", layername: "FranceRenov_isochrone30", time: "30 min"},
-        {title:"France Service", layername: "FranceService_isochrone30", time: "30 min"},
-        {title:"France Travail", layername: "FranceTravail_isochrone30", time: "30 min"},
-        {title:"MDS", layername: "MDS_isochrone30", time: "30 min"},
-        {title:"MSA", layername: "MSA_isochrone30", time: "30 min"},
-        {title:"Point Justice CDAD", layername: "PointJustice_CDAD_isochrone30", time: "30 min"},
-        {title:"SIP", layername: "SIP_isochrone30", time: "30 min"},
-        {title:"URSSAF", layername: "URSSAF_isochrone30", time: "30 min"},
-        {title:"Carsat", layername: "carsat_isochrone30", time: "30 min"}
-      ]
+      typologies: [
+        {nom:"Caisse d'allocations familiales (Caf)"}, 
+        {nom:"Caisse primaire d’assurance maladie (CPAM)"}, 
+        {nom:"Espace conseil France rénov'"}, 
+        {nom:"France services"}, 
+        {nom:"France Travail"}, 
+        {nom:"Maison départementale des solidarités (MDS)"}, 
+        {nom:"Mutualité sociale agricole (MSA)"}, 
+        {nom:"Point-justice"}, 
+        {nom:"Service des impôts des particuliers (SIP)"}, 
+        {nom:"Caisse d'assurance retraite et de la santé au travail (Carsat)"},
+        {nom:"France Santé"}
+      ],
+      cartospApi: this.apicartospService.apiUrl + "/isochrone"
     });
 
     this.control.addEventListener("isochrone:add",  (e: any) => {
       this.rightpanelService.setContent(LocalisationInfoComponent,{map : this.map, location: {name: e.layer.values_.name_location,number: e.layer.values_.location}, type: "departement", isochronecall: true}, "locationinfo");
-      this.map.getView().fit(e.layer.values_.extent);
+      //this.map.getView().fit(e.layer.values_.extent);
     });
 
     this.control.addEventListener("isochrone:remove",  (e: any) => {

package.json

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { MinimapComponent } from './minimap.component';
+
+describe('MinimapComponent', () => {
+  let component: MinimapComponent;
+  let fixture: ComponentFixture<MinimapComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [MinimapComponent]
+    })
+    .compileComponents();
+    
+    fixture = TestBed.createComponent(MinimapComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/controls/isochrone-simple/isochrone-simple.component.ts

@@ -0,0 +1,28 @@
+import { Component, OnInit, Input, ElementRef } from '@angular/core';
+
+import Map from 'ol/Map';
+import Control from 'ol/control/Control';
+import { GeoportalOverviewMap } from "geopf-extensions-openlayers/src";
+
+@Component({
+  selector: 'app-minimap',
+  standalone: true,
+  imports: [],
+  template: '',
+  styleUrls: []
+})
+export class MinimapComponent implements OnInit {
+  @Input() map!: Map;
+  control!: Control;
+
+  constructor(private elementRef: ElementRef) {}
+
+  ngOnInit() {
+    this.control = new GeoportalOverviewMap({
+      position : "bottom-left",
+      auto: true
+    });
+
+    this.map.addControl(this.control);
+  }
+}

src/app/controls/minimap/minimap.component.spec.ts

@@ -32,7 +32,7 @@ export class SpwfsfilterComponent implements OnInit {
             ]
         },
         "Santé" : {
-            markerPath: "assets/images/mapmarker/social-sante/",
+            markerPath: "assets/images/mapmarker/sante/",
             topologies: [
                 "Centre de Santé",
                 "Centre Hospitalier (C.H.)", 
@@ -43,7 +43,7 @@ export class SpwfsfilterComponent implements OnInit {
             ]
         },
         "Social" : {
-            markerPath: "assets/images/mapmarker/social-sante/",
+            markerPath: "assets/images/mapmarker/social/",
             topologies: [
                 "Caisse commune de sécurité sociale (CCSS)",   
                 "Caisse d'allocations familiales (Caf)",

src/app/controls/minimap/minimap.component.ts

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TerritoireComponent } from './territoire.component';
+
+describe('TerritoireComponent', () => {
+  let component: TerritoireComponent;
+  let fixture: ComponentFixture<TerritoireComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [TerritoireComponent]
+    })
+    .compileComponents();
+    
+    fixture = TestBed.createComponent(TerritoireComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/controls/spwfsfilter/spwfsfilter.component.ts

@@ -0,0 +1,31 @@
+import { Component, OnInit, Input, ElementRef } from '@angular/core';
+
+import Map from 'ol/Map';
+import Control from 'ol/control/Control';
+import { Territories } from "geopf-extensions-openlayers/src";
+
+@Component({
+  selector: 'app-territoire',
+  standalone: true,
+  template: '',
+  styles: []
+})
+export class TerritoireComponent implements OnInit {
+  @Input() map!: Map;
+  control!: Control;
+
+  constructor(private elementRef: ElementRef) {}
+
+  ngOnInit() {
+    this.control = new Territories({
+      position : "bottom-left",
+      auto: true,
+      thumbnail: false,
+      reduce: false,
+      tiles: 0,
+      id: "territoires",
+    });
+
+    this.map.addControl(this.control);
+  }
+}

src/app/controls/territoire/territoire.component.spec.ts

@@ -14,6 +14,8 @@
             <app-scaleline [map]="map"></app-scaleline>
             <app-layerselector [map]="map"></app-layerselector>
             <app-spselector [map]="map"></app-spselector>
+            <app-territoire [map]="map"></app-territoire>
+            <app-minimap [map]="map"></app-minimap>
             <div id="tooltip-feature"></div>
         </div>
         <app-rightpanel [map]="map"></app-rightpanel>