diff --git a/doc/.azure-pipelines.yml b/doc/.azure-pipelines.yml index 1d771b61330a..bb61614b0bd5 100644 --- a/doc/.azure-pipelines.yml +++ b/doc/.azure-pipelines.yml @@ -68,6 +68,7 @@ jobs: rm gdal-docs/gdal.pdf cp doc/build/latex/gdal.pdf gdal-docs cp data/gdalicon.png gdal-docs # For GDAL autotest... + cp -r resources gdal-docs # Do not change this without changing swig/python/gdal-utils/osgeo_utils/gdal2tiles.py cd gdal-docs wget http://download.osgeo.org/gdal/for_doc/javadoc.zip -O /tmp/javadoc.zip wget http://download.osgeo.org/gdal/for_doc/python-doc.tar.gz -O /tmp/python-doc.tar.gz diff --git a/resources/gdal2tiles/none.png b/resources/gdal2tiles/none.png new file mode 100644 index 000000000000..351bbc06ebd0 Binary files /dev/null and b/resources/gdal2tiles/none.png differ diff --git a/resources/gdal2tiles/opacity-slider.png b/resources/gdal2tiles/opacity-slider.png new file mode 100644 index 000000000000..87c7628917e2 Binary files /dev/null and b/resources/gdal2tiles/opacity-slider.png differ diff --git a/swig/python/gdal-utils/osgeo_utils/gdal2tiles.py b/swig/python/gdal-utils/osgeo_utils/gdal2tiles.py index 6e9e10527444..a7102c34db0d 100644 --- a/swig/python/gdal-utils/osgeo_utils/gdal2tiles.py +++ b/swig/python/gdal-utils/osgeo_utils/gdal2tiles.py @@ -11,8 +11,6 @@ # - support of global tiles (Spherical Mercator) for compatibility # with interactive web maps a la Google Maps # Author: Klokan Petr Pridal, klokan at klokan dot cz -# Web: http://www.klokan.cz/projects/gdal2tiles/ -# GUI: http://www.maptiler.org/ # ############################################################################### # Copyright (c) 2008, Klokan Petr Pridal @@ -2357,7 +2355,6 @@ def generate_googlemaps(self) -> str: /* * Create a Custom Opacity GControl - * http://www.maptiler.org/google-maps-overlay-opacity-control/ */ var CTransparencyLENGTH = 58; @@ -2404,16 +2401,16 @@ def generate_googlemaps(self) -> str: // Handle transparent PNG files in MSIE if (this.ie) { - var loader = "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='http://www.maptiler.org/img/opacity-slider.png', sizingMethod='crop');"; + var loader = "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://gdal.org/resources/gdal2tiles/opacity-slider.png', sizingMethod='crop');"; container.innerHTML = '
'; } else { - container.innerHTML = ''; + container.innerHTML = ''; } // create the knob as a GDraggableObject // Handle transparent PNG files in MSIE if (this.ie) { - var loader = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='http://www.maptiler.org/img/opacity-slider.png', sizingMethod='crop');"; + var loader = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://gdal.org/resources/gdal2tiles/opacity-slider.png', sizingMethod='crop');"; this.knob = document.createElement("div"); this.knob.style.height="21px"; this.knob.style.width="13px"; @@ -2429,7 +2426,7 @@ def generate_googlemaps(self) -> str: this.knob = document.createElement("div"); this.knob.style.height="21px"; this.knob.style.width="13px"; - this.knob.style.backgroundImage="url(http://www.maptiler.org/img/opacity-slider.png)"; + this.knob.style.backgroundImage="url(https://gdal.org/resources/gdal2tiles/opacity-slider.png)"; this.knob.style.backgroundPosition="-70px 0px"; } container.appendChild(this.knob); @@ -2522,7 +2519,7 @@ def generate_googlemaps(self) -> str: var mercator = new GMercatorProjection(mapMaxZoom+1); tilelayer.getTileUrl = function(tile,zoom) { if ((zoom < mapMinZoom) || (zoom > mapMaxZoom)) { - return "http://www.maptiler.org/img/none.png"; + return "https://gdal.org/resources/gdal2tiles/none.png"; } var ymax = 1 << zoom; var y = ymax - tile.y -1; @@ -2533,7 +2530,7 @@ def generate_googlemaps(self) -> str: if (mapBounds.intersects(tileBounds)) { return zoom+"/"+tile.x+"/"+y+".png"; } else { - return "http://www.maptiler.org/img/none.png"; + return "https://gdal.org/resources/gdal2tiles/none.png"; } } // IE 7-: support for PNG alpha channel @@ -2593,7 +2590,7 @@ def generate_googlemaps(self) -> str: