Skip to content

Commit 95ecea8

Browse files
committedMay 16, 2018
move additions from top __init__ to core.__init__
1 parent 5790bbc commit 95ecea8

File tree

4 files changed

+28
-32
lines changed

4 files changed

+28
-32
lines changed
 

‎python/__init__.py

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -69,25 +69,3 @@ def setupenv():
6969

7070

7171
from qgis.PyQt import QtCore
72-
from qgis.core import QgsFeature, QgsGeometry
73-
74-
75-
def mapping_feature(feature):
76-
geom = feature.geometry()
77-
properties = {}
78-
fields = [field.name() for field in feature.fields()]
79-
properties = dict(list(zip(fields, feature.attributes())))
80-
return {'type': 'Feature',
81-
'properties': properties,
82-
'geometry': geom.__geo_interface__}
83-
84-
85-
def mapping_geometry(geometry):
86-
geo = geometry.asJson()
87-
# We have to use eval because exportToGeoJSON() gives us
88-
# back a string that looks like a dictionary.
89-
return eval(geo)
90-
91-
92-
QgsFeature.__geo_interface__ = property(mapping_feature)
93-
QgsGeometry.__geo_interface__ = property(mapping_geometry)

‎python/core/__init__.py

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,26 @@
2626
from qgis.PyQt.QtCore import NULL
2727
from qgis._core import *
2828

29-
from .additions.readwritecontextentercategory import ReadWriteContextEnterCategory
30-
from .additions.projectdirtyblocker import ProjectDirtyBlocker
31-
from .additions.qgstaskwrapper import QgsTaskWrapper
32-
from .additions.qgsfunction import register_function, qgsfunction
3329
from .additions.edit import edit, QgsEditError
3430
from .additions.fromfunction import fromFunction
3531
from .additions.processing import processing_output_layer_repr, processing_source_repr
36-
from .additions.qgsgeometry import _geometryNonZero
32+
from .additions.projectdirtyblocker import ProjectDirtyBlocker
3733
from .additions.qgsdefaultvalue import _isValid
34+
from .additions.qgsfeature import mapping_feature
35+
from .additions.qgsfunction import register_function, qgsfunction
36+
from .additions.qgsgeometry import _geometryNonZero, mapping_geometry
37+
from .additions.qgstaskwrapper import QgsTaskWrapper
38+
from .additions.readwritecontextentercategory import ReadWriteContextEnterCategory
3839

3940
# Injections into classes
40-
QgsGeometry.__nonzero__ = _geometryNonZero
41-
QgsGeometry.__bool__ = _geometryNonZero
4241
QgsDefaultValue.__bool__ = _isValid
43-
QgsReadWriteContext.enterCategory = ReadWriteContextEnterCategory
44-
QgsProject.blockDirtying = ProjectDirtyBlocker
45-
QgsTask.fromFunction = fromFunction
42+
QgsFeature.__geo_interface__ = property(mapping_feature)
43+
QgsGeometry.__bool__ = _geometryNonZero
44+
QgsGeometry.__geo_interface__ = property(mapping_geometry)
45+
QgsGeometry.__nonzero__ = _geometryNonZero
4646
QgsProcessingFeatureSourceDefinition.__repr__ = processing_source_repr
4747
QgsProcessingOutputLayerDefinition.__repr__ = processing_output_layer_repr
48+
QgsProject.blockDirtying = ProjectDirtyBlocker
49+
QgsReadWriteContext.enterCategory = ReadWriteContextEnterCategory
50+
QgsTask.fromFunction = fromFunction
51+
QgsTolerance.UnitType.parentClass = QgsTolerance

‎python/core/additions/qgsfeature.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
def mapping_feature(feature):
2+
geom = feature.geometry()
3+
fields = [field.name() for field in feature.fields()]
4+
properties = dict(list(zip(fields, feature.attributes())))
5+
return {'type': 'Feature',
6+
'properties': properties,
7+
'geometry': geom.__geo_interface__}

‎python/core/additions/qgsgeometry.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,10 @@
2020

2121
def _geometryNonZero(self):
2222
return not self.isEmpty()
23+
24+
25+
def mapping_geometry(geometry):
26+
geo = geometry.asJson()
27+
# We have to use eval because exportToGeoJSON() gives us
28+
# back a string that looks like a dictionary.
29+
return eval(geo)

0 commit comments

Comments
 (0)
Please sign in to comment.