jef-n

diff --git a/src/github_issues/github_issue_maker.py b/src/github_issues/github_issue_maker.py
index cd5fef2..20d1712 100644
--- a/src/github_issues/github_issue_maker.py
+++ b/src/github_issues/github_issue_maker.py
@@ -239,6 +239,7 @@ class GithubIssueMaker:
         # end: Related tickets under 'children'
 
         update_issue = False
+        updated_description = None
         try:

jef-n

diff --git a/autotest/ogr/ogr_nas.py b/autotest/ogr/ogr_nas.py
index 784fc9b6f2..cd88bdd20b 100755
--- a/autotest/ogr/ogr_nas.py
+++ b/autotest/ogr/ogr_nas.py
@@ -147,7 +147,7 @@ def ogr_nas_2():
 
     # Loop until a feature that has a complex geometry including <gml:Arc>
     feat = lyr.GetNextFeature()
-    while feat is not None and feat.GetField('identifier') != 'urn:adv:oid:DERP1234000002Iz':
+    while feat is not None and feat.GetField('gml_id')[:16] != 'DERP1234000002Iz':

jef-n

@echo off
echo.
echo.    Generating .bat files for all .py files in %OSGEO4W_ROOT%\bin
echo.

pushd "%OSGEO4W_ROOT%\bin"
for %%g in (*.py) do (
        if not exist %%~ng.bat (
                echo @echo off >%%~ng.bat
                echo call "%%OSGEO4W_ROOT%%\bin\o4w_env.bat" >>%%~ng.bat

jef-n

Timing is on.
uelzen_alkis=# SELECT gml_id FROM ax_flurstueck WHERE endet IS NULL AND (st_contains(wkb_geometry,st_geomfromtext('POINT(606786.750 5868489.774)'::text,find_srid(current_schema()::text,'ax_flurstueck'::text,'wkb_geometry'::text))));
      gml_id
------------------
 DENIAL890000fSkW
(1 row)

Time: 35935,446 ms
uelzen_alkis=# select find_srid(current_schema()::text,'ax_flurstueck'::text,'wkb_geometry'::text);
 find_srid

jef-n

diff --git a/src/core/dxf/qgsdxfexport.cpp b/src/core/dxf/qgsdxfexport.cpp
index 45b1d34926..f9418cb679 100644
--- a/src/core/dxf/qgsdxfexport.cpp
+++ b/src/core/dxf/qgsdxfexport.cpp
@@ -3487,6 +3487,12 @@ void QgsDxfExport::writePolyline( const QgsPointSequence &line, const QString &l
     writeGroup( 0, QgsPoint( QgsWkbTypes::PointZ ) );
     writeGroup( 70, 8 );

+    if( width > 0 )
+    {

jef-n

diff --git a/gdal/ogr/file.lst b/gdal/ogr/file.lst
index 684660ff47..abd6875ce9 100644
--- a/gdal/ogr/file.lst
+++ b/gdal/ogr/file.lst
@@ -14,12 +14,12 @@ OBJ =	ogrgeometryfactory.o \
 	ogrtriangulatedsurface.o \
 	ogrmultipoint.o \
 	ogrmultilinestring.o \
-    ogrcircularstring.o \
-    ogrcompoundcurve.o \

jef-n

--- Log opened Mo Feb 20 00:00:25 2017
09:59 < timlinux> hi all
10:00 < nyalldawson> hey
10:00 < timlinux> hi
10:01 < nyalldawson> are we moving here?
10:01 < timlinux> @pcav and @jef-n did you see the request from Nyall to move here?
10:01 < gitter> [Github] elpaso commented in qgis/QGIS on issue: [feature] QgsSettings QGIS QSettings replacement https://github.com/qgis/QGIS/pull/4160#issuecomment-281022603
10:01 < timlinux> or I can make a side channel
10:01 < jef-n> no.
10:01 < nyalldawson> sorry my daughter is going crazy so i can't do voice

jef-n

--- orig/gdal-2.1.3/ogr/ogrcompoundcurve.cpp    2017-01-20 09:20:48.000000000 +0100
+++ gdal-2.1.3/ogr/ogrcompoundcurve.cpp 2017-02-02 08:40:55.627891600 +0100
@@ -578,8 +578,17 @@
             fabs(end.getY() - start.getY()) > dfToleranceEps ||
             fabs(end.getZ() - start.getZ()) > dfToleranceEps )
         {
-            CPLError(CE_Failure, CPLE_AppDefined, "Non contiguous curves");
-            return OGRERR_FAILURE;
+            poCurve->EndPoint(&start);
+            if( fabs(end.getX() - start.getX()) > dfToleranceEps ||

jef-n

from github import Github
from github.NamedUser import NamedUser
from github.GithubObject import NotSet
import sqlite3
import sys
import subprocess 

REPONAME = "rm2gh"
PROJECT_ID = 17

jef-n

diff --git a/src/gui/qgsmanageconnectionsdialog.cpp b/src/gui/qgsmanageconnectionsdialog.cpp
index 22a338d..4a10f04 100644
--- a/src/gui/qgsmanageconnectionsdialog.cpp
+++ b/src/gui/qgsmanageconnectionsdialog.cpp
@@ -496,6 +496,7 @@ QDomDocument QgsManageConnectionsDialog::saveOracleConnections( const QStringLis
     el.setAttribute( "port", settings.value( path + "/port", "" ).toString() );
     el.setAttribute( "database", settings.value( path + "/database", "" ).toString() );
     el.setAttribute( "dboptions", settings.value( path + "/dboptions", "" ).toString() );
+    el.setAttribute( "dbworkspace", settings.value( path + "/dbworkspace", "" ).toString() );
     el.setAttribute( "estimatedMetadata", settings.value( path + "/estimatedMetadata", "0" ).toString() );