diff --git a/app.js b/app.js index c5681e0e..5874c178 100755 --- a/app.js +++ b/app.js @@ -6,7 +6,7 @@ var path = require('path'); var fs = require('fs'); var _ = require('underscore'); var semver = require('semver'); -const setICUEnvVariable = require('./lib/cartodb/utils/icu_data_env_setter'); +const setICUEnvVariable = require('./lib/utils/icu_data_env_setter'); // jshint undef:false var log = console.log.bind(console); @@ -105,8 +105,8 @@ global.logger = global.log4js.getLogger(); // Include cartodb_windshaft only _after_ the "global" variable is set // See https://github.com/Vizzuality/Windshaft-cartodb/issues/28 -var cartodbWindshaft = require('./lib/cartodb/server'); -var serverOptions = require('./lib/cartodb/server_options'); +var cartodbWindshaft = require('./lib/server'); +var serverOptions = require('./lib/server_options'); var server = cartodbWindshaft(serverOptions); diff --git a/lib/cartodb/api/api-router.js b/lib/api/api-router.js similarity index 99% rename from lib/cartodb/api/api-router.js rename to lib/api/api-router.js index 08e5072d..8785a50e 100644 --- a/lib/cartodb/api/api-router.js +++ b/lib/api/api-router.js @@ -282,7 +282,7 @@ function createSurrogateKeysCacheBackends(serverOptions) { return cacheBackends; } -const timeoutErrorTilePath = __dirname + '/../../../assets/render-timeout-fallback.png'; +const timeoutErrorTilePath = __dirname + '/../../assets/render-timeout-fallback.png'; const timeoutErrorTile = require('fs').readFileSync(timeoutErrorTilePath, {encoding: null}); function createRendererFactory ({ redisPool, serverOptions, environmentOptions }) { diff --git a/lib/cartodb/api/map/analyses-catalog-controller.js b/lib/api/map/analyses-catalog-controller.js similarity index 100% rename from lib/cartodb/api/map/analyses-catalog-controller.js rename to lib/api/map/analyses-catalog-controller.js diff --git a/lib/cartodb/api/map/analysis-layergroup-controller.js b/lib/api/map/analysis-layergroup-controller.js similarity index 100% rename from lib/cartodb/api/map/analysis-layergroup-controller.js rename to lib/api/map/analysis-layergroup-controller.js diff --git a/lib/cartodb/api/map/anonymous-map-controller.js b/lib/api/map/anonymous-map-controller.js similarity index 100% rename from lib/cartodb/api/map/anonymous-map-controller.js rename to lib/api/map/anonymous-map-controller.js diff --git a/lib/cartodb/api/map/attributes-layergroup-controller.js b/lib/api/map/attributes-layergroup-controller.js similarity index 100% rename from lib/cartodb/api/map/attributes-layergroup-controller.js rename to lib/api/map/attributes-layergroup-controller.js diff --git a/lib/cartodb/api/map/clustered-features-layergroup-controller.js b/lib/api/map/clustered-features-layergroup-controller.js similarity index 100% rename from lib/cartodb/api/map/clustered-features-layergroup-controller.js rename to lib/api/map/clustered-features-layergroup-controller.js diff --git a/lib/cartodb/api/map/dataview-layergroup-controller.js b/lib/api/map/dataview-layergroup-controller.js similarity index 100% rename from lib/cartodb/api/map/dataview-layergroup-controller.js rename to lib/api/map/dataview-layergroup-controller.js diff --git a/lib/cartodb/api/map/map-router.js b/lib/api/map/map-router.js similarity index 100% rename from lib/cartodb/api/map/map-router.js rename to lib/api/map/map-router.js diff --git a/lib/cartodb/api/map/preview-layergroup-controller.js b/lib/api/map/preview-layergroup-controller.js similarity index 100% rename from lib/cartodb/api/map/preview-layergroup-controller.js rename to lib/api/map/preview-layergroup-controller.js diff --git a/lib/cartodb/api/map/preview-template-controller.js b/lib/api/map/preview-template-controller.js similarity index 100% rename from lib/cartodb/api/map/preview-template-controller.js rename to lib/api/map/preview-template-controller.js diff --git a/lib/cartodb/api/map/tile-layergroup-controller.js b/lib/api/map/tile-layergroup-controller.js similarity index 100% rename from lib/cartodb/api/map/tile-layergroup-controller.js rename to lib/api/map/tile-layergroup-controller.js diff --git a/lib/cartodb/api/middlewares/augment-layergroup-data.js b/lib/api/middlewares/augment-layergroup-data.js similarity index 100% rename from lib/cartodb/api/middlewares/augment-layergroup-data.js rename to lib/api/middlewares/augment-layergroup-data.js diff --git a/lib/cartodb/api/middlewares/authorize.js b/lib/api/middlewares/authorize.js similarity index 100% rename from lib/cartodb/api/middlewares/authorize.js rename to lib/api/middlewares/authorize.js diff --git a/lib/cartodb/api/middlewares/cache-channel-header.js b/lib/api/middlewares/cache-channel-header.js similarity index 100% rename from lib/cartodb/api/middlewares/cache-channel-header.js rename to lib/api/middlewares/cache-channel-header.js diff --git a/lib/cartodb/api/middlewares/cache-control-header.js b/lib/api/middlewares/cache-control-header.js similarity index 100% rename from lib/cartodb/api/middlewares/cache-control-header.js rename to lib/api/middlewares/cache-control-header.js diff --git a/lib/cartodb/api/middlewares/check-json-content-type.js b/lib/api/middlewares/check-json-content-type.js similarity index 100% rename from lib/cartodb/api/middlewares/check-json-content-type.js rename to lib/api/middlewares/check-json-content-type.js diff --git a/lib/cartodb/api/middlewares/check-static-image-format.js b/lib/api/middlewares/check-static-image-format.js similarity index 100% rename from lib/cartodb/api/middlewares/check-static-image-format.js rename to lib/api/middlewares/check-static-image-format.js diff --git a/lib/cartodb/api/middlewares/clean-up-query-params.js b/lib/api/middlewares/clean-up-query-params.js similarity index 100% rename from lib/cartodb/api/middlewares/clean-up-query-params.js rename to lib/api/middlewares/clean-up-query-params.js diff --git a/lib/cartodb/api/middlewares/coordinates.js b/lib/api/middlewares/coordinates.js similarity index 100% rename from lib/cartodb/api/middlewares/coordinates.js rename to lib/api/middlewares/coordinates.js diff --git a/lib/cartodb/api/middlewares/cors.js b/lib/api/middlewares/cors.js similarity index 100% rename from lib/cartodb/api/middlewares/cors.js rename to lib/api/middlewares/cors.js diff --git a/lib/cartodb/api/middlewares/credentials.js b/lib/api/middlewares/credentials.js similarity index 100% rename from lib/cartodb/api/middlewares/credentials.js rename to lib/api/middlewares/credentials.js diff --git a/lib/cartodb/api/middlewares/db-conn-setup.js b/lib/api/middlewares/db-conn-setup.js similarity index 100% rename from lib/cartodb/api/middlewares/db-conn-setup.js rename to lib/api/middlewares/db-conn-setup.js diff --git a/lib/cartodb/api/middlewares/error-middleware.js b/lib/api/middlewares/error-middleware.js similarity index 100% rename from lib/cartodb/api/middlewares/error-middleware.js rename to lib/api/middlewares/error-middleware.js diff --git a/lib/cartodb/api/middlewares/increment-map-view-count.js b/lib/api/middlewares/increment-map-view-count.js similarity index 100% rename from lib/cartodb/api/middlewares/increment-map-view-count.js rename to lib/api/middlewares/increment-map-view-count.js diff --git a/lib/cartodb/api/middlewares/init-profiler.js b/lib/api/middlewares/init-profiler.js similarity index 100% rename from lib/cartodb/api/middlewares/init-profiler.js rename to lib/api/middlewares/init-profiler.js diff --git a/lib/cartodb/api/middlewares/initialize-status-code.js b/lib/api/middlewares/initialize-status-code.js similarity index 100% rename from lib/cartodb/api/middlewares/initialize-status-code.js rename to lib/api/middlewares/initialize-status-code.js diff --git a/lib/cartodb/api/middlewares/last-modified-header.js b/lib/api/middlewares/last-modified-header.js similarity index 100% rename from lib/cartodb/api/middlewares/last-modified-header.js rename to lib/api/middlewares/last-modified-header.js diff --git a/lib/cartodb/api/middlewares/last-updated-time-layergroup.js b/lib/api/middlewares/last-updated-time-layergroup.js similarity index 100% rename from lib/cartodb/api/middlewares/last-updated-time-layergroup.js rename to lib/api/middlewares/last-updated-time-layergroup.js diff --git a/lib/cartodb/api/middlewares/layer-stats.js b/lib/api/middlewares/layer-stats.js similarity index 100% rename from lib/cartodb/api/middlewares/layer-stats.js rename to lib/api/middlewares/layer-stats.js diff --git a/lib/cartodb/api/middlewares/layergroup-id-header.js b/lib/api/middlewares/layergroup-id-header.js similarity index 100% rename from lib/cartodb/api/middlewares/layergroup-id-header.js rename to lib/api/middlewares/layergroup-id-header.js diff --git a/lib/cartodb/api/middlewares/layergroup-metadata.js b/lib/api/middlewares/layergroup-metadata.js similarity index 100% rename from lib/cartodb/api/middlewares/layergroup-metadata.js rename to lib/api/middlewares/layergroup-metadata.js diff --git a/lib/cartodb/api/middlewares/layergroup-token.js b/lib/api/middlewares/layergroup-token.js similarity index 100% rename from lib/cartodb/api/middlewares/layergroup-token.js rename to lib/api/middlewares/layergroup-token.js diff --git a/lib/cartodb/api/middlewares/logger.js b/lib/api/middlewares/logger.js similarity index 100% rename from lib/cartodb/api/middlewares/logger.js rename to lib/api/middlewares/logger.js diff --git a/lib/cartodb/api/middlewares/lzma.js b/lib/api/middlewares/lzma.js similarity index 100% rename from lib/cartodb/api/middlewares/lzma.js rename to lib/api/middlewares/lzma.js diff --git a/lib/cartodb/api/middlewares/map-error.js b/lib/api/middlewares/map-error.js similarity index 100% rename from lib/cartodb/api/middlewares/map-error.js rename to lib/api/middlewares/map-error.js diff --git a/lib/cartodb/api/middlewares/map-store-map-config-provider.js b/lib/api/middlewares/map-store-map-config-provider.js similarity index 100% rename from lib/cartodb/api/middlewares/map-store-map-config-provider.js rename to lib/api/middlewares/map-store-map-config-provider.js diff --git a/lib/cartodb/api/middlewares/named-map-provider.js b/lib/api/middlewares/named-map-provider.js similarity index 100% rename from lib/cartodb/api/middlewares/named-map-provider.js rename to lib/api/middlewares/named-map-provider.js diff --git a/lib/cartodb/api/middlewares/noop.js b/lib/api/middlewares/noop.js similarity index 100% rename from lib/cartodb/api/middlewares/noop.js rename to lib/api/middlewares/noop.js diff --git a/lib/cartodb/api/middlewares/rate-limit.js b/lib/api/middlewares/rate-limit.js similarity index 100% rename from lib/cartodb/api/middlewares/rate-limit.js rename to lib/api/middlewares/rate-limit.js diff --git a/lib/cartodb/api/middlewares/send-response.js b/lib/api/middlewares/send-response.js similarity index 100% rename from lib/cartodb/api/middlewares/send-response.js rename to lib/api/middlewares/send-response.js diff --git a/lib/cartodb/api/middlewares/served-by-host-header.js b/lib/api/middlewares/served-by-host-header.js similarity index 100% rename from lib/cartodb/api/middlewares/served-by-host-header.js rename to lib/api/middlewares/served-by-host-header.js diff --git a/lib/cartodb/api/middlewares/stats.js b/lib/api/middlewares/stats.js similarity index 100% rename from lib/cartodb/api/middlewares/stats.js rename to lib/api/middlewares/stats.js diff --git a/lib/cartodb/api/middlewares/surrogate-key-header.js b/lib/api/middlewares/surrogate-key-header.js similarity index 100% rename from lib/cartodb/api/middlewares/surrogate-key-header.js rename to lib/api/middlewares/surrogate-key-header.js diff --git a/lib/cartodb/api/middlewares/syntax-error.js b/lib/api/middlewares/syntax-error.js similarity index 100% rename from lib/cartodb/api/middlewares/syntax-error.js rename to lib/api/middlewares/syntax-error.js diff --git a/lib/cartodb/api/middlewares/user.js b/lib/api/middlewares/user.js similarity index 100% rename from lib/cartodb/api/middlewares/user.js rename to lib/api/middlewares/user.js diff --git a/lib/cartodb/api/middlewares/vector-error.js b/lib/api/middlewares/vector-error.js similarity index 95% rename from lib/cartodb/api/middlewares/vector-error.js rename to lib/api/middlewares/vector-error.js index 4de1ebce..6e69f982 100644 --- a/lib/cartodb/api/middlewares/vector-error.js +++ b/lib/api/middlewares/vector-error.js @@ -1,7 +1,7 @@ 'use strict'; const fs = require('fs'); -const timeoutErrorVectorTile = fs.readFileSync(__dirname + '/../../../../assets/render-timeout-fallback.mvt'); +const timeoutErrorVectorTile = fs.readFileSync(__dirname + '/../../../assets/render-timeout-fallback.mvt'); module.exports = function vectorError() { return function vectorErrorMiddleware(err, req, res, next) { diff --git a/lib/cartodb/api/template/admin-template-controller.js b/lib/api/template/admin-template-controller.js similarity index 100% rename from lib/cartodb/api/template/admin-template-controller.js rename to lib/api/template/admin-template-controller.js diff --git a/lib/cartodb/api/template/named-template-controller.js b/lib/api/template/named-template-controller.js similarity index 100% rename from lib/cartodb/api/template/named-template-controller.js rename to lib/api/template/named-template-controller.js diff --git a/lib/cartodb/api/template/template-router.js b/lib/api/template/template-router.js similarity index 100% rename from lib/cartodb/api/template/template-router.js rename to lib/api/template/template-router.js diff --git a/lib/cartodb/api/template/tile-template-controller.js b/lib/api/template/tile-template-controller.js similarity index 100% rename from lib/cartodb/api/template/tile-template-controller.js rename to lib/api/template/tile-template-controller.js diff --git a/lib/cartodb/backends/analysis-status.js b/lib/backends/analysis-status.js similarity index 100% rename from lib/cartodb/backends/analysis-status.js rename to lib/backends/analysis-status.js diff --git a/lib/cartodb/backends/analysis.js b/lib/backends/analysis.js similarity index 100% rename from lib/cartodb/backends/analysis.js rename to lib/backends/analysis.js diff --git a/lib/cartodb/backends/auth.js b/lib/backends/auth.js similarity index 100% rename from lib/cartodb/backends/auth.js rename to lib/backends/auth.js diff --git a/lib/cartodb/backends/cluster.js b/lib/backends/cluster.js similarity index 100% rename from lib/cartodb/backends/cluster.js rename to lib/backends/cluster.js diff --git a/lib/cartodb/backends/dataview.js b/lib/backends/dataview.js similarity index 100% rename from lib/cartodb/backends/dataview.js rename to lib/backends/dataview.js diff --git a/lib/cartodb/backends/filter-stats.js b/lib/backends/filter-stats.js similarity index 100% rename from lib/cartodb/backends/filter-stats.js rename to lib/backends/filter-stats.js diff --git a/lib/cartodb/backends/layer-stats/empty-layer-stats.js b/lib/backends/layer-stats/empty-layer-stats.js similarity index 100% rename from lib/cartodb/backends/layer-stats/empty-layer-stats.js rename to lib/backends/layer-stats/empty-layer-stats.js diff --git a/lib/cartodb/backends/layer-stats/factory.js b/lib/backends/layer-stats/factory.js similarity index 100% rename from lib/cartodb/backends/layer-stats/factory.js rename to lib/backends/layer-stats/factory.js diff --git a/lib/cartodb/backends/layer-stats/layer-stats.js b/lib/backends/layer-stats/layer-stats.js similarity index 100% rename from lib/cartodb/backends/layer-stats/layer-stats.js rename to lib/backends/layer-stats/layer-stats.js diff --git a/lib/cartodb/backends/layer-stats/mapnik-layer-stats.js b/lib/backends/layer-stats/mapnik-layer-stats.js similarity index 100% rename from lib/cartodb/backends/layer-stats/mapnik-layer-stats.js rename to lib/backends/layer-stats/mapnik-layer-stats.js diff --git a/lib/cartodb/backends/layer-stats/torque-layer-stats.js b/lib/backends/layer-stats/torque-layer-stats.js similarity index 100% rename from lib/cartodb/backends/layer-stats/torque-layer-stats.js rename to lib/backends/layer-stats/torque-layer-stats.js diff --git a/lib/cartodb/backends/overviews-metadata.js b/lib/backends/overviews-metadata.js similarity index 100% rename from lib/cartodb/backends/overviews-metadata.js rename to lib/backends/overviews-metadata.js diff --git a/lib/cartodb/backends/pg_connection.js b/lib/backends/pg_connection.js similarity index 100% rename from lib/cartodb/backends/pg_connection.js rename to lib/backends/pg_connection.js diff --git a/lib/cartodb/backends/pg_query_runner.js b/lib/backends/pg_query_runner.js similarity index 100% rename from lib/cartodb/backends/pg_query_runner.js rename to lib/backends/pg_query_runner.js diff --git a/lib/cartodb/backends/stats.js b/lib/backends/stats.js similarity index 100% rename from lib/cartodb/backends/stats.js rename to lib/backends/stats.js diff --git a/lib/cartodb/backends/tables-extent.js b/lib/backends/tables-extent.js similarity index 100% rename from lib/cartodb/backends/tables-extent.js rename to lib/backends/tables-extent.js diff --git a/lib/cartodb/backends/template_maps.js b/lib/backends/template_maps.js similarity index 100% rename from lib/cartodb/backends/template_maps.js rename to lib/backends/template_maps.js diff --git a/lib/cartodb/backends/turbo-carto-postgres-datasource.js b/lib/backends/turbo-carto-postgres-datasource.js similarity index 100% rename from lib/cartodb/backends/turbo-carto-postgres-datasource.js rename to lib/backends/turbo-carto-postgres-datasource.js diff --git a/lib/cartodb/backends/user-limits.js b/lib/backends/user-limits.js similarity index 100% rename from lib/cartodb/backends/user-limits.js rename to lib/backends/user-limits.js diff --git a/lib/cartodb/cache/backend/fastly.js b/lib/cache/backend/fastly.js similarity index 100% rename from lib/cartodb/cache/backend/fastly.js rename to lib/cache/backend/fastly.js diff --git a/lib/cartodb/cache/backend/varnish_http.js b/lib/cache/backend/varnish_http.js similarity index 100% rename from lib/cartodb/cache/backend/varnish_http.js rename to lib/cache/backend/varnish_http.js diff --git a/lib/cartodb/cache/layergroup_affected_tables.js b/lib/cache/layergroup_affected_tables.js similarity index 100% rename from lib/cartodb/cache/layergroup_affected_tables.js rename to lib/cache/layergroup_affected_tables.js diff --git a/lib/cartodb/cache/model/named_maps_entry.js b/lib/cache/model/named_maps_entry.js similarity index 100% rename from lib/cartodb/cache/model/named_maps_entry.js rename to lib/cache/model/named_maps_entry.js diff --git a/lib/cartodb/cache/named_map_provider_cache.js b/lib/cache/named_map_provider_cache.js similarity index 100% rename from lib/cartodb/cache/named_map_provider_cache.js rename to lib/cache/named_map_provider_cache.js diff --git a/lib/cartodb/cache/surrogate_keys_cache.js b/lib/cache/surrogate_keys_cache.js similarity index 100% rename from lib/cartodb/cache/surrogate_keys_cache.js rename to lib/cache/surrogate_keys_cache.js diff --git a/lib/cartodb/models/aggregation/aggregation-mapconfig.js b/lib/models/aggregation/aggregation-mapconfig.js similarity index 100% rename from lib/cartodb/models/aggregation/aggregation-mapconfig.js rename to lib/models/aggregation/aggregation-mapconfig.js diff --git a/lib/cartodb/models/aggregation/aggregation-query.js b/lib/models/aggregation/aggregation-query.js similarity index 100% rename from lib/cartodb/models/aggregation/aggregation-query.js rename to lib/models/aggregation/aggregation-query.js diff --git a/lib/cartodb/models/aggregation/aggregation-validator.js b/lib/models/aggregation/aggregation-validator.js similarity index 100% rename from lib/cartodb/models/aggregation/aggregation-validator.js rename to lib/models/aggregation/aggregation-validator.js diff --git a/lib/cartodb/models/aggregation/time-dimension.js b/lib/models/aggregation/time-dimension.js similarity index 100% rename from lib/cartodb/models/aggregation/time-dimension.js rename to lib/models/aggregation/time-dimension.js diff --git a/lib/cartodb/models/cdb_request.js b/lib/models/cdb_request.js similarity index 100% rename from lib/cartodb/models/cdb_request.js rename to lib/models/cdb_request.js diff --git a/lib/cartodb/models/dataview/aggregation.js b/lib/models/dataview/aggregation.js similarity index 100% rename from lib/cartodb/models/dataview/aggregation.js rename to lib/models/dataview/aggregation.js diff --git a/lib/cartodb/models/dataview/base.js b/lib/models/dataview/base.js similarity index 100% rename from lib/cartodb/models/dataview/base.js rename to lib/models/dataview/base.js diff --git a/lib/cartodb/models/dataview/factory.js b/lib/models/dataview/factory.js similarity index 94% rename from lib/cartodb/models/dataview/factory.js rename to lib/models/dataview/factory.js index 729305fc..bd035270 100644 --- a/lib/cartodb/models/dataview/factory.js +++ b/lib/models/dataview/factory.js @@ -1,6 +1,6 @@ 'use strict'; -const dataviews = require('./'); +const dataviews = require('.'); module.exports = class DataviewFactory { static get dataviews() { diff --git a/lib/cartodb/models/dataview/formula.js b/lib/models/dataview/formula.js similarity index 100% rename from lib/cartodb/models/dataview/formula.js rename to lib/models/dataview/formula.js diff --git a/lib/cartodb/models/dataview/histogram.js b/lib/models/dataview/histogram.js similarity index 100% rename from lib/cartodb/models/dataview/histogram.js rename to lib/models/dataview/histogram.js diff --git a/lib/cartodb/models/dataview/histograms/base-histogram.js b/lib/models/dataview/histograms/base-histogram.js similarity index 100% rename from lib/cartodb/models/dataview/histograms/base-histogram.js rename to lib/models/dataview/histograms/base-histogram.js diff --git a/lib/cartodb/models/dataview/histograms/date-histogram.js b/lib/models/dataview/histograms/date-histogram.js similarity index 100% rename from lib/cartodb/models/dataview/histograms/date-histogram.js rename to lib/models/dataview/histograms/date-histogram.js diff --git a/lib/cartodb/models/dataview/histograms/numeric-histogram.js b/lib/models/dataview/histograms/numeric-histogram.js similarity index 100% rename from lib/cartodb/models/dataview/histograms/numeric-histogram.js rename to lib/models/dataview/histograms/numeric-histogram.js diff --git a/lib/cartodb/models/dataview/index.js b/lib/models/dataview/index.js similarity index 100% rename from lib/cartodb/models/dataview/index.js rename to lib/models/dataview/index.js diff --git a/lib/cartodb/models/dataview/overviews/aggregation.js b/lib/models/dataview/overviews/aggregation.js similarity index 100% rename from lib/cartodb/models/dataview/overviews/aggregation.js rename to lib/models/dataview/overviews/aggregation.js diff --git a/lib/cartodb/models/dataview/overviews/base.js b/lib/models/dataview/overviews/base.js similarity index 100% rename from lib/cartodb/models/dataview/overviews/base.js rename to lib/models/dataview/overviews/base.js diff --git a/lib/cartodb/models/dataview/overviews/factory.js b/lib/models/dataview/overviews/factory.js similarity index 97% rename from lib/cartodb/models/dataview/overviews/factory.js rename to lib/models/dataview/overviews/factory.js index 1a402f88..c67aea8e 100644 --- a/lib/cartodb/models/dataview/overviews/factory.js +++ b/lib/models/dataview/overviews/factory.js @@ -1,7 +1,7 @@ 'use strict'; var parentFactory = require('../factory'); -var dataviews = require('./'); +var dataviews = require('.'); function OverviewsDataviewFactory(queryRewriter, queryRewriteData, options) { this.queryRewriter = queryRewriter; diff --git a/lib/cartodb/models/dataview/overviews/formula.js b/lib/models/dataview/overviews/formula.js similarity index 100% rename from lib/cartodb/models/dataview/overviews/formula.js rename to lib/models/dataview/overviews/formula.js diff --git a/lib/cartodb/models/dataview/overviews/histogram.js b/lib/models/dataview/overviews/histogram.js similarity index 100% rename from lib/cartodb/models/dataview/overviews/histogram.js rename to lib/models/dataview/overviews/histogram.js diff --git a/lib/cartodb/models/dataview/overviews/index.js b/lib/models/dataview/overviews/index.js similarity index 100% rename from lib/cartodb/models/dataview/overviews/index.js rename to lib/models/dataview/overviews/index.js diff --git a/lib/cartodb/models/filter/analysis.js b/lib/models/filter/analysis.js similarity index 100% rename from lib/cartodb/models/filter/analysis.js rename to lib/models/filter/analysis.js diff --git a/lib/cartodb/models/filter/analysis/category.js b/lib/models/filter/analysis/category.js similarity index 100% rename from lib/cartodb/models/filter/analysis/category.js rename to lib/models/filter/analysis/category.js diff --git a/lib/cartodb/models/filter/analysis/range.js b/lib/models/filter/analysis/range.js similarity index 100% rename from lib/cartodb/models/filter/analysis/range.js rename to lib/models/filter/analysis/range.js diff --git a/lib/cartodb/models/filter/bbox.js b/lib/models/filter/bbox.js similarity index 100% rename from lib/cartodb/models/filter/bbox.js rename to lib/models/filter/bbox.js diff --git a/lib/cartodb/models/layergroup-token.js b/lib/models/layergroup-token.js similarity index 100% rename from lib/cartodb/models/layergroup-token.js rename to lib/models/layergroup-token.js diff --git a/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js b/lib/models/mapconfig/adapter/aggregation-mapconfig-adapter.js similarity index 100% rename from lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js rename to lib/models/mapconfig/adapter/aggregation-mapconfig-adapter.js diff --git a/lib/cartodb/models/mapconfig/adapter/analysis-mapconfig-adapter.js b/lib/models/mapconfig/adapter/analysis-mapconfig-adapter.js similarity index 100% rename from lib/cartodb/models/mapconfig/adapter/analysis-mapconfig-adapter.js rename to lib/models/mapconfig/adapter/analysis-mapconfig-adapter.js diff --git a/lib/cartodb/models/mapconfig/adapter/dataviews-widgets-adapter.js b/lib/models/mapconfig/adapter/dataviews-widgets-adapter.js similarity index 100% rename from lib/cartodb/models/mapconfig/adapter/dataviews-widgets-adapter.js rename to lib/models/mapconfig/adapter/dataviews-widgets-adapter.js diff --git a/lib/cartodb/models/mapconfig/adapter/index.js b/lib/models/mapconfig/adapter/index.js similarity index 100% rename from lib/cartodb/models/mapconfig/adapter/index.js rename to lib/models/mapconfig/adapter/index.js diff --git a/lib/cartodb/models/mapconfig/adapter/mapconfig-buffer-size-adapter.js b/lib/models/mapconfig/adapter/mapconfig-buffer-size-adapter.js similarity index 100% rename from lib/cartodb/models/mapconfig/adapter/mapconfig-buffer-size-adapter.js rename to lib/models/mapconfig/adapter/mapconfig-buffer-size-adapter.js diff --git a/lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter.js b/lib/models/mapconfig/adapter/mapconfig-named-layers-adapter.js similarity index 100% rename from lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter.js rename to lib/models/mapconfig/adapter/mapconfig-named-layers-adapter.js diff --git a/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js b/lib/models/mapconfig/adapter/mapconfig-overviews-adapter.js similarity index 100% rename from lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js rename to lib/models/mapconfig/adapter/mapconfig-overviews-adapter.js diff --git a/lib/cartodb/models/mapconfig/adapter/sql-wrap-mapconfig-adapter.js b/lib/models/mapconfig/adapter/sql-wrap-mapconfig-adapter.js similarity index 100% rename from lib/cartodb/models/mapconfig/adapter/sql-wrap-mapconfig-adapter.js rename to lib/models/mapconfig/adapter/sql-wrap-mapconfig-adapter.js diff --git a/lib/cartodb/models/mapconfig/adapter/turbo-carto-adapter.js b/lib/models/mapconfig/adapter/turbo-carto-adapter.js similarity index 100% rename from lib/cartodb/models/mapconfig/adapter/turbo-carto-adapter.js rename to lib/models/mapconfig/adapter/turbo-carto-adapter.js diff --git a/lib/cartodb/models/mapconfig/adapter/vector-mapconfig-adapter.js b/lib/models/mapconfig/adapter/vector-mapconfig-adapter.js similarity index 100% rename from lib/cartodb/models/mapconfig/adapter/vector-mapconfig-adapter.js rename to lib/models/mapconfig/adapter/vector-mapconfig-adapter.js diff --git a/lib/cartodb/models/mapconfig/provider/base-mapconfig-adapter.js b/lib/models/mapconfig/provider/base-mapconfig-adapter.js similarity index 100% rename from lib/cartodb/models/mapconfig/provider/base-mapconfig-adapter.js rename to lib/models/mapconfig/provider/base-mapconfig-adapter.js diff --git a/lib/cartodb/models/mapconfig/provider/create-layergroup-provider.js b/lib/models/mapconfig/provider/create-layergroup-provider.js similarity index 100% rename from lib/cartodb/models/mapconfig/provider/create-layergroup-provider.js rename to lib/models/mapconfig/provider/create-layergroup-provider.js diff --git a/lib/cartodb/models/mapconfig/provider/map-store-provider.js b/lib/models/mapconfig/provider/map-store-provider.js similarity index 100% rename from lib/cartodb/models/mapconfig/provider/map-store-provider.js rename to lib/models/mapconfig/provider/map-store-provider.js diff --git a/lib/cartodb/models/mapconfig/provider/named-map-provider.js b/lib/models/mapconfig/provider/named-map-provider.js similarity index 100% rename from lib/cartodb/models/mapconfig/provider/named-map-provider.js rename to lib/models/mapconfig/provider/named-map-provider.js diff --git a/lib/cartodb/models/resource-locator.js b/lib/models/resource-locator.js similarity index 100% rename from lib/cartodb/models/resource-locator.js rename to lib/models/resource-locator.js diff --git a/lib/cartodb/monitoring/health_check.js b/lib/monitoring/health_check.js similarity index 100% rename from lib/cartodb/monitoring/health_check.js rename to lib/monitoring/health_check.js diff --git a/lib/cartodb/server-info-controller.js b/lib/server-info-controller.js similarity index 100% rename from lib/cartodb/server-info-controller.js rename to lib/server-info-controller.js diff --git a/lib/cartodb/server.js b/lib/server.js similarity index 98% rename from lib/cartodb/server.js rename to lib/server.js index 01e68391..9f7b7ee0 100644 --- a/lib/cartodb/server.js +++ b/lib/server.js @@ -68,7 +68,7 @@ function mapnikVersion(opts) { function getAndValidateVersions(options) { var warn = console.warn.bind(console); // jshint ignore:line - var packageDefinition = require('../../package.json'); + var packageDefinition = require('../package.json'); var declaredDependencies = packageDefinition.dependencies || {}; var installedDependenciesVersions = { diff --git a/lib/cartodb/server_options.js b/lib/server_options.js similarity index 100% rename from lib/cartodb/server_options.js rename to lib/server_options.js diff --git a/lib/cartodb/stats/client.js b/lib/stats/client.js similarity index 100% rename from lib/cartodb/stats/client.js rename to lib/stats/client.js diff --git a/lib/cartodb/stats/profiler_proxy.js b/lib/stats/profiler_proxy.js similarity index 100% rename from lib/cartodb/stats/profiler_proxy.js rename to lib/stats/profiler_proxy.js diff --git a/lib/cartodb/stats/reporter/named-map-provider.js b/lib/stats/reporter/named-map-provider.js similarity index 100% rename from lib/cartodb/stats/reporter/named-map-provider.js rename to lib/stats/reporter/named-map-provider.js diff --git a/lib/cartodb/stats/reporter/renderer.js b/lib/stats/reporter/renderer.js similarity index 100% rename from lib/cartodb/stats/reporter/renderer.js rename to lib/stats/reporter/renderer.js diff --git a/lib/cartodb/stats/timer.js b/lib/stats/timer.js similarity index 100% rename from lib/cartodb/stats/timer.js rename to lib/stats/timer.js diff --git a/lib/cartodb/utils/database-params.js b/lib/utils/database-params.js similarity index 100% rename from lib/cartodb/utils/database-params.js rename to lib/utils/database-params.js diff --git a/lib/cartodb/utils/date-wrapper.js b/lib/utils/date-wrapper.js similarity index 100% rename from lib/cartodb/utils/date-wrapper.js rename to lib/utils/date-wrapper.js diff --git a/lib/cartodb/utils/icu_data_env_setter.js b/lib/utils/icu_data_env_setter.js similarity index 100% rename from lib/cartodb/utils/icu_data_env_setter.js rename to lib/utils/icu_data_env_setter.js diff --git a/lib/cartodb/utils/json-replacer.js b/lib/utils/json-replacer.js similarity index 100% rename from lib/cartodb/utils/json-replacer.js rename to lib/utils/json-replacer.js diff --git a/lib/cartodb/utils/layergroup-metadata.js b/lib/utils/layergroup-metadata.js similarity index 100% rename from lib/cartodb/utils/layergroup-metadata.js rename to lib/utils/layergroup-metadata.js diff --git a/lib/cartodb/utils/overviews_query_rewriter.js b/lib/utils/overviews_query_rewriter.js similarity index 100% rename from lib/cartodb/utils/overviews_query_rewriter.js rename to lib/utils/overviews_query_rewriter.js diff --git a/lib/cartodb/utils/query-utils.js b/lib/utils/query-utils.js similarity index 100% rename from lib/cartodb/utils/query-utils.js rename to lib/utils/query-utils.js diff --git a/lib/cartodb/utils/substitution-tokens.js b/lib/utils/substitution-tokens.js similarity index 100% rename from lib/cartodb/utils/substitution-tokens.js rename to lib/utils/substitution-tokens.js diff --git a/lib/cartodb/utils/table_name_parser.js b/lib/utils/table_name_parser.js similarity index 100% rename from lib/cartodb/utils/table_name_parser.js rename to lib/utils/table_name_parser.js diff --git a/test/acceptance/aggregation.js b/test/acceptance/aggregation.js index 7bc5e6de..347d91e8 100644 --- a/test/acceptance/aggregation.js +++ b/test/acceptance/aggregation.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -const serverOptions = require('../../lib/cartodb/server_options'); +const serverOptions = require('../../lib/server_options'); const WebMercatorHelper = require('cartodb-query-tables').utils.webMercatorHelper; const webmercator = new WebMercatorHelper(); diff --git a/test/acceptance/analysis/named-maps.js b/test/acceptance/analysis/named-maps.js index dd34b7dd..b6e5f103 100644 --- a/test/acceptance/analysis/named-maps.js +++ b/test/acceptance/analysis/named-maps.js @@ -4,11 +4,11 @@ var assert = require('../../support/assert'); var helper = require('../../support/test_helper'); -var CartodbWindshaft = require('../../../lib/cartodb/server'); -var serverOptions = require('../../../lib/cartodb/server_options'); +var CartodbWindshaft = require('../../../lib/server'); +var serverOptions = require('../../../lib/server_options'); var TestClient = require('../../support/test-client'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); describe('named-maps analysis', function() { var server; diff --git a/test/acceptance/auth/authorization-basic-use-cases.js b/test/acceptance/auth/authorization-basic-use-cases.js index d0c3a17c..e86a879e 100644 --- a/test/acceptance/auth/authorization-basic-use-cases.js +++ b/test/acceptance/auth/authorization-basic-use-cases.js @@ -2,9 +2,9 @@ const assert = require('../../support/assert'); const testHelper = require('../../support/test_helper'); -const CartodbWindshaft = require('../../../lib/cartodb/server'); -const serverOptions = require('../../../lib/cartodb/server_options'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +const CartodbWindshaft = require('../../../lib/server'); +const serverOptions = require('../../../lib/server_options'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); function singleLayergroupConfig(sql, cartocss) { return { diff --git a/test/acceptance/buffer-size-format.js b/test/acceptance/buffer-size-format.js index e3daf626..120bf42b 100644 --- a/test/acceptance/buffer-size-format.js +++ b/test/acceptance/buffer-size-format.js @@ -5,7 +5,7 @@ require('../support/test_helper'); var fs = require('fs'); var assert = require('../support/assert'); var TestClient = require('../support/test-client'); -var serverOptions = require('../../lib/cartodb/server_options'); +var serverOptions = require('../../lib/server_options'); var mapnik = require('windshaft').mapnik; var IMAGE_TOLERANCE_PER_MIL = 5; diff --git a/test/acceptance/cache/cache_headers.js b/test/acceptance/cache/cache_headers.js index 46a22026..81a0dd85 100644 --- a/test/acceptance/cache/cache_headers.js +++ b/test/acceptance/cache/cache_headers.js @@ -5,10 +5,10 @@ var testHelper = require('../../support/test_helper'); var assert = require('../../support/assert'); var qs = require('querystring'); -var CartodbWindshaft = require('../../../lib/cartodb/server'); -var serverOptions = require('../../../lib/cartodb/server_options'); +var CartodbWindshaft = require('../../../lib/server'); +var serverOptions = require('../../../lib/server_options'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); describe('get requests with cache headers', function() { var server; diff --git a/test/acceptance/cache/surrogate_keys_invalidation.js b/test/acceptance/cache/surrogate_keys_invalidation.js index aa22892b..ae3e47c4 100644 --- a/test/acceptance/cache/surrogate_keys_invalidation.js +++ b/test/acceptance/cache/surrogate_keys_invalidation.js @@ -7,13 +7,13 @@ var step = require('step'); var FastlyPurge = require('fastly-purge'); var _ = require('underscore'); -var NamedMapsCacheEntry = require(__dirname + '/../../../lib/cartodb/cache/model/named_maps_entry'); -var CartodbWindshaft = require(__dirname + '/../../../lib/cartodb/server'); +var NamedMapsCacheEntry = require(__dirname + '/../../../lib/cache/model/named_maps_entry'); +var CartodbWindshaft = require(__dirname + '/../../../lib/server'); var nock = require('nock'); describe('templates surrogate keys', function() { - var serverOptions = require('../../../lib/cartodb/server_options'); + var serverOptions = require('../../../lib/server_options'); // Enable Varnish purge for tests var varnishHost = serverOptions.varnish_host; diff --git a/test/acceptance/custom-middlewares.js b/test/acceptance/custom-middlewares.js index 38067296..a4bb7559 100644 --- a/test/acceptance/custom-middlewares.js +++ b/test/acceptance/custom-middlewares.js @@ -2,8 +2,8 @@ const helper = require('../support/test_helper'); const assert = require('../support/assert'); -const createServer = require('../../lib/cartodb/server'); -const serverOptions = require('../../lib/cartodb/server_options'); +const createServer = require('../../lib/server'); +const serverOptions = require('../../lib/server_options'); describe('custom middlewares', function () { const RESPONSE_OK = { diff --git a/test/acceptance/date-wrapping.spec.js b/test/acceptance/date-wrapping.spec.js index f26caf1e..a3c98261 100644 --- a/test/acceptance/date-wrapping.spec.js +++ b/test/acceptance/date-wrapping.spec.js @@ -4,7 +4,7 @@ const assert = require('assert'); const TestClient = require('../support/test-client'); const mapConfigFactory = require('../fixtures/test_mapconfigFactory'); -const serverOptions = require('../../lib/cartodb/server_options'); +const serverOptions = require('../../lib/server_options'); const usePgMvtRenderer = serverOptions.renderer.mvt.usePostGIS; const describe_mvt = !usePgMvtRenderer ? describe : describe.skip; diff --git a/test/acceptance/dynamic-styling-named-maps.js b/test/acceptance/dynamic-styling-named-maps.js index 994e347f..744bf1cd 100644 --- a/test/acceptance/dynamic-styling-named-maps.js +++ b/test/acceptance/dynamic-styling-named-maps.js @@ -2,10 +2,10 @@ var assert = require('../support/assert'); var step = require('step'); -var LayergroupToken = require('../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../lib/models/layergroup-token'); var testHelper = require(__dirname + '/../support/test_helper'); -var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server'); -var serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); +var CartodbWindshaft = require(__dirname + '/../../lib/server'); +var serverOptions = require(__dirname + '/../../lib/server_options'); describe('dynamic styling for named maps', function() { var server; diff --git a/test/acceptance/errors-with-context.js b/test/acceptance/errors-with-context.js index 1adc877a..4d07617f 100644 --- a/test/acceptance/errors-with-context.js +++ b/test/acceptance/errors-with-context.js @@ -1,8 +1,8 @@ 'use strict'; var assert = require('../support/assert'); -var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server'); -var serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); +var CartodbWindshaft = require(__dirname + '/../../lib/server'); +var serverOptions = require(__dirname + '/../../lib/server_options'); describe('error with context', function () { var server; diff --git a/test/acceptance/health_check.js b/test/acceptance/health_check.js index 112cc88d..b49eb03f 100644 --- a/test/acceptance/health_check.js +++ b/test/acceptance/health_check.js @@ -5,8 +5,8 @@ require(__dirname + '/../support/test_helper'); var fs = require('fs'); var assert = require('../support/assert'); -var CartodbWindshaft = require('../../lib/cartodb/server'); -var serverOptions = require('../../lib/cartodb/server_options'); +var CartodbWindshaft = require('../../lib/server'); +var serverOptions = require('../../lib/server_options'); describe('health checks', function () { diff --git a/test/acceptance/layergroup-metadata.js b/test/acceptance/layergroup-metadata.js index 50e30895..816c44b2 100644 --- a/test/acceptance/layergroup-metadata.js +++ b/test/acceptance/layergroup-metadata.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -const serverOptions = require('../../lib/cartodb/server_options'); +const serverOptions = require('../../lib/server_options'); describe('layergroup metadata', function () { const originalUsePostGIS = serverOptions.renderer.mvt.usePostGIS; diff --git a/test/acceptance/multilayer.js b/test/acceptance/multilayer.js index 28d9914f..6ccfd82f 100644 --- a/test/acceptance/multilayer.js +++ b/test/acceptance/multilayer.js @@ -11,15 +11,15 @@ var mapnik = require('windshaft').mapnik; var semver = require('semver'); var helper = require(__dirname + '/../support/test_helper'); -var LayergroupToken = require('../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../lib/models/layergroup-token'); var windshaft_fixtures = __dirname + '/../../node_modules/windshaft/test/fixtures'; var IMAGE_EQUALS_TOLERANCE_PER_MIL = 20; var IMAGE_EQUALS_HIGHER_TOLERANCE_PER_MIL = 25; -var CartodbWindshaft = require('../../lib/cartodb/server'); -var serverOptions = require('../../lib/cartodb/server_options'); +var CartodbWindshaft = require('../../lib/server'); +var serverOptions = require('../../lib/server_options'); var QueryTables = require('cartodb-query-tables').queryTables; diff --git a/test/acceptance/multilayer_server.js b/test/acceptance/multilayer_server.js index 3f6c1b45..24080b52 100644 --- a/test/acceptance/multilayer_server.js +++ b/test/acceptance/multilayer_server.js @@ -6,12 +6,12 @@ var assert = require('../support/assert'); var _ = require('underscore'); -var LayergroupToken = require('../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../lib/models/layergroup-token'); -var PgQueryRunner = require('../../lib/cartodb/backends/pg_query_runner'); +var PgQueryRunner = require('../../lib/backends/pg_query_runner'); var QueryTables = require('cartodb-query-tables').queryTables; -var CartodbWindshaft = require('../../lib/cartodb/server'); -var serverOptions = require('../../lib/cartodb/server_options'); +var CartodbWindshaft = require('../../lib/server'); +var serverOptions = require('../../lib/server_options'); describe('tests from old api translated to multilayer', function() { var server; diff --git a/test/acceptance/mvt-regressions.js b/test/acceptance/mvt-regressions.js index c660e23d..c8c4ffa8 100644 --- a/test/acceptance/mvt-regressions.js +++ b/test/acceptance/mvt-regressions.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -const serverOptions = require('../../lib/cartodb/server_options'); +const serverOptions = require('../../lib/server_options'); const suites = [ { diff --git a/test/acceptance/mvt.js b/test/acceptance/mvt.js index bb446680..10c5cac7 100644 --- a/test/acceptance/mvt.js +++ b/test/acceptance/mvt.js @@ -4,7 +4,7 @@ require('../support/test_helper'); var assert = require('../support/assert'); var TestClient = require('../support/test-client'); -var serverOptions = require('../../lib/cartodb/server_options'); +var serverOptions = require('../../lib/server_options'); function createMapConfig(sql = TestClient.SQL.ONE_POINT) { return { diff --git a/test/acceptance/named-map-cache-regressions.js b/test/acceptance/named-map-cache-regressions.js index 8521ca8a..15c03f51 100644 --- a/test/acceptance/named-map-cache-regressions.js +++ b/test/acceptance/named-map-cache-regressions.js @@ -4,8 +4,8 @@ require('../support/test_helper'); const request = require('request'); const assert = require('assert'); -const Server = require('../../lib/cartodb/server'); -const serverOptions = require('../../lib/cartodb/server_options'); +const Server = require('../../lib/server'); +const serverOptions = require('../../lib/server_options'); const { mapnik } = require('windshaft'); const helper = require('../support/test_helper'); diff --git a/test/acceptance/named_layers.js b/test/acceptance/named_layers.js index b80bfacc..4d92880f 100644 --- a/test/acceptance/named_layers.js +++ b/test/acceptance/named_layers.js @@ -3,13 +3,13 @@ var test_helper = require('../support/test_helper'); var assert = require('../support/assert'); -var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server'); -var serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); +var CartodbWindshaft = require(__dirname + '/../../lib/server'); +var serverOptions = require(__dirname + '/../../lib/server_options'); -var LayergroupToken = require('../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../lib/models/layergroup-token'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../lib/cartodb/backends/template_maps.js'); +var TemplateMaps = require('../../lib/backends/template_maps.js'); var step = require('step'); diff --git a/test/acceptance/named_layers_visibility.js b/test/acceptance/named_layers_visibility.js index 0df92ed6..5d1f9618 100644 --- a/test/acceptance/named_layers_visibility.js +++ b/test/acceptance/named_layers_visibility.js @@ -4,11 +4,11 @@ var step = require('step'); var test_helper = require('../support/test_helper'); var assert = require('../support/assert'); -var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server'); -var serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); +var CartodbWindshaft = require(__dirname + '/../../lib/server'); +var serverOptions = require(__dirname + '/../../lib/server_options'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../lib/cartodb/backends/template_maps.js'); +var TemplateMaps = require('../../lib/backends/template_maps.js'); var mapnik = require('windshaft').mapnik; var IMAGE_TOLERANCE = 20; diff --git a/test/acceptance/named_maps_authentication.js b/test/acceptance/named_maps_authentication.js index 4f8e343c..f1edf5b2 100644 --- a/test/acceptance/named_maps_authentication.js +++ b/test/acceptance/named_maps_authentication.js @@ -6,10 +6,10 @@ var querystring = require('querystring'); var assert = require('../support/assert'); var mapnik = require('windshaft').mapnik; -var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server'); -var serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); -var TemplateMaps = require('../../lib/cartodb/backends/template_maps.js'); -var NamedMapsCacheEntry = require('../../lib/cartodb/cache/model/named_maps_entry'); +var CartodbWindshaft = require(__dirname + '/../../lib/server'); +var serverOptions = require(__dirname + '/../../lib/server_options'); +var TemplateMaps = require('../../lib/backends/template_maps.js'); +var NamedMapsCacheEntry = require('../../lib/cache/model/named_maps_entry'); describe('named maps authentication', function() { var server; diff --git a/test/acceptance/named_maps_cache.js b/test/acceptance/named_maps_cache.js index 0cdc2a49..eb2edcd0 100644 --- a/test/acceptance/named_maps_cache.js +++ b/test/acceptance/named_maps_cache.js @@ -5,8 +5,8 @@ require('../support/test_helper'); const helper = require('../support/test_helper'); var assert = require('../support/assert'); var mapnik = require('windshaft').mapnik; -var CartodbWindshaft = require('../../lib/cartodb/server'); -var serverOptions = require('../../lib/cartodb/server_options'); +var CartodbWindshaft = require('../../lib/server'); +var serverOptions = require('../../lib/server_options'); describe('named maps provider cache', function() { var server; diff --git a/test/acceptance/named_maps_static_view.js b/test/acceptance/named_maps_static_view.js index 8a9b1402..1075b398 100644 --- a/test/acceptance/named_maps_static_view.js +++ b/test/acceptance/named_maps_static_view.js @@ -6,9 +6,9 @@ var RedisPool = require('redis-mpool'); var assert = require('../support/assert'); var mapnik = require('windshaft').mapnik; -var CartodbWindshaft = require('../../lib/cartodb/server'); -var serverOptions = require('../../lib/cartodb/server_options'); -var TemplateMaps = require('../../lib/cartodb/backends/template_maps.js'); +var CartodbWindshaft = require('../../lib/server'); +var serverOptions = require('../../lib/server_options'); +var TemplateMaps = require('../../lib/backends/template_maps.js'); describe('named maps static view', function() { // configure redis pool instance to use in tests diff --git a/test/acceptance/named_maps_stats.js b/test/acceptance/named_maps_stats.js index fc80cbbc..1ad92772 100644 --- a/test/acceptance/named_maps_stats.js +++ b/test/acceptance/named_maps_stats.js @@ -6,10 +6,10 @@ var querystring = require('querystring'); var assert = require('../support/assert'); var mapnik = require('windshaft').mapnik; -var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server'); -var serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); -var TemplateMaps = require('../../lib/cartodb/backends/template_maps.js'); -var NamedMapsCacheEntry = require('../../lib/cartodb/cache/model/named_maps_entry'); +var CartodbWindshaft = require(__dirname + '/../../lib/server'); +var serverOptions = require(__dirname + '/../../lib/server_options'); +var TemplateMaps = require('../../lib/backends/template_maps.js'); +var NamedMapsCacheEntry = require('../../lib/cache/model/named_maps_entry'); describe('named maps preview stats', function() { var server; diff --git a/test/acceptance/overviews_metadata.js b/test/acceptance/overviews_metadata.js index 90642777..2b2b25a8 100644 --- a/test/acceptance/overviews_metadata.js +++ b/test/acceptance/overviews_metadata.js @@ -3,10 +3,10 @@ var test_helper = require('../support/test_helper'); var assert = require('../support/assert'); -var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server'); -var serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); +var CartodbWindshaft = require(__dirname + '/../../lib/server'); +var serverOptions = require(__dirname + '/../../lib/server_options'); -var LayergroupToken = require('../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../lib/models/layergroup-token'); var RedisPool = require('redis-mpool'); diff --git a/test/acceptance/overviews_metadata_named_maps.js b/test/acceptance/overviews_metadata_named_maps.js index 9e66cf07..e4822e0b 100644 --- a/test/acceptance/overviews_metadata_named_maps.js +++ b/test/acceptance/overviews_metadata_named_maps.js @@ -3,10 +3,10 @@ var test_helper = require('../support/test_helper'); var assert = require('../support/assert'); -var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server'); -var serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); +var CartodbWindshaft = require(__dirname + '/../../lib/server'); +var serverOptions = require(__dirname + '/../../lib/server_options'); -var LayergroupToken = require('../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../lib/models/layergroup-token'); var RedisPool = require('redis-mpool'); diff --git a/test/acceptance/overviews_queries.js b/test/acceptance/overviews_queries.js index c3726a61..ade842c9 100644 --- a/test/acceptance/overviews_queries.js +++ b/test/acceptance/overviews_queries.js @@ -3,7 +3,7 @@ var testHelper = require('../support/test_helper'); var assert = require('../support/assert'); -var cartodbServer = require('../../lib/cartodb/server'); +var cartodbServer = require('../../lib/server'); var ServerOptions = require('./ported/support/ported_server_options'); var testClient = require('./ported/support/test_client'); diff --git a/test/acceptance/ported/attributes.js b/test/acceptance/ported/attributes.js index 13af276e..b77dfbbb 100644 --- a/test/acceptance/ported/attributes.js +++ b/test/acceptance/ported/attributes.js @@ -4,9 +4,9 @@ var testHelper = require('../../support/test_helper'); var assert = require('../../support/assert'); var step = require('step'); -var cartodbServer = require('../../../lib/cartodb/server'); +var cartodbServer = require('../../../lib/server'); var PortedServerOptions = require('./support/ported_server_options'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); describe('attributes', function() { var server; diff --git a/test/acceptance/ported/multilayer.js b/test/acceptance/ported/multilayer.js index f996d45c..9ecbbf48 100644 --- a/test/acceptance/ported/multilayer.js +++ b/test/acceptance/ported/multilayer.js @@ -7,9 +7,9 @@ var _ = require('underscore'); var querystring = require('querystring'); var step = require('step'); var mapnik = require('windshaft').mapnik; -var cartodbServer = require('../../../lib/cartodb/server'); +var cartodbServer = require('../../../lib/server'); var ServerOptions = require('./support/ported_server_options'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); describe('multilayer', function() { var server; diff --git a/test/acceptance/ported/multilayer_error_cases.js b/test/acceptance/ported/multilayer_error_cases.js index 246f9964..a05976a6 100644 --- a/test/acceptance/ported/multilayer_error_cases.js +++ b/test/acceptance/ported/multilayer_error_cases.js @@ -4,7 +4,7 @@ require('../../support/test_helper'); var assert = require('../../support/assert'); var step = require('step'); -var cartodbServer = require('../../../lib/cartodb/server'); +var cartodbServer = require('../../../lib/server'); var ServerOptions = require('./support/ported_server_options'); var testClient = require('./support/test_client'); var TestClient = require('../../support/test-client'); diff --git a/test/acceptance/ported/multilayer_interactivity.js b/test/acceptance/ported/multilayer_interactivity.js index 62948038..4dd3fa69 100644 --- a/test/acceptance/ported/multilayer_interactivity.js +++ b/test/acceptance/ported/multilayer_interactivity.js @@ -4,10 +4,10 @@ var testHelper = require('../../support/test_helper'); var assert = require('../../support/assert'); var _ = require('underscore'); -var cartodbServer = require('../../../lib/cartodb/server'); +var cartodbServer = require('../../../lib/server'); var getLayerTypeFn = require('windshaft').model.MapConfig.prototype.getType; var PortedServerOptions = require('./support/ported_server_options'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); describe('multilayer interactivity and layers order', function() { var server; diff --git a/test/acceptance/ported/raster.js b/test/acceptance/ported/raster.js index 574de93c..ec206e1b 100644 --- a/test/acceptance/ported/raster.js +++ b/test/acceptance/ported/raster.js @@ -4,9 +4,9 @@ var testHelper =require('../../support/test_helper'); var assert = require('../../support/assert'); var step = require('step'); -var cartodbServer = require('../../../lib/cartodb/server'); +var cartodbServer = require('../../../lib/server'); var ServerOptions = require('./support/ported_server_options'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); describe('raster', function() { diff --git a/test/acceptance/ported/retina.js b/test/acceptance/ported/retina.js index d2a82306..8c29a9f5 100644 --- a/test/acceptance/ported/retina.js +++ b/test/acceptance/ported/retina.js @@ -4,10 +4,10 @@ var testHelper = require('../../support/test_helper'); var assert = require('../../support/assert'); var mapnik = require('windshaft').mapnik; -var cartodbServer = require('../../../lib/cartodb/server'); +var cartodbServer = require('../../../lib/server'); var ServerOptions = require('./support/ported_server_options'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); describe('retina support', function() { diff --git a/test/acceptance/ported/server.js b/test/acceptance/ported/server.js index 58febf38..28eb9340 100644 --- a/test/acceptance/ported/server.js +++ b/test/acceptance/ported/server.js @@ -3,7 +3,7 @@ var testHelper = require('../../support/test_helper'); var assert = require('../../support/assert'); -var cartodbServer = require('../../../lib/cartodb/server'); +var cartodbServer = require('../../../lib/server'); var ServerOptions = require('./support/ported_server_options'); var testClient = require('./support/test_client'); diff --git a/test/acceptance/ported/server_gettile.js b/test/acceptance/ported/server_gettile.js index 61daa568..98a19659 100644 --- a/test/acceptance/ported/server_gettile.js +++ b/test/acceptance/ported/server_gettile.js @@ -5,7 +5,7 @@ var testHelper = require('../../support/test_helper'); var assert = require('../../support/assert'); var mapnik = require('windshaft').mapnik; var semver = require('semver'); -var cartodbServer = require('../../../lib/cartodb/server'); +var cartodbServer = require('../../../lib/server'); var ServerOptions = require('./support/ported_server_options'); var testClient = require('./support/test_client'); diff --git a/test/acceptance/ported/server_png8_format.js b/test/acceptance/ported/server_png8_format.js index ab4f2758..f9a0624a 100644 --- a/test/acceptance/ported/server_png8_format.js +++ b/test/acceptance/ported/server_png8_format.js @@ -5,10 +5,10 @@ var testHelper = require('../../support/test_helper'); var assert = require('../../support/assert'); var _ = require('underscore'); var fs = require('fs'); -var cartodbServer = require('../../../lib/cartodb/server'); +var cartodbServer = require('../../../lib/server'); var ServerOptions = require('./support/ported_server_options'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); var IMAGE_EQUALS_TOLERANCE_PER_MIL = 85; diff --git a/test/acceptance/ported/support/ported_server_options.js b/test/acceptance/ported/support/ported_server_options.js index 10908124..db1a2ecf 100644 --- a/test/acceptance/ported/support/ported_server_options.js +++ b/test/acceptance/ported/support/ported_server_options.js @@ -1,9 +1,9 @@ 'use strict'; var _ = require('underscore'); -var serverOptions = require('../../../../lib/cartodb/server_options'); +var serverOptions = require('../../../../lib/server_options'); var mapnik = require('windshaft').mapnik; -var OverviewsQueryRewriter = require('../../../../lib/cartodb/utils/overviews_query_rewriter'); +var OverviewsQueryRewriter = require('../../../../lib/utils/overviews_query_rewriter'); var overviewsQueryRewriter = new OverviewsQueryRewriter({ zoom_level: 'CDB_ZoomFromScale(!scale_denominator!)' }); diff --git a/test/acceptance/ported/support/test_client.js b/test/acceptance/ported/support/test_client.js index 67d5c11e..6b19d3c4 100644 --- a/test/acceptance/ported/support/test_client.js +++ b/test/acceptance/ported/support/test_client.js @@ -1,14 +1,14 @@ 'use strict'; var testHelper = require('../../../support/test_helper'); -var LayergroupToken = require('../../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../../lib/models/layergroup-token'); var step = require('step'); var assert = require('../../../support/assert'); var _ = require('underscore'); var querystring = require('querystring'); var mapnik = require('windshaft').mapnik; -var CartodbServer = require('../../../../lib/cartodb/server'); +var CartodbServer = require('../../../../lib/server'); var PortedServerOptions = require('./ported_server_options'); var DEFAULT_POINT_STYLE = [ diff --git a/test/acceptance/ported/torque.js b/test/acceptance/ported/torque.js index 31f3cf55..528885d8 100644 --- a/test/acceptance/ported/torque.js +++ b/test/acceptance/ported/torque.js @@ -5,10 +5,10 @@ var testHelper = require('../../support/test_helper'); var assert = require('../../support/assert'); var _ = require('underscore'); var step = require('step'); -var cartodbServer = require('../../../lib/cartodb/server'); +var cartodbServer = require('../../../lib/server'); var ServerOptions = require('./support/ported_server_options'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); describe('torque', function() { var server; diff --git a/test/acceptance/ported/torque_boundaries.js b/test/acceptance/ported/torque_boundaries.js index 55b26297..b3d09e91 100644 --- a/test/acceptance/ported/torque_boundaries.js +++ b/test/acceptance/ported/torque_boundaries.js @@ -3,10 +3,10 @@ var testHelper = require('../../support/test_helper'); var assert = require('../../support/assert'); -var cartodbServer = require('../../../lib/cartodb/server'); +var cartodbServer = require('../../../lib/server'); var ServerOptions = require('./support/ported_server_options'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); describe('torque boundary points', function() { var server; diff --git a/test/acceptance/rate-limit.test.js b/test/acceptance/rate-limit.test.js index f5b6f456..d9589d0b 100644 --- a/test/acceptance/rate-limit.test.js +++ b/test/acceptance/rate-limit.test.js @@ -7,9 +7,9 @@ const redis = require('redis'); const RedisPool = require('redis-mpool'); const cartodbRedis = require('cartodb-redis'); const TestClient = require('../support/test-client'); -const UserLimitsBackend = require('../../lib/cartodb/backends/user-limits'); -const rateLimitMiddleware = require('../../lib/cartodb/api/middlewares/rate-limit'); -const serverOptions = require('../../lib/cartodb/server_options'); +const UserLimitsBackend = require('../../lib/backends/user-limits'); +const rateLimitMiddleware = require('../../lib/api/middlewares/rate-limit'); +const serverOptions = require('../../lib/server_options'); const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimitMiddleware; let userLimitsApi; diff --git a/test/acceptance/regressions.js b/test/acceptance/regressions.js index 21d9c970..df91d910 100644 --- a/test/acceptance/regressions.js +++ b/test/acceptance/regressions.js @@ -4,9 +4,9 @@ require('../support/test_helper'); var assert = require('../support/assert'); const helper = require('../support/test_helper'); var TestClient = require('../support/test-client'); -const LayergroupToken = require('../../lib/cartodb/models/layergroup-token'); -const CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server'); -const serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); +const LayergroupToken = require('../../lib/models/layergroup-token'); +const CartodbWindshaft = require(__dirname + '/../../lib/server'); +const serverOptions = require(__dirname + '/../../lib/server_options'); describe('regressions', function() { diff --git a/test/acceptance/server.js b/test/acceptance/server.js index 183d6bac..39275415 100644 --- a/test/acceptance/server.js +++ b/test/acceptance/server.js @@ -6,8 +6,8 @@ var assert = require('../support/assert'); var querystring = require('querystring'); var step = require('step'); -var CartodbWindshaft = require('../../lib/cartodb/server'); -var serverOptions = require('../../lib/cartodb/server_options'); +var CartodbWindshaft = require('../../lib/server'); +var serverOptions = require('../../lib/server_options'); describe('server', function() { diff --git a/test/acceptance/stats/mapnik_stats_layergroup.js b/test/acceptance/stats/mapnik_stats_layergroup.js index 55ca7a64..5395bf0c 100644 --- a/test/acceptance/stats/mapnik_stats_layergroup.js +++ b/test/acceptance/stats/mapnik_stats_layergroup.js @@ -4,7 +4,7 @@ require('../../support/test_helper'); var assert = require('../../support/assert'); var TestClient = require('../../support/test-client'); -const serverOptions = require('../../../lib/cartodb/server_options'); +const serverOptions = require('../../../lib/server_options'); const suites = [ { diff --git a/test/acceptance/templates.js b/test/acceptance/templates.js index 72e6fa73..28a76701 100644 --- a/test/acceptance/templates.js +++ b/test/acceptance/templates.js @@ -6,7 +6,7 @@ var redis = require('redis'); var step = require('step'); var strftime = require('strftime'); var QueryTables = require('cartodb-query-tables').queryTables; -var NamedMapsCacheEntry = require('../../lib/cartodb/cache/model/named_maps_entry'); +var NamedMapsCacheEntry = require('../../lib/cache/model/named_maps_entry'); var redis_stats_db = 5; // Pollute the PG environment to make sure @@ -20,10 +20,10 @@ var http = require('http'); var helper = require(__dirname + '/../support/test_helper'); -var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server'); -var serverOptions = require(__dirname + '/../../lib/cartodb/server_options'); +var CartodbWindshaft = require(__dirname + '/../../lib/server'); +var serverOptions = require(__dirname + '/../../lib/server_options'); -var LayergroupToken = require('../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../lib/models/layergroup-token'); describe('template_api', function() { var server; diff --git a/test/acceptance/tilejson.js b/test/acceptance/tilejson.js index 19ef158f..22db6082 100644 --- a/test/acceptance/tilejson.js +++ b/test/acceptance/tilejson.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -const serverOptions = require('../../lib/cartodb/server_options'); +const serverOptions = require('../../lib/server_options'); const originalUsePostGIS = serverOptions.renderer.mvt.usePostGIS; diff --git a/test/acceptance/turbo-carto/named-maps.js b/test/acceptance/turbo-carto/named-maps.js index 6a302498..17269442 100644 --- a/test/acceptance/turbo-carto/named-maps.js +++ b/test/acceptance/turbo-carto/named-maps.js @@ -2,10 +2,10 @@ var assert = require('../../support/assert'); var step = require('step'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); var testHelper = require('../../support/test_helper'); -var CartodbWindshaft = require('../../../lib/cartodb/server'); -var serverOptions = require('../../../lib/cartodb/server_options'); +var CartodbWindshaft = require('../../../lib/server'); +var serverOptions = require('../../../lib/server_options'); var mapnik = require('windshaft').mapnik; var IMAGE_TOLERANCE_PER_MIL = 10; diff --git a/test/acceptance/user-database-timeout-limit.js b/test/acceptance/user-database-timeout-limit.js index 629d3778..81c0161c 100644 --- a/test/acceptance/user-database-timeout-limit.js +++ b/test/acceptance/user-database-timeout-limit.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -const serverOptions = require('../../lib/cartodb/server_options'); +const serverOptions = require('../../lib/server_options'); const timeoutErrorTilePath = `${process.cwd()}/assets/render-timeout-fallback.png`; diff --git a/test/acceptance/user-render-timeout-limit.js b/test/acceptance/user-render-timeout-limit.js index a011ce70..6e2e1e36 100644 --- a/test/acceptance/user-render-timeout-limit.js +++ b/test/acceptance/user-render-timeout-limit.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -var serverOptions = require('../../lib/cartodb/server_options'); +var serverOptions = require('../../lib/server_options'); const timeoutErrorTilePath = `${process.cwd()}/assets/render-timeout-fallback.png`; diff --git a/test/acceptance/vector-layergroup.js b/test/acceptance/vector-layergroup.js index d23403db..781e4d3f 100644 --- a/test/acceptance/vector-layergroup.js +++ b/test/acceptance/vector-layergroup.js @@ -4,7 +4,7 @@ require('../support/test_helper'); const assert = require('../support/assert'); const TestClient = require('../support/test-client'); -const serverOptions = require('../../lib/cartodb/server_options'); +const serverOptions = require('../../lib/server_options'); const POINTS_SQL_1 = ` diff --git a/test/acceptance/widgets/named-maps.js b/test/acceptance/widgets/named-maps.js index ab136dc0..d034453a 100644 --- a/test/acceptance/widgets/named-maps.js +++ b/test/acceptance/widgets/named-maps.js @@ -8,10 +8,10 @@ var queue = require('queue-async'); var helper = require('../../support/test_helper'); -var CartodbWindshaft = require('../../../lib/cartodb/server'); -var serverOptions = require('../../../lib/cartodb/server_options'); +var CartodbWindshaft = require('../../../lib/server'); +var serverOptions = require('../../../lib/server_options'); -var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../../lib/models/layergroup-token'); describe('named-maps widgets', function() { var server; diff --git a/test/integration/analysis-backend-limits.js b/test/integration/analysis-backend-limits.js index 21e7d9cc..2bc94f15 100644 --- a/test/integration/analysis-backend-limits.js +++ b/test/integration/analysis-backend-limits.js @@ -8,7 +8,7 @@ var redis = require('redis'); var RedisPool = require('redis-mpool'); var cartodbRedis = require('cartodb-redis'); -var AnalysisBackend = require('../../lib/cartodb/backends/analysis'); +var AnalysisBackend = require('../../lib/backends/analysis'); describe('analysis-backend limits', function() { diff --git a/test/integration/mapconfig_named_layers_datasource.js b/test/integration/mapconfig_named_layers_datasource.js index d3eefd28..55247105 100644 --- a/test/integration/mapconfig_named_layers_datasource.js +++ b/test/integration/mapconfig_named_layers_datasource.js @@ -4,9 +4,9 @@ require('../support/test_helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../lib/cartodb/backends/template_maps.js'); -var PgConnection = require(__dirname + '/../../lib/cartodb/backends/pg_connection'); -var MapConfigNamedLayersAdapter = require('../../lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter'); +var TemplateMaps = require('../../lib/backends/template_maps.js'); +var PgConnection = require(__dirname + '/../../lib/backends/pg_connection'); +var MapConfigNamedLayersAdapter = require('../../lib/models/mapconfig/adapter/mapconfig-named-layers-adapter'); // configure redis pool instance to use in tests var redisPool = new RedisPool(global.environment.redis); diff --git a/test/integration/mapconfig_named_layers_expanded.js b/test/integration/mapconfig_named_layers_expanded.js index ea3a34a4..e0f3e71e 100644 --- a/test/integration/mapconfig_named_layers_expanded.js +++ b/test/integration/mapconfig_named_layers_expanded.js @@ -4,9 +4,9 @@ require('../support/test_helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../lib/cartodb/backends/template_maps.js'); -var PgConnection = require(__dirname + '/../../lib/cartodb/backends/pg_connection'); -var MapConfigNamedLayersAdapter = require('../../lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter'); +var TemplateMaps = require('../../lib/backends/template_maps.js'); +var PgConnection = require(__dirname + '/../../lib/backends/pg_connection'); +var MapConfigNamedLayersAdapter = require('../../lib/models/mapconfig/adapter/mapconfig-named-layers-adapter'); describe('mapconfig-named-layers-adapter', function() { diff --git a/test/integration/mapconfig_overviews_adapter.js b/test/integration/mapconfig_overviews_adapter.js index 64a2d0c9..b737c058 100644 --- a/test/integration/mapconfig_overviews_adapter.js +++ b/test/integration/mapconfig_overviews_adapter.js @@ -5,11 +5,11 @@ require('../support/test_helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); var cartodbRedis = require('cartodb-redis'); -var PgConnection = require(__dirname + '/../../lib/cartodb/backends/pg_connection'); -var PgQueryRunner = require('../../lib/cartodb/backends/pg_query_runner'); -var OverviewsMetadataBackend = require('../../lib/cartodb/backends/overviews-metadata'); -var FilterStatsBackend = require('../../lib/cartodb/backends/filter-stats'); -var MapConfigOverviewsAdapter = require('../../lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter'); +var PgConnection = require(__dirname + '/../../lib/backends/pg_connection'); +var PgQueryRunner = require('../../lib/backends/pg_query_runner'); +var OverviewsMetadataBackend = require('../../lib/backends/overviews-metadata'); +var FilterStatsBackend = require('../../lib/backends/filter-stats'); +var MapConfigOverviewsAdapter = require('../../lib/models/mapconfig/adapter/mapconfig-overviews-adapter'); var redisPool = new RedisPool(global.environment.redis); var metadataBackend = cartodbRedis({pool: redisPool}); diff --git a/test/integration/overviews-metadata-api.js b/test/integration/overviews-metadata-api.js index c3e241ec..761ccad0 100644 --- a/test/integration/overviews-metadata-api.js +++ b/test/integration/overviews-metadata-api.js @@ -7,9 +7,9 @@ var assert = require('assert'); var RedisPool = require('redis-mpool'); var cartodbRedis = require('cartodb-redis'); -var PgConnection = require('../../lib/cartodb/backends/pg_connection'); -var PgQueryRunner = require('../../lib/cartodb/backends/pg_query_runner'); -var OverviewsMetadataBackend = require('../../lib/cartodb/backends/overviews-metadata'); +var PgConnection = require('../../lib/backends/pg_connection'); +var PgQueryRunner = require('../../lib/backends/pg_query_runner'); +var OverviewsMetadataBackend = require('../../lib/backends/overviews-metadata'); describe('OverviewsMetadataBackend', function() { diff --git a/test/integration/pg-query-runner.js b/test/integration/pg-query-runner.js index a979ee81..9c6b80b2 100644 --- a/test/integration/pg-query-runner.js +++ b/test/integration/pg-query-runner.js @@ -7,8 +7,8 @@ var assert = require('assert'); var RedisPool = require('redis-mpool'); var cartodbRedis = require('cartodb-redis'); -var PgConnection = require('../../lib/cartodb/backends/pg_connection'); -var PgQueryRunner = require('../../lib/cartodb/backends/pg_query_runner'); +var PgConnection = require('../../lib/backends/pg_connection'); +var PgQueryRunner = require('../../lib/backends/pg_query_runner'); describe('PgQueryRunner', function() { diff --git a/test/integration/profiler.js b/test/integration/profiler.js index 4bc7ee0e..a4f81857 100644 --- a/test/integration/profiler.js +++ b/test/integration/profiler.js @@ -3,8 +3,8 @@ require('../support/test_helper'); var assert = require('assert'); -var StatsClient = require('../../lib/cartodb/stats/client'); -var ProfilerProxy = require('../../lib/cartodb/stats/profiler_proxy'); +var StatsClient = require('../../lib/stats/client'); +var ProfilerProxy = require('../../lib/stats/profiler_proxy'); describe('profiler + statsd', function() { var statsInstance; diff --git a/test/integration/query-tables.js b/test/integration/query-tables.js index 721de841..bf21f34c 100644 --- a/test/integration/query-tables.js +++ b/test/integration/query-tables.js @@ -7,7 +7,7 @@ var assert = require('assert'); var RedisPool = require('redis-mpool'); var cartodbRedis = require('cartodb-redis'); -var PgConnection = require('../../lib/cartodb/backends/pg_connection'); +var PgConnection = require('../../lib/backends/pg_connection'); var QueryTables = require('cartodb-query-tables').queryTables; diff --git a/test/integration/template-maps-limits.js b/test/integration/template-maps-limits.js index 37f3ca9f..d8b7d8e2 100644 --- a/test/integration/template-maps-limits.js +++ b/test/integration/template-maps-limits.js @@ -5,7 +5,7 @@ require('../support/test_helper'); var assert = require('assert'); var redis = require('redis'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../lib/cartodb/backends/template_maps'); +var TemplateMaps = require('../../lib/backends/template_maps'); describe('TemplateMaps limits', function() { diff --git a/test/support/test-client.js b/test/support/test-client.js index 5d88f6e0..b18580e4 100644 --- a/test/support/test-client.js +++ b/test/support/test-client.js @@ -7,13 +7,13 @@ var PSQL = require('cartodb-psql'); var _ = require('underscore'); var mapnik = require('windshaft').mapnik; -var LayergroupToken = require('../../lib/cartodb/models/layergroup-token'); +var LayergroupToken = require('../../lib/models/layergroup-token'); var assert = require('./assert'); var helper = require('./test_helper'); -var CartodbWindshaft = require('../../lib/cartodb/server'); -var serverOptions = require('../../lib/cartodb/server_options'); +var CartodbWindshaft = require('../../lib/server'); +var serverOptions = require('../../lib/server_options'); serverOptions.analysis.batch.inlineExecution = true; const MAPNIK_SUPPORTED_FORMATS = { diff --git a/test/support/test_helper.js b/test/support/test_helper.js index 55fad97a..cc5ff311 100644 --- a/test/support/test_helper.js +++ b/test/support/test_helper.js @@ -15,7 +15,7 @@ var lzmaWorker = new LZMA(); var redis = require('redis'); var log4js = require('log4js'); -const setICUEnvVariable = require('../../lib/cartodb/utils/icu_data_env_setter'); +const setICUEnvVariable = require('../../lib/utils/icu_data_env_setter'); // set environment specific variables global.environment = require(__dirname + '/../../config/environments/test'); diff --git a/test/unit/cartodb/backends/layer-stats/mapnik-layer-stats.js b/test/unit/cartodb/backends/layer-stats/mapnik-layer-stats.js index 874fba28..7106e60f 100644 --- a/test/unit/cartodb/backends/layer-stats/mapnik-layer-stats.js +++ b/test/unit/cartodb/backends/layer-stats/mapnik-layer-stats.js @@ -1,7 +1,7 @@ 'use strict'; var assert = require('assert'); -var MapnikLayerStats = require('../../../../../lib/cartodb/backends/layer-stats/mapnik-layer-stats'); +var MapnikLayerStats = require('../../../../../lib/backends/layer-stats/mapnik-layer-stats'); var MapConfig = require('windshaft').model.MapConfig; function getDbConnectionMock () { diff --git a/test/unit/cartodb/backends/layer-stats/torque-layer-stats.js b/test/unit/cartodb/backends/layer-stats/torque-layer-stats.js index c00260c8..a6638610 100644 --- a/test/unit/cartodb/backends/layer-stats/torque-layer-stats.js +++ b/test/unit/cartodb/backends/layer-stats/torque-layer-stats.js @@ -1,7 +1,7 @@ 'use strict'; var assert = require('assert'); -var TorqueLayerStats = require('../../../../../lib/cartodb/backends/layer-stats/torque-layer-stats'); +var TorqueLayerStats = require('../../../../../lib/backends/layer-stats/torque-layer-stats'); var MapConfig = require('windshaft').model.MapConfig; describe('torque-layer-stats', function () { diff --git a/test/unit/cartodb/backends/turbo-carto-postgres-datasource.js b/test/unit/cartodb/backends/turbo-carto-postgres-datasource.js index 861f51d8..420edf7f 100644 --- a/test/unit/cartodb/backends/turbo-carto-postgres-datasource.js +++ b/test/unit/cartodb/backends/turbo-carto-postgres-datasource.js @@ -1,6 +1,6 @@ 'use strict'; -var PostgresDatasource = require('../../../../lib/cartodb/backends/turbo-carto-postgres-datasource'); +var PostgresDatasource = require('../../../../lib/backends/turbo-carto-postgres-datasource'); var PSQL = require('cartodb-psql'); var _ = require('underscore'); var assert = require('assert'); diff --git a/test/unit/cartodb/cache/model/named_maps_entry.test.js b/test/unit/cartodb/cache/model/named_maps_entry.test.js index 335f30c7..35be48d1 100644 --- a/test/unit/cartodb/cache/model/named_maps_entry.test.js +++ b/test/unit/cartodb/cache/model/named_maps_entry.test.js @@ -4,7 +4,7 @@ require('../../../../support/test_helper'); var assert = require('assert'); var _ = require('underscore'); -var NamedMapsCacheEntry = require('../../../../../lib/cartodb/cache/model/named_maps_entry'); +var NamedMapsCacheEntry = require('../../../../../lib/cache/model/named_maps_entry'); describe('cache named_maps_entry', function() { diff --git a/test/unit/cartodb/cdb_request.test.js b/test/unit/cartodb/cdb_request.test.js index 0dbf35a3..78d55761 100644 --- a/test/unit/cartodb/cdb_request.test.js +++ b/test/unit/cartodb/cdb_request.test.js @@ -3,7 +3,7 @@ require('../../support/test_helper'); var assert = require('assert'); -var CdbRequest = require('../../../lib/cartodb/models/cdb_request'); +var CdbRequest = require('../../../lib/models/cdb_request'); describe('req2params', function() { diff --git a/test/unit/cartodb/error-middleware.test.js b/test/unit/cartodb/error-middleware.test.js index 1f17ed9c..1645d422 100644 --- a/test/unit/cartodb/error-middleware.test.js +++ b/test/unit/cartodb/error-middleware.test.js @@ -3,7 +3,7 @@ require('../../support/test_helper.js'); var assert = require('assert'); -var errorMiddleware = require('../../../lib/cartodb/api/middlewares/error-middleware'); +var errorMiddleware = require('../../../lib/api/middlewares/error-middleware'); describe('error-middleware', function() { diff --git a/test/unit/cartodb/error_messages.test.js b/test/unit/cartodb/error_messages.test.js index 13ea1661..981b0a21 100644 --- a/test/unit/cartodb/error_messages.test.js +++ b/test/unit/cartodb/error_messages.test.js @@ -4,7 +4,7 @@ require('../../support/test_helper'); var assert = require('assert'); -var errorMiddleware = require('../../../lib/cartodb/api/middlewares/error-middleware'); +var errorMiddleware = require('../../../lib/api/middlewares/error-middleware'); describe('error messages clean up', function() { diff --git a/test/unit/cartodb/lzmaMiddleware.test.js b/test/unit/cartodb/lzmaMiddleware.test.js index 4dc355fb..6d9c214e 100644 --- a/test/unit/cartodb/lzmaMiddleware.test.js +++ b/test/unit/cartodb/lzmaMiddleware.test.js @@ -3,7 +3,7 @@ var assert = require('assert'); var testHelper = require('../../support/test_helper'); -var lzmaMiddleware = require('../../../lib/cartodb/api/middlewares/lzma'); +var lzmaMiddleware = require('../../../lib/api/middlewares/lzma'); describe('lzma-middleware', function() { diff --git a/test/unit/cartodb/mapconfig/adapter.test.js b/test/unit/cartodb/mapconfig/adapter.test.js index d2832c78..b82237f1 100644 --- a/test/unit/cartodb/mapconfig/adapter.test.js +++ b/test/unit/cartodb/mapconfig/adapter.test.js @@ -3,7 +3,7 @@ //require('../../../support/test_helper'); var assert = require('assert'); -var MapConfigAdapter = require('../../../../lib/cartodb/models/mapconfig/adapter'); +var MapConfigAdapter = require('../../../../lib/models/mapconfig/adapter'); describe('MapConfigAdapter', function() { var user = 'wadus'; diff --git a/test/unit/cartodb/mapconfig/dataviews-widgets-adapter.test.js b/test/unit/cartodb/mapconfig/dataviews-widgets-adapter.test.js index 58eaa709..5cf94175 100644 --- a/test/unit/cartodb/mapconfig/dataviews-widgets-adapter.test.js +++ b/test/unit/cartodb/mapconfig/dataviews-widgets-adapter.test.js @@ -3,7 +3,7 @@ //require('../../../support/test_helper'); var assert = require('assert'); -var DataviewsMapConfigAdapter = require('../../../../lib/cartodb/models/mapconfig/adapter/dataviews-widgets-adapter'); +var DataviewsMapConfigAdapter = require('../../../../lib/models/mapconfig/adapter/dataviews-widgets-adapter'); describe('dataviews-widgets-adapter', function() { diff --git a/test/unit/cartodb/middlewares/coordinates.test.js b/test/unit/cartodb/middlewares/coordinates.test.js index f6c39d88..ca13d6a3 100644 --- a/test/unit/cartodb/middlewares/coordinates.test.js +++ b/test/unit/cartodb/middlewares/coordinates.test.js @@ -1,7 +1,7 @@ 'use strict'; const assert = require('assert'); -const coordinates = require('../../../../lib/cartodb/api/middlewares/coordinates'); +const coordinates = require('../../../../lib/api/middlewares/coordinates'); describe('coordinates middleware', function () { it('should return error: invalid zoom paramenter (-1)', function (done) { diff --git a/test/unit/cartodb/model/filter/bbox-filters.test.js b/test/unit/cartodb/model/filter/bbox-filters.test.js index a0e7a14b..03b90b96 100644 --- a/test/unit/cartodb/model/filter/bbox-filters.test.js +++ b/test/unit/cartodb/model/filter/bbox-filters.test.js @@ -4,7 +4,7 @@ require('../../../../support/test_helper'); var util = require('util'); var assert = require('../../../../support/assert'); -var BboxFilter = require('../../../../../lib/cartodb/models/filter/bbox'); +var BboxFilter = require('../../../../../lib/models/filter/bbox'); var MAX_EXTENT_MERCATOR_REF = [ -BboxFilter.LONGITUDE_MAX_VALUE, diff --git a/test/unit/cartodb/model/resource-locator.test.js b/test/unit/cartodb/model/resource-locator.test.js index e9571c3e..332fa886 100644 --- a/test/unit/cartodb/model/resource-locator.test.js +++ b/test/unit/cartodb/model/resource-locator.test.js @@ -3,7 +3,7 @@ require('../../../support/test_helper'); var assert = require('../../../support/assert'); -var ResourceLocator = require('../../../../lib/cartodb/models/resource-locator'); +var ResourceLocator = require('../../../../lib/models/resource-locator'); describe('ResourceLocator', function() { var USERNAME = 'username'; diff --git a/test/unit/cartodb/overviews_query_rewriter.js b/test/unit/cartodb/overviews_query_rewriter.js index a3d07e4c..4aa74264 100644 --- a/test/unit/cartodb/overviews_query_rewriter.js +++ b/test/unit/cartodb/overviews_query_rewriter.js @@ -3,7 +3,7 @@ require('../../support/test_helper'); var assert = require('assert'); -var OverviewsQueryRewriter = require('../../../lib/cartodb/utils/overviews_query_rewriter'); +var OverviewsQueryRewriter = require('../../../lib/utils/overviews_query_rewriter'); var overviewsQueryRewriter = new OverviewsQueryRewriter({ zoom_level: 'ZoomLevel()' }); diff --git a/test/unit/cartodb/ported/profiler.test.js b/test/unit/cartodb/ported/profiler.test.js index d9bc775e..45c3e05f 100644 --- a/test/unit/cartodb/ported/profiler.test.js +++ b/test/unit/cartodb/ported/profiler.test.js @@ -3,7 +3,7 @@ require('../../../support/test_helper'); var assert = require('assert'); -var ProfilerProxy = require('../../../../lib/cartodb/stats/profiler_proxy'); +var ProfilerProxy = require('../../../../lib/stats/profiler_proxy'); describe('profiler', function() { diff --git a/test/unit/cartodb/ported/stats_client.test.js b/test/unit/cartodb/ported/stats_client.test.js index 230d8b25..5e21da8e 100644 --- a/test/unit/cartodb/ported/stats_client.test.js +++ b/test/unit/cartodb/ported/stats_client.test.js @@ -4,7 +4,7 @@ require('../../../support/test_helper'); var assert = require('assert'); -var StatsClient = require('../../../../lib/cartodb/stats/client'); +var StatsClient = require('../../../../lib/stats/client'); describe('stats client', function() { var statsInstance; diff --git a/test/unit/cartodb/ported/windshaft_server.test.js b/test/unit/cartodb/ported/windshaft_server.test.js index 1591dc45..cf19f1b2 100644 --- a/test/unit/cartodb/ported/windshaft_server.test.js +++ b/test/unit/cartodb/ported/windshaft_server.test.js @@ -3,8 +3,8 @@ require('../../../support/test_helper.js'); var assert = require('assert'); -var cartodbServer = require('../../../../lib/cartodb/server'); -var serverOptions = require('../../../../lib/cartodb/server_options'); +var cartodbServer = require('../../../../lib/server'); +var serverOptions = require('../../../../lib/server_options'); describe('windshaft', function() { diff --git a/test/unit/cartodb/prepare-context.test.js b/test/unit/cartodb/prepare-context.test.js index 5de8a677..21046391 100644 --- a/test/unit/cartodb/prepare-context.test.js +++ b/test/unit/cartodb/prepare-context.test.js @@ -5,14 +5,14 @@ var _ = require('underscore'); var RedisPool = require('redis-mpool'); var cartodbRedis = require('cartodb-redis'); -var PgConnection = require('../../../lib/cartodb/backends/pg_connection'); -var AuthBackend = require('../../../lib/cartodb/backends/auth'); -var TemplateMaps = require('../../../lib/cartodb/backends/template_maps'); +var PgConnection = require('../../../lib/backends/pg_connection'); +var AuthBackend = require('../../../lib/backends/auth'); +var TemplateMaps = require('../../../lib/backends/template_maps'); -const cleanUpQueryParamsMiddleware = require('../../../lib/cartodb/api/middlewares/clean-up-query-params'); -const authorizeMiddleware = require('../../../lib/cartodb/api/middlewares/authorize'); -const dbConnSetupMiddleware = require('../../../lib/cartodb/api/middlewares/db-conn-setup'); -const credentialsMiddleware = require('../../../lib/cartodb/api/middlewares/credentials'); +const cleanUpQueryParamsMiddleware = require('../../../lib/api/middlewares/clean-up-query-params'); +const authorizeMiddleware = require('../../../lib/api/middlewares/authorize'); +const dbConnSetupMiddleware = require('../../../lib/api/middlewares/db-conn-setup'); +const credentialsMiddleware = require('../../../lib/api/middlewares/credentials'); var windshaft = require('windshaft'); diff --git a/test/unit/cartodb/stats/reporter/named-map-provider.js b/test/unit/cartodb/stats/reporter/named-map-provider.js index f99a9edf..eefa9816 100644 --- a/test/unit/cartodb/stats/reporter/named-map-provider.js +++ b/test/unit/cartodb/stats/reporter/named-map-provider.js @@ -1,7 +1,7 @@ 'use strict'; const assert = require('assert'); -const NamedMapProviderReporter = require('../../../../../lib/cartodb/stats/reporter/named-map-provider'); +const NamedMapProviderReporter = require('../../../../../lib/stats/reporter/named-map-provider'); describe('named-map-provider-reporter', function () { it('should report metrics every 100 ms', function (done) { diff --git a/test/unit/cartodb/substitution-tokens.test.js b/test/unit/cartodb/substitution-tokens.test.js index 61b78e39..f092e22e 100644 --- a/test/unit/cartodb/substitution-tokens.test.js +++ b/test/unit/cartodb/substitution-tokens.test.js @@ -1,7 +1,7 @@ 'use strict'; var assert = require('assert'); -var SubstitutionTokens = require('../../../lib/cartodb/utils/substitution-tokens'); +var SubstitutionTokens = require('../../../lib/utils/substitution-tokens'); describe('SubstitutionTokens', function() { diff --git a/test/unit/cartodb/table_name_parser.js b/test/unit/cartodb/table_name_parser.js index 3c7aac48..dd62a410 100644 --- a/test/unit/cartodb/table_name_parser.js +++ b/test/unit/cartodb/table_name_parser.js @@ -3,7 +3,7 @@ require('../../support/test_helper'); var assert = require('assert'); -var TableNameParser = require('../../../lib/cartodb/utils/table_name_parser'); +var TableNameParser = require('../../../lib/utils/table_name_parser'); describe('TableNameParser', function() { diff --git a/test/unit/cartodb/template_maps.test.js b/test/unit/cartodb/template_maps.test.js index d504dc2d..555a327d 100644 --- a/test/unit/cartodb/template_maps.test.js +++ b/test/unit/cartodb/template_maps.test.js @@ -4,7 +4,7 @@ var testHelper = require('../../support/test_helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../../lib/cartodb/backends/template_maps.js'); +var TemplateMaps = require('../../../lib/backends/template_maps.js'); var step = require('step'); var _ = require('underscore'); diff --git a/test/unit/cartodb/template_maps_auth.test.js b/test/unit/cartodb/template_maps_auth.test.js index 9497adde..5b96b538 100644 --- a/test/unit/cartodb/template_maps_auth.test.js +++ b/test/unit/cartodb/template_maps_auth.test.js @@ -5,7 +5,7 @@ require('../../support/test_helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../../lib/cartodb/backends/template_maps'); +var TemplateMaps = require('../../../lib/backends/template_maps'); describe('template_maps_auth', function() { diff --git a/test/unit/cartodb/template_maps_defaults.test.js b/test/unit/cartodb/template_maps_defaults.test.js index dc612cd5..1a3e6e7b 100644 --- a/test/unit/cartodb/template_maps_defaults.test.js +++ b/test/unit/cartodb/template_maps_defaults.test.js @@ -4,7 +4,7 @@ require('../../support/test_helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../../lib/cartodb/backends/template_maps.js'); +var TemplateMaps = require('../../../lib/backends/template_maps.js'); var _ = require('underscore'); describe('template_maps', function() { diff --git a/test/unit/cartodb/utils/date-wrapper.test.js b/test/unit/cartodb/utils/date-wrapper.test.js index 0ef7c126..3cb05743 100644 --- a/test/unit/cartodb/utils/date-wrapper.test.js +++ b/test/unit/cartodb/utils/date-wrapper.test.js @@ -1,7 +1,7 @@ 'use strict'; var assert = require('assert'); -var dateWrapper = require('../../../../lib/cartodb/utils/date-wrapper'); +var dateWrapper = require('../../../../lib/utils/date-wrapper'); describe('date-wrapper', function() { diff --git a/test/unit/cartodb/valid_template_maps.test.js b/test/unit/cartodb/valid_template_maps.test.js index c9a90b2c..1b07f161 100644 --- a/test/unit/cartodb/valid_template_maps.test.js +++ b/test/unit/cartodb/valid_template_maps.test.js @@ -4,7 +4,7 @@ require('../../support/test_helper'); var assert = require('assert'); var RedisPool = require('redis-mpool'); -var TemplateMaps = require('../../../lib/cartodb/backends/template_maps.js'); +var TemplateMaps = require('../../../lib/backends/template_maps.js'); var _ = require('underscore'); describe('template_maps', function() {