Merge branch 'master' of https://github.com/qgis/QGIS into master

qgis · Sep 14, 2020 · a715e50 · a715e50
2 parents aca1c4e + 4fe3d2f
commit a715e50
Show file tree

Hide file tree

Showing 368 changed files with 13,341 additions and 8,129 deletions.
diff --git a/.ci/ogc/Dockerfile b/.ci/ogc/Dockerfile
@@ -0,0 +1,41 @@
+FROM ubuntu:latest
+MAINTAINER Paul Blottiere <blottiere.paul@gmail.com>
+RUN  export DEBIAN_FRONTEND=noninteractive
+ENV  DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update \
+    && apt-get upgrade -y \
+    && apt-get install -y \
+  cmake \
+  ninja-build \
+  clang \
+  flex \
+  bison \
+  libgeos-dev \
+  libgdal-dev \
+  libzip-dev \
+  libprotobuf-dev \
+  qtbase5-dev \
+  libqt5svg5-dev \
+  libqt5serialport5-dev \
+  qttools5-dev \
+  protobuf-compiler \
+  qt5-default \
+  qtpositioning5-dev \
+  libqt5webkit5-dev \
+  libqca-qt5-2-dev \
+  libgsl-dev \
+  libspatialindex-dev \
+  qt5keychain-dev \
+  libexiv2-dev \
+  libfcgi-dev \
+  libqt5scintilla2-dev \
+  libqwt-qt5-dev \
+  pyqt5-dev \
+  python3-pyqt5 \
+  python3-pyqt5.qsci \
+  pyqt5-dev-tools \
+  spawn-fcgi
+
+ADD qgis_mapserv.sh /root/qgis_mapserv.sh
+CMD ["sh", "/root/qgis_mapserv.sh"]
diff --git a/.ci/ogc/build.sh b/.ci/ogc/build.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+mkdir /usr/src/qgis/build
+cd /usr/src/qgis/build || exit -1
+
+cmake -GNinja \
+ -DWITH_QUICK=OFF \
+ -DWITH_3D=OFF \
+ -DWITH_STAGED_PLUGINS=OFF \
+ -DWITH_GRASS=OFF \
+ -DSUPPRESS_QT_WARNINGS=ON \
+ -DENABLE_MODELTEST=OFF \
+ -DENABLE_PGTEST=OFF \
+ -DENABLE_SAGA_TESTS=OFF \
+ -DENABLE_MSSQLTEST=OFF \
+ -DENABLE_TESTS=OFF \
+ -DWITH_QSPATIALITE=OFF \
+ -DWITH_QWTPOLAR=OFF \
+ -DWITH_APIDOC=OFF \
+ -DWITH_ASTYLE=OFF \
+ -DWITH_DESKTOP=OFF \
+ -DWITH_BINDINGS=ON \
+ -DWITH_SERVER=ON \
+ -DWITH_SERVER_PLUGINS=ON \
+ -DWITH_ORACLE=OFF \
+ -DDISABLE_DEPRECATED=ON \
+ -DCXX_EXTRA_FLAGS="${CLANG_WARNINGS}" \
+ -DCMAKE_C_COMPILER=/bin/clang \
+ -DCMAKE_CXX_COMPILER=/bin/clang++ \
+ -DADD_CLAZY_CHECKS=OFF \
+ ..
+
+ninja
diff --git a/.ci/ogc/docker-compose.yml b/.ci/ogc/docker-compose.yml
@@ -0,0 +1,29 @@
+version: '3'
+services:
+
+  nginx:
+    image: nginx:1.13
+    container_name: qgis_server_nginx
+    ports:
+      - 8089:80
+    networks:
+      - qgis
+    volumes:
+      - ./nginx.conf:/etc/nginx/conf.d/default.conf:ro
+      - ./../../data/metadata:/var/www/html/wms13/metadata
+    depends_on:
+      - qgis-server
+
+  qgis-server:
+    image: qgis_server_deps
+    container_name: qgis_server_deps
+    volumes:
+      - ./../../:/usr/src/qgis/
+      - ./../../data:/data
+    networks:
+      - qgis
+    privileged: true
+
+networks:
+  qgis:
+    driver: bridge
diff --git a/.ci/ogc/nginx.conf b/.ci/ogc/nginx.conf
@@ -0,0 +1,32 @@
+server {
+        listen 80 default_server;
+        listen [::]:80 default_server;
+
+        root /var/www/html;
+
+        # Add index.php to the list if you are using PHP
+        index index.html index.htm index.nginx-debian.html;
+
+        server_name _;
+
+	location / {
+		try_files $uri $uri/ =404;
+	}
+
+        location /qgisserver {
+                fastcgi_pass qgis-server:5555;
+                add_header Access-Control-Allow-Origin *;
+                add_header 'Access-Control-Allow-Headers' 'Authorization,Content-Type,Accept,Origin,X-Requested-With';
+                fastcgi_param   PATH_INFO $fastcgi_script_name;
+                fastcgi_param   REQUEST_METHOD $request_method;
+                fastcgi_param   QUERY_STRING $query_string;
+                fastcgi_param   CONTENT_TYPE $content_type;
+                fastcgi_param   CONTENT_LENGTH $content_length;
+                fastcgi_param   SERVER_PROTOCOL $server_protocol;
+                fastcgi_param   REQUEST_URI $request_uri;
+                fastcgi_param   HTTPS $https if_not_empty;
+                fastcgi_param   SERVER_PORT 80;
+                fastcgi_param   SERVER_NAME $server_addr;
+                fastcgi_param   QGIS_PROJECT_FILE /data/teamengine_wms_130.qgs;
+        }
+}
diff --git a/.ci/ogc/qgis_mapserv.sh b/.ci/ogc/qgis_mapserv.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+export QGIS_SERVER_LOG_FILE=/var/log/qgisserver.log
+export QGIS_SERVER_LOG_LEVEL=0
+export QGIS_PREFIX_PATH=/usr/src/qgis/build/output
+
+exec /usr/bin/spawn-fcgi -n -p 5555 /usr/src/qgis/build/output/bin/qgis_mapserv.fcgi
diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml
@@ -20,8 +20,8 @@ on:
     - 'CMakeLists.txt'
 
 env:
-  QT_VERSION: 5.14.1
-  QGIS_DEPS_VERSION: 0.2.2
+  QT_VERSION: 5.14.2
+  QGIS_DEPS_VERSION: 0.5.4
 
 jobs:
   mac_os_build:

diff --git a/.github/workflows/ogc.yml b/.github/workflows/ogc.yml
@@ -0,0 +1,42 @@
+name: OGC tests for QGIS Server
+
+on:
+  push:
+    branches:
+      - master
+      - release-**
+  pull_request:
+    branches:
+      - master
+      - release-**
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+
+      - name: Setup build dependencies
+        run: |
+          docker build -t qgis_server_deps -f .ci/ogc/Dockerfile .ci/ogc/
+
+      - name: Run build
+        run: |
+          docker run -v $(pwd):/usr/src/qgis qgis_server_deps /usr/src/qgis/.ci/ogc/build.sh
+
+      - name: Install pyogctest
+        run: |
+          sudo apt-get install python3-virtualenv virtualenv git
+          git clone https://github.com/pblottiere/pyogctest
+          cd pyogctest && git checkout 1.0.0 && cd -
+          virtualenv -p /usr/bin/python3 venv && source venv/bin/activate && pip install -e pyogctest/
+
+      - name: Download WMS 1.3.0 dataset
+        run: |
+          source venv/bin/activate && ./pyogctest/pyogctest.py -s wms130 -w
+
+      - name: Run WMS 1.3.0 OGC tests
+        run: |
+          docker-compose -f .ci/ogc/docker-compose.yml up -d
+          source venv/bin/activate && ./pyogctest/pyogctest.py -n ogc_qgis -s wms130 -v -u http://$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' qgis_server_nginx)/qgisserver
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -871,7 +871,7 @@ IF (WITH_CORE AND WITH_BINDINGS)
   INCLUDE(SIPMacros)
 
   SET(SIP_INCLUDES ${PYQT_SIP_DIR} ${CMAKE_SOURCE_DIR}/python)
-  SET(SIP_CONCAT_PARTS 6)
+  SET(SIP_CONCAT_PARTS 11)
 
   IF (NOT BINDINGS_GLOBAL_INSTALL)
     SET(PYTHON_SITE_PACKAGES_DIR ${QGIS_DATA_DIR}/python)

diff --git a/external/mdal/frmts/mdal_gdal_netcdf.cpp b/external/mdal/frmts/mdal_gdal_netcdf.cpp
@@ -39,8 +39,11 @@ bool MDAL::DriverGdalNetCDF::parseBandInfo( const MDAL::GdalDataset *cfGDALDatas
   metadata_hash::const_iterator iter;
 
   iter = metadata.find( "netcdf_dim_time" );
-  if ( iter == metadata.end() ) return true; //FAILURE, skip no-time bands
-  *time = MDAL::RelativeTimestamp( parseMetadataTime( iter->second ), mTimeUnit );
+
+  if ( iter == metadata.end() )
+    *time = MDAL::RelativeTimestamp();
+  else
+    *time = MDAL::RelativeTimestamp( parseMetadataTime( iter->second ), mTimeUnit );
 
   // NAME
   iter = metadata.find( "long_name" );

diff --git a/external/mdal/mdal.cpp b/external/mdal/mdal.cpp
@@ -21,7 +21,7 @@ static const char *EMPTY_STR = "";
 
 const char *MDAL_Version()
 {
-  return "0.6.93";
+  return "0.7.0";
 }
 
 MDAL_Status MDAL_LastStatus()

diff --git a/external/mdal/mdal_memory_data_model.cpp b/external/mdal/mdal_memory_data_model.cpp
@@ -205,9 +205,15 @@ void MDAL::MemoryMesh::addFaces( size_t faceCount, size_t driverMaxVerticesPerFa
     Face face( faceSize );
     for ( size_t i = 0; i < faceSize; ++i )
     {
-      size_t indice =  vertexIndices[indicesIndex + i];
-      if ( indice >= 0 && indice < mVertices.size() )
-        face[i] = indice;
+      const int indice = vertexIndices[indicesIndex + i];
+      if ( indice < 0 )
+      {
+        MDAL::Log::error( Err_InvalidData, "Invalid vertex index when adding faces" );
+        return;
+      }
+      size_t indiceU = static_cast< size_t >( indice );
+      if ( indiceU < mVertices.size() )
+        face[i] = indiceU;
       else
       {
         MDAL::Log::error( Err_InvalidData, "Invalid vertex index when adding faces" );

diff --git a/python/3d/auto_generated/qgs3dmapsettings.sip.in b/python/3d/auto_generated/qgs3dmapsettings.sip.in
@@ -477,6 +477,8 @@ Default value is 96
 
 
 
+
+
     bool isSkyboxEnabled() const;
 %Docstring
 Returns whether the skybox is enabled.
@@ -624,6 +626,13 @@ Emitted when the camera lens field of view changes
 %Docstring
 Emitted when skybox settings are changed
 
+.. versionadded:: 3.16
+%End
+
+    void shadowSettingsChanged();
+%Docstring
+Emitted when shadow rendering settings are changed
+
 .. versionadded:: 3.16
 %End
 

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -156,6 +156,7 @@ IF (WITH_GUI)
     ${CMAKE_SOURCE_DIR}/src/gui/labeling
     ${CMAKE_SOURCE_DIR}/src/gui/layertree
     ${CMAKE_SOURCE_DIR}/src/gui/layout
+    ${CMAKE_SOURCE_DIR}/src/gui/mesh
     ${CMAKE_SOURCE_DIR}/src/gui/locator
     ${CMAKE_SOURCE_DIR}/src/gui/numericformats
     ${CMAKE_SOURCE_DIR}/src/gui/processing

diff --git a/python/analysis/analysis_auto.sip b/python/analysis/analysis_auto.sip
@@ -5,6 +5,7 @@
 %Include auto_generated/interpolation/qgsinterpolator.sip
 %Include auto_generated/interpolation/qgstininterpolator.sip
 %Include auto_generated/mesh/qgsmeshcontours.sip
+%Include auto_generated/mesh/qgsmeshtriangulation.sip
 %Include auto_generated/network/qgsgraph.sip
 %Include auto_generated/network/qgsgraphanalyzer.sip
 %Include auto_generated/network/qgsgraphbuilder.sip