Skip to content

GitLab

Commit b14555eb authored by FORESTIER Fabien's avatar FORESTIER Fabien
Browse files

Upgrade to angular 8 that should solve lazy loaded module, use titilium web... 

Upgrade to angular 8 that should solve lazy loaded module, use titilium web font on satellite view in the map
parent 0fd39ca6
Expand all Hide whitespace changes
Inline Side-by-side
Dockerfile
View file @ b14555eb
# Stage 0, based on Node.js, to build and compile Angular
FROM node:8.10.0 as builder
FROM node:12.13.0 as builder
WORKDIR /app
......
browserslist 0 → 100644
View file @ b14555eb
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries
# You can see what browsers were selected by your queries by running:
# npx browserslist
> 0.5%
last 2 versions
Firefox ESR
not dead
not IE 9-11 # For IE 9-11 support, remove 'not'.
\ No newline at end of file
config/config-dev.json
View file @ b14555eb
{
"backendUrls": {
"organizations": "/api/organizations",
"resources": "/api/resources",
"changelog": "/api/changelog",
"credits": "/api/credits/credits",
"auth": "/api/authentication/",
"middlewareLegacyAuth": "/api/middleware-legacy/",
"email": "/api/email",
"matomo": "/api/analytics/pageStats",
"elasticsearch": "/api/es-consumer-aware",
"catalogue": "/api/catalogue",
"reuses": "/api/reuses/reuses",
"organizations": "https://data-reloaded-dev.alpha.grandlyon.com/api/organizations",
"resources": "https://data-reloaded-dev.alpha.grandlyon.com/api/resources",
"changelog": "https://data-reloaded-dev.alpha.grandlyon.com/api/changelog",
"credits": "https://data-reloaded-dev.alpha.grandlyon.com/api/credits/credits",
"auth": "https://data-reloaded-dev.alpha.grandlyon.com/api/authentication/",
"middlewareLegacyAuth": "https://data-reloaded-dev.alpha.grandlyon.com/api/middleware-legacy/",
"email": "https://data-reloaded-dev.alpha.grandlyon.com/api/email",
"matomo": "https://data-reloaded-dev.alpha.grandlyon.com/api/analytics/pageStats",
"elasticsearch": "https://data-reloaded-dev.alpha.grandlyon.com/api/es-consumer-aware",
"catalogue": "https://data-reloaded-dev.alpha.grandlyon.com/api/catalogue",
"reuses": "https://data-reloaded-dev.alpha.grandlyon.com/api/reuses/reuses",
"wms": "https://data-reloaded-dev.alpha.grandlyon.com/api/services/wms",
"mvt": "https://data-reloaded-dev.alpha.grandlyon.com/api/services/mvt",
"geocoder": "https://download.data.grandlyon.com/geocoding/photon",
......
package-lock.json
View file @ b14555eb
This diff is collapsed.
package.json
View file @ b14555eb
......@@ -21,16 +21,15 @@
},
"private": true,
"dependencies": {
"@angular/animations": "7.2.4",
"@angular/animations": "8.2.14",
"@angular/cdk": "^7.3.1",
"@angular/common": "7.2.4",
"@angular/compiler": "7.2.4",
"@angular/core": "7.2.4",
"@angular/forms": "7.2.4",
"@angular/http": "7.2.4",
"@angular/platform-browser": "7.2.4",
"@angular/platform-browser-dynamic": "7.2.4",
"@angular/router": "7.2.4",
"@angular/common": "8.2.14",
"@angular/compiler": "8.2.14",
"@angular/core": "8.2.14",
"@angular/forms": "8.2.14",
"@angular/platform-browser": "8.2.14",
"@angular/platform-browser-dynamic": "8.2.14",
"@angular/router": "8.2.14",
"@turf/centroid": "^5.1.5",
"@turf/helpers": "^6.1.4",
"angulartics2": "^7.5.2",
......@@ -50,22 +49,22 @@
"ngx-cookie-service": "^2.2.0",
"ngx-infinite-scroll": "^6.0.1",
"node-rsa": "^1.0.3",
"rxjs": "^6.4.0",
"rxjs": "^6.5.4",
"xml2js": "^0.4.19",
"zone.js": "^0.8.29"
"zone.js": "~0.9.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.13.1",
"@angular/cli": "^7.3.1",
"@angular/compiler-cli": "7.2.4",
"@angular/language-service": "7.2.4",
"@angular-devkit/build-angular": "~0.803.23",
"@angular/cli": "^8.3.23",
"@angular/compiler-cli": "8.2.14",
"@angular/language-service": "8.2.14",
"@types/file-saver": "^2.0.1",
"@types/jasmine": "^2.8.12",
"@types/jasminewd2": "^2.0.6",
"@types/jwt-decode": "^2.2.1",
"@types/mapbox-gl": "^0.54.1",
"@types/node": "^6.14.2",
"codelyzer": "^4.5.0",
"codelyzer": "^5.0.1",
"jasmine-core": "~2.8.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "^4.0.0",
......@@ -83,7 +82,7 @@
"ts-node": "~4.1.0",
"tslint": "^5.12.1",
"tslint-config-airbnb": "^5.11.1",
"typescript": "3.2.4",
"typescript": "3.5.3",
"webpack-bundle-analyzer": "^3.1.0"
}
}
src/app/dataset-detail/components/dataset-map/dataset-map.component.ts
View file @ b14555eb
......@@ -24,7 +24,7 @@ export class DatasetMapComponent implements OnInit, OnDestroy {
@Output() featureClicked = new EventEmitter<mapboxgl.MapboxGeoJSONFeature>();
@ViewChild(MapComponent) mapComponent: MapComponent;
@ViewChild(MapComponent, { static: false }) mapComponent: MapComponent;
private _selectedFeature = null; // Contains the gid of the selected feature
private subscriptions: Subscription[] = [];
......
src/app/dataset-detail/components/dataset-resources/resource-downloadable/resource-downloadable.component.scss
View file @ b14555eb
......@@ -40,7 +40,7 @@
}
.resource-icon {
/deep/ svg {
::ng-deep svg {
height: 2.125rem;
.grey {
......@@ -54,31 +54,31 @@
}
.resource-icon.PDF {
/deep/ svg {
::ng-deep svg {
fill: #ef7575;
}
}
.resource-icon.ZIP {
/deep/ svg {
::ng-deep svg {
fill: #e5bb4e;
}
}
.resource-icon.ECW {
/deep/ svg {
::ng-deep svg {
fill: #da92bb;
}
}
.resource-icon.CSV {
/deep/ svg {
::ng-deep svg {
fill: #86b89b;
}
}
.resource-icon.TIF {
/deep/ svg {
::ng-deep svg {
fill: #7e99ce;
}
}
......
src/app/dataset-detail/components/dataset-table-map/dataset-table-map.component.ts
View file @ b14555eb
......@@ -12,7 +12,7 @@ import { DatasetMapComponent } from '../dataset-map/dataset-map.component';
})
export class DatasetTableMapComponent implements OnInit, OnDestroy {
@ViewChild(DatasetMapComponent) datasetMapComponent: DatasetMapComponent;
@ViewChild(DatasetMapComponent, { static: false }) datasetMapComponent: DatasetMapComponent;
// Component state
fullscreen = false;
......
src/app/datasets/components/search-bar/search-bar.component.ts
View file @ b14555eb
......@@ -16,7 +16,7 @@ export class SearchBarComponent implements OnInit {
// To be deleted
// @Input() searchOnChangeScope: boolean = true;
@ViewChild('inputSearch') inputSearch: ElementRef;
@ViewChild('inputSearch', { static: true }) inputSearch: ElementRef;
searchValue: string;
geosource = geosource;
......
src/app/datasets/datasets-routing.module.ts
View file @ b14555eb
......@@ -17,7 +17,7 @@ export const routes: Routes = [
},
{
path: `${AppRoutes.datasets.uri}/:id`,
loadChildren: '../dataset-detail/dataset-detail.module#DatasetDetailModule',
loadChildren: () => import('../dataset-detail/dataset-detail.module').then(m => m.DatasetDetailModule),
},
];
......
src/app/map/components/search-address/search-address.component.ts
View file @ b14555eb
......@@ -15,7 +15,7 @@ export class SearchAddressComponent implements OnInit {
@Output() searchAddress = new EventEmitter();
@Output() clearAddress = new EventEmitter();
@Output() addressSelected = new EventEmitter();
@ViewChild('inputSearch') inputSearch: ElementRef;
@ViewChild('inputSearch', { static: true }) inputSearch: ElementRef;
searchValue: string;
geosource = geosource;
......
src/assets/mapbox-gl-styles/satellite.json
View file @ b14555eb
......@@ -7,7 +7,7 @@
"https://ortho.data.grandlyon.com/?bbox={bbox-epsg-3857}&format=image/jpeg&service=WMS&version=1.1.1&request=GetMap&srs=EPSG:3857&width=512&height=512&transparent=true&layers=ortho2018"
],
"maxzoom": 21,
"attribution": "© <a href='https://www.openstreetmap.org/copyright'>OpenStreetMap</a> contributors"
"attribution": " © <a href='https://openmaptiles.org/'>OpenMapTiles</a> © <a href='https://www.openstreetmap.org/copyright'>OpenStreetMap contributors</a>"
},
"openmaptiles": {
"type": "vector",
......@@ -18,9 +18,8 @@
"maxzoom": 22
}
},
"glyphs": "https://openmaptiles.geo.data.gouv.fr/fonts/{fontstack}/{range}.pbf",
"layers": [
{
"glyphs": "https://minio.alpha.grandlyon.com/mapbox-glyphs/{fontstack}/{range}.pbf",
"layers": [{
"id": "simple-tiles",
"type": "raster",
"source": "raster-tiles"
......@@ -39,7 +38,7 @@
"symbol-placement": "line",
"text-field": "{name:latin} {name:nonlatin}",
"text-font": [
"Noto Sans Regular"
"titiliumweb-regular"
],
"text-transform": "uppercase",
"text-letter-spacing": 0.1,
......@@ -89,7 +88,7 @@
"layout": {
"text-field": "{name:latin}\n{name:nonlatin}",
"text-font": [
"Noto Sans Regular"
"titiliumweb-regular"
],
"text-max-width": 6,
"text-size": {
......
src/tsconfig.app.json
View file @ b14555eb
......@@ -3,7 +3,6 @@
"compilerOptions": {
"outDir": "../out-tsc/app",
"baseUrl": "./",
"module": "es2015",
"types": []
},
"exclude": [
......
src/tsconfig.spec.json
View file @ b14555eb
......@@ -3,7 +3,6 @@
"compilerOptions": {
"outDir": "../out-tsc/spec",
"baseUrl": "./",
"module": "commonjs",
"types": [
"jasmine",
"node"
......
tsconfig.json
View file @ b14555eb
{
"compileOnSave": false,
"compilerOptions": {
"module": "esnext",
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"target": "es5",
"target": "es2015",
"typeRoots": [
"node_modules/@types"
],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment