diff --git a/www/app/maps/map/map-layer.factory.js b/www/app/maps/map/map-layer.factory.js index 9c1fb73d..6cc0a80c 100644 --- a/www/app/maps/map/map-layer.factory.js +++ b/www/app/maps/map/map-layer.factory.js @@ -341,12 +341,14 @@ switch (layer.source) { case 'osm': return new ol.source.OSM({'layer': 'osm'}); - case 'strabo_spot_mapbox': + case 'strabo_spot_mapbox': case 'mapbox_classic': case 'mapbox_styles': return new ol.source.XYZ({'url': url + layer.id + layer.tilePath + '?access_token=' + layer.key}); - case 'map_warper': - return new ol.source.XYZ({'url': url + layer.id + layer.tilePath}); + case 'map_warper': + return new ol.source.XYZ({'url': url + layer.id + layer.tilePath}); + case 'strabospot_mymaps': + return new ol.source.XYZ({'url': url + layer.id + layer.tilePath}); default: return new ol.source.XYZ({'url': ''}); // No basemap layer } diff --git a/www/app/maps/map/map.factory.js b/www/app/maps/map/map.factory.js index ea2ec2db..69cbcc11 100644 --- a/www/app/maps/map/map.factory.js +++ b/www/app/maps/map/map.factory.js @@ -82,6 +82,14 @@ 'tilePath': '/{z}/{x}/{y}.png', 'url': ['http://tiles.strabospot.org/v4/'], 'maxZoom': 19 // https://www.mapbox.com/help/define-mapbox-satellite/ + }, + 'strabospot_mymaps': { + 'attributions': 'StraboSpot Contributed', + 'imageType': 'png', + 'mime': 'image/png', + 'tilePath': '/{z}/{x}/{y}.png', + 'url': ['https://strabospot.org/geotiff/tiles/'], + 'maxZoom': 25 } }; return mapProviders[mapSource]; diff --git a/www/app/maps/other-maps/other-maps.controller.js b/www/app/maps/other-maps/other-maps.controller.js index a81fbbba..9875463c 100644 --- a/www/app/maps/other-maps/other-maps.controller.js +++ b/www/app/maps/other-maps/other-maps.controller.js @@ -26,7 +26,8 @@ vm.mapSources = [ {'name': 'Mapbox Classic', 'source': 'mapbox_classic', 'idLabel': 'Map Id'}, {'name': 'Mapbox Styles', 'source': 'mapbox_styles', 'idLabel': 'Style URL'}, - {'name': 'Map Warper', 'source': 'map_warper', 'idLabel': '5 Digit Map ID'} + {'name': 'Map Warper', 'source': 'map_warper', 'idLabel': '5 Digit Map ID'}, + {'name': 'StraboSpot MyMaps', 'source': 'strabospot_mymaps', 'idLabel': 'Strabo Map ID'} ]; vm.modalTitle = ''; vm.openModal = openModal; @@ -190,7 +191,7 @@ } function save() { - if (vm.data.source === 'map_warper' && (!vm.data.title || !vm.data.id )) { + if (( vm.data.source === 'map_warper' || vm.data.source === 'strabospot_mymaps' ) && (!vm.data.title || !vm.data.id )) { $ionicPopup.alert({ 'title': 'Incomplete Map Info!', 'template': 'Title and Map ID required fields.' @@ -218,6 +219,9 @@ case 'map_warper': testUrl = 'https://strabospot.org/map_warper_check/' + vm.data.id; break; + case 'strabospot_mymaps': + testUrl = 'https://strabospot.org/strabo_mymaps_check/' + vm.data.id; + break; } $ionicLoading.show({'template': '
Testing Connection...'}); testMapConnection(testUrl).then(function () {