Index: frmts/wms/minidriver_tms.h =================================================================== --- frmts/wms/minidriver_tms.h (revision 0) +++ frmts/wms/minidriver_tms.h (revision 0) @@ -0,0 +1,48 @@ +/****************************************************************************** + * + * Project: WMS Client Driver + * Purpose: Implementation of Dataset and RasterBand classes for WMS + * and other similar services. + * Author: Adam Nowacki, nowak@xpam.de + * + ****************************************************************************** + * Copyright (c) 2007, Adam Nowacki + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + ****************************************************************************/ + +H_GDALWMSMiniDriverFactory(TMS) + +class GDALWMSMiniDriver_TMS : public GDALWMSMiniDriver { +public: + GDALWMSMiniDriver_TMS(); + virtual ~GDALWMSMiniDriver_TMS(); + +public: + virtual CPLErr Initialize(CPLXMLNode *config); + virtual void GetCapabilities(GDALWMSMiniDriverCapabilities *caps); + virtual void ImageRequest(CPLString *url, const GDALWMSImageRequestInfo &iri); + virtual void TiledImageRequest(CPLString *url, const GDALWMSImageRequestInfo &iri, const GDALWMSTiledImageRequestInfo &tiri); + +protected: + CPLString m_base_url; + CPLString m_dataset; + CPLString m_version; + CPLString m_format; +}; Index: frmts/wms/makefile.vc =================================================================== --- frmts/wms/makefile.vc (revision 16514) +++ frmts/wms/makefile.vc (working copy) @@ -1,6 +1,6 @@ OBJ = cache.obj dataset.obj gdalhttp.obj md5.obj minidriver.obj rasterband.obj stuff.obj wmsdriver.obj \ - minidriver_wms.obj minidriver_tileservice.obj minidriver_worldwind.obj + minidriver_wms.obj minidriver_tileservice.obj minidriver_worldwind.obj minidriver_tms.obj EXTRAFLAGS = -DHAVE_CURL $(CURL_CFLAGS) $(CURL_INC) Index: frmts/wms/frmt_wms_openstreetmap_tms.xml =================================================================== --- frmts/wms/frmt_wms_openstreetmap_tms.xml (revision 0) +++ frmts/wms/frmt_wms_openstreetmap_tms.xml (revision 0) @@ -0,0 +1,20 @@ + + + http://tile.openstreetmap.org/${z}/${x}/${y}.png + + + -20037508.34 + 20037508.34 + 20037508.34 + -20037508.34 + 19 + 1 + 1 + top + + EPSG:900913 + 256 + 256 + 3 + + Index: frmts/wms/GNUmakefile =================================================================== --- frmts/wms/GNUmakefile (revision 16514) +++ frmts/wms/GNUmakefile (working copy) @@ -2,7 +2,7 @@ include ../../GDALmake.opt OBJ = cache.o dataset.o gdalhttp.o md5.o minidriver.o rasterband.o stuff.o wmsdriver.o \ - minidriver_wms.o minidriver_tileservice.o minidriver_worldwind.o + minidriver_wms.o minidriver_tileservice.o minidriver_worldwind.o minidriver_tms.o CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) $(CURL_INC) @@ -14,4 +14,4 @@ install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) -$(OBJ) $(O_OBJ): gdalhttp.h md5.h minidriver_tileservice.h minidriver_wms.h minidriver_worldwind.h wmsdriver.h +$(OBJ) $(O_OBJ): gdalhttp.h md5.h minidriver_tileservice.h minidriver_wms.h minidriver_worldwind.h minidriver_tms.h wmsdriver.h Index: frmts/wms/frmt_wms.html =================================================================== --- frmts/wms/frmt_wms.html (revision 16514) +++ frmts/wms/frmt_wms.html (working copy) @@ -119,6 +119,10 @@ Can be used to define image size, SizeY = TileCountY * BlockSizeY * 2TileLevel. (tiled image sources only, optional, defaults to 0) + <YOrigin>top</YOrigin> + Can be used to define the position of the Y origin with respect to the tile grid. Possible values are 'top', 'bottom', and 'default', where the default behavior is mini-driver-specific. (TMS mini-driver only, optional, defaults to 'bottom' for TMS) + + </DataWindow> @@ -196,6 +200,69 @@ +

Minidrivers

+

+ The GDAL WMS driver has support for several internal 'minidrivers', which + allow access to different web mapping services. Each of these services may + support a different set of options in the Service block. +

+

WMS

+

+ Communications with an OGC WMS server. Has support for both tiled and + untiled requests. +

+ +

TileService

+

+ Service to support talking to a WorldWind TileService. Access is always tile based. +

+ +

WorldWind

+

+ Access to web-based WorldWind tile services. Access is always tile based. +

+ +

TMS

+

+ The TMS Minidriver is designed primarily to support the users of the + TMS + Specification. This service supports only access by tiles. +

+

+ Because TMS is similar to many other 'x/y/z' flavored services on the web, + this service can also be used to access these services. To use it in this + fashion, you can use replacement variables, of the format ${x}, ${y}, etc. +

+

+ Supported variables are: +

+

+

+ A typical ServerURL might look like:
+ http://labs.metacarta.com/wms-c/Basic.py/${version}/${layer}/${z}/${x}/${y}.${format}
+ In order to better suit TMS users, any URL that does not contain "${" will automatically have the string above (after "Basic.py/") appended to their URL. +

+

+ The TMS Service has 3 XML configuration elements that are different from + other services: Format which defaults to jpg, Layer which has no default, and Version which defaults to 1.0.0. +

+

+ Additionally, the TMS service respects one additional parameter, at the + DataWindow level, which is the YOrigin element. This element should be one of + bottom (the default in TMS) or top, which matches + OpenStreetMap and many other popular tile services. +

+

+ Two examples of usage of the TMS service are included in the examples below. +

+

Examples

See Also:

Index: frmts/wms/frmt_wms_metacarta_tms.xml =================================================================== --- frmts/wms/frmt_wms_metacarta_tms.xml (revision 0) +++ frmts/wms/frmt_wms_metacarta_tms.xml (revision 0) @@ -0,0 +1,20 @@ + + + http://labs.metacarta.com/wms-c/Basic.py + basic + png + + + -180.0 + 90.0 + 180.0 + -90.0 + 19 + 2 + 1 + + EPSG:4326 + 256 + 256 + 3 + Index: frmts/wms/wmsdriver.cpp =================================================================== --- frmts/wms/wmsdriver.cpp (revision 16514) +++ frmts/wms/wmsdriver.cpp (working copy) @@ -80,5 +80,6 @@ mdm->Register(new GDALWMSMiniDriverFactory_WMS()); mdm->Register(new GDALWMSMiniDriverFactory_TileService()); mdm->Register(new GDALWMSMiniDriverFactory_WorldWind()); + mdm->Register(new GDALWMSMiniDriverFactory_TMS()); } } Index: frmts/wms/dataset.cpp =================================================================== --- frmts/wms/dataset.cpp (revision 16514) +++ frmts/wms/dataset.cpp (working copy) @@ -154,6 +154,7 @@ const char *tlevel = CPLGetXMLValue(data_window_node, "TileLevel", ""); const char *str_tile_count_x = CPLGetXMLValue(data_window_node, "TileCountX", "1"); const char *str_tile_count_y = CPLGetXMLValue(data_window_node, "TileCountY", "1"); + const char *y_origin = CPLGetXMLValue(data_window_node, "YOrigin", "default"); if (ret == CE_None) { if ((ulx[0] != '\0') && (uly[0] != '\0') && (lrx[0] != '\0') && (lry[0] != '\0')) { @@ -208,6 +209,20 @@ m_overview_count = MAX(0, MIN(static_cast(ceil(a)), 32)); } } + if (ret == CE_None) { + CPLString y_origin_str = y_origin; + if (y_origin_str == "top") { + m_data_window.m_y_origin = GDALWMSDataWindow::TOP; + } else if (y_origin_str == "bottom") { + m_data_window.m_y_origin = GDALWMSDataWindow::BOTTOM; + } else if (y_origin_str == "default") { + m_data_window.m_y_origin = GDALWMSDataWindow::DEFAULT; + } else { + CPLError(CE_Failure, CPLE_AppDefined, "GDALWMS: DataWindow YOrigin must be set to " + "one of 'default', 'top', or 'bottom', not '%s'.", y_origin_str.c_str()); + ret = CE_Failure; + } + } } } if (ret == CE_None) { Index: frmts/wms/stuff.cpp =================================================================== --- frmts/wms/stuff.cpp (revision 16514) +++ frmts/wms/stuff.cpp (working copy) @@ -119,3 +119,20 @@ if (EQUAL(p, "0") || EQUAL(p, "false") || EQUAL(p, "no") || EQUAL(p, "disable") || EQUAL(p, "disabled") || EQUAL(p, "off")) return 0; return -1; } + +int URLSearchAndReplace (CPLString *base, const char *search, const char *fmt, ...) { + CPLString tmp; + va_list args; + + size_t start = base->find(search); + if (start == std::string::npos) { + return -1; + } + + va_start(args, fmt); + tmp.vPrintf(fmt, args); + va_end(args); + + base->replace(start, strlen(search), tmp); + return start; +} Index: frmts/wms/wmsdriver.h =================================================================== --- frmts/wms/wmsdriver.h (revision 16514) +++ frmts/wms/wmsdriver.h (working copy) @@ -38,10 +38,12 @@ CPLString BufferToVSIFile(GByte *buffer, size_t size); CPLErr MakeDirs(const char *path); int StrToBool(const char *p); +int URLSearchAndReplace (CPLString *base, const char *search, const char *fmt, ...); /* Convert a.b.c.d to a * 0x1000000 + b * 0x10000 + c * 0x100 + d */ int VersionStringToInt(const char *version); + class GDALWMSImageRequestInfo { public: double m_x0, m_y0; @@ -55,6 +57,7 @@ double m_x1, m_y1; int m_sx, m_sy; int m_tx, m_ty, m_tlevel; + enum { BOTTOM = -1, DEFAULT = 0, TOP = 1 } m_y_origin; }; class GDALWMSTiledImageRequestInfo { Index: frmts/wms/stdinc.h =================================================================== --- frmts/wms/stdinc.h (revision 16514) +++ frmts/wms/stdinc.h (working copy) @@ -18,3 +18,4 @@ #include "minidriver_wms.h" #include "minidriver_tileservice.h" #include "minidriver_worldwind.h" +#include "minidriver_tms.h" Index: frmts/wms/minidriver_tms.cpp =================================================================== --- frmts/wms/minidriver_tms.cpp (revision 0) +++ frmts/wms/minidriver_tms.cpp (revision 0) @@ -0,0 +1,96 @@ +/****************************************************************************** + * + * Project: WMS Client Driver + * Purpose: Implementation of Dataset and RasterBand classes for WMS + * and other similar services. + * Author: Adam Nowacki, nowak@xpam.de + * + ****************************************************************************** + * Copyright (c) 2007, Adam Nowacki + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + ****************************************************************************/ + +#include "stdinc.h" + +CPP_GDALWMSMiniDriverFactory(TMS) + +GDALWMSMiniDriver_TMS::GDALWMSMiniDriver_TMS() { +} + +GDALWMSMiniDriver_TMS::~GDALWMSMiniDriver_TMS() { +} + +CPLErr GDALWMSMiniDriver_TMS::Initialize(CPLXMLNode *config) { + CPLErr ret = CE_None; + + if (ret == CE_None) { + const char *base_url = CPLGetXMLValue(config, "ServerURL", ""); + if (base_url[0] != '\0') { + m_base_url = base_url; + if (m_base_url.find("${") == std::string::npos) { + if (m_base_url[m_base_url.size()-1] != '/') { + m_base_url += "/"; + } + m_base_url += "${version}/${layer}/${z}/${x}/${y}.${format}"; + } + } else { + CPLError(CE_Failure, CPLE_AppDefined, "GDALWMS, TMS mini-driver: ServerURL missing."); + ret = CE_Failure; + } + } + + m_dataset = CPLGetXMLValue(config, "Layer", ""); + m_version = CPLGetXMLValue(config, "Version", "1.0.0"); + m_format = CPLGetXMLValue(config, "Format", "jpg"); + + return ret; +} + +void GDALWMSMiniDriver_TMS::GetCapabilities(GDALWMSMiniDriverCapabilities *caps) { + caps->m_capabilities_version = 1; + caps->m_has_arb_overviews = 0; + caps->m_has_image_request = 0; + caps->m_has_tiled_image_requeset = 1; + caps->m_max_overview_count = 32; +} + +void GDALWMSMiniDriver_TMS::ImageRequest(CPLString *url, const GDALWMSImageRequestInfo &iri) { +} + +void GDALWMSMiniDriver_TMS::TiledImageRequest(CPLString *url, const GDALWMSImageRequestInfo &iri, const GDALWMSTiledImageRequestInfo &tiri) { + const GDALWMSDataWindow *data_window = m_parent_dataset->WMSGetDataWindow(); + int tms_y; + + if (data_window->m_y_origin != GDALWMSDataWindow::TOP) { + tms_y = static_cast(floor(((data_window->m_y1 - data_window->m_y0) + / (iri.m_y1 - iri.m_y0)) + 0.5)) - tiri.m_y - 1; + } else { + tms_y = tiri.m_y; + } + // http://tms25.arc.nasa.gov/tile/tile.aspx?T=geocover2000&L=0&X=86&Y=39 + *url = m_base_url; + + URLSearchAndReplace(url, "${version}", "%s", m_version.c_str()); + URLSearchAndReplace(url, "${layer}", "%s", m_dataset.c_str()); + URLSearchAndReplace(url, "${format}", "%s", m_format.c_str()); + URLSearchAndReplace(url, "${x}", "%d", tiri.m_x); + URLSearchAndReplace(url, "${y}", "%d", tms_y); + URLSearchAndReplace(url, "${z}", "%d", tiri.m_level); +}