diff --git a/geoportal/geoportailv3_geoportal/static-ngeo/js/mvtstyling/MvtStylingService.js b/geoportal/geoportailv3_geoportal/static-ngeo/js/mvtstyling/MvtStylingService.js index 7490b5bc8..866a2199c 100644 --- a/geoportal/geoportailv3_geoportal/static-ngeo/js/mvtstyling/MvtStylingService.js +++ b/geoportal/geoportailv3_geoportal/static-ngeo/js/mvtstyling/MvtStylingService.js @@ -50,7 +50,7 @@ class MvtStylingService { * @param {ngeo.statemanager.Location} ngeoLocation ngeo location service. * @ngInject */ - constructor($http, appUserManager, uploadvtstyleUrl, deletevtstyleUrl, getvtstyleUrl, vectortilesUrl, ngeoBackgroundLayerMgr, ngeoLocation) { + constructor($http, appUserManager, uploadvtstyleUrl, uploadvtstyleUrlOverride, deletevtstyleUrl, deletevtstyleUrlOverride, getvtstyleUrl, vectortilesUrl, ngeoBackgroundLayerMgr, ngeoLocation) { this.http_ = $http; this.appUserManager_ = appUserManager; this.isCustomStyle = false; @@ -59,8 +59,8 @@ class MvtStylingService { topogr_global: false, topo_bw_jpeg: false }; - this.uploadvtstyleUrl_ = uploadvtstyleUrl; - this.deletevtstyleUrl_ = deletevtstyleUrl; + this.uploadvtstyleUrl_ = uploadvtstyleUrlOverride ? uploadvtstyleUrlOverride : uploadvtstyleUrl; + this.deletevtstyleUrl_ = deletevtstyleUrlOverride ? deletevtstyleUrlOverride : deletevtstyleUrl; this.getvtstyleUrl_ = getvtstyleUrl; this.vectortilesUrl_ = vectortilesUrl; this.backgroundLayerMgr_ = ngeoBackgroundLayerMgr; diff --git a/geoportal/vars.yaml b/geoportal/vars.yaml index 2e6d571a6..a3d45d5d9 100644 --- a/geoportal/vars.yaml +++ b/geoportal/vars.yaml @@ -178,8 +178,8 @@ vars: tiles3dUrl: https://3dtiles.geoportail.lu/3dtiles/ lidarProfileUrl: '{LIDAR_PROFILE_URL}' proxyWmsUrl: '{PROXYWMSURL}' - uploadvtstyleUrl: '{UPLOAD_VT_STYLE_URL}' - deletevtstyleUrl: '{DELETE_VT_STYLE_URL}' + uploadvtstyleUrlOverride: '{UPLOAD_VT_STYLE_URL}' + deletevtstyleUrlOverride: '{DELETE_VT_STYLE_URL}' geonetworkBaseUrl: '{GEONETWORK_BASE_URL}' vectortilesUrl: '{VECTORTILESURL}' wmtsUrl: '{WMTSURL}' @@ -245,12 +245,12 @@ vars: reverseGeocodingServiceUrl: {name: reverse_geocode} routingServiceUrl: {name: getremoteroute} shorturlServiceUrl: {name: shortener_create} - # uploadvtstyleUrl: {name: upload_vt_style} - # deletevtstyleUrl: {name: delete_vt_style} - getvtpermalinkUrl: {name: get_permalink_style} + uploadvtstyleUrl: {name: upload_vt_style} + deletevtstyleUrl: {name: delete_vt_style} + getvtstyleUrl: {name: get_vt_style} uploadvtpermalinkUrl: {name: upload_permalink_style} deletevtpermalinkUrl: {name: delete_permalink_style} - getvtstyleUrl: {name: get_vt_style} + getvtpermalinkUrl: {name: get_permalink_style} downloadPdfUrl: {name: download_pdf} static: appImagesPath: {name: 'geoportailv3_geoportal:static-ngeo/images/'} @@ -529,8 +529,8 @@ runtime_environment: - {name: PDS_SMTP_SERVER} - {name: PDS_BCC_ADDRESS} - {name: PROXYWMSURL, default: 'https://wmsproxy.geoportail.lu/ogcproxywms'} - - {name: UPLOAD_VT_STYLE_URL, default: 'https://map.geoportail.lu/uploadvtstyle'} - - {name: DELETE_VT_STYLE_URL, default: 'https://map.geoportail.lu/deletevtstyle'} + - {name: UPLOAD_VT_STYLE_URL} + - {name: DELETE_VT_STYLE_URL} - {name: REVERSE_GEOCODE_API_KEY, default: ''} - {name: REVERSE_GEOCODE_URL, default: 'http://open.mapquestapi.com/nominatim/v1/reverse.php'} - {name: ROUTING_GRAPHHOPPER_API_KEY, default: null}