diff --git a/public/js/map.js b/public/js/map.js index 751046a..b9d9ff8 100644 --- a/public/js/map.js +++ b/public/js/map.js @@ -58,9 +58,9 @@ function init(lat, lng) { markers = new L.MarkerClusterGroup({showCoverageOnHover: false, maxClusterRadius: 30}); markersPlus = new L.MarkerClusterGroup({showCoverageOnHover: false, maxClusterRadius: 25}); - layers['quest'] = L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA, Imagery © Mapbox', maxZoom: 18}); - layers['osm'] = L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA, Imagery ©', maxZoom: 18}); - layers['topo'] = L.tileLayer('http://topo.wikipoints.ru/?z={z}&x={x}&y={y}', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA, Imagery © Маршруты.ру', maxZoom: 15}); + layers['quest'] = L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA, Imagery © Mapbox | Points data © WIKIPOINTS.RU', maxZoom: 18}); + layers['osm'] = L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA | Points data © WIKIPOINTS.RU', maxZoom: 18}); + layers['topo'] = L.tileLayer('http://topo.wikipoints.ru/?z={z}&x={x}&y={y}', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA, Imagery © Маршруты.ру | Points data © WIKIPOINTS.RU', maxZoom: 15}); layers['google'] = new L.Google('HYBRID'); layers['yandexMap'] = new L.Yandex(); layers['yandex'] = new L.Yandex('hybrid'); diff --git a/public/js/mapPoint.js b/public/js/mapPoint.js index a6aaedf..67c5e45 100644 --- a/public/js/mapPoint.js +++ b/public/js/mapPoint.js @@ -45,7 +45,7 @@ function init(lat, lng) { myMap = L.map('map', {zoomControl: true}).setView([lat, lng], defaultZoom); markers = new L.MarkerClusterGroup({showCoverageOnHover: false, maxClusterRadius: 45}); - layers['quest'] = L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA, Imagery © Mapbox', maxZoom: 18}); + layers['quest'] = L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA, Imagery © Mapbox | Points data © WIKIPOINTS.RU', maxZoom: 18}); setLayer('quest'); diff --git a/public/js/tile/Google.js b/public/js/tile/Google.js index 353a14d..a955769 100644 --- a/public/js/tile/Google.js +++ b/public/js/tile/Google.js @@ -13,7 +13,7 @@ L.Google = L.Class.extend({ tileSize: 256, subdomains: 'abc', errorTileUrl: '', - attribution: '', + attribution: 'Points data © WIKIPOINTS.RU', opacity: 1, continuousWorld: false, noWrap: false, diff --git a/public/js/tile/Yandex.js b/public/js/tile/Yandex.js index afa0aa1..cb042a6 100644 --- a/public/js/tile/Yandex.js +++ b/public/js/tile/Yandex.js @@ -11,7 +11,7 @@ L.Yandex = L.Class.extend({ options: { minZoom: 0, maxZoom: 18, - attribution: '', + attribution: 'Points data © WIKIPOINTS.RU', opacity: 1, traffic: false }, @@ -23,7 +23,7 @@ L.Yandex = L.Class.extend({ publicMap: 'publicMap', publicMapInHybridView: 'publicMapHybrid' }, - + _getPossibleMapType: function (mapType) { var result = 'yandex#map'; if (typeof mapType !== 'string') { @@ -40,7 +40,7 @@ L.Yandex = L.Class.extend({ } return result; }, - + // Possible types: yandex#map, yandex#satellite, yandex#hybrid, yandex#publicMap, yandex#publicMapHybrid // Or their short names: map, satellite, hybrid, publicMap, publicMapHybrid initialize: function(type, options) { @@ -153,7 +153,7 @@ L.Yandex = L.Class.extend({ this._yandex = map; this._update(true); - + //Reporting that map-object was initialized this.fire('MapObjectInitialized', { mapObject: map }); },