camel case

lib/api/map/anonymous-map-controller.js

@@ -133,7 +133,7 @@ function prepareAdapterMapConfig (mapConfigAdapter) {
     return function prepareAdapterMapConfigMiddleware (req, res, next) {
         const requestMapConfig = req.body;
 
-        const { user, api_key } = res.locals;
+        const { user, api_key: apiKey } = res.locals;
         const { dbuser, dbname, dbpassword, dbhost, dbport } = res.locals;
         const params = Object.assign({ dbuser, dbname, dbpassword, dbhost, dbport }, req.query);
 
@@ -149,7 +149,7 @@ function prepareAdapterMapConfig (mapConfigAdapter) {
                 },
                 batch: {
                     username: user,
-                    apiKey: api_key
+                    apiKey
                 }
             }
         };
@@ -181,12 +181,12 @@ function createLayergroup (mapBackend, userLimitsBackend, pgConnection, affected
         const requestMapConfig = req.body;
 
         const { context } = res.locals;
-        const { user, cache_buster, api_key } = res.locals;
+        const { user, cache_buster: cacheBuster, api_key: apiKey } = res.locals;
         const { dbuser, dbname, dbpassword, dbhost, dbport } = res.locals;
 
         const params = {
-            cache_buster,
-            api_key,
+            cache_buster: cacheBuster,
+            api_key: apiKey,
             dbuser,
             dbname,
             dbpassword,

lib/api/map/preview-template-controller.js

@@ -100,7 +100,7 @@ function getTemplate ({ label }) {
 function prepareLayerFilterFromPreviewLayers ({ namedMapProviderCache, label }) {
     return function prepareLayerFilterFromPreviewLayersMiddleware (req, res, next) {
         const { template } = res.locals;
-        const { config, auth_token } = req.query;
+        const { config, auth_token: authToken } = req.query;
 
         if (!template || !template.view || !template.view.preview_layers) {
             return next();
@@ -119,21 +119,21 @@ function prepareLayerFilterFromPreviewLayers ({ namedMapProviderCache, label })
             return next();
         }
 
-        const { user, token, cache_buster, api_key } = res.locals;
+        const { user, token, cache_buster: cacheBuster, api_key: apiKey } = res.locals;
         const { dbuser, dbname, dbpassword, dbhost, dbport } = res.locals;
-        const { template_id, format } = req.params;
+        const { template_id: templateId, format } = req.params;
 
         const params = {
             user,
             token,
-            cache_buster,
-            api_key,
+            cache_buster: cacheBuster,
+            api_key: apiKey,
             dbuser,
             dbname,
             dbpassword,
             dbhost,
             dbport,
-            template_id,
+            template_id: templateId,
             format
         };
 
@@ -141,7 +141,7 @@ function prepareLayerFilterFromPreviewLayers ({ namedMapProviderCache, label })
         params.layer = layerVisibilityFilter.join(',');
 
         // recreates the provider
-        namedMapProviderCache.get(user, template_id, config, auth_token, params, (err, provider) => {
+        namedMapProviderCache.get(user, templateId, config, authToken, params, (err, provider) => {
             if (err) {
                 err.label = label;
                 return next(err);

lib/api/middlewares/last-modified-header.js

@@ -6,12 +6,12 @@ module.exports = function setLastModifiedHeader () {
             return next();
         }
 
-        const { mapConfigProvider, cache_buster } = res.locals;
+        const { mapConfigProvider, cache_buster: cacheBuster } = res.locals;
 
-        if (cache_buster) {
-            const cacheBuster = parseInt(cache_buster, 10);
-            const lastModifiedDate = Number.isFinite(cacheBuster) && cacheBuster !== 0
-                ? new Date(cacheBuster)
+        if (cacheBuster) {
+            const cacheBusterTimestamp = parseInt(cacheBuster, 10);
+            const lastModifiedDate = Number.isFinite(cacheBusterTimestamp) && cacheBusterTimestamp !== 0
+                ? new Date(cacheBusterTimestamp)
                 : new Date();
 
             res.set('Last-Modified', lastModifiedDate.toUTCString());

lib/api/middlewares/map-store-map-config-provider.js

@@ -10,16 +10,16 @@ module.exports = function createMapStoreMapConfigProvider (
     forcedFormat = null
 ) {
     return function createMapStoreMapConfigProviderMiddleware (req, res, next) {
-        const { user, token, cache_buster, api_key } = res.locals;
+        const { user, token, cache_buster: cacheBuster, api_key: apiKey } = res.locals;
         const { dbuser, dbname, dbpassword, dbhost, dbport } = res.locals;
-        const { layer: layerFromParams, z, x, y, scale_factor, format } = req.params;
+        const { layer: layerFromParams, z, x, y, scale_factor: scaleFactor, format } = req.params;
         const { layer: layerFromQuery } = req.query;
 
         const params = {
             user,
             token,
-            cache_buster,
-            api_key,
+            cache_buster: cacheBuster,
+            api_key: apiKey,
             dbuser,
             dbname,
             dbpassword,
@@ -29,7 +29,7 @@ module.exports = function createMapStoreMapConfigProvider (
             z,
             x,
             y,
-            scale_factor,
+            scale_factor: scaleFactor,
             format
         };
 

lib/api/middlewares/named-map-provider.js

@@ -2,22 +2,22 @@
 
 module.exports = function getNamedMapProvider ({ namedMapProviderCache, label, forcedFormat = null }) {
     return function getNamedMapProviderMiddleware (req, res, next) {
-        const { user, token, cache_buster, api_key } = res.locals;
+        const { user, token, cache_buster: cacheBuster, api_key: apiKey } = res.locals;
         const { dbuser, dbname, dbpassword, dbhost, dbport } = res.locals;
-        const { template_id, layer: layerFromParams, z, x, y, format } = req.params;
+        const { template_id: templateId, layer: layerFromParams, z, x, y, format } = req.params;
         const { layer: layerFromQuery } = req.query;
 
         const params = {
             user,
             token,
-            cache_buster,
-            api_key,
+            cache_buster: cacheBuster,
+            api_key: apiKey,
             dbuser,
             dbname,
             dbpassword,
             dbhost,
             dbport,
-            template_id,
+            template_id: templateId,
             layer: (layerFromQuery || layerFromParams),
             z,
             x,
@@ -30,9 +30,9 @@ module.exports = function getNamedMapProvider ({ namedMapProviderCache, label, f
             params.layer = params.layer || 'all';
         }
 
-        const { config, auth_token } = req.query;
+        const { config, auth_token: authToken } = req.query;
 
-        namedMapProviderCache.get(user, template_id, config, auth_token, params, (err, namedMapProvider) => {
+        namedMapProviderCache.get(user, templateId, config, authToken, params, (err, namedMapProvider) => {
             if (err) {
                 err.label = label;
                 return next(err);

lib/api/template/named-template-controller.js

@@ -148,8 +148,8 @@ function getTemplate (
     return function getTemplateMiddleware (req, res, next) {
         const templateParams = req.body;
         const { user, dbuser, dbname, dbpassword, dbhost, dbport } = res.locals;
-        const { template_id } = req.params;
-        const { auth_token } = req.query;
+        const { template_id: templateId } = req.params;
+        const { auth_token: authToken } = req.query;
 
         const params = Object.assign({ dbuser, dbname, dbpassword, dbhost, dbport }, req.query);
 
@@ -161,9 +161,9 @@ function getTemplate (
             mapConfigAdapter,
             affectedTablesCache,
             user,
-            template_id,
+            templateId,
             templateParams,
-            auth_token,
+            authToken,
             params
         );