Precision and 3d

elpaso · elpaso · commit be8822ed8bea · 2019-04-16T14:00:59.000+02:00
diff --git a/python/core/auto_generated/geometry/qgsabstractgeometry.sip.in b/python/core/auto_generated/geometry/qgsabstractgeometry.sip.in
@@ -259,7 +259,7 @@ Returns a GeoJSON representation of the geometry.
 .. seealso:: :py:func:`asGml3`
 %End
 
-    virtual QJsonObject asJsonV2( ) const = 0;
+    virtual QJsonObject asJsonObject( int precision = 17 ) const = 0;
 %Docstring
 Returns a GeoJSON object of the geometry.
 
diff --git a/python/core/auto_generated/geometry/qgscircularstring.sip.in b/python/core/auto_generated/geometry/qgscircularstring.sip.in
@@ -81,7 +81,7 @@ to ``p2`` will be used (i.e. winding the other way around the circle).
 
     virtual QString asJson( int precision = 17 ) const;
 
-    virtual QJsonObject asJsonV2( ) const;
+    virtual QJsonObject asJsonObject( int precision ) const;
 
     virtual bool isEmpty() const;
 
diff --git a/python/core/auto_generated/geometry/qgscompoundcurve.sip.in b/python/core/auto_generated/geometry/qgscompoundcurve.sip.in
@@ -52,7 +52,7 @@ Compound curve geometry type
 
     virtual QString asJson( int precision = 17 ) const;
 
-    virtual QJsonObject asJsonV2( ) const;
+    virtual QJsonObject asJsonObject( int precision ) const;
 
 
     virtual double length() const;
diff --git a/python/core/auto_generated/geometry/qgscurvepolygon.sip.in b/python/core/auto_generated/geometry/qgscurvepolygon.sip.in
@@ -56,7 +56,7 @@ Curve polygon geometry type
 
     virtual QString asJson( int precision = 17 ) const;
 
-    virtual QJsonObject asJsonV2() const;
+    virtual QJsonObject asJsonObject( int precision = 17 ) const;
 
 
     virtual double area() const;
diff --git a/python/core/auto_generated/geometry/qgsgeometry.sip.in b/python/core/auto_generated/geometry/qgsgeometry.sip.in
@@ -1441,7 +1441,7 @@ Exports the geometry to WKT
 Exports the geometry to a GeoJSON string.
 %End
 
-    QJsonObject asJsonV2( ) const;
+    QJsonObject asJsonObject( int precision = 17 ) const;
 %Docstring
 Exports the geometry to a GeoJSON object.
 %End
diff --git a/python/core/auto_generated/geometry/qgsgeometrycollection.sip.in b/python/core/auto_generated/geometry/qgsgeometrycollection.sip.in
@@ -154,7 +154,7 @@ An IndexError will be raised if no geometry with the specified index exists.
 
     virtual QString asJson( int precision = 17 ) const;
 
-    virtual QJsonObject asJsonV2( ) const;
+    virtual QJsonObject asJsonObject( int precision ) const;
 
 
     virtual QgsRectangle boundingBox() const;
diff --git a/python/core/auto_generated/geometry/qgslinestring.sip.in b/python/core/auto_generated/geometry/qgslinestring.sip.in
@@ -414,7 +414,7 @@ segment in the line.
 
     virtual QString asJson( int precision = 17 ) const;
 
-    virtual QJsonObject asJsonV2( ) const;
+    virtual QJsonObject asJsonObject( int precision ) const;
 
 
     virtual double length() const;
diff --git a/python/core/auto_generated/geometry/qgsmulticurve.sip.in b/python/core/auto_generated/geometry/qgsmulticurve.sip.in
@@ -37,7 +37,7 @@ Multi curve geometry collection.
 
     virtual QString asJson( int precision = 17 ) const;
 
-    virtual QJsonObject asJsonV2( ) const;
+    virtual QJsonObject asJsonObject( int precision ) const;
 
     virtual bool addGeometry( QgsAbstractGeometry *g /Transfer/ );
 
diff --git a/python/core/auto_generated/geometry/qgsmultilinestring.sip.in b/python/core/auto_generated/geometry/qgsmultilinestring.sip.in
@@ -36,7 +36,7 @@ Multi line string geometry collection.
 
     virtual QString asJson( int precision = 17 ) const;
 
-    virtual QJsonObject asJsonV2( ) const;
+    virtual QJsonObject asJsonObject( int precision ) const;
 
     virtual bool addGeometry( QgsAbstractGeometry *g /Transfer/ );
 
diff --git a/python/core/auto_generated/geometry/qgsmultipoint.sip.in b/python/core/auto_generated/geometry/qgsmultipoint.sip.in
@@ -38,7 +38,7 @@ Multi point geometry collection.
 
     virtual QString asJson( int precision = 17 ) const;
 
-    virtual QJsonObject asJsonV2( ) const;
+    virtual QJsonObject asJsonObject( int precision ) const;
 
     virtual int nCoordinates() const;
 
diff --git a/python/core/auto_generated/geometry/qgsmultipolygon.sip.in b/python/core/auto_generated/geometry/qgsmultipolygon.sip.in
@@ -35,7 +35,7 @@ Multi polygon geometry collection.
 
     virtual QString asJson( int precision = 17 ) const;
 
-    virtual QJsonObject asJsonV2( ) const;
+    virtual QJsonObject asJsonObject( int precision ) const;
 
     virtual bool addGeometry( QgsAbstractGeometry *g /Transfer/ );
 
diff --git a/python/core/auto_generated/geometry/qgsmultisurface.sip.in b/python/core/auto_generated/geometry/qgsmultisurface.sip.in
@@ -37,7 +37,7 @@ Multi surface geometry collection.
 
     virtual QString asJson( int precision = 17 ) const;
 
-    virtual QJsonObject asJsonV2( ) const;
+    virtual QJsonObject asJsonObject( int precision ) const;
 
     virtual bool addGeometry( QgsAbstractGeometry *g /Transfer/ );
 
diff --git a/python/core/auto_generated/geometry/qgspoint.sip.in b/python/core/auto_generated/geometry/qgspoint.sip.in
@@ -357,7 +357,7 @@ M value is preserved.
 
     virtual QString asJson( int precision = 17 ) const;
 
-    virtual QJsonObject asJsonV2( ) const;
+    virtual QJsonObject asJsonObject( int precision ) const;
 
     virtual void draw( QPainter &p ) const;
 
diff --git a/python/core/auto_generated/qgsjsonutils.sip.in b/python/core/auto_generated/qgsjsonutils.sip.in
@@ -231,9 +231,9 @@ Returns a GeoJSON string representation of a feature.
 .. seealso:: :py:func:`exportFeatures`
 %End
 
-    QJsonObject exportFeatureV2( const QgsFeature &feature,
-                                 const QVariantMap &extraProperties = QVariantMap(),
-                                 const QVariant &id = QVariant() ) const;
+    QJsonObject exportFeatureToJsonObject( const QgsFeature &feature,
+                                           const QVariantMap &extraProperties = QVariantMap(),
+                                           const QVariant &id = QVariant() ) const;
 %Docstring
 Returns a GeoJSON string representation of a feature.
 
@@ -330,8 +330,8 @@ Exports all attributes from a QgsFeature as a JSON map type.
                               to speed up exporting the attributes for multiple features from the same layer.
 %End
 
-    static QJsonObject exportAttributesV2( const QgsFeature &feature, QgsVectorLayer *layer = 0,
-                                           const QVector<QVariant> &attributeWidgetCaches = QVector<QVariant>() );
+    static QJsonObject exportAttributesToJsonObject( const QgsFeature &feature, QgsVectorLayer *layer = 0,
+        const QVector<QVariant> &attributeWidgetCaches = QVector<QVariant>() );
 %Docstring
 Exports all attributes from a QgsFeature as a JSON map type.
 
diff --git a/src/core/geometry/qgsabstractgeometry.h b/src/core/geometry/qgsabstractgeometry.h
@@ -287,7 +287,7 @@ class CORE_EXPORT QgsAbstractGeometry
      * \see asGml2()
      * \see asGml3()
      */
-    virtual QJsonObject asJsonV2( ) const = 0;
+    virtual QJsonObject asJsonObject( int precision = 17 ) const = 0;
 
     //render pipeline
 
diff --git a/src/core/geometry/qgscircularstring.cpp b/src/core/geometry/qgscircularstring.cpp
@@ -375,11 +375,11 @@ QString QgsCircularString::asJson( int precision ) const
   return json;
 }
 
-QJsonObject QgsCircularString::asJsonV2() const
+QJsonObject QgsCircularString::asJsonObject( int precision ) const
 {
   // GeoJSON does not support curves
   std::unique_ptr< QgsLineString > line( curveToLine() );
-  return line->asJsonV2( );
+  return line->asJsonObject( precision );
 }
 
 bool QgsCircularString::isEmpty() const
diff --git a/src/core/geometry/qgscircularstring.h b/src/core/geometry/qgscircularstring.h
@@ -80,7 +80,7 @@ class CORE_EXPORT QgsCircularString: public QgsCurve
     QDomElement asGml2( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
     QDomElement asGml3( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
     QString asJson( int precision = 17 ) const override;
-    QJsonObject asJsonV2( ) const override;
+    QJsonObject asJsonObject( int precision ) const override;
     bool isEmpty() const override;
     int numPoints() const override;
 
diff --git a/src/core/geometry/qgscompoundcurve.cpp b/src/core/geometry/qgscompoundcurve.cpp
@@ -299,11 +299,11 @@ QString QgsCompoundCurve::asJson( int precision ) const
   return json;
 }
 
-QJsonObject QgsCompoundCurve::asJsonV2() const
+QJsonObject QgsCompoundCurve::asJsonObject( int precision ) const
 {
   // GeoJSON does not support curves
   std::unique_ptr< QgsLineString > line( curveToLine() );
-  return line->asJsonV2();
+  return line->asJsonObject( precision );
 }
 
 double QgsCompoundCurve::length() const
diff --git a/src/core/geometry/qgscompoundcurve.h b/src/core/geometry/qgscompoundcurve.h
@@ -51,7 +51,7 @@ class CORE_EXPORT QgsCompoundCurve: public QgsCurve
     QDomElement asGml2( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
     QDomElement asGml3( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
     QString asJson( int precision = 17 ) const override;
-    QJsonObject asJsonV2( ) const override;
+    QJsonObject asJsonObject( int precision ) const override;
 
     //curve interface
     double length() const override;
diff --git a/src/core/geometry/qgscurvepolygon.cpp b/src/core/geometry/qgscurvepolygon.cpp
@@ -428,23 +428,23 @@ QString QgsCurvePolygon::asJson( int precision ) const
   return json;
 }
 
-QJsonObject QgsCurvePolygon::asJsonV2() const
+QJsonObject QgsCurvePolygon::asJsonObject( int precision ) const
 {
   QJsonArray coordinates;
   if ( exteriorRing() )
   {
     std::unique_ptr< QgsLineString > exteriorLineString( exteriorRing()->curveToLine() );
     QgsPointSequence exteriorPts;
     exteriorLineString->points( exteriorPts );
-    coordinates.append( QgsGeometryUtils::pointsToJsonV2( exteriorPts ) );
+    coordinates.append( QgsGeometryUtils::pointsToJsonObject( exteriorPts, precision ) );
 
     std::unique_ptr< QgsLineString > interiorLineString;
     for ( int i = 0, n = numInteriorRings(); i < n; ++i )
     {
       interiorLineString.reset( interiorRing( i )->curveToLine() );
       QgsPointSequence interiorPts;
       interiorLineString->points( interiorPts );
-      coordinates.append( QgsGeometryUtils::pointsToJsonV2( interiorPts ) );
+      coordinates.append( QgsGeometryUtils::pointsToJsonObject( interiorPts, precision ) );
     }
   }
   return
diff --git a/src/core/geometry/qgscurvepolygon.h b/src/core/geometry/qgscurvepolygon.h
@@ -56,7 +56,7 @@ class CORE_EXPORT QgsCurvePolygon: public QgsSurface
     QDomElement asGml2( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
     QDomElement asGml3( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
     QString asJson( int precision = 17 ) const override;
-    QJsonObject asJsonV2() const override;
+    QJsonObject asJsonObject( int precision = 17 ) const override;
 
     //surface interface
     double area() const override;
diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
@@ -1268,13 +1268,13 @@ QString QgsGeometry::asJson( int precision ) const
   return d->geometry->asJson( precision );
 }
 
-QJsonObject QgsGeometry::asJsonV2() const
+QJsonObject QgsGeometry::asJsonObject( int precision ) const
 {
   if ( !d->geometry )
   {
     return QJsonObject( );
   }
-  return d->geometry->asJsonV2( );
+  return d->geometry->asJsonObject( precision );
 }
 
 QgsGeometry QgsGeometry::convertToType( QgsWkbTypes::GeometryType destType, bool destMultipart ) const
diff --git a/src/core/geometry/qgsgeometry.h b/src/core/geometry/qgsgeometry.h
@@ -1433,7 +1433,7 @@ class CORE_EXPORT QgsGeometry
     /**
      * Exports the geometry to a GeoJSON object.
      */
-    QJsonObject asJsonV2( ) const;
+    QJsonObject asJsonObject( int precision = 17 ) const;
 
     /**
      * Try to convert the geometry to the requested type
diff --git a/src/core/geometry/qgsgeometrycollection.cpp b/src/core/geometry/qgsgeometrycollection.cpp
@@ -431,12 +431,12 @@ QString QgsGeometryCollection::asJson( int precision ) const
   return json;
 }
 
-QJsonObject QgsGeometryCollection::asJsonV2() const
+QJsonObject QgsGeometryCollection::asJsonObject( int precision ) const
 {
   QJsonArray coordinates;
   for ( const QgsAbstractGeometry *geom : qgis::as_const( mGeometries ) )
   {
-    coordinates.append( geom->asJsonV2() );
+    coordinates.append( geom->asJsonObject() );
   }
   return
   {
diff --git a/src/core/geometry/qgsgeometrycollection.h b/src/core/geometry/qgsgeometrycollection.h
@@ -174,7 +174,7 @@ class CORE_EXPORT QgsGeometryCollection: public QgsAbstractGeometry
     QDomElement asGml2( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
     QDomElement asGml3( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
     QString asJson( int precision = 17 ) const override;
-    QJsonObject asJsonV2( ) const override;
+    QJsonObject asJsonObject( int precision ) const override;
 
     QgsRectangle boundingBox() const override;
 
diff --git a/src/core/geometry/qgsgeometryutils.cpp b/src/core/geometry/qgsgeometryutils.cpp
@@ -1195,12 +1195,19 @@ QString QgsGeometryUtils::pointsToJSON( const QgsPointSequence &points, int prec
   return json;
 }
 
-QJsonArray QgsGeometryUtils::pointsToJsonV2( const QgsPointSequence &points )
+QJsonArray QgsGeometryUtils::pointsToJsonObject( const QgsPointSequence &points, int precision )
 {
   QJsonArray coordinates;
   for ( const QgsPoint &p : points )
   {
-    coordinates.append( QJsonArray( { p.x(), p.y() } ) );
+    if ( p.is3D() )
+    {
+      coordinates.append( QJsonArray( { qgsRound( p.x(), precision ), qgsRound( p.y(), precision ), qgsRound( p.z(), precision ) } ) );
+    }
+    else
+    {
+      coordinates.append( QJsonArray( { qgsRound( p.x(), precision ), qgsRound( p.y(), precision ) } ) );
+    }
   }
   return coordinates;
 }
diff --git a/src/core/geometry/qgsgeometryutils.h b/src/core/geometry/qgsgeometryutils.h
@@ -425,7 +425,7 @@ class CORE_EXPORT QgsGeometryUtils
      * Returns a geoJSON coordinates object.
      * \note not available in Python bindings
      */
-    static QJsonArray pointsToJsonV2( const QgsPointSequence &points ) SIP_SKIP;
+    static QJsonArray pointsToJsonObject( const QgsPointSequence &points, int precision ) SIP_SKIP;
 
     /**
      * Ensures that an angle is in the range 0 <= angle < 2 pi.
diff --git a/src/core/geometry/qgslinestring.cpp b/src/core/geometry/qgslinestring.cpp
@@ -419,14 +419,14 @@ QString QgsLineString::asJson( int precision ) const
   return "{\"type\": \"LineString\", \"coordinates\": " + QgsGeometryUtils::pointsToJSON( pts, precision ) + '}';
 }
 
-QJsonObject QgsLineString::asJsonV2() const
+QJsonObject QgsLineString::asJsonObject( int precision ) const
 {
   QgsPointSequence pts;
   points( pts );
   return
   {
     { QLatin1String( "type" ), QLatin1String( "LineString" ) },
-    { QLatin1String( "coordinates" ),  QgsGeometryUtils::pointsToJsonV2( pts ) }
+    { QLatin1String( "coordinates" ),  QgsGeometryUtils::pointsToJsonObject( pts, precision ) }
   };
 }
 
diff --git a/src/core/geometry/qgslinestring.h b/src/core/geometry/qgslinestring.h
@@ -561,7 +561,7 @@ class CORE_EXPORT QgsLineString: public QgsCurve
     QDomElement asGml2( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
     QDomElement asGml3( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
     QString asJson( int precision = 17 ) const override;
-    QJsonObject asJsonV2( ) const override;
+    QJsonObject asJsonObject( int precision ) const override;
 
     //curve interface
     double length() const override;
diff --git a/src/core/geometry/qgsmulticurve.cpp b/src/core/geometry/qgsmulticurve.cpp
@@ -131,7 +131,7 @@ QString QgsMultiCurve::asJson( int precision ) const
   return json;
 }
 
-QJsonObject QgsMultiCurve::asJsonV2() const
+QJsonObject QgsMultiCurve::asJsonObject( int precision ) const
 {
   QJsonArray coordinates;
   for ( const QgsAbstractGeometry *geom : qgis::as_const( mGeometries ) )
@@ -141,7 +141,7 @@ QJsonObject QgsMultiCurve::asJsonV2() const
       std::unique_ptr< QgsLineString > lineString( static_cast<const QgsCurve *>( geom )->curveToLine() );
       QgsPointSequence pts;
       lineString->points( pts );
-      coordinates.append( QgsGeometryUtils::pointsToJsonV2( pts ) );
+      coordinates.append( QgsGeometryUtils::pointsToJsonObject( pts, precision ) );
     }
   }
   return
diff --git a/src/core/geometry/qgsmulticurve.h b/src/core/geometry/qgsmulticurve.h
@@ -38,7 +38,7 @@ class CORE_EXPORT QgsMultiCurve: public QgsGeometryCollection
     QDomElement asGml2( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
     QDomElement asGml3( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
     QString asJson( int precision = 17 ) const override;
-    QJsonObject asJsonV2( ) const override;
+    QJsonObject asJsonObject( int precision ) const override;
     bool addGeometry( QgsAbstractGeometry *g SIP_TRANSFER ) override;
     bool insertGeometry( QgsAbstractGeometry *g SIP_TRANSFER, int index ) override;
 
diff --git a/src/core/geometry/qgsmultilinestring.cpp b/src/core/geometry/qgsmultilinestring.cpp
@@ -118,7 +118,7 @@ QString QgsMultiLineString::asJson( int precision ) const
   return json;
 }
 
-QJsonObject QgsMultiLineString::asJsonV2() const
+QJsonObject QgsMultiLineString::asJsonObject( int precision ) const
 {
   QJsonArray coordinates;
   for ( const QgsAbstractGeometry *geom : mGeometries )
@@ -128,7 +128,7 @@ QJsonObject QgsMultiLineString::asJsonV2() const
       const QgsLineString *lineString = static_cast<const QgsLineString *>( geom );
       QgsPointSequence pts;
       lineString->points( pts );
-      coordinates.append( QgsGeometryUtils::pointsToJsonV2( pts ) );
+      coordinates.append( QgsGeometryUtils::pointsToJsonObject( pts, precision ) );
     }
   }
   return
diff --git a/src/core/geometry/qgsmultilinestring.h b/src/core/geometry/qgsmultilinestring.h
@@ -38,7 +38,7 @@ class CORE_EXPORT QgsMultiLineString: public QgsMultiCurve
     QDomElement asGml2( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
     QDomElement asGml3( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
     QString asJson( int precision = 17 ) const override;
-    QJsonObject asJsonV2( ) const override;
+    QJsonObject asJsonObject( int precision ) const override;
     bool addGeometry( QgsAbstractGeometry *g SIP_TRANSFER ) override;
     bool insertGeometry( QgsAbstractGeometry *g SIP_TRANSFER, int index ) override;
 
diff --git a/src/core/geometry/qgsmultipoint.cpp b/src/core/geometry/qgsmultipoint.cpp
diff --git a/src/core/geometry/qgsmultipoint.h b/src/core/geometry/qgsmultipoint.h
diff --git a/src/core/geometry/qgsmultipolygon.cpp b/src/core/geometry/qgsmultipolygon.cpp
diff --git a/src/core/geometry/qgsmultipolygon.h b/src/core/geometry/qgsmultipolygon.h
diff --git a/src/core/geometry/qgsmultisurface.cpp b/src/core/geometry/qgsmultisurface.cpp
diff --git a/src/core/geometry/qgsmultisurface.h b/src/core/geometry/qgsmultisurface.h
diff --git a/src/core/geometry/qgspoint.cpp b/src/core/geometry/qgspoint.cpp
diff --git a/src/core/geometry/qgspoint.h b/src/core/geometry/qgspoint.h
diff --git a/src/core/qgsjsonutils.cpp b/src/core/qgsjsonutils.cpp
diff --git a/src/core/qgsjsonutils.h b/src/core/qgsjsonutils.h
diff --git a/tests/src/core/testqgsjsonutils.cpp b/tests/src/core/testqgsjsonutils.cpp
