.clang-format

+---
+Language:        Cpp
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: DontAlign
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: true
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: TopLevelDefinitions
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: false
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:
+  AfterClass:      false
+  AfterControlStatement: true
+  AfterEnum:       true
+  AfterFunction:   true
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     true
+  AfterUnion:      false
+  AfterExternBlock: false
+  BeforeCatch:     true
+  BeforeElse:      true
+  IndentBraces:    false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Custom
+BreakBeforeInheritanceComma: false
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: false
+ColumnLimit:    120
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:   
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeBlocks:   Preserve
+IncludeCategories: 
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    Priority:        3
+  - Regex:           '.*'
+    Priority:        1
+IncludeIsMainRegex: '(Test)?$'
+IndentCaseLabels: false
+IndentPPDirectives: None
+IndentWidth:     8
+IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Right
+ReflowComments:  true
+SortIncludes:    false
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Cpp11
+TabWidth:        8
+UseTab:          ForContinuationAndIndentation
+...
+

.drone-1.0.yml

+# This is for the drone 1.0 agent
+# https://docs.drone.io/user-guide/pipeline/steps/
+# https://dronie.osgeo.org #1.0 server
+
+# See https://git.osgeo.org/gitea/postgis/postgis-docker
+# todo: add docker images from https://hub.docker.com/r/postgis/postgis-build-env/tags/
+test-image: &test-image docker.kbt.io/postgis/build-test:trisquel2
+kind: pipeline
+name: pg-9.5
+steps:
+  - name: build
+    image: *test-image
+    pull: true
+    commands:
+      - export PGVER=9.5
+      - service postgresql start $PGVER
+      - export PGPORT=`grep ^port /etc/postgresql/$PGVER/main/postgresql.conf | awk '{print $3}'`
+      - export PATH=/usr/lib/postgresql/$PGVER/bin:$PATH
+      - psql --version
+      - ./autogen.sh
+      - ./configure CFLAGS="-O0 -Wall -fno-omit-frame-pointer -Werror" --without-interrupt-tests
+      - make -j
+      # we should maybe wait for postgresql service to startup here...
+      - psql -c "select version()" template1
+      - make check RUNTESTFLAGS=-v
+      - make install
+      - utils/check_all_upgrades.sh -s
+        `grep '^POSTGIS_' Version.config | cut -d= -f2 | paste -sd '.'`
+---
+test-image: &test-image docker.kbt.io/postgis/build-test:trisquel2
+kind: pipeline
+name: pg-9.6
+steps:
+  - name: build
+    image: *test-image
+    pull: true
+    commands:
+      - export PGVER=9.6
+      - service postgresql start $PGVER
+      - export PGPORT=`grep ^port /etc/postgresql/$PGVER/main/postgresql.conf | awk '{print $3}'`
+      - export PATH=/usr/lib/postgresql/$PGVER/bin:$PATH
+      - psql --version
+      - ./autogen.sh
+      - ./configure CFLAGS="-O0 -Wall -fno-omit-frame-pointer -Werror" --without-interrupt-tests
+      - make -j
+      # we should maybe wait for postgresql service to startup here...
+      - psql -c "select version()" template1
+      - make check RUNTESTFLAGS=-v
+      - make install
+      - utils/check_all_upgrades.sh -s
+        `grep '^POSTGIS_' Version.config | cut -d= -f2 | paste -sd '.'`
+---
+test-image: &test-image docker.kbt.io/postgis/build-test:trisquel2
+kind: pipeline
+name: pg-10
+steps:
+  - name: build
+    image: *test-image
+    pull: true
+    commands:
+      - export PGVER=10
+      - service postgresql start $PGVER
+      - export PGPORT=`grep ^port /etc/postgresql/$PGVER/main/postgresql.conf | awk '{print $3}'`
+      - export PATH=/usr/lib/postgresql/$PGVER/bin:$PATH
+      - psql --version
+      - ./autogen.sh
+      - ./configure CFLAGS="-O0 -Wall -fno-omit-frame-pointer -Werror" --without-interrupt-tests
+      - make -j
+      # we should maybe wait for postgresql service to startup here...
+      - psql -c "select version()" template1
+      - make check RUNTESTFLAGS=-v
+      - make install
+      - utils/check_all_upgrades.sh -s
+        `grep '^POSTGIS_' Version.config | cut -d= -f2 | paste -sd '.'`
+...

.drone.yml

-# See http://readme.drone.io/0.5/usage/overview
-
-# See https://git.osgeo.org/gogs/postgis/postgis-docker
-test-image: &test-image docker.kbt.io/postgis/build-test:trisquel2
-
-matrix:
-  PGVER:
-    - 9.4
-    - 9.5
-    - 9.6
-    - 10
-
-pipeline:
-  clone:
-    image: plugins/git
-    depth: 20
-    recursive: false
-  build:
-    image: *test-image
-    pull: true
-    commands:
-      - service postgresql start $PGVER
-      - export PGPORT=`grep ^port /etc/postgresql/$PGVER/main/postgresql.conf | awk '{print $3}'`
-      - export PATH=/usr/lib/postgresql/$PGVER/bin:$PATH
-      - psql --version
-      - ./autogen.sh
-      - ./configure CFLAGS="-O0 -Wall -fno-omit-frame-pointer -Werror" --without-interrupt-tests
-      - make
-      # we should maybe wait for postgresql service to startup here...
-      - psql -c "select version()" template1
-      - make check RUNTESTFLAGS=-v
-      - make install
-      - utils/check_all_upgrades.sh
-        `grep '^POSTGIS_' Version.config | cut -d= -f2 | paste -sd '.'`

.github/codecov.yml

@@ -7,3 +7,5 @@ coverage:
             default:
                 threshold: 0.2%
 comment: false
+ignore:
+  - "deps/wagyu/include/**/*" # Ignore wagyu library files

.github/codecov_env.bash

+#!/usr/bin/env bash
+
+# Apache License Version 2.0, January 2004
+# https://github.com/codecov/codecov-bash/blob/master/LICENSE
+
+set -e +o pipefail
+
+VERSION="0b37652"
+
+add(){
+  if [ ! -z "$1" ];
+  then
+    echo -n "-e $1 "
+  fi
+}
+
+add "CODECOV_ENV"
+add "CODECOV_TOKEN"
+add "CODECOV_URL"
+add "CODECOV_SLUG"
+add "VCS_COMMIT_ID"
+add "VCS_BRANCH_NAME"
+add "VCS_PULL_REQUEST"
+add "VCS_SLUG"
+add "VCS_TAG"
+add "CI_BUILD_URL"
+add "CI_BUILD_ID"
+add "CI_JOB_ID"
+
+if [ "$JENKINS_URL" != "" ];
+then
+  add "JENKINS_URL"
+  add "ghprbSourceBranch"
+  add "GIT_BRANCH"
+  add "ghprbActualCommit"
+  add "GIT_COMMIT"
+  add "CHANGE_ID"
+  add "BRANCH_NAME"
+  add "BUILD_NUMBER"
+  add "ghprbPullId"
+  add "BUILD_URL"
+
+elif [ "$CI" = "true" ] && [ "$TRAVIS" = "true" ] && [ "$SHIPPABLE" != "true" ];
+then
+  add "CI"
+  add "TRAVIS"
+  add "SHIPPABLE"
+  add "TRAVIS_BRANCH"
+  add "TRAVIS_COMMIT"
+  add "TRAVIS_JOB_NUMBER"
+  add "TRAVIS_PULL_REQUEST"
+  add "TRAVIS_JOB_ID"
+  add "TRAVIS_REPO_SLUG"
+  add "TRAVIS_TAG"
+  add "TRAVIS_OS_NAME"
+
+elif [ "$CI" = "true" ] && [ "$CI_NAME" = "codeship" ];
+then
+  add "CI"
+  add "CI_NAME"
+  add "CI_BRANCH"
+  add "CI_BUILD_NUMBER"
+  add "CI_BUILD_URL"
+  add "CI_COMMIT_ID"
+
+elif [ "$TEAMCITY_VERSION" != "" ];
+then
+  add "TEAMCITY_VERSION"
+  add "TEAMCITY_BUILD_BRANCH"
+  add "TEAMCITY_BUILD_ID"
+  add "TEAMCITY_BUILD_URL"
+  add "TEAMCITY_BUILD_COMMIT"
+  add "TEAMCITY_BUILD_COMMIT"
+  add "BUILD_VCS_NUMBER"
+  add "TEAMCITY_BUILD_REPOSITORY"
+
+elif [ "$CI" = "true" ] && [ "$CIRCLECI" = "true" ];
+then
+  add "CI"
+  add "CIRCLECI"
+  add "CIRCLE_BRANCH"
+  add "CIRCLE_BUILD_NUM"
+  add "CIRCLE_NODE_INDEX"
+  add "CIRCLE_PROJECT_USERNAME"
+  add "CIRCLE_PROJECT_REPONAME"
+  add "CIRCLE_REPOSITORY_URL"
+  add "CIRCLE_PR_NUMBER"
+  add "CIRCLE_SHA1"
+  add "CIRCLE_ARTIFACTS"
+  add "CIRCLE_TEST_REPORTS"
+
+elif [ "$BUDDYBUILD_BRANCH" != "" ];
+then
+  add "BUDDYBUILD_BRANCH"
+  add "BUDDYBUILD_BUILD_NUMBER"
+  add "BUDDYBUILD_BUILD_ID"
+  add "BUDDYBUILD_APP_ID"
+
+elif [ "${bamboo_planRepository_revision}" != "" ];
+then
+  add "bamboo_planRepository_revision"
+  add "bamboo_planRepository_branch"
+  add "bamboo_buildNumber"
+  add "bamboo_buildResultsUrl"
+  add "bamboo_planRepository_repositoryUrl"
+
+elif [ "$CI" = "true" ] && [ "$BITRISE_IO" = "true" ];
+then
+  add "CI"
+  add "BITRISE_IO"
+  add "BITRISE_GIT_BRANCH"
+  add "BITRISE_BUILD_NUMBER"
+  add "BITRISE_BUILD_URL"
+  add "BITRISE_PULL_REQUEST"
+  add "BITRISE_GIT_COMMIT"
+
+elif [ "$CI" = "true" ] && [ "$SEMAPHORE" = "true" ];
+then
+  add "CI"
+  add "SEMAPHORE"
+  add "BRANCH_NAME"
+  add "SEMAPHORE_BUILD_NUMBER"
+  add "SEMAPHORE_CURRENT_THREAD"
+  add "PULL_REQUEST_NUMBER"
+  add "SEMAPHORE_REPO_SLUG"
+  add "REVISION"
+  add "SEMAPHORE_TRIGGER_SOURCE"
+
+elif [ "$CI" = "true" ] && [ "$BUILDKITE" = "true" ];
+then
+  add "CI"
+  add "BUILDKITE"
+  add "BUILDKITE_BRANCH"
+  add "BUILDKITE_BUILD_NUMBER"
+  add "BUILDKITE_JOB_ID"
+  add "BUILDKITE_BUILD_URL"
+  add "BUILDKITE_PROJECT_SLUG"
+  add "BUILDKITE_COMMIT"
+
+elif [ "$CI" = "drone" ];
+then
+  add "CI"
+  add "DRONE_BRANCH"
+  add "DRONE_BUILD_NUMBER"
+  add "DRONE_BUILD_LINK"
+  add "DRONE_PULL_REQUEST"
+  add "DRONE_JOB_NUMBER"
+  add "DRONE_TAG"
+  add "CI_BUILD_URL"
+
+elif [ "$HEROKU_TEST_RUN_BRANCH" != "" ];
+then
+  add "HEROKU_TEST_RUN_BRANCH"
+  add "HEROKU_TEST_RUN_ID"
+
+elif [ "$CI" = "True" ] && [ "$APPVEYOR" = "True" ];
+then
+  add "CI"
+  add "APPVEYOR"
+  add "APPVEYOR_REPO_BRANCH"
+  add "APPVEYOR_JOB_ID"
+  add "APPVEYOR_PULL_REQUEST_NUMBER"
+  add "APPVEYOR_ACCOUNT_NAME"
+  add "APPVEYOR_PROJECT_SLUG"
+  add "APPVEYOR_BUILD_VERSION"
+  add "APPVEYOR_REPO_NAME"
+  add "APPVEYOR_REPO_COMMIT"
+
+elif [ "$CI" = "true" ] && [ "$WERCKER_GIT_BRANCH" != "" ];
+then
+  add "CI"
+  add "WERCKER_GIT_BRANCH"
+  add "WERCKER_MAIN_PIPELINE_STARTED"
+  add "WERCKER_GIT_OWNER"
+  add "WERCKER_GIT_REPOSITORY"
+  add "WERCKER_GIT_COMMIT"
+
+elif [ "$CI" = "true" ] && [ "$MAGNUM" = "true" ];
+then
+  add "CI"
+  add "MAGNUM"
+  add "CI_BRANCH"
+  add "CI_BUILD_NUMBER"
+  add "CI_COMMIT"
+
+elif [ "$SHIPPABLE" = "true" ];
+then
+  add "SHIPPABLE"
+  add "HEAD_BRANCH"
+  add "BRANCH"
+  add "BUILD_NUMBER"
+  add "BUILD_URL"
+  add "PULL_REQUEST"
+  add "REPO_FULL_NAME"
+  add "COMMIT"
+
+elif [ "$TDDIUM" != "" ];
+then
+  add "TDDIUM"
+  add "TDDIUM_CURRENT_COMMIT"
+  add "TDDIUM_CURRENT_BRANCH"
+  add "TDDIUM_TID"
+  add "TDDIUM_PR_ID"
+
+elif [ "$GREENHOUSE" = "true" ];
+then
+  add "GREENHOUSE"
+  add "GREENHOUSE_BRANCH"
+  add "GREENHOUSE_BUILD_NUMBER"
+  add "GREENHOUSE_BUILD_URL"
+  add "GREENHOUSE_PULL_REQUES"
+  add "GREENHOUSE_COMMIT"
+  add "GREENHOUSE_EXPORT_DIR"
+
+elif [ "$GITLAB_CI" != "" ];
+then
+  add "GITLAB_CI"
+  add "CI_BUILD_REF_NAME"
+  add "CI_BUILD_ID"
+  add "CI_BUILD_REPO"
+  add "CI_BUILD_REF"
+
+fi

.gitignore

@@ -24,6 +24,7 @@ de9i*.png
 doc/html/image_src/generator
 doc/html/image_src/Makefile
 doc/html/*.html
+doc/html/docbook.css
 doc/Makefile
 doc/Makefile.comments
 doc/po/*/*.xml
@@ -53,6 +54,9 @@ extensions/postgis/Makefile
 extensions/postgis/postgis.control
 extensions/postgis/sql/
 extensions/postgis/sql_bits/*.sql
+extensions/postgis_raster/Makefile
+extensions/postgis_raster/postgis_raster.control
+extensions/postgis_raster/sql/
 extensions/postgis_sfcgal/Makefile
 extensions/postgis_sfcgal/postgis_sfcgal.control
 extensions/postgis_sfcgal/sql/
@@ -106,9 +110,9 @@ postgis/legacy.sql
 postgis/postgis.sql
 postgis/postgis_proc_set_search_path.sql
 postgis/postgis_for_extension.sql
+postgis/postgis_upgrade.sql*
 postgis/postgis_upgrade_for_extension.sql
 postgis/postgis_upgrade_for_extension.sql.in
-postgis/postgis_upgrade.sql*
 postgis/sfcgal_upgrade.sql*
 postgis/sqldefines.h
 postgis/uninstall_legacy.sql
@@ -125,10 +129,10 @@ raster/rt_pg/rtpostgis.sql
 raster/rt_pg/rtpostgis_drop.sql
 raster/rt_pg/rtpostgis_legacy.sql
 raster/rt_pg/rtpostgis_proc_set_search_path.sql
-raster/rt_pg/rtpostgis_upgrade.sql.in
 raster/rt_pg/rtpostgis_for_extension.sql
-raster/rt_pg/rtpostgis_upgrade_for_extension.sql.in
+raster/rt_pg/rtpostgis_upgrade.sql.in
 raster/rt_pg/rtpostgis_upgrade*.sql
+raster/rt_pg/rtpostgis_upgrade_for_extension.sql.in
 raster/rt_pg/uninstall_rtpostgis.sql
 raster/scripts/Makefile
 raster/scripts/python/Makefile
@@ -142,6 +146,8 @@ raster/test/regress/Makefile
 raster/test/regress/rtpostgis.sql
 regress/00-regress-install/
 regress/Makefile
+regress/core/Makefile
+regress/sfcgal/Makefile
 regress/postgis.sql
 regress/postgis_garden_result.txt
 regress/raster_garden_result.txt
@@ -172,7 +178,11 @@ postgis/uninstall_sfcgal.sql
 *.pdf
 .idea/*
 .syntastic_c_config
+.vs/*
 
 # LLVM JIT
 *.bc
 *.ll
+
+deps/Makefile
+deps/wagyu/Makefile

.gitlab-ci.yml

 test:
+  image: debian:buster
   script:
     - apt-get update -qq && apt-get install -y
-        postgresql-9.6 postgresql-server-dev-9.6
+        bison flex
+        postgresql-11 postgresql-server-dev-11
         build-essential autoconf libtool libcunit1-dev
         xsltproc docbook-xsl docbook-mathml dblatex
         libproj-dev libgdal-dev libgeos-dev libjson-c-dev
@@ -10,6 +12,9 @@ test:
     - service postgresql start
     - su -l postgres -c "createuser -s `whoami`"
     - ./autogen.sh
+    - ./configure
+    - make maintainer-clean
+    - ./autogen.sh
     - ./configure CFLAGS="-Wall -fno-omit-frame-pointer -Werror"
     - make
     - make check RUNTESTFLAGS=-v

.mailmap

+Sandro Santilli <strk@kbt.io> <strk@keybit.net>
+Bborie Park <dustymugs@gmail.com> <dustymugs at gmail.com>
+Bborie Park <dustymugs@gmail.com> <bkpark at ucdavis.edu>

.travis.yml

-env:
-  matrix:
-    - CFLAGS="-g -Og" MATRIX_EVAL="touch check-no-trailing-blanks"
-    - CFLAGS="-g -O2 -fstack-protector -Wformat -Werror=format-security" LDFLAGS="-Wl,-Bsymbolic-functions -Wl,-z,relro"
-    - CFLAGS="-g -O3 -mtune=generic -fno-omit-frame-pointer -Werror -Wall -Wextra -Wno-unused-parameter"
-    - CFLAGS="-g -O0 --coverage -fprofile-arcs -ftest-coverage" LDFLAGS="--coverage -fprofile-arcs -ftest-coverage" CONFIGURE_FLAGS="--enable-debug"
-
-addons:
-  postgresql: "9.6"
-  apt:
-    packages:
-      - eatmydata
-
-before_install:
-  - eval "${MATRIX_EVAL}"
-  - sudo sh -c "echo /usr/lib/libeatmydata/libeatmydata.so >> /etc/ld.so.preload"
-  - curl -sSfL https://github.com/mapbox/logbt/archive/v2.0.3.tar.gz | sudo tar --gunzip --extract --strip-components=1 --exclude="*md" --exclude="test*" --directory=/usr/local
-  - curl -sSfL https://raw.githubusercontent.com/mapbox/logbt/30c554dd37b6c96c23fc424f75910fc6d6696f00/bin/logbt | sudo tee /usr/local/bin/logbt > /dev/null
-  - sudo logbt --setup
-  - sudo service postgresql stop 9.6
-  - sudo chown -hRL --from=postgres travis:travis /etc /var /tmp
-  - sudo usermod -u 1000 postgres
-  - sudo adduser travis ssl-cert
-  - sudo service postgresql start 9.6
-  - sudo add-apt-repository --yes ppa:ubuntugis/ppa
-  - sudo add-apt-repository --yes ppa:ubuntugis/ubuntugis-unstable
-  - sudo apt-get update -qq
-  - mkdir -p /home/travis/deb && touch /home/travis/deb/__ && sudo cp -n /home/travis/deb/* /var/cache/apt/archives || true
-  - sudo apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests libsfcgal1 libsfcgal-dev postgresql-server-dev-9.6 libxml2-utils libcunit1-dev xsltproc docbook-xsl docbook-mathml dblatex libgeos-dev libjson0-dev libgdal-dev gdb libc6-dbg
-  - sudo sh -c "echo deb http://archive.ubuntu.com/ubuntu/ artful main restricted universe multiverse >> /etc/apt/sources.list"
-  - sudo apt-get update -qq
-  - sudo apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests binutils libproj-dev libprotobuf-c-dev protobuf-c-compiler
-  - cp -n /var/cache/apt/archives/* /home/travis/deb || true
-  - ls -la /home/travis/deb/
-  - sudo ldconfig
-  - ./autogen.sh
-
-after_failure:
-  - sudo head -n1000 /var/log/postgresql/postgresql-9.6-main.log
-
-after_success:
-  - bash .github/codecov.bash
+services:
+  - docker
 
+sudo: true
 language: c
 
-compiler: gcc
-
-dist: trusty
+env:
+  - tag=pg11-geos37-gdal24-proj52 mode=garden
+  - tag=latest mode=tests
+  - tag=pg11-geos37-gdal24-proj52 mode=debug
+  - tag=pg11-geos37-gdal24-proj52 mode=coverage
+  - tag=pg11-geos37-gdal24-proj52 mode=usan_gcc
+  - tag=pg11-geos37-gdal24-proj52 mode=usan_clang
+  - tag=pg11-geos37-gdal24-proj52 mode=wagyu
+  - tag=pg11-geos37-gdal24-proj52 mode=tests
+  - tag=pg10-geos36-gdal23-proj49 mode=tests
+  - tag=pg96-geos36-gdal22-proj49 mode=tests
+  - tag=pg95-geos36-gdal21-proj48 mode=tests
 
-cache:
-  ccache: true
-  directories:
-    - /home/travis/deb
+matrix:
+  allow_failures:
+    - env: tag=latest mode=tests
 
 script:
-  - ./configure CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" $CONFIGURE_FLAGS || cat config.log
-  - make -j
-  - chmod 755 /home/travis
-  - logbt -- make check "RUNTESTFLAGS=--verbose"
-  - logbt -- make check "RUNTESTFLAGS='--dumprestore --verbose'"
-  - sudo make install
-  - logbt -- make installcheck "RUNTESTFLAGS=--verbose"
-  - logbt -- make installcheck "RUNTESTFLAGS=--dumprestore --verbose"
+  - echo "/tmp/logbt-coredumps/core.%p.%E" | sudo tee /proc/sys/kernel/core_pattern
+  - echo "FROM postgis/postgis-build-env:${tag}" > Dockerfile
+  - echo "ADD --chown=postgres:postgres . /src/postgis" >> Dockerfile
+  - echo "CMD bash ci/travis/run_${mode}.sh" >> Dockerfile
+  - docker build -t pgtest .
+  - ci_env=`bash .github/codecov_env.bash`
+  - docker run $ci_env --name pgtest-${TRAVIS_BUILD_NUMBER} pgtest
+
+after_success:
+  - docker rm pgtest-${TRAVIS_BUILD_NUMBER}
 
 notifications:
   email: false

GNUmakefile.in

@@ -6,9 +6,13 @@
 
 SUBDIRS = liblwgeom
 ifeq (@LIBLWGEOM_ONLY@,no)
-SUBDIRS += libpgcommon postgis regress @RASTER@ @TOPOLOGY@ loader utils doc @EXTENSIONS@
+SUBDIRS += libpgcommon postgis regress @RASTER@ @TOPOLOGY@ loader utils doc @EXTENSIONS@ @DEPS_SUBDIR@
 endif
 
+POSTGIS_MAJOR_VERSION=@POSTGIS_MAJOR_VERSION@
+POSTGIS_MINOR_VERSION=@POSTGIS_MINOR_VERSION@
+POSTGIS_MICRO_VERSION=@POSTGIS_MICRO_VERSION@
+
 PERL = @PERL@
 
 # todo: add more rules here, like uninstall, clean...
@@ -45,9 +49,19 @@ check-no-trailing-blanks:
 		grep -v postgis/sqldefines.h | \
 		xargs grep -n '[[:space:]]$$'
 
-installcheck:
+installcheck: installcheck-base installcheck-upgrade
+
+installcheck-base:
 	RUNTESTFLAGS="$(RUNTESTFLAGS) --extension" $(MAKE) check
 
+# only run upgrade test if RUNTESTFLAGS was not already doing that
+installcheck-upgrade:
+	if test -z `echo "$(RUNTESTFLAGS)" | grep -- --upgrade`; then \
+		RUNTESTFLAGS="$(RUNTESTFLAGS) --extension \
+			--upgrade-path unpackaged--$(POSTGIS_MAJOR_VERSION).$(POSTGIS_MINOR_VERSION).$(POSTGIS_MICRO_VERSION)" \
+			$(MAKE) check; \
+	fi
+
 distclean: distclean-local
 
 distclean-local: clean-local

NEWS

-PostGIS 2.5.0rc2
-2018/09/16
-WARNING: If compiling with PostgreSQL+JIT, LLVM >= 6 is required
+PostGIS 3.0.0alpha1
+2019/05/26
+For full changes and enhancements, refer to PostGIS 3.0.0 section.
+This version requires PostgreSQL 9.5+-12 and GEOS >= 3.6+
+Additional features enabled if you are running Proj6+ and PostgreSQL 12
+* Major highlights *
+  - #4341, Using "support function" API in PgSQL 12+ to replace SQL inlining
+           as the mechanism for providing index support under ST_Intersects, et al
+           (Paul Ramsey)
+  - #3888, Raster support now packaged as a separate extension - postgis_raster
+           (Sandro Santilli)
+  - #3807, Extension library files no longer include the minor version.
+           Use New configure switch --with-library-minor-version
+           if you need the old behavior (Regina Obe)
+  - #4322, Support for Proj 6+ API, bringing more accurate datum transforms
+           and support for WKT projections
+  - #4260, liblwgeom headers are not installed anymore.
+           If your project depends on them available, please use
+           librttopo instead. (Darafei Praliaskouski)
+  - #4311, Introduce `--with-wagyu` as an option for MVT polygons (Raúl Marín)
+  - #4258, #4278 Enhance postgis functions ST_Area, ST_Distance, ST_Intersection,
+           ST_Difference, ST_Union, ST_Intersects, ST_3DIntersects, ST_3DDistance
+           to handle types (Solid PolyhedralSurface, TINS) that were only available in SFCGAL.
+           Remove postgis.backend switch.
+          (Darafei Praliaskouski)
+  - #4230, SP-GiST and GiST support for ND box operators overlaps, contains,
+           within, equals (Esteban Zimányi and Arthur Lesuisse from Université
+           Libre de Bruxelles (ULB), Darafei Praliaskouski)
 
-New since PostGIS 2.5.0rc1
+PostGIS 3.0.0
+2019/xx/xx
+* Breaking Changes *
+  - #4267, Bump minimum GEOS version to 3.6 (Regina Obe, Darafei Praliaskouski)
+  - #3888, Raster support now available as a separate extension
+           (Sandro Santilli)
+  - #3807, Extension library files no longer include the minor version.
+           Use New configure switch --with-library-minor-version
+           if you need the old behavior (Regina Obe)
+  - #4230, ND box operators (overlaps, contains, within, equals) now don't look on
+           dimensions that aren't present in both operands.
+           Please REINDEX your ND indexes after upgrade. (Darafei Praliaskouski)
+  - #4229, Dropped support for PostgreSQL < 9.5. (Darafei Praliaskouski)
+  - #4260, liblwgeom headers are not installed anymore.
+           If your project depends on them available, please use
+           librttopo instead. (Darafei Praliaskouski)
+  - #4258, Remove SFCGAL support for ST_Area, ST_Distance, ST_Intersection,
+           ST_Difference, ST_Union, ST_Intersects, ST_3DIntersects, ST_3DDistance
+           and postgis.backend switch (Darafei Praliaskouski)
+  - #4267, Enable Proj 6 deprecated APIs (Darafei Praliaskouski, Raúl Marín)
+  - #4268, Bump minimum SFCGAL version to 1.3.1 (Darafei Praliaskouski)
+  - #4331, ST_3DMakeBox now returns error instead of a miniscule box (Regina Obe)
+  - #4342, Removed "versioned" variants of ST_AsGeoJSON and ST_AsKML (Paul Ramsey)
+  - #4356, ST_Accum removed. Use array_agg instead. (Darafei Praliaskouski)
+
+* New Features *
+  - #2902, postgis_geos_noop (Sandro Santilli)
+  - #4128, ST_AsMVT support for Feature ID (Stepan Kuzmin)
+  - #4230, SP-GiST and GiST support for ND box operators overlaps, contains,
+           within, equals (Esteban Zimányi and Arthur Lesuisse from Université
+           Libre de Bruxelles (ULB), Darafei Praliaskouski)
+  - #4171, ST_3DLineInterpolatePoint (Julien Cabieces, Vincent Mora)
+  - #4311, Introduce `--with-wagyu` as an option for MVT polygons (Raúl Marín)
+  - #1833, ST_AsGeoJSON(row) generates full GeoJSON Features (Joe Conway)
+  - #3687, Casts json(geometry) and jsonb(geometry) for implicit GeoJSON
+           generation (Paul Ramsey)
+
+* Enhancements and fixes *
+  - #4342, Move deprecated functions into legacy.sql file
+  - #4341, Using "support function" API in PgSQL 12+ to replace SQL inlining
+           as the mechanism for providing index support under ST_Intersects, et al
+  - #4330, postgis_restore OOM when output piped to an intermediate process
+           (Hugh Ranalli)
+  - #4322, Support for Proj 6+ API, bringing more accurate datum transforms
+           and support for WKT projections
+  - #4153, ST_Segmentize now splits segments proportionally (Darafei
+           Praliaskouski).
   - #4162, ST_DWithin documentation examples for storing geometry and
            radius in table (Darafei Praliaskouski, github user Boscop).
-  - #4163, MVT: Fix resource leak when the first geometry is NULL (Raúl Marín)
-  - #4172, Fix memory leak in lwgeom_offsetcurve (Raúl Marín)
-  - #4164, Parse error on incorrectly nested GeoJSON input (Paul Ramsey)
+  - #4161 and #4294, ST_AsMVTGeom: Shortcut geometries smaller than the
+           resolution (Raúl Marín)
   - #4176, ST_Intersects supports GEOMETRYCOLLECTION (Darafei Praliaskouski)
-  - #4177, Postgres 12 disallows variable length arrays in C (Laurenz Albe)
-  - #4160, Use qualified names in topology extension install (Raúl Marín)
-  - #4180, installed liblwgeom includes sometimes getting used
-           instead of source ones (Regina Obe)
-
-PostGIS 2.5.0rc1
-2018/08/19
-New since PostGIS 2.5.0beta2
-  - #4146, Fix compilation error against Postgres 12 (Raúl Marín).
-  - #4147, #4148, Honor SOURCE_DATE_EPOCH when present (Christoph Berg).
-
-PostGIS 2.5.0beta2
-2018/08/11
-New since PostGIS 2.5.0beta1
-  - #4115, Fix a bug that created MVTs with incorrect property values under
-    parallel plans (Raúl Marín).
-  - #4120, ST_AsMVTGeom: Clip using tile coordinates (Raúl Marín).
-  - #4132, ST_Intersection on Raster now works without throwing TopologyException
-    (Vinícius A.B. Schmidt, Darafei Praliaskouski)
-  - #4109, Fix WKT parser accepting and interpreting numbers with
-    multiple dots (Raúl Marín, Paul Ramsey)
-  - #4140, Use user-provided CFLAGS in address standardizer and the
-    topology module (Raúl Marín)
-  - #4143, Fix backend crash when ST_OffsetCurve fails (Dan Baston)
-  - #4145, Speedup MVT column parsing (Raúl Marín)
-
-  See PostGIS 2.5.0 section for full details
-
-
-PostGIS 2.5.0beta1
-2018/07/03
-New since PostGIS 2.5.0alpha
-  - #1847, spgist 2d and 3d support for PG 11+
-    (Esteban Zimányi and Arthur Lesuisse from Université Libre de Bruxelles (ULB),
-      Darafei Praliaskouski)
-
-  - Numerous packaging fixes
-  See PostGIS 2.5.0 section for full details
-
+  - #4181, ST_AsMVTGeom: Avoid type changes due to validation (Raúl Marín)
+  - #4183, ST_AsMVTGeom: Drop invalid geometries after simplification (Raúl Marín)
+  - #4188, Avoid division by zero in KMeans (Raúl Marín)
+  - #4189, Fix undefined behaviour in SADFWrite (Raúl Marín)
+  - #4191, Fix undefined behaviour in ptarray_clone_deep (Raúl Marín)
+  - #4211, Fix ST_Subdivide for minimal exterior ring with minimal hole (Darafei
+           Praliaskouski)
+  - #3457, Fix raster envelope shortcut in ST_Clip (Sai-bot)
+  - #4215, Use floating point compare in ST_DumpAsPolygons (Darafei Praliaskouski)
+  - #4155, Support for GEOMETRYCOLLECTION, POLYGON, TIN, TRIANGLE in
+           ST_LocateBetween and ST_LocateBetweenElevations (Darafei Praliaskouski)
+  - #2767, Documentation for AddRasterConstraint optional parameters (Sunveer Singh)
+  - #4326, Allocate enough memory in gidx_to_string (Raúl Marín)
+  - #4190, Avoid undefined behaviour in gserialized_estimate (Raúl Marín)
+  - #4233, Fix undefined behaviour in gserialized_spgist_picksplit_nd (Raúl Marín)
+  - #4247, Avoid undefined behaviour in next_float functions (Raúl Marín)
+  - #4249, Fix undefined behaviour in raster intersection (Raúl Marín)
+  - #4246, Fix undefined behaviour in ST_3DDistance (Raúl Marín)
+  - #4244, Avoid unaligned memory access in BOX2D_out (Raúl Marín)
+  - #4139, Make mixed-dimension ND index build tree correctly (Darafei Praliaskouski,
+           Arthur Lesuisse, Andrew Gierth, Raúl Marín)
+  - #4262, Document MULTISURFACE compatibility of ST_LineToCurve (Steven Ottens)
+  - #4276, ST_AsGeoJSON documentation refresh (Darafei Praliaskouski)
+  - #4292, ST_AsMVT: parse JSON numeric values with decimals as doubles (Raúl Marín)
+  - #4300, ST_AsMVTGeom: Always return the simplest geometry (Raúl Marín)
+  - #4301, ST_Subdivide: fix endless loop on coordinates near coincident to bounds
+           (Darafei Praliaskouski)
+  - #4289, ST_AsMVTGeom: Transform coordinates space before clipping (Raúl Marín)
+  - #4275, Avoid passing a NULL pointer to GEOSisEmpty (Raúl Marín)
+  - #4296, Use `server_version_num` instead of parsing `version()` (Raúl Marín)
+  - #4272, Improve notice message when unable to compute stats (Raúl Marín)
+  - #4314, ST_ClipByBox2D: Do not throw when the geometry is invalid (Raúl Marín)
+  - #4313, #4307, PostgreSQL 12 compatibility (Laurenz Albe, Raúl Marín)
+  - #4299, #4304, ST_GeneratePoints is now VOLATILE. IMMUTABLE version with
+           seed parameter added. (Mike Taves)
+  - #4278, ST_3DDistance and ST_3DIntersects now support Solid TIN and Solid
+           POLYHEDRALSURFACE (Darafei Praliaskouski)
+  - #4348, ST_AsMVTGeom (GEOS): Enforce validation at all times (Raúl Marín)
+  - #4361, Fix postgis_type_name with (GEOMETRYM,3) (Matt Bretl)
+  - #4295, Allow GEOMETRYCOLLECTION in ST_Overlaps, ST_Contains, ST_ContainsProperly,
+           ST_Covers, ST_CoveredBy, ST_Crosses, ST_Touches, ST_Disjoint, ST_Relate,
+           ST_Equals (Esteban Zimányi)
+  - #4340, ST_Union aggregate now can handle more than 1 GB of geometries
+           (Darafei Praliaskouski)
+  - #4378, Allow passing TINs as input to GEOS-backed functions (Darafei
+           Praliaskouski)
+  - #4368, Reorder LWGEOM struct members to minimize extra padding (Raúl Marín)
+  - #4141, Use uint64 to handle row counts in the topology extension (Raúl Marín)
+  - #4225, Upgrade tiger to use tiger 2018 census files
 
-PostGIS 2.5.0alpha
-2018/05/28
-See PostGIS 2.5.0 section for details
 
 PostGIS 2.5.0
-2018/xx/xx
+2018/09/23
+WARNING: If compiling with PostgreSQL+JIT, LLVM >= 6 is required
+Supported PostgreSQL versions for this release are:
+PostgreSQL 9.4 - PostgreSQL 12 (in development)
+GEOS >= 3.5
 
 * New Features *
-  - #1847, spgist 2d and 3d support for PG 11+
-    (Esteban Zimányi and Arthur Lesuisse from Université Libre de Bruxelles (ULB),
-      Darafei Praliaskouski)
+  - #1847, SP-GiST 2D and 3D support for PostgreSQL 11+ (Esteban Zimányi and
+           Arthur Lesuisse from Université Libre de Bruxelles (ULB), Darafei
+           Praliaskouski)
   - #4056, ST_FilterByM (Nicklas Avén)
   - #4050, ST_ChaikinSmoothing (Nicklas Avén)
   - #3989, ST_Buffer single sided option (Stephen Knox)
@@ -82,8 +163,9 @@ PostGIS 2.5.0
   - #3885, version number removed from address_standardize lib file
            (Regina Obe)
   - #3893, raster support functions can only be loaded in the same schema
-           with core PostGIS functions.
+           with core PostGIS functions. (Sandro Santilli)
   - #4035, remove dummy pgis_abs type from aggregate/collect routines.
+           (Paul Ramsey)
   - #4069, drop support for GEOS < 3.5 and PostgreSQL < 9.4 (Regina Obe)
   - #4082, ST_BandMetaData extended to include filesize, timestamp (Even Rouault)
 
@@ -132,6 +214,33 @@ PostGIS 2.5.0
   - #4115, Fix a bug that created MVTs with incorrect property values under
     parallel plans (Raúl Marín).
   - #4120, ST_AsMVTGeom: Clip using tile coordinates (Raúl Marín).
+  - #4132, ST_Intersection on Raster now works without throwing TopologyException
+          (Vinícius A.B. Schmidt, Darafei Praliaskouski)
+  - #4177, #4180 Support for PostgreSQL 12 dev branch (Laurenz Albe, Raúl Marín)
+  - #4156, ST_ChaikinSmoothing: also smooth start/end point of
+  polygon by default (Darafei Praliaskouski)
+
+PostGIS 2.4.5
+2018/09/12
+
+  * Bug Fixes and Enhancements
+
+  - #4031, Survive to big MaxError tolerances passed to ST_CurveToLine
+           (Sandro Santilli)
+  - #4058, Fix infinite loop in linearization of a big radius small arc
+           (Sandro Santilli)
+  - #4071, ST_ClusterKMeans crash on NULL/EMPTY fixed (Darafei Praliaskouski)
+  - #4079, ensure St_AsMVTGeom outputs CW oriented polygons (Paul Ramsey)
+  - #4070, use standard interruption error code on GEOS interruptions
+           (Paul Ramsey)
+  - #3980, delay freeing input until processing complete (lucasvr)
+  - #4090, PG 11 support (Paul Ramsey, Raúl Marín)
+  - #4077, Serialization failure for particular empty geometry cases (Paul Ramsey)
+  - #3997, fix bug in lwgeom_median and avoid division by zero (Raúl Marín)
+  - #4093, Inconsistent results from qsort callback (yugr)
+  - #4081, Geography DWithin() issues for certain cases (Paul Ramsey)
+  - #4105, Parallel build of tarball (Bas Couwenberg)
+  - #4163, MVT: Fix resource leak when the first geometry is NULL (Raúl Marín)
 
 PostGIS 2.4.4
 2018/04/08

README.md

 Debbie:
-   [![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_2.5)](https://debbie.postgis.net/view/PostGIS/job/PostGIS_2.5/)
+   [![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_trunk)](https://debbie.postgis.net/view/PostGIS/job/PostGIS_trunk/)
 Winnie:
- [![Build Status](https://debbie.postgis.net:444/buildStatus/icon?job=PostGIS_2.5)](https://debbie.postgis.net:444/view/PostGIS/job/PostGIS_2.5/)
+ [![Build Status](https://winnie.postgis.net:444/buildStatus/icon?job=PostGIS_trunk)](https://winnie.postgis.net:444/view/PostGIS/job/PostGIS_trunk/)
 Dronie:
- [![Build Status](https://drone.osgeo.org/api/badges/postgis/postgis/status.svg?branch=svn-2.5)](https://drone.osgeo.org/postgis/postgis?branch=svn-2.5)
+ [![Build Status](https://dronie.osgeo.org/api/badges/postgis/postgis/status.svg?branch=svn-trunk)](https://dronie.osgeo.org/postgis/postgis?branch=svn-trunk)
 Travis:
- [![Build Status](https://secure.travis-ci.org/postgis/postgis.svg)](http://travis-ci.org/postgis/postgis)
+ [![Build Status](https://api.travis-ci.org/postgis/postgis.svg?branch=svn-trunk,svn-2.5,svn-2.4,svn-2.3)](http://travis-ci.org/postgis/postgis)
 GitLab-CI:
- [![Gitlab-CI](https://gitlab.com/postgis/postgis/badges/svn-2.5/build.svg)](https://gitlab.com/postgis/postgis/commits/svn-2.5)
+ [![Gitlab-CI](https://gitlab.com/postgis/postgis/badges/svn-trunk/build.svg)](https://gitlab.com/postgis/postgis/commits/svn-trunk)
+Drone.io:
+ [![Build Status](https://cloud.drone.io/api/badges/postgis/postgis/status.svg?branch=svn-trunk)](https://cloud.drone.io/postgis/postgis?branch=svn-trunk)
+
 
 This file is here to play nicely with modern code repository facilities.
 Actual readme is [here](README.postgis).
@@ -20,7 +23,7 @@ https://trac.osgeo.org/postgis/
 Official chat room is the #postgis channel on the
 [freenode](https://freenode.net) network.
 
-To partecipate, point your preferred
+To participate, point your preferred
 [IRC client](https://en.wikipedia.org/wiki/Comparison_of_Internet_Relay_Chat_clients)
 to:
 

README.postgis

@@ -43,8 +43,7 @@ this to work.
 
     http://trac.osgeo.org/proj/
 
-* GEOS (Required, Version 3.5 or higher)
-  - 3.6+ is strongly recommended to expose most GEOS features
+* GEOS (Required, Version 3.6 or higher)
   - 3.7+ is needed just for the ST_FrechetDistance function
 
   The GEOS library provides support for exact topological tests such as
@@ -79,10 +78,10 @@ this to work.
 * GDAL (Optional, Version 1.8.0 or higher 1.9+ is strongly recommended)
 
   GDAL (http://gdal.org) is *required* if you want to compile PostGIS
-  with raster or extension support. To compile without raster support you
-  must ``./configure --without-raster`` (also disables extension)
+  with raster support. To compile without raster support you
+  must ``./configure --without-raster``
 
-* CGAL 4.1+ and SFCGAL (Optional) needed for advanced 3D support
+* CGAL 4.1+ and SFCGAL 1.3.1+ (Optional) needed for advanced 3D support
 
   https://github.com/Oslandia/SFCGAL
 

Version.config

@@ -3,9 +3,9 @@
 
 # See HOWTO_RELEASE file in SVN for definitions of those three.
 
-POSTGIS_MAJOR_VERSION=2
-POSTGIS_MINOR_VERSION=5
-POSTGIS_MICRO_VERSION=0rc2
+POSTGIS_MAJOR_VERSION=3
+POSTGIS_MINOR_VERSION=0
+POSTGIS_MICRO_VERSION=0alpha1
 
 # Liblwgeom interface versioning, reset to 0:0:0 (cur:age:rev)
 # when changing POSTGIS_MINOR_VERSION

aclocal.m4

@@ -45,6 +45,7 @@ esac
 ])
 
 m4_include([macros/ac_proj4_version.m4])
+m4_include([macros/ax_cxx_compile_stdcxx.m4])
 m4_include([macros/gettext.m4])
 m4_include([macros/gtk-2.0.m4])
 m4_include([macros/iconv.m4])

authors.git

@@ -15,6 +15,7 @@ jorgearevalo = Jorge Arévalo <jorge.arevalo@deimos-space.com>
 kneufeld = Kevin Neufeld <kneufeld.ca@gmail.com>
 komzpa = Darafei Praliaskouski <me@komzpa.net>
 mcayland = Mark Cave-Ayland <mark.cave-ayland@siriusit.co.uk>
+mdavis = Martin Davis <mtnclimb@gmail.com>
 mleslie = Mark Leslie <mark.s.leslie@gmail.com>
 mloskot = Mateusz Loskot <mateusz@loskot.net>
 mschaber = Markus Schaber <markus@schabi.de>

authors.svn

@@ -15,6 +15,7 @@ jorgearevalo:Jorge Arévalo <jorge.arevalo@deimos-space.com>
 kneufeld:Kevin Neufeld <kneufeld.ca@gmail.com>
 komzpa:Darafei Praliaskouski <me@komzpa.net>
 mcayland:Mark Cave-Ayland <mark.cave-ayland@siriusit.co.uk>
+mdavis:Martin Davis <mtnclimb@gmail.com>
 mleslie:Mark Leslie <mark.s.leslie@gmail.com>
 mloskot:Mateusz Loskot <mateusz@loskot.net>
 mschaber:Markus Schaber <markus@schabi.de>