All4DK
/
wikipoints
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Навёл порядок с копирайтами, показываемыми на карте

This commit is contained in:
Krivchikov Dmitry 2016-01-29 14:26:21 +03:00
parent 623ae27d2c
commit 64cabceea4
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/js/map.js
View File

@ -58,9 +58,9 @@ function init(lat, lng) {
markers = new L.MarkerClusterGroup({showCoverageOnHover: false, maxClusterRadius: 30}); markers = new L.MarkerClusterGroup({showCoverageOnHover: false, maxClusterRadius: 30});
markersPlus = new L.MarkerClusterGroup({showCoverageOnHover: false, maxClusterRadius: 25}); 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 &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com">Mapbox</a>', maxZoom: 18}); layers['quest'] = L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png', {attribution: 'Map data &copy; <a href="http://openstreetmap.org" target="_blank">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/" target="_blank">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com" target="_blank">Mapbox</a> | Points data &copy; <a href="http://wikipoints.ru" target="_blank">WIKIPOINTS.RU</a>', maxZoom: 18});
layers['osm'] = L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery ©</a>', maxZoom: 18}); layers['osm'] = L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {attribution: 'Map data &copy; <a href="http://openstreetmap.org" target="_blank">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/" target="_blank">CC-BY-SA</a> | Points data &copy; <a href="http://wikipoints.ru" target="_blank">WIKIPOINTS.RU</a>', maxZoom: 18});
layers['topo'] = L.tileLayer('http://topo.wikipoints.ru/?z={z}&x={x}&y={y}', {attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://www.marshruty.ru/">Маршруты.ру</a>', maxZoom: 15}); layers['topo'] = L.tileLayer('http://topo.wikipoints.ru/?z={z}&x={x}&y={y}', {attribution: 'Map data &copy; <a href="http://openstreetmap.org" target="_blank">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/" target="_blank">CC-BY-SA</a>, Imagery © <a href="http://www.marshruty.ru/" target="_blank">Маршруты.ру</a> | Points data &copy; <a href="http://wikipoints.ru" target="_blank">WIKIPOINTS.RU</a>', maxZoom: 15});
layers['google'] = new L.Google('HYBRID'); layers['google'] = new L.Google('HYBRID');
layers['yandexMap'] = new L.Yandex(); layers['yandexMap'] = new L.Yandex();
layers['yandex'] = new L.Yandex('hybrid'); layers['yandex'] = new L.Yandex('hybrid');

2
public/js/mapPoint.js
View File

@ -45,7 +45,7 @@ function init(lat, lng) {
myMap = L.map('map', {zoomControl: true}).setView([lat, lng], defaultZoom); myMap = L.map('map', {zoomControl: true}).setView([lat, lng], defaultZoom);
markers = new L.MarkerClusterGroup({showCoverageOnHover: false, maxClusterRadius: 45}); 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 &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com">Mapbox</a>', maxZoom: 18}); layers['quest'] = L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png', {attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com">Mapbox</a> | <nobr>Points data &copy; <a href="http://wikipoints.ru" target="_blank">WIKIPOINTS.RU</a></nobr>', maxZoom: 18});
setLayer('quest'); setLayer('quest');

2
public/js/tile/Google.js
View File

@ -13,7 +13,7 @@ L.Google = L.Class.extend({
tileSize: 256, tileSize: 256,
subdomains: 'abc', subdomains: 'abc',
errorTileUrl: '', errorTileUrl: '',
attribution: '', attribution: 'Points data &copy; <a href="http://wikipoints.ru" target="_blank">WIKIPOINTS.RU</a>',
opacity: 1, opacity: 1,
continuousWorld: false, continuousWorld: false,
noWrap: false, noWrap: false,

8
public/js/tile/Yandex.js
View File

@ -11,7 +11,7 @@ L.Yandex = L.Class.extend({
options: { options: {
minZoom: 0, minZoom: 0,
maxZoom: 18, maxZoom: 18,
attribution: '', attribution: 'Points data &copy; <a href="http://wikipoints.ru" target="_blank">WIKIPOINTS.RU</a>',
opacity: 1, opacity: 1,
traffic: false traffic: false
}, },
@ -23,7 +23,7 @@ L.Yandex = L.Class.extend({
publicMap: 'publicMap', publicMap: 'publicMap',
publicMapInHybridView: 'publicMapHybrid' publicMapInHybridView: 'publicMapHybrid'
}, },
_getPossibleMapType: function (mapType) { _getPossibleMapType: function (mapType) {
var result = 'yandex#map'; var result = 'yandex#map';
if (typeof mapType !== 'string') { if (typeof mapType !== 'string') {
@ -40,7 +40,7 @@ L.Yandex = L.Class.extend({
} }
return result; return result;
}, },
// Possible types: yandex#map, yandex#satellite, yandex#hybrid, yandex#publicMap, yandex#publicMapHybrid // Possible types: yandex#map, yandex#satellite, yandex#hybrid, yandex#publicMap, yandex#publicMapHybrid
// Or their short names: map, satellite, hybrid, publicMap, publicMapHybrid // Or their short names: map, satellite, hybrid, publicMap, publicMapHybrid
initialize: function(type, options) { initialize: function(type, options) {
@ -153,7 +153,7 @@ L.Yandex = L.Class.extend({
this._yandex = map; this._yandex = map;
this._update(true); this._update(true);
//Reporting that map-object was initialized //Reporting that map-object was initialized
this.fire('MapObjectInitialized', { mapObject: map }); this.fire('MapObjectInitialized', { mapObject: map });
}, },