.travis.yml

@@ -2,19 +2,19 @@ matrix:
   fast_finish: true
   include:
     - os: linux
-      dist: trusty
+      dist: xenial
       language: c
       sudo: required
       env:
-        - DISTRO=trusty
+        - DISTRO=xenial
         - BUILD_TYPE=maximum
 
     - os: linux
-      dist: trusty
+      dist: xenial
       language: c
       sudo: required
       env:
-        - DISTRO=trusty
+        - DISTRO=xenial
         - BUILD_TYPE=minimum
 
     - os: linux
@@ -38,11 +38,11 @@ before_install:
 script:
   - mkdir build
   - cd build
-  - if test "$BUILD_TYPE" = "maximum"; then cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DWITH_TIFF=ON -DWITH_GEOTIFF=ON -DWITH_TIFF_WRITE_SUPPORT=ON -DWITH_PCRE=ON -DWITH_SQLITE=ON -DWITH_BERKELEY_DB=ON; else cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DWITH_TIFF=OFF -DWITH_GEOTIFF=OFF -DWITH_TIFF_WRITE_SUPPORT=OFF -DWITH_PCRE=OFF -DWITH_SQLITE=OFF -DWITH_BERKELEY_DB=OFF -DWITH_GDAL=OFF -DWITH_GEOS=OFF -DWITH_FCGI=OFF -DWITH_CGI=OFF -DWITH_APACHE=OFF -DWITH_OGR=OFF -DWITH_MAPSERVER=OFF; fi
+  - if test "$BUILD_TYPE" = "maximum"; then cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DWITH_TIFF=ON -DWITH_GEOTIFF=ON -DWITH_TIFF_WRITE_SUPPORT=ON -DWITH_PCRE=ON -DWITH_SQLITE=ON -DWITH_BERKELEY_DB=ON; else cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DWITH_TIFF=OFF -DWITH_GEOTIFF=OFF -DWITH_TIFF_WRITE_SUPPORT=OFF -DWITH_PCRE=OFF -DWITH_SQLITE=OFF -DWITH_BERKELEY_DB=OFF -DWITH_GDAL=OFF -DWITH_GEOS=OFF -DWITH_FCGI=OFF -DWITH_CGI=OFF -DWITH_APACHE=OFF -DWITH_OGR=OFF -DWITH_MAPSERVER=OFF -DWITH_MAPCACHE_DETAIL=OFF; fi
   - make -j3
   - sudo make install
 # Only test with Apache 2.4
-  - if test "$DISTRO" = "trusty" -a "$BUILD_TYPE" = "maximum"; then cd ../tests; sh ./travis_setup.sh; sh ./run_tests.sh; fi
+  - if test "$DISTRO" = "xenial" -a "$BUILD_TYPE" = "maximum"; then cd ../tests; sh ./travis_setup.sh; sh ./run_tests.sh; fi
 
 
 #notifications:

CMakeLists.txt

@@ -12,8 +12,8 @@ endif ()
 
 
 set (MAPCACHE_VERSION_MAJOR 1)
-set (MAPCACHE_VERSION_MINOR 6)
-set (MAPCACHE_VERSION_REVISION 1)
+set (MAPCACHE_VERSION_MINOR 8)
+set (MAPCACHE_VERSION_REVISION 0)
 
 if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
    set(CMAKE_INSTALL_LIBDIR lib)
@@ -85,7 +85,8 @@ endif()
 
 #options suported by the cmake builder
 option(WITH_PIXMAN "Use pixman for SSE optimized image manipulations" ON)
-option(WITH_SQLITE "Use sqlite as a cache backend" ON)
+option(WITH_SQLITE "Use sqlite as a cache/dimension backend" ON)
+option(WITH_POSTGRESQL "Use sqlite as a dimension backend" OFF)
 option(WITH_BERKELEY_DB "Use Berkeley DB as a cache backend" OFF)
 option(WITH_MEMCACHE "Use memcache as a cache backend (requires recent apr-util)" OFF)
 option(WITH_TIFF "Use TIFFs as a cache backend" OFF)
@@ -95,6 +96,7 @@ option(WITH_PCRE "Use PCRE for regex tests" OFF)
 option(WITH_MAPSERVER "Enable (experimental) support for the mapserver library" OFF)
 option(WITH_RIAK "Use Riak as a cache backend" OFF)
 option(WITH_GDAL "Choose if GDAL raster support should be built in" ON)
+option(WITH_MAPCACHE_DETAIL "Build coverage analysis tool for SQLite caches" ON)
 
 find_package(PNG)
 if(PNG_FOUND)
@@ -198,6 +200,17 @@ if(WITH_SQLITE)
   endif(SQLITE_FOUND)
 endif (WITH_SQLITE)
 
+if(WITH_POSTGRESQL)
+  find_package(PostgreSQL)
+  if(PostgreSQL_FOUND)
+    include_directories(${PostgreSQL_INCLUDE_DIR})
+    target_link_libraries(mapcache ${PostgreSQL_LIBRARY})
+    set (USE_POSTGRESQL 1)
+  else(POSTGRESQL_FOUND)
+    report_optional_not_found(POSTGRESQL)
+  endif(PostgreSQL_FOUND)
+endif (WITH_POSTGRESQL)
+
 if(WITH_BERKELEY_DB)
   if(NOT BERKELEYDB_FIND_VERSION)
     set(BERKELEYDB_FIND_VERSION "4.6")
@@ -289,7 +302,7 @@ macro(status_optional_component component enabled libpath)
   endif()
 endmacro()
 macro(status_optional_feature feature enabled)
-  if("${enabled}" EQUAL "1")
+  if("${enabled}" EQUAL "1" OR "${enabled}" STREQUAL "ON")
     message(STATUS "  * ${feature}: ENABLED")
   else()
     message(STATUS "  * ${feature}: disabled")
@@ -305,6 +318,7 @@ message(STATUS "  * Apr: ${APR_LIBRARY}")
 message(STATUS " * Optional components")
 status_optional_component("PIXMAN" "${USE_PIXMAN}" "${PIXMAN_LIBRARY}")
 status_optional_component("SQLITE" "${USE_SQLITE}" "${SQLITE_LIBRARY}")
+status_optional_component("POSTGRESQL" "${USE_POSTGRESQL}" "${PostgreSQL_LIBRARY}")
 status_optional_component("Berkeley DB" "${USE_BDB}" "${BERKELEYDB_LIBRARY}")
 status_optional_component("Memcache" "${USE_MEMCACHE}" "${APU_LIBRARY}")
 status_optional_component("TIFF" "${USE_TIFF}" "${TIFF_LIBRARY}")
@@ -314,6 +328,8 @@ status_optional_component("PCRE" "${USE_PCRE}" "${PCRE_LIBRARY}")
 status_optional_component("Experimental mapserver support" "${USE_MAPSERVER}" "${MAPSERVER_LIBRARY}")
 status_optional_component("RIAK" "${USE_RIAK}" "${RIAK_LIBRARY}")
 status_optional_component("GDAL" "${USE_GDAL}" "${GDAL_LIBRARY}")
+message(STATUS " * Optional features")
+status_optional_feature("MAPCACHE_DETAIL" "${WITH_MAPCACHE_DETAIL}")
 
 INSTALL(TARGETS mapcache DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
@@ -321,3 +337,7 @@ add_subdirectory(util)
 add_subdirectory(cgi)
 add_subdirectory(apache)
 add_subdirectory(nginx)
+
+if (WITH_MAPCACHE_DETAIL)
+  add_subdirectory(contrib/mapcache_detail)
+endif (WITH_MAPCACHE_DETAIL)

LICENSE

@@ -6,7 +6,7 @@
  * Author:   Thomas Bonfort and the MapServer team.
  *
  ******************************************************************************
- * Copyright (c) 1996-2012 Regents of the University of Minnesota.
+ * Copyright (c) 1996-2019 Regents of the University of Minnesota.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

MIGRATION_GUIDE.txt

+Migrating from Mapcache 1.6 to 1.8
+===================================
+
+* <dimensions type="time" ...>...<query>SQL</query> should be replaced by
+  <dimensions type="time" ...>...<validate_query>SQL</validate_query><list_query>...</list_query> or
+  <dimensions type="sqlite" time="true" ...>...<validate_query>SQL</validate_query><list_query>...</list_query>
+  (see [RFC-121](http://mapserver.org/development/rfc/ms-rfc-121.html) for full examples)
+
 Migrating from Mapcache 1.4 to 1.6
 ===================================
 

README

-new code repository is at https://github.com/mapserver/mapcache
-

README.rst

+MapCache
+========
+
+| |Build Status| |Appveyor Build Status|
+
+-------
+Summary
+-------
+
+MapCache is a server that implements tile caching to speed up access to WMS layers. The primary objectives are to be fast and easily deployable, 
+while offering the essential features (and more!) expected from a tile caching solution.
+
+For more  information and complete documentation please 
+visit:
+
+  http://mapserver.org/mapcache/
+  
+Questions relating to MapCache use and development can be asked on the MapServer mailing lists:
+
+  http://www.mapserver.org/community/lists.html  
+  
+License
+-------
+
+::
+
+	/******************************************************************************
+	 *
+	 * Project:  MapServer
+	 * Purpose:  MapCache tile caching program.
+	 * Author:   Thomas Bonfort and the MapServer team.
+	 *
+	 ******************************************************************************
+	 * Copyright (c) 1996-2019 Regents of the University of Minnesota.
+	 *
+	 * 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 of this Software or works derived from this 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.
+	 *****************************************************************************/
+
+
+.. |Build Status| image:: https://travis-ci.org/mapserver/mapcache.svg?branch=master
+   :target: https://travis-ci.org/mapserver/mapcache
+
+.. |Appveyor Build Status| image:: https://ci.appveyor.com/api/projects/status/7al5utxjh83ig71v?svg=true
+   :target: https://ci.appveyor.com/project/mapserver/mapcache
\ No newline at end of file

appveyor.yml

+image: Visual Studio 2017
+
+platform:
+- x64
+
+environment:
+  matrix:
+# VS 2017
+  - VS_VERSION: Visual Studio 15 2017
+
+shallow_clone: true
+
+build_script:
+  - echo build_script
+  - if "%platform%" == "x64" SET VS_FULL=%VS_VERSION% Win64
+  - if "%platform%" == "x86" SET VS_FULL=%VS_VERSION%
+  - if "%platform%" == "x86" SET SDK=release-1911
+  - if "%platform%" == "x64" SET SDK=release-1911-x64
+  - echo "%VS_FULL%"
+  - if "%platform%" == "x64" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+  - if "%platform%" == "x86" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
+  - set SDK_ZIP=%SDK%-dev.zip
+  - set SDK_URL=http://download.gisinternals.com/sdk/downloads/%SDK_ZIP%
+  - echo "%SDK_ZIP%"
+  - echo "%SDK_URL%"
+  - mkdir sdk
+  - cd sdk
+  - appveyor DownloadFile "%SDK_URL%"
+  - 7z x "%SDK_ZIP%" > nul
+  - cd %SDK%
+  - cd lib
+  - copy libpng.lib libpng.lib.lib
+  - cd %APPVEYOR_BUILD_FOLDER%
+  - set SDK_PREFIX=%CD%\sdk\%SDK%
+  - set SDK_INC=%CD%\sdk\%SDK%\include
+  - set SDK_LIB=%CD%\sdk\%SDK%\lib
+  - set SDK_BIN=%CD%\sdk\%SDK%\bin
+  - set REGEX_DIR=%CD%\sdk\regex-0.12
+
+  - if not exist apr-1.6.3-win32-src.zip appveyor DownloadFile https://archive.apache.org/dist/apr/apr-1.6.3-win32-src.zip
+  - 7z x apr-1.6.3-win32-src.zip
+  - mkdir build-cmake
+  - cd build-cmake
+  - mkdir apr
+  - cd apr
+  - cmake -G "NMake Makefiles" 
+        -DCMAKE_INSTALL_PREFIX=%SDK_PREFIX% 
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo 
+        -DMIN_WINDOWS_VER=0x0600 
+        -DAPR_HAVE_IPV6=ON 
+        -DAPR_INSTALL_PRIVATE_H=ON 
+        -DAPR_BUILD_TESTAPR=OFF 
+        -DAPU_HAVE_ODBC=OFF 
+        -DINSTALL_PDB=OFF ..\..\apr-1.6.3
+  - nmake
+  - nmake install
+
+  - cd %APPVEYOR_BUILD_FOLDER%
+
+  - if not exist apr-util-1.6.1-win32-src.zip appveyor DownloadFile https://archive.apache.org/dist/apr/apr-util-1.6.1-win32-src.zip
+  - 7z x apr-util-1.6.1-win32-src.zip
+  - mkdir build-cmake\apr-util
+  - cd build-cmake\apr-util
+  - cmake -G "NMake Makefiles" 
+        -DCMAKE_INSTALL_PREFIX=%SDK_PREFIX% 
+        -DOPENSSL_ROOT_DIR=%SDK_PREFIX% 
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo 
+        -DAPU_HAVE_CRYPTO=ON 
+        -DAPU_HAVE_ODBC=OFF 
+        -DAPR_HAS_LDAP=OFF 
+        -DAPR_BUILD_TESTAPR=OFF 
+        -DINSTALL_PDB=OFF ..\..\apr-util-1.6.1
+  - nmake
+  - nmake install
+
+  - cd %APPVEYOR_BUILD_FOLDER%
+
+  - set PCRE_VERSION=8.38
+  - set PCRE=pcre-%PCRE_VERSION%
+  - if not exist %PCRE%.zip appveyor DownloadFile "http://zoo-project.org/dl/%PCRE%.zip"
+  - 7z x %PCRE%.zip > nul
+  - mkdir build-cmake\pcre
+  - cd build-cmake\pcre
+  - cmake -G "NMake Makefiles" 
+        -DCMAKE_INSTALL_PREFIX=%SDK_PREFIX% 
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo 
+        -DBUILD_SHARED_LIBS=ON 
+        -DPCRE_BUILD_TESTS=OFF 
+        -DPCRE_BUILD_PCRECPP=OFF 
+        -DPCRE_BUILD_PCREGREP=OFF 
+        -DPCRE_SUPPORT_PCREGREP_JIT=OFF 
+        -DPCRE_SUPPORT_UTF=ON 
+        -DPCRE_SUPPORT_UNICODE_PROPERTIES=ON 
+        -DPCRE_NEWLINE=CRLF 
+        -DINSTALL_MSVC_PDB=OFF ..\..\%PCRE%
+  - nmake
+  - nmake install
+
+  - copy %SDK_PREFIX%\lib\libfcgi.lib %SDK_PREFIX%\lib\fcgi.lib /Y > nul
+  - copy %SDK_PREFIX%\lib\apr-1.lib %SDK_PREFIX%\lib\apr-1-1.lib /Y > nul
+  - copy %SDK_PREFIX%\lib\libapr-1.lib %SDK_PREFIX%\lib\apr-1.lib /Y > nul
+  - copy %SDK_PREFIX%\lib\aprutil-1.lib %SDK_PREFIX%\lib\aprutil-1-1.lib /Y > nul
+  - copy %SDK_PREFIX%\lib\libaprutil-1.lib %SDK_PREFIX%\lib\aprutil-1.lib /Y > nul
+  - xcopy %REGEX_DIR%\*.h %SDK_PREFIX%\include\ /O /X /E /H /K /Y > nul
+
+  - cd %APPVEYOR_BUILD_FOLDER%
+
+  - mkdir build
+  - cd build
+  - cmake -G "%VS_FULL%" 
+        -DWITH_APACHE=OFF 
+        -DWITH_FCGI=ON 
+        -DWITH_PCRE=ON 
+        -DWITH_TIFF=OFF 
+        -DCMAKE_PREFIX_PATH=%SDK_PREFIX% ..
+  - cmake --build . --config Release
+
+  - copy %SDK_PREFIX%\lib\apr-1-1.lib %SDK_PREFIX%\lib\apr-1.lib /Y > nul
+  - copy %SDK_PREFIX%\lib\aprutil-1-1.lib %SDK_PREFIX%\lib\aprutil-1.lib /Y > nul
+  - copy %SDK_PREFIX%\bin\libapr-1.dll %SDK_PREFIX%\bin\apr-1.dll /Y > nul
+  - copy %SDK_PREFIX%\bin\libaprutil-1.dll %SDK_PREFIX%\bin\aprutil-1.dll /Y > nul
+  - copy %SDK_PREFIX%\bin\libfcgi.dll %SDK_PREFIX%\bin\fcgi.dll /Y > nul
+  - copy Release\*dll %SDK_PREFIX%\bin\ /Y > nul
+  - copy Release\*lib %SDK_PREFIX%\lib\ /Y > nul
+  - copy cgi\Release\*exe %SDK_PREFIX%\bin\ /Y > nul
+  - copy util\Release\*exe %SDK_PREFIX%\bin\ /Y > nul
+
+after_build:
+  - cd %SDK_PREFIX%\bin
+  - 7z a %APPVEYOR_BUILD_FOLDER%\mapcache.zip libapr*.dll apr*.dll pcre.dll pcreposix.dll mapcache.dll 
+        mapcache.fcgi.exe mapcache_seed.exe %APPVEYOR_BUILD_FOLDER%\mapcache.xml
+
+test_script:
+  - cd %SDK_PREFIX%\bin
+  - set MAPCACHE_CONFIG_FILE=mapcache.xml
+  - set PATH_INFO="/"
+  - set REQUEST_METHOD=GET
+  - set QUERY_STRING="SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&STYLES=&FORMAT=image/png&SRS=EPSG:4326&BBOX=0,0,10,10&WIDTH=256&HEIGHT=256&LAYERS=test&TRANSPARENT=TRUE"
+  - rem mapcache.fcgi.exe
+  - rem mapcache_seed.exe
+
+deploy: off
+
+artifacts:
+  - path: mapcache.zip
+    name: mapcache
+    type: zip

contrib/mapcache_detail/CMakeLists.txt

+option(WITH_GEOS
+       "Choose if GEOS geometry operations support should be built in" ON)
+option(WITH_OGR
+       "Choose if OGR/GDAL input vector support should be built in" ON)
+
+add_executable(mapcache_detail mapcache_detail.c)
+target_link_libraries(mapcache_detail mapcache)
+
+if (WITH_SQLITE)
+  find_package(SQLITE)
+  if(SQLITE_FOUND)
+    include_directories(${SQLITE_INCLUDE_DIR})
+    target_link_libraries(mapcache_detail ${SQLITE_LIBRARY})
+  else(SQLITE_FOUND)
+    report_mandatory_not_found(SQLITE)
+  endif(SQLITE_FOUND)
+else (WITH_SQLITE)
+  report_dependency_error(MAPCACHE_DETAIL SQLITE)
+endif (WITH_SQLITE)
+
+if (WITH_OGR)
+  find_package(GDAL)
+  if (GDAL_FOUND)
+    include_directories(${GDAL_INCLUDE_DIR})
+    target_link_libraries(mapcache_detail ${GDAL_LIBRARY})
+    set (USE_OGR 1)
+  else (GDAL_FOUND)
+    report_optional_not_found(GDAL)
+  endif (GDAL_FOUND)
+endif (WITH_OGR)
+
+if (WITH_GEOS)
+  find_package(GEOS)
+  if (GEOS_FOUND)
+    include_directories(${GEOS_INCLUDE_DIR})
+    target_link_libraries(mapcache_detail ${GEOS_LIBRARY})
+    set (USE_GEOS 1)
+  else (GEOS_FOUND)
+    report_optional_not_found(GEOS)
+  endif (GEOS_FOUND)
+endif (WITH_GEOS)
+
+
+set (CURRENT_BINARY_DIR "${PROJECT_BINARY_DIR}/contrib/mapcache_detail/")
+include_directories("${CURRENT_BINARY_DIR}")
+
+configure_file (
+  "${CMAKE_CURRENT_SOURCE_DIR}/mapcache_detail_config.h.in"
+  "${CURRENT_BINARY_DIR}/mapcache_detail_config.h"
+)
+
+message(STATUS "* mapcache_detail Configuration Options:")
+message(STATUS " * Mandatory components")
+message(STATUS "  * SQLite: ${SQLITE_LIBRARY}")
+message(STATUS " * Optional components")
+status_optional_component("GEOS" "${USE_GEOS}" "${GEOS_LIBRARY}")
+status_optional_component("OGR" "${USE_OGR}" "${GDAL_LIBRARY}")
+
+INSTALL(TARGETS mapcache_detail
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

contrib/mapcache_detail/mapcache_detail_config.h.in

+#ifndef _MAPCACHE_DETAIL_CONFIG_H
+#define _MAPCACHE_DETAIL_CONFIG_H
+
+#cmakedefine USE_OGR 1
+#cmakedefine USE_GEOS 1
+
+#endif

debian/changelog

+mapcache (1.8.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Update copyright file, changes:
+    - Change license shortname from MIT to Expat
+    - Update copyright years for Regents of the University of Minnesota
+    - Add license & copyright for cJSON sources
+  * Drop spelling-errors.patch, applied upstream. Refresh remaining patch.
+  * Add manpage for mapcache_detail.
+  * Update docs for README rename.
+  * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Thu, 25 Jul 2019 05:59:55 +0200
+
 mapcache (1.6.1-4) unstable; urgency=medium
 
   * Bump Standards-Version to 4.4.0, no changes.

debian/copyright

@@ -4,9 +4,14 @@ Upstream-Contact: The MapServer team <mapserver-dev@lists.osgeo.org>
 Source: https://github.com/mapserver/mapcache/releases
 
 Files: *
-Copyright: 1996-2017, Regents of the University of Minnesota
+Copyright: 1996-2019, Regents of the University of Minnesota
                 2004, Frank Warmerdam <warmerdam@pobox.com>
-License: MIT
+License: Expat
+
+Files: include/cJSON.h
+ lib/cJSON.c
+Copyright: 2009-2017 Dave Gamble and cJSON contributors
+License: Expat
 
 Files: include/ezxml.h
  lib/ezxml.c
@@ -25,25 +30,6 @@ Files: debian/*
 Copyright: 2012, Tom Payne <tom.payne@camptocamp.com>
 License: BSD-3-clause
 
-License: MIT
- 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 of this Software or works derived from this 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.
-
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the

debian/libapache2-mod-mapcache.docs

-README
+README.rst

debian/libmapcache1.symbols

-# SymbolsHelper-Confirmed: 1.6.1 amd64
+# SymbolsHelper-Confirmed: 1.8.0 amd64
 libmapcache.so.1 #PACKAGE# #MINVER#
 * Build-Depends-Package: libmapcache1-dev
  EZXML_NIL@Base 1.0.0
@@ -32,10 +32,7 @@ libmapcache.so.1 #PACKAGE# #MINVER#
  _mapcache_context_set_exception_default@Base 1.0.0
  _mapcache_curl_header_callback@Base 1.0.0
  _mapcache_curl_memory_callback@Base 1.0.0
- _mapcache_dimension_time_get_all_entries@Base 1.6.0
- _mapcache_dimension_time_get_entries@Base 1.6.0
- _mapcache_dimension_time_get_entries_for_value@Base 1.6.0
- _mapcache_dimension_time_parse_xml@Base 1.6.0
+ _mapcache_dimension_sqlite_get_entries_for_time_range@Base 1.8.0
  _mapcache_imageio_classify@Base 1.0.0
  _mapcache_imageio_jpeg_buffer_empty_output_buffer@Base 1.0.0
  _mapcache_imageio_jpeg_buffer_term_destination@Base 1.0.0
@@ -52,6 +49,7 @@ libmapcache.so.1 #PACKAGE# #MINVER#
  _mapcache_imageio_png_read_func@Base 1.0.0
  _mapcache_imageio_png_write_func@Base 1.0.0
  _mapcache_imageio_quantize_image@Base 1.0.0
+ _mapcache_imageio_raw_encode@Base 1.8.0
  _mapcache_imageio_remap_palette@Base 1.0.0
  _mapcache_service_demo_parse_request@Base 1.0.0
  _mapcache_service_kml_parse_request@Base 1.0.0
@@ -81,6 +79,80 @@ libmapcache.so.1 #PACKAGE# #MINVER#
  _wmts_service_identification_keywords@Base 1.2.0
  base64_encode@Base 1.4.0
  buffer_write_callback@Base 1.4.0
+ cJSON_AddArrayToObject@Base 1.8.0
+ cJSON_AddBoolToObject@Base 1.8.0
+ cJSON_AddFalseToObject@Base 1.8.0
+ cJSON_AddItemReferenceToArray@Base 1.8.0
+ cJSON_AddItemReferenceToObject@Base 1.8.0
+ cJSON_AddItemToArray@Base 1.8.0
+ cJSON_AddItemToObject@Base 1.8.0
+ cJSON_AddItemToObjectCS@Base 1.8.0
+ cJSON_AddNullToObject@Base 1.8.0
+ cJSON_AddNumberToObject@Base 1.8.0
+ cJSON_AddObjectToObject@Base 1.8.0
+ cJSON_AddRawToObject@Base 1.8.0
+ cJSON_AddStringToObject@Base 1.8.0
+ cJSON_AddTrueToObject@Base 1.8.0
+ cJSON_Compare@Base 1.8.0
+ cJSON_CreateArray@Base 1.8.0
+ cJSON_CreateArrayReference@Base 1.8.0
+ cJSON_CreateBool@Base 1.8.0
+ cJSON_CreateDoubleArray@Base 1.8.0
+ cJSON_CreateFalse@Base 1.8.0
+ cJSON_CreateFloatArray@Base 1.8.0
+ cJSON_CreateIntArray@Base 1.8.0
+ cJSON_CreateNull@Base 1.8.0
+ cJSON_CreateNumber@Base 1.8.0
+ cJSON_CreateObject@Base 1.8.0
+ cJSON_CreateObjectReference@Base 1.8.0
+ cJSON_CreateRaw@Base 1.8.0
+ cJSON_CreateString@Base 1.8.0
+ cJSON_CreateStringArray@Base 1.8.0
+ cJSON_CreateStringReference@Base 1.8.0
+ cJSON_CreateTrue@Base 1.8.0
+ cJSON_Delete@Base 1.8.0
+ cJSON_DeleteItemFromArray@Base 1.8.0
+ cJSON_DeleteItemFromObject@Base 1.8.0
+ cJSON_DeleteItemFromObjectCaseSensitive@Base 1.8.0
+ cJSON_DetachItemFromArray@Base 1.8.0
+ cJSON_DetachItemFromObject@Base 1.8.0
+ cJSON_DetachItemFromObjectCaseSensitive@Base 1.8.0
+ cJSON_DetachItemViaPointer@Base 1.8.0
+ cJSON_Duplicate@Base 1.8.0
+ cJSON_GetArrayItem@Base 1.8.0
+ cJSON_GetArraySize@Base 1.8.0
+ cJSON_GetErrorPtr@Base 1.8.0
+ cJSON_GetObjectItem@Base 1.8.0
+ cJSON_GetObjectItemCaseSensitive@Base 1.8.0
+ cJSON_GetStringValue@Base 1.8.0
+ cJSON_HasObjectItem@Base 1.8.0
+ cJSON_InitHooks@Base 1.8.0
+ cJSON_InsertItemInArray@Base 1.8.0
+ cJSON_IsArray@Base 1.8.0
+ cJSON_IsBool@Base 1.8.0
+ cJSON_IsFalse@Base 1.8.0
+ cJSON_IsInvalid@Base 1.8.0
+ cJSON_IsNull@Base 1.8.0
+ cJSON_IsNumber@Base 1.8.0
+ cJSON_IsObject@Base 1.8.0
+ cJSON_IsRaw@Base 1.8.0
+ cJSON_IsString@Base 1.8.0
+ cJSON_IsTrue@Base 1.8.0
+ cJSON_Minify@Base 1.8.0
+ cJSON_Parse@Base 1.8.0
+ cJSON_ParseWithOpts@Base 1.8.0
+ cJSON_Print@Base 1.8.0
+ cJSON_PrintBuffered@Base 1.8.0
+ cJSON_PrintPreallocated@Base 1.8.0
+ cJSON_PrintUnformatted@Base 1.8.0
+ cJSON_ReplaceItemInArray@Base 1.8.0
+ cJSON_ReplaceItemInObject@Base 1.8.0
+ cJSON_ReplaceItemInObjectCaseSensitive@Base 1.8.0
+ cJSON_ReplaceItemViaPointer@Base 1.8.0
+ cJSON_SetNumberHelper@Base 1.8.0
+ cJSON_Version@Base 1.8.0
+ cJSON_free@Base 1.8.0
+ cJSON_malloc@Base 1.8.0
  crc_table@Base 1.2.0
  (arch=!alpha !amd64 !arm64 !armel !armhf !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips64el !mipsel !ppc64el !x32)crc_table_computed@Base 1.4.0
  (arch=!armel !armhf !hppa !hurd-i386 !i386 !mips !mipsel !powerpc)create_memcache@Base 1.4.1
@@ -179,9 +251,13 @@ libmapcache.so.1 #PACKAGE# #MINVER#
  mapcache_core_get_tile@Base 1.0.0
  mapcache_core_proxy_request@Base 1.0.0
  mapcache_core_respond_to_error@Base 1.0.0
+ mapcache_dimension_elasticsearch_create@Base 1.8.0
+ mapcache_dimension_get_entries_for_value@Base 1.8.0
+ mapcache_dimension_postgresql_create@Base 1.8.0
  mapcache_dimension_regex_create@Base 1.0.0
  mapcache_dimension_sqlite_create@Base 1.4.0
- mapcache_dimension_time_create@Base 1.0.0
+ mapcache_dimension_time_get_entries@Base 1.8.0
+ mapcache_dimension_time_get_entries_for_value@Base 1.8.0
  mapcache_dimension_values_create@Base 1.0.0
  mapcache_empty_png_decode@Base 1.2.0
  mapcache_error_image@Base 1.0.0
@@ -219,9 +295,11 @@ libmapcache.so.1 #PACKAGE# #MINVER#
  mapcache_imageio_create_mixed_format@Base 1.0.0
  mapcache_imageio_create_png_format@Base 1.0.0
  mapcache_imageio_create_png_q_format@Base 1.0.0
+ mapcache_imageio_create_raw_format@Base 1.8.0
  mapcache_imageio_decode@Base 1.0.0
  mapcache_imageio_decode_to_image@Base 1.0.0
  mapcache_imageio_header_sniff@Base 1.0.0
+ mapcache_imageio_is_raw_tileset@Base 1.8.0
  mapcache_imageio_is_valid_format@Base 1.0.0
  mapcache_is_axis_inverted@Base 1.0.0
  mapcache_lock_or_wait_for_resource@Base 1.0.0
@@ -305,6 +383,8 @@ libmapcache.so.1 #PACKAGE# #MINVER#
  mapcache_tileset_tile_validate_y@Base 1.6.0
  mapcache_tileset_tile_validate_z@Base 1.6.0
  mapcache_unlock_resource@Base 1.0.0
+ mapcache_util_dbl_replace@Base 1.8.0
+ mapcache_util_dbl_replace_all@Base 1.8.0
  mapcache_util_extract_double_list@Base 1.0.0
  mapcache_util_extract_int_list@Base 1.0.0
  mapcache_util_get_tile_dimkey@Base 1.0.0
@@ -312,6 +392,7 @@ libmapcache.so.1 #PACKAGE# #MINVER#
  mapcache_util_quadkey_decode@Base 1.6.0
  mapcache_util_quadkey_encode@Base 1.6.0
  mapcache_util_str_replace@Base 1.0.0
+ mapcache_util_str_replace_all@Base 1.8.0
  mapcache_util_str_sanitize@Base 1.0.0
  mapcache_util_str_xml_escape@Base 1.6.1
  parseCache@Base 1.0.0

debian/man/mapcache_detail.1.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<refentry id='mapcache_detail'>
+
+  <refmeta>
+    <refentrytitle>mapcache_detail</refentrytitle>
+    <manvolnum>1</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>mapcache_detail</refname>
+    <refpurpose>coverage analysis tool for SQLite caches</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv id='synopsis'>
+    <cmdsynopsis>
+      <command>mapcache_detail</command>
+      <arg choice='opt'><replaceable>options</replaceable></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1 id='description'>
+    <title>DESCRIPTION</title>
+    <para>
+      <command>mapcache_detail</command> is a coverage analysis tool for SQLite caches.
+    </para>
+  </refsect1>
+
+  <refsect1 id='options'>
+    <title>OPTIONS</title>
+    <variablelist>
+
+      <varlistentry>
+        <term><option>-c</option></term>
+        <term><option>--config</option> <replaceable>file</replaceable></term>
+        <listitem>
+          <para>Configuration file (/path/to/mapcache.xml)</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-D</option></term>
+        <term><option>--dimension</option> <replaceable>DIMENSION_NAME=VALUE</replaceable></term>
+        <listitem>
+          <para>Set the value of a dimension: format DIMENSIONNAME=VALUE. Can be used multiple times for multiple dimensions</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-t</option></term>
+        <term><option>--tileset</option> <replaceable>name</replaceable></term>
+        <listitem>
+          <para>Tileset to analyze</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-g</option></term>
+        <term><option>--grid</option> <replaceable>name</replaceable></term>
+        <listitem>
+          <para>Grid to analyze</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-e</option></term>
+        <term><option>--extent</option> <replaceable>minx,miny,maxx,maxy</replaceable></term>
+        <listitem>
+          <para>Extent to analyze: format minx,miny,maxx,maxy. Cannot be used with <option>--ogr-datasource</option></para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-d</option></term>
+        <term><option>--ogr-datasource</option> <replaceable>data source</replaceable></term>
+        <listitem>
+          <para>OGR data source to get features from. Cannot be used with <option>--extent</option>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-l</option></term>
+        <term><option>--ogr-layer</option> <replaceable>layer</replaceable></term>
+        <listitem>
+          <para>OGR layer inside OGR data source. Cannot be used with <option>--ogr-sql</option>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-w</option></term>
+        <term><option>--ogr-where</option> <replaceable>filter</replaceable></term>
+        <listitem>
+          <para>Filter to apply on OGR layer features. Cannot be used with <option>--ogr-sql</option>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-s</option></term>
+        <term><option>--ogr-sql</option> <replaceable>SQL query</replaceable></term>
+        <listitem>
+          <para>SQL query to filter inside OGR data source. Cannot be used with <option>--ogr-layer</option> or <option>--ogr-where</option>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-z</option></term>
+        <term><option>--zoom</option> <replaceable>minzoom,maxzoom</replaceable></term>
+        <listitem>
+          <para>Set min and max zoom levels to analyze, separated by a comma, eg: 12,15</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-q</option></term>
+        <term><option>--query</option> <replaceable>value</replaceable></term>
+        <listitem>
+          <para>Set query for counting tiles in a rectangle. Default value works with default schema of SQLite caches.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-o</option></term>
+        <term><option>--short-output</option></term>
+        <listitem>
+          <para>Only existing SQLite files are reported, missing SQLite files are still taken into account for level and global coverage.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </refsect1>
+
+  <refsect1 id='example'>
+    <title>EXAMPLE</title>
+
+    <informalexample>
+      <para>Analyze tile coverage of tileset osm with the g grid. Default extent is the whole world and default zoom level is 0:</para>
+      <screen>
+        mapcache_detail --config mapcache.xml --tileset osm --grid g
+      </screen>
+    </informalexample>
+
+    <informalexample>
+      <para>Same as beforehand, with explicit zoom levels 9 to 12 and explicit extent covering Switzerland:</para>
+      <screen>
+        mapcache_detail --config mapcache.xml --tileset osm --grid g --zoom 9,12 --extent 663000,5751230,1167680,6075050
+      </screen>
+    </informalexample>
+
+  </refsect1>
+
+</refentry>

debian/mapcache-tools.install

-usr/bin/mapcache_seed
+usr/bin

debian/mapcache-tools.manpages

-debian/mapcache_seed.1
+debian/man/*.1

debian/patches/cmake-mapserver-include.patch

@@ -4,7 +4,7 @@ Forwarded: not-needed
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -244,10 +244,18 @@ if(WITH_GEOTIFF)
+@@ -257,10 +257,18 @@ if(WITH_GEOTIFF)
  endif (WITH_GEOTIFF)
  
  if(WITH_MAPSERVER)

debian/patches/series

 cmake-mapserver-include.patch
-spelling-errors.patch