diff --git a/js/map.js b/js/map.js index 983dff9..cddd395 100644 --- a/js/map.js +++ b/js/map.js @@ -44,11 +44,20 @@ var gMapStyles = { url: "https://tilecache[1-4].kairo.at/mapqsat/{z}/{x}/{y}.png", // route through CORS+SSL tilecache @ kairo.at //url: "http://otile[1-4].mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.jpg", copyright: 'Tiles Courtesy of MapQuest, portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency.'}, + arcgis_world_imagery: + {name: "ArcGIS World Imagery", // see https://server.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer + url: "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}", + copyright: 'Source: Esri, Maxar, GeoEye, Earthstar Geographics, CNES/Airbus DS, USDA, USGS, AeroGRID, IGN, and the GIS User Community.'}, osm_hot: {name: "OSM HOT style", url: "https://tilecache[1-4].kairo.at/osmhot/{z}/{x}/{y}.png", // route through CORS+SSL tilecache @ kairo.at //url: "http://[a-c].tile.openstreetmap.fr/hot/{z}/{x}/{y}.png", // https has CAcert which doesn't work in browsers copyright: 'Map data and imagery © OpenStreetMap contributors, ODbL/CC-BY-SA'}, + opentopomap: + {name: "OpenTopoMap", + //url: "https://tilecache[1-4].kairo.at/opentopomap/{z}/{x}/{y}.png", // route through tilecache @ kairo.at + url: "https://[a-c].tile.opentopomap.org/{z}/{x}/{y}.png", + copyright: 'Map data: Â© OpenStreetMap contributors, SRTM | map style: Â© OpenTopoMap (CC-BY-SA)'}, hikebike: {name: "Hike and Bike (OSM)", url: "https://tilecache[1-4].kairo.at/hikebike/{z}/{x}/{y}.png", // route through CORS+SSL tilecache @ kairo.at diff --git a/js/piwik.js b/js/piwik.js index 19af876..19e1845 100644 --- a/js/piwik.js +++ b/js/piwik.js @@ -4,7 +4,7 @@ _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { - var u="https://piwik.kairo.at/"; + var u="https://matomo.kairo.at/"; _paq.push(['setTrackerUrl', u+'piwik.php']); _paq.push(['setSiteId', '2']); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];

Lantea Map