diff --git a/app.js b/app.js index d251a0998..923702ff8 100644 --- a/app.js +++ b/app.js @@ -1,6 +1,7 @@ //Web app of 2GIS Maps API 2.0 var express = require('express'), cluster = require('cluster'), + cors = require('cors'), cpuCount = require('os').cpus().length, clc = require('cli-color'), config = require(__dirname + '/build/config.js').appConfig; @@ -11,6 +12,7 @@ var app = express(); //General configuration of the application app.set('port', config.PORT || '3000'); app.set('host', config.HOST || null); +app.use(cors()); app.use(express.static(__dirname + '/public')); //Routes diff --git a/config.main.json b/config.main.json index ccb8ba58d..5959839da 100644 --- a/config.main.json +++ b/config.main.json @@ -4,22 +4,26 @@ "BASE_URL": "", "DEFAULT_SKIN": "dark", - "TILE_SERVER": "https://tile{s}.maps.2gis.com/tiles?x={x}&y={y}&z={z}&v=1", + "TILE_SERVER": "//tile{s}.maps.2gis.com/tiles?x={x}&y={y}&z={z}&v=1", + + "TRAFFIC_TILE_SERVER": "//traffic{s}.maps.2gis.com/{projectCode}/traffic/{z}/{x}/{y}/speed/{period}/{timestampString}", + "TRAFFIC_META_SERVER": "//meta{s}.maps.2gis.com/{projectCode}/meta/{z}/{x}/{y}/graph_speed/{period}/{timestampString}", + "TRAFFIC_TIMESTAMP_SERVER": "//traffic{s}.maps.2gis.com/{projectCode}/meta/speed/time/", - "TRAFFIC_TILE_SERVER" : "http://traffic{s}.2gis.ru/{projectCode}/traffic/{z}/{x}/{y}/speed/{period}/{timestampString}", - "TRAFFIC_META_SERVER" : "http://meta{s}.2gis.ru/{projectCode}/meta/{z}/{x}/{y}/graph_speed/{period}/{timestampString}", - "TRAFFIC_TIMESTAMP_SERVER" : "http://traffic{s}.2gis.ru/{projectCode}/meta/speed/time/", "TRAFFIC_LAYER_MIN_ZOOM": 10, "TRAFFIC_LAYER_UPDATE_INTERVAL": 300000, + "DETECT_RETINA": true, "PPNOT_LINK": "http://2gis.ru/{projectCode}/center/{center}/zoom/{zoom}/routeTab/rsType/{rsType}/to/{point}╎{name}", "PHOTOS_LINK": "http://2gis.ru/photos/{id}", - "HIGHLIGHT_POI_SERVER": "http://tile{s}.maps.2gis.ru/?x={x}&y={y}&z={z}&v=1&type=poi", + "POI_META_SERVER": "//tile{s}.maps.2gis.com/?x={x}&y={y}&z={z}&v=1&type=poi", "POI_LAYER_MIN_ZOOM": 15, - "WEB_API_SERVER": "http://catalog.api.2gis.ru", + "DETECT_RETINA": true, + + "WEB_API_SERVER": "//catalog.api.2gis.ru", "WEB_API_KEY": "rujrdp3400", "WEB_API_VERSION": "2.0", "FIRM_INFO_FIELDS": "data.reviews,data.geo.id,data.photos", diff --git a/package.json b/package.json index c69f1c79d..725c9c2b4 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "url": "git://github.com/2gis/maps-api-2.0.git" }, "dependencies": { + "cors": "^2.4.1", "chalk": "0.4.0", "cli-color": "0.3.2", "cluster": "0.7.7", diff --git a/private/index.html b/private/index.html index 4a1bb9180..a0caf8d8b 100644 --- a/private/index.html +++ b/private/index.html @@ -5,7 +5,7 @@ - +