diff --git a/angular.json b/angular.json index d43381d533faa0db8686f75273d31a0f487733a7..03d530a815bf0a6575eb9e2ae9b5676edba49ebb 100644 --- a/angular.json +++ b/angular.json @@ -46,7 +46,8 @@ "src/app/@theme/styles/styles.scss", "node_modules/leaflet-timedimension/dist/leaflet.timedimension.control.css", "node_modules/leaflet.awesome-markers/dist/leaflet.awesome-markers.css", - "node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css" + "node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css", + "node_modules/leaflet-draw/dist/leaflet.draw.css" ], "scripts": [ "node_modules/pace-js/pace.min.js", diff --git a/package-lock.json b/package-lock.json index 8edf0c163619dc1c655c3b9ae441b1bb35b11a1e..0bb18e2c719c4c098fe268542518295ce9cf73e9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1258,9 +1258,14 @@ } }, "@asymmetrik/ngx-leaflet": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@asymmetrik/ngx-leaflet/-/ngx-leaflet-3.0.1.tgz", - "integrity": "sha512-rQaqLM/n9gIPMKkNDOd3+H1kiQiuXtY5KVOM5cPJCoetaN9oIJrCATQHPRO47j1os8Wqcv5I0BKEH/EtTtVuiA==" + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@asymmetrik/ngx-leaflet/-/ngx-leaflet-5.0.1.tgz", + "integrity": "sha512-0C/C1seJvXeOYp//yPrgi55v3yQ42JCFkMSAc/CuJCwMXlkGSfJ0Sd/yb/zY2ElhOknfIMJg68jVTbNxMqlz2Q==" + }, + "@asymmetrik/ngx-leaflet-draw": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@asymmetrik/ngx-leaflet-draw/-/ngx-leaflet-draw-7.0.0.tgz", + "integrity": "sha512-BgTqx9RFumMFL9wKcg/p52Q+hVFHkeiYZ5fBek7hxBPvUekEoISs2CZtCf20evyI9XtXwZgSfZQkIZJx7ztJZA==" }, "@asymmetrik/ngx-leaflet-markercluster": { "version": "5.0.1", @@ -4788,6 +4793,15 @@ "@types/geojson": "*" } }, + "@types/leaflet-draw": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/leaflet-draw/-/leaflet-draw-1.0.5.tgz", + "integrity": "sha512-m/vmhI1XjiBZphwKwmmcOoxbMd0ybN78uZb1c9//zOG0aWVYJd3XTnIW1pnPhxhIB4EB1tgjmWjq0YQM/IyuXg==", + "dev": true, + "requires": { + "@types/leaflet": "*" + } + }, "@types/leaflet.awesome-markers": { "version": "2.0.24", "resolved": "https://registry.npmjs.org/@types/leaflet.awesome-markers/-/leaflet.awesome-markers-2.0.24.tgz", @@ -14334,6 +14348,11 @@ "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.2.0.tgz", "integrity": "sha512-Bold8phAE6WcRsuwhofrQ7cOK1REFHaYIkKuj7+TBYK3ONKRpGGIb5oXR5akYotFnrWN0TWKh6Svlhflm3dogg==" }, + "leaflet-draw": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/leaflet-draw/-/leaflet-draw-1.0.4.tgz", + "integrity": "sha512-rsQ6saQO5ST5Aj6XRFylr5zvarWgzWnrg46zQ1MEOEIHsppdC/8hnN8qMoFvACsPvTioAuysya/TVtog15tyAQ==" + }, "leaflet-timedimension": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/leaflet-timedimension/-/leaflet-timedimension-1.1.1.tgz", diff --git a/package.json b/package.json index 96716238842d1bcbb40eedd36dd783a0028ebb8c..86f8ea514dd5dfe2fb3e3a47205f38823247021c 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,8 @@ "@angular/platform-browser": "^11.0.9", "@angular/platform-browser-dynamic": "^11.0.9", "@angular/router": "^11.0.9", - "@asymmetrik/ngx-leaflet": "3.0.1", + "@asymmetrik/ngx-leaflet": "5.0.1", + "@asymmetrik/ngx-leaflet-draw": "^7.0.0", "@asymmetrik/ngx-leaflet-markercluster": "^5.0.1", "@fortawesome/angular-fontawesome": "^0.8.2", "@fortawesome/fontawesome-svg-core": "^1.2.34", @@ -81,6 +82,7 @@ "ionicons": "2.0.1", "iso8601-js-period": "^0.2.1", "leaflet": "1.2.0", + "leaflet-draw": "^1.0.4", "leaflet-timedimension": "^1.1.1", "leaflet.awesome-markers": "^2.0.5", "leaflet.heat": "0.2.0", @@ -125,6 +127,7 @@ "@types/jasmine": "3.5.14", "@types/jasminewd2": "2.0.8", "@types/leaflet": "1.2.3", + "@types/leaflet-draw": "^1.0.5", "@types/leaflet.heat": "0.2.0", "@types/node": "14.11.2", "codelyzer": "^6.0.0", diff --git a/src/app/pages/tecnalia-module/noise-comp/noise-comp.component.ts b/src/app/pages/tecnalia-module/noise-comp/noise-comp.component.ts index 858f4fcd4edb52d2e812b6a5ad7aea64e4f2a177..de71199122180180d0e40772b2cd1f9f0199561a 100644 --- a/src/app/pages/tecnalia-module/noise-comp/noise-comp.component.ts +++ b/src/app/pages/tecnalia-module/noise-comp/noise-comp.component.ts @@ -3,7 +3,6 @@ import { HttpHeaders, HttpClient } from '@angular/common/http'; import * as L from 'leaflet'; import { ConfigService } from '@ngx-config/core'; import { GetNoiseComputationService } from '../services/get-noisecomputation.service'; -import "leaflet-draw"; @Component({ selector: 'ngx-noise-comp', diff --git a/src/app/pages/tecnalia-module/tecnalia-module.module.ts b/src/app/pages/tecnalia-module/tecnalia-module.module.ts index c706a357a21444f15617796d8bb06db110dd2939..21c1ed88aa5bab2182ca775d4b1df62cb406c4a1 100644 --- a/src/app/pages/tecnalia-module/tecnalia-module.module.ts +++ b/src/app/pages/tecnalia-module/tecnalia-module.module.ts @@ -14,12 +14,14 @@ import { GlobalPositionStrategy } from '@angular/cdk/overlay'; import { GlTrafficPredictionComponent } from './gltraffic-prediction/gltraffic-prediction.component'; import { BikeTrajectoryComponent } from './bike-trajectory/bike-trajectory.component'; import { NoiseCompComponent } from './noise-comp/noise-comp.component'; +import { LeafletDrawModule } from '@asymmetrik/ngx-leaflet-draw'; @NgModule({ declarations: [TrafficPredictionComponent, BikeAnalysisComponent, BikeTrajectoryComponent, BusOdComponent, GlTrafficPredictionComponent, NoiseCompComponent], imports: [ CommonModule, LeafletModule, + LeafletDrawModule, MatSliderModule, TecnaliaModuleRoutingModule, NgxChartsModule,