From 457e1e4fb5724f9f942b7c3cd8e1e7e66eda66d0 Mon Sep 17 00:00:00 2001 From: Daniel McDonald Date: Fri, 16 Jun 2023 14:31:49 -0400 Subject: [PATCH 1/2] added World_Physical_Map, World_Shaded_Relief and World_Topo_Map --- geoviews/tile_sources.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/geoviews/tile_sources.py b/geoviews/tile_sources.py index dbfec5a6..29b077e8 100644 --- a/geoviews/tile_sources.py +++ b/geoviews/tile_sources.py @@ -55,6 +55,18 @@ ('arcgis','USA_Topo') : ( '© Esri, ' 'NatGeo, i-cubed' + ), + ('arcgis','World_Physical_Map') : ( + '© Esri, ' + 'US National Park Service' + ), + ('arcgis','World_Shaded_Relief') : ( + '© Esri, ' + 'Esri' + ), + ('arcgis','World_Topo_Map') : ( + '© Esri, ' + 'Esri, HERE, Garmin, Intermap, increment P Corp., GEBCO, USGS, FAO, NPS, NRCAN, GeoBase, IGN, Kadaster NL, Ordnance Survey, Esri Japan, METI, Esri China (Hong Kong), (c) OpenStreetMap contributors, and the GIS User Community' ) } @@ -80,6 +92,9 @@ EsriReference = WMTS('https://server.arcgisonline.com/ArcGIS/rest/services/Reference/World_Reference_Overlay/MapServer/tile/{Z}/{Y}/{X}', name="EsriReference") EsriOceanBase = WMTS('https://server.arcgisonline.com/ArcGIS/rest/services/Ocean/World_Ocean_Base/MapServer/tile/{Z}/{Y}/{X}', name="EsriOceanBase") EsriOceanReference = WMTS('https://server.arcgisonline.com/ArcGIS/rest/services/Ocean/World_Ocean_Reference/MapServer/tile/{Z}/{Y}/{X}', name="EsriOceanReference") +EsriWorldPhysical = WMTS('https://server.arcgisonline.com/arcgis/rest/services/World_Physical_Map/MapServer/tile/{Z}/{Y}/{X}', name="EsriWorldPhysical") +EsriWorldShadedRelief = WMTS('https://server.arcgisonline.com/arcgis/rest/services/World_Shaded_Relief/MapServer/tile/{Z}/{Y}/{X}', name="EsriWorldShadedRelief") +EsriWorldTopo = WMTS('https://server.arcgisonline.com/arcgis/rest/services/World_Topo_Map/MapServer/tile/{Z}/{Y}/{X}', name="EsriWorldTopo") ESRI = EsriImagery # For backwards compatibility with gv 1.5 From 584040e7cd6b2773a68a2c2bde3bf10e6a625bf5 Mon Sep 17 00:00:00 2001 From: Daniel McDonald Date: Mon, 19 Jun 2023 12:01:34 -0400 Subject: [PATCH 2/2] added rest of esri tile sources --- geoviews/tile_sources.py | 82 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/geoviews/tile_sources.py b/geoviews/tile_sources.py index 29b077e8..4ccd490b 100644 --- a/geoviews/tile_sources.py +++ b/geoviews/tile_sources.py @@ -67,7 +67,71 @@ ('arcgis','World_Topo_Map') : ( '© Esri, ' 'Esri, HERE, Garmin, Intermap, increment P Corp., GEBCO, USGS, FAO, NPS, NRCAN, GeoBase, IGN, Kadaster NL, Ordnance Survey, Esri Japan, METI, Esri China (Hong Kong), (c) OpenStreetMap contributors, and the GIS User Community' - ) + ), + ('arcgis','World_Dark_Gray_Base') : ( + '© Esri, ' + 'Esri, HERE, Garmin, (c) OpenStreetMap contributors, and the GIS user community' + ), + ('arcgis','World_Dark_Gray_Reference') : ( + '© Esri, ' + 'Esri, HERE, Garmin, (c) OpenStreetMap contributors, and the GIS user community' + ), + ('arcgis','World_Light_Gray_Base') : ( + '© Esri, ' + 'Esri, HERE, Garmin, (c) OpenStreetMap contributors, and the GIS user community' + ), + ('arcgis','World_Light_Gray_Reference') : ( + '© Esri, ' + 'Esri, HERE, Garmin, (c) OpenStreetMap contributors, and the GIS user community' + ), + ('arcgis','World_Hillshade_Dark') : ( + '© Esri ' + 'Esri, Airbus DS, USGS, NGA, NASA, CGIAR, N Robinson, NCEAS, NLS, OS, NMA, Geodatastyrelsen, Rijkswaterstaat, GSA, Geoland, FEMA, Intermap and the GIS user community' + ), + ('arcgis','World_Hillshade') : ( + '© Esri ' + 'Esri, Airbus DS, USGS, NGA, NASA, CGIAR, N Robinson, NCEAS, NLS, OS, NMA, Geodatastyrelsen, Rijkswaterstaat, GSA, Geoland, FEMA, Intermap and the GIS user community' + ), + ('arcgis','Antarctic_Imagery') : ( + '© Esri ' + 'Earthstar Geographics' + ), + ('arcgis','Arctic_Imagery') : ( + '© Esri ' + 'Earthstar Geographics' + ), + ('arcgis','Arctic_Ocean_Base') : ( + '© Esri ' + 'Esri, Garmin, GEBCO, NOAA NGDC, and other contributors' + ), + ('arcgis','Arctic_Ocean_Reference') : ( + '© Esri ' + 'Esri, GEBCO, NOAA, National Geographic, Garmin, HERE, Geonames.org, and other contributors' + ), + ('arcgis','World_Boundaries_and_Places') : ( + '© Esri ' + 'Esri, HERE, Garmin, (c) OpenStreetMap contributors, and the GIS user community' + ), + ('arcgis','World_Boundaries_and_Places_Alternate') : ( + '© Esri ' + 'Esri, HERE, Garmin, (c) OpenStreetMap contributors, and the GIS user community' + ), + ('arcgis','World_Transportation') : ( + '© Esri ' + 'Esri, HERE, Garmin, (c) OpenStreetMap contributors' + ), + ('arcgis','DeLorme_World_Base_Map') : ( + '© Esri ' + 'Garmin' + ), + ('arcgis','World_Navigation_Charts') : ( + '© Esri ' + 'East View Cartographic' + ), + ('arcgis','World_Street_Map') : ( + '© Esri ' + 'Esri, HERE, Garmin, USGS, Intermap, INCREMENT P, NRCan, Esri Japan, METI, Esri China (Hong Kong), Esri Korea, Esri (Thailand), NGCC, (c) OpenStreetMap contributors, and the GIS User Community' + ), } # CartoDB basemaps @@ -95,6 +159,22 @@ EsriWorldPhysical = WMTS('https://server.arcgisonline.com/arcgis/rest/services/World_Physical_Map/MapServer/tile/{Z}/{Y}/{X}', name="EsriWorldPhysical") EsriWorldShadedRelief = WMTS('https://server.arcgisonline.com/arcgis/rest/services/World_Shaded_Relief/MapServer/tile/{Z}/{Y}/{X}', name="EsriWorldShadedRelief") EsriWorldTopo = WMTS('https://server.arcgisonline.com/arcgis/rest/services/World_Topo_Map/MapServer/tile/{Z}/{Y}/{X}', name="EsriWorldTopo") +EsriWorldDarkGrayBase = WMTS('https://server.arcgisonline.com/arcgis/rest/services/Canvas/World_Dark_Gray_Base/MapServer/tile/{Z}/{Y}/{X}', name="EsriWorldDarkGrayBase") +EsriWorldDarkGrayReference = WMTS('https://server.arcgisonline.com/arcgis/rest/services/Canvas/World_Dark_Gray_Reference/MapServer/tile/{Z}/{Y}/{X}', name="EsriWorldDarkGrayReference") +EsriWorldLightGrayBase = WMTS('https://server.arcgisonline.com/arcgis/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/{Z}/{Y}/{X}', name="EsriWorldLightGrayBase") +EsriWorldLightGrayReference = WMTS('https://server.arcgisonline.com/arcgis/rest/services/Canvas/World_Light_Gray_Reference/MapServer/tile/{Z}/{Y}/{X}', name="EsriWorldLightGrayReference") +EsriWorldHillshadeDark = WMTS('https://server.arcgisonline.com/arcgis/rest/services/Elevation/World_Hillshade_Dark/MapServer/tile/{Z}/{Y}/{X}', name="EsriWorldHillshadeDark") +EsriWorldHillshade = WMTS('https://server.arcgisonline.com/arcgis/rest/services/Elevation/World_Hillshade/MapServer/tile/{Z}/{Y}/{X}', name="EsriWorldHillshade") +EsriAntarcticImagery = WMTS('https://server.arcgisonline.com/arcgis/rest/services/Polar/Antarctic_Imagery/MapServer/tile/{Z}/{Y}/{X}', name="EsriAntarcticImagery") +EsriArcticImagery = WMTS('https://server.arcgisonline.com/arcgis/rest/services/Polar/Arctic_Imagery/MapServer/tile/{Z}/{Y}/{X}', name="EsriArcticImagery") +EsriArcticOceanBase = WMTS('https://server.arcgisonline.com/arcgis/rest/services/Polar/Arctic_Ocean_Base/MapServer/tile/{Z}/{Y}/{X}', name="EsriArcticOceanBase") +EsriArcticOceanReference = WMTS('https://server.arcgisonline.com/arcgis/rest/services/Polar/Arctic_Ocean_Reference/MapServer/tile/{Z}/{Y}/{X}', name="EsriArcticOceanReference") +EsriWorldBoundariesAndPlaces = WMTS('https://server.arcgisonline.com/arcgis/rest/services/Reference/World_Boundaries_and_Places/MapServer/tile/{Z}/{Y}/{X}', name="EsriWorldBoundariesAndPlaces") +EsriWorldBoundariesAndPlacesAlternate = WMTS('https://server.arcgisonline.com/arcgis/rest/services/Reference/World_Boundaries_and_Places_Alternate/MapServer/tile/{Z}/{Y}/{X}', name="EsriWorldBoundariesAndPlacesAlternate") +EsriWorldTransportation = WMTS('https://server.arcgisonline.com/arcgis/rest/services/Reference/World_Transportation/MapServer/tile/{Z}/{Y}/{X}', name="EsriWorldTransportation") +EsriDelormeWorldBaseMap = WMTS('https://server.arcgisonline.com/arcgis/rest/services/Specialty/DeLorme_World_Base_Map/MapServer/tile/{Z}/{Y}/{X}', name="EsriDelormeWorldBaseMap") +EsriWorldNavigationCharts = WMTS('https://server.arcgisonline.com/arcgis/rest/services/Specialty/World_Navigation_Charts/MapServer/tile/{Z}/{Y}/{X}', name="EsriWorldNavigationCharts") +EsriWorldStreetMap = WMTS('https://server.arcgisonline.com/arcgis/rest/services/World_Street_Map/MapServer/tile/{Z}/{Y}/{X}', name="EsriWorldStreetMap") ESRI = EsriImagery # For backwards compatibility with gv 1.5