Merge pull request #1 from OSGeo/master

Merge upstream/master into forked/master

.editorconfig

@@ -14,15 +14,27 @@ indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
 
-[*.{sln,*proj,*proj.filters,rc,rc2}]
+[{*.h.vc*}]
+charset = utf-8
+end_of_line = crlf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.{bat,sln,*proj,*proj.filters,rc,rc2}]
 charset = unset
 end_of_line = crlf
 insert_final_newline = unset
 indent_style = unset
 indent_size = unset
 
+[{makefile.vc,nmake.opt}]
+end_of_line = crlf
+indent_style = tab
+
 [{configure,configure.*,config.*,*.{sh,yml}}]
 indent_size = 2
 
-[{GNUmakefile,*.{in,opt,vc}}]
+[{GNUmakefile,*.in}]
 indent_style = tab

.gitattributes

@@ -0,0 +1,24 @@
+# Do NOT set the default behavior, in case people don't have core.autocrlf set.
+# This may lead to implicit modification of certain files (eg. test data) during git clone.
+#* text=auto
+
+# Declare files that will always have LF line endings on checkout.
+*.m4            text eol=lf
+*.sh            text eol=lf
+config.guess    text eol=lf
+cpl_config.h.in text eol=lf
+config.sub      text eol=lf
+configure       text eol=lf
+configure.ac    text eol=lf
+gdal.pc.in      text eol=lf
+install-sh      text eol=lf
+GNUmakefile     text eol=lf
+GNUmake.opt*    text eol=lf
+VERSION         text eol=lf
+
+# Declare files that will always have CRLF line endings on checkout.
+*.bat           text eol=crlf
+*.cmd           text eol=crlf
+*.ps1           text eol=crlf
+cpl_config.h.vc.* text eol=crlf
+makefile.vc     text eol=crlf

.github/ISSUE_TEMPLATE.md

@@ -7,18 +7,18 @@ for new features.
 
 ## Expected behavior and actual behavior.
 
-For example: I expected to be able to open this raster file (with a link to
+For example (please modify !!!): I expected to be able to open this raster file (with a link to
 the raster file, or it as an attachment) and it returns an error message
 instead.
 
 ## Steps to reproduce the problem.
 
-For example: "gdalinfo myfile"
+For example (please modify !!!): "gdalinfo myfile"
 
 ## Operating system
 
-For example: Ubuntu 16.04 64 bit
+For example (please modify !!!): Ubuntu 16.04 64 bit
 
 ## GDAL version and provenance
 
-For example: the 2.2.3 version from ubuntugis-unstable PPA
+For example (please modify !!!): the 2.2.3 version from ubuntugis-unstable PPA

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,3 +1,22 @@
+<!--
+Make sure that the title of your commit(s) is descriptive. Typically, they
+should be formatted as "component/filename: Describe what the commit does (fixes #ticket)",
+so that anyone that parses 'git log' immediately knows what a commit is about.
+Do not hesitate to provide more context in the longer part of the commit message.
+
+GOOD: "GTiff: fix wrong color interpretation with -co ALPHA=YES (fixes #1234)
+
+When -co ALPHA=YES was used, but PHOTOMETRIC was not specified, the ExtraSample
+tag was wrongly set to unspecified.
+"
+
+BAD: "Fix crash", "fix #1234"
+
+In case you need several iterations to make continuous integration happy,
+please squash your commits in a single one at the end. See
+[Contributing](https://github.com/OSGeo/gdal/blob/master/CONTRIBUTING.md)
+-->
+
 ## What does this PR do?
 
 ## What are related issues/pull requests?

.gitignore

@@ -4,8 +4,13 @@
 *.so
 *~
 
-# eclipse ignore
+.vagrant
+
+# IDE ignore
 .project
 .settings
 .pydevproject
 .cproject
+.idea
+.vscode
+

.travis.yml

@@ -1,6 +1,10 @@
 # This is the config file for building GDAL and running its autotest suite
 # with Travis-ci.org
 
+branches:
+  except:
+  - /^(cherry-pick-)?backport-\d+-to-/
+
 matrix:
   fast_finish: true
   include:

CONTRIBUTING.md

@@ -21,7 +21,8 @@ gdalinfo --version
 Run autotest suite:
 ```
 cd ../autotest
-python run_all.py
+pip install -r requirements.txt
+pytest
 ```
 
 Git workflows with GDAL
@@ -83,7 +84,15 @@ git rebase origin/master
 
 # At end of your work, make sure history is reasonable by folding non
 # significant commits into a consistent set
-git rebase -i master (use fixup for example to merge several commits together)
+git rebase -i master (use 'fixup' for example to merge several commits together,
+and 'reword' to modify commit messages)
+
+# or alternatively, in case there is a big number of commits and marking
+# all them as 'fixup' is tedious
+git fetch origin
+git rebase origin/master
+git reset --soft origin/master
+git commit -a -m "Put here the synthetic commit message"
 
 # push your branch
 git push my_user_name my_new_feature_branch
@@ -103,9 +112,12 @@ Backporting bugfixes from master to a stable branch
 git checkout master
 With git log, identify the sha1sum of the commit you want to backport
 git checkout 2.2 (if you want to backport to 2.2)
+git pull origin 2.2
+(git checkout -b branh_name: if you intend to submit the backport as a pull request)
 git cherry-pick the_sha1_sum
+git push ...
 ```
-If changes are needed, do them and git commit -a --amend
+If changes are needed, do them and ```git commit -a --amend```
 
 
 Things you should NOT do

README.md

@@ -4,6 +4,7 @@ GDAL - Geospatial Data Abstraction Library
 [![Build Status](https://travis-ci.com/OSGeo/gdal.svg?branch=master)](https://travis-ci.com/OSGeo/gdal)
 [![Build status](https://ci.appveyor.com/api/projects/status/jtwx0pcr0y01i17p/branch/master?svg=true)](https://ci.appveyor.com/project/OSGeo/gdal)
 [![Build Status](https://scan.coverity.com/projects/749/badge.svg?flat=1)](https://scan.coverity.com/projects/gdal)
+[gdalautotest coverage](https://gdalautotest-coverage-results.github.io/coverage_html/index.html)
 
 | Tested configurations    |
 | ------------------------ |

Vagrantfile

@@ -43,7 +43,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     ovrd.vm.box = "cultuurnet/ubuntu-14.04-64-puppet"
     lxc.backingstore = 'dir'
     lxc.customize 'cgroup.memory.limit_in_bytes', vm_ram_bytes
-    lxc.customize 'aa_allow_incomplete', 1
+    # LXC 3 or later deprecated old parameter
+    lxc.customize 'apparmor.allow_incomplete', 1
+    # for LXC 2.1 or before
+    #lxc.customize 'aa_allow_incomplete', 1
     lxc.container_name = "gdal-vagrant"
     # allow android adb connection from guest
     #ovrd.vm.synced_folder('/dev/bus', '/dev/bus')
@@ -65,7 +68,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   ppaRepos = [
     "ppa:openjdk-r/ppa",
     "ppa:ubuntugis/ubuntugis-unstable",
-    "ppa:miurahr/gdal-depends"
+    "ppa:miurahr/gdal-dev-additions"
   ]
 
   packageList = [
@@ -88,7 +91,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     "liblzma-dev",
     "libgeos-dev",
     "libcurl4-gnutls-dev",
-    "libproj-dev",
+    # "libproj-dev",
     "libxml2-dev",
     "libexpat-dev",
     "libxerces-c-dev",
@@ -102,7 +105,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     "libmpfr-dev",
     "libkml-dev",
     "swig",
-    "libhdf4-dev",
+    "libhdf4-alt-dev", # libhdf4-dev conflicts with netcdf and crashes at runtime
     "libhdf5-dev",
     "poppler-utils",
     "libfreexl-dev",
@@ -119,7 +122,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     "libogdi3.2-dev",
     "libcfitsio3-dev",
     "libfyba-dev",
-#   "libsfcgal-dev", # 1.2.2
+    "libsfcgal-dev",
     "couchdb",
     "libmongo-client-dev",
     "libqhull-dev",
@@ -132,37 +135,43 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     "vim",
     "ant",
     "unzip",
-    "mono-mcs",
+    "mono-devel",
     "libmono-system-drawing4.0-cil",
     "libjson-c-dev",
     "libtiff5-dev",
     "libopenjp2-7-dev",
+    "libopenjpip7",
+    "libopenjp3d7",
     "clang-3.9",
     "cmake3",
     "git",
     "wine",
     "ccache",
     "curl",
-    "mingw32",
     "mingw-w64",
     "mingw-w64-i686-dev",
     "mingw-w64-x86-64-dev",
     "mingw-w64-tools",
+    "gdb-mingw-w64-target",
+    "libgeos-mingw-w64-dev",
+    # "libproj-mingw-w64-dev",
     "cmake3-curses-gui",
     "gdb",
     "gdbserver",
-    "gdb-mingw-w64-target",
     "ninja-build",
     "openjdk-8-jdk",
     "ghostscript",
 #    "grass-dev",
     "libcharls-dev",
     "libgeotiff-dev",
+    "libgeotiff-epsg",
+    "sqlite3",
     "sqlite3-pcre",
     "libpcre3-dev",
     "libspatialite-dev",
     "librasterlite2-dev",
-    "libkea-dev"
+    "libkea-dev",
+    "libzstd-dev"
   ];
 
   if Vagrant.has_plugin?("vagrant-cachier")
@@ -177,22 +186,25 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       pkg_cmd << 'echo "deb mirror://mirrors.ubuntu.com/mirrors.txt trusty universe" > /etc/apt/sources.list.d/official-ubuntu-trusty-universe.list; '
       pkg_cmd << 'echo "deb [ arch=amd64 ] http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.4 multiverse" > /etc/apt/sources.list.d/mongodb-org-3.4.list; '
       pkg_cmd << 'curl -Ls https://www.mongodb.org/static/pgp/server-3.4.asc | apt-key add -; '
-	  pkg_cmd << "apt-get update -qq; apt-get install -q -y python-software-properties; "
+      pkg_cmd << "apt-get update -qq; apt-get install -q -y python-software-properties; "
+      pkg_cmd << "apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF ; "
+      pkg_cmd << 'echo "deb https://download.mono-project.com/repo/ubuntu stable-trusty main" > /etc/apt/sources.list.d/mono-official-stable.list; '
       pkg_cmd << "dpkg --add-architecture i386; "
 
 	  if ppaRepos.length > 0
 		  ppaRepos.each { |repo| pkg_cmd << "add-apt-repository -y " << repo << " ; " }
 		  pkg_cmd << "apt-get update -qq; "
 	  end
 
-	  # install packages we need we need
+	  # install packages we need
 	  pkg_cmd << "apt-get --no-install-recommends install -q -y " + packageList.join(" ") << " ; "
 	  config.vm.provision :shell, :inline => pkg_cmd
     scripts = [
-      "sfcgal.sh",
-      "openjpeg.sh",
+      "install-proj6.sh",
       "gdal.sh",
-      "postgis.sh"
+      "postgis.sh",
+      "install-proj6-mingw.sh",
+      "gdal-mingw.sh"
     ];
     scripts.each { |script| config.vm.provision :shell, :privileged => false, :path => "gdal/scripts/vagrant/" << script }
   end