Skip to content

Commit 4ab4a1f

Browse files
nyalldawsonnyalldawson
committedAug 7, 2017
Spell check 'mitre' -> 'miter' (i.e. use en-us variation)
·
ltr-3_40final-3_0_0
1 parent 75a372c commit 4ab4a1f

35 files changed

+166
-164
lines changed
 

‎python/core/geometry/qgsgeometry.sip

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ Test for containment of a point (uses GEOS)
618618
enum JoinStyle
619619
{
620620
JoinStyleRound,
621-
JoinStyleMitre,
621+
JoinStyleMiter,
622622
JoinStyleBevel,
623623
};
624624

@@ -629,40 +629,40 @@ of segments used to approximate curves *
629629
:rtype: QgsGeometry
630630
%End
631631

632-
QgsGeometry buffer( double distance, int segments, EndCapStyle endCapStyle, JoinStyle joinStyle, double mitreLimit ) const;
632+
QgsGeometry buffer( double distance, int segments, EndCapStyle endCapStyle, JoinStyle joinStyle, double miterLimit ) const;
633633
%Docstring
634634
Returns a buffer region around the geometry, with additional style options.
635635
\param distance buffer distance
636636
\param segments for round joins, number of segments to approximate quarter-circle
637637
\param endCapStyle end cap style
638638
\param joinStyle join style for corners in geometry
639-
\param mitreLimit limit on the mitre ratio used for very sharp corners (JoinStyleMitre only)
639+
\param miterLimit limit on the miter ratio used for very sharp corners (JoinStyleMiter only)
640640
.. versionadded:: 2.4
641641
:rtype: QgsGeometry
642642
%End
643643

644-
QgsGeometry offsetCurve( double distance, int segments, JoinStyle joinStyle, double mitreLimit ) const;
644+
QgsGeometry offsetCurve( double distance, int segments, JoinStyle joinStyle, double miterLimit ) const;
645645
%Docstring
646646
Returns an offset line at a given distance and side from an input line.
647647
\param distance buffer distance
648648
\param segments for round joins, number of segments to approximate quarter-circle
649649
\param joinStyle join style for corners in geometry
650-
\param mitreLimit limit on the mitre ratio used for very sharp corners (JoinStyleMitre only)
650+
\param miterLimit limit on the miter ratio used for very sharp corners (JoinStyleMiter only)
651651
.. versionadded:: 2.4
652652
:rtype: QgsGeometry
653653
%End
654654

655655
QgsGeometry singleSidedBuffer( double distance, int segments, BufferSide side,
656656
JoinStyle joinStyle = JoinStyleRound,
657-
double mitreLimit = 2.0 ) const;
657+
double miterLimit = 2.0 ) const;
658658
%Docstring
659659
Returns a single sided buffer for a (multi)line geometry. The buffer is only
660660
applied to one side of the line.
661661
\param distance buffer distance
662662
\param segments for round joins, number of segments to approximate quarter-circle
663663
\param side side of geometry to buffer
664664
\param joinStyle join style for corners
665-
\param mitreLimit limit on the mitre ratio used for very sharp corners
665+
\param miterLimit limit on the miter ratio used for very sharp corners
666666
:return: buffered geometry, or an empty geometry if buffer could not be
667667
calculated
668668
.. versionadded:: 3.0

‎python/core/geometry/qgsgeometryengine.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class QgsGeometryEngine
5050
%Docstring
5151
:rtype: QgsAbstractGeometry
5252
%End
53-
virtual QgsAbstractGeometry *buffer( double distance, int segments, int endCapStyle, int joinStyle, double mitreLimit, QString *errorMsg = 0 ) const = 0 /Factory/;
53+
virtual QgsAbstractGeometry *buffer( double distance, int segments, int endCapStyle, int joinStyle, double miterLimit, QString *errorMsg = 0 ) const = 0 /Factory/;
5454
%Docstring
5555
:rtype: QgsAbstractGeometry
5656
%End
@@ -170,7 +170,7 @@ class QgsGeometryEngine
170170
:rtype: int
171171
%End
172172

173-
virtual QgsAbstractGeometry *offsetCurve( double distance, int segments, int joinStyle, double mitreLimit, QString *errorMsg = 0 ) const = 0 /Factory/;
173+
virtual QgsAbstractGeometry *offsetCurve( double distance, int segments, int joinStyle, double miterLimit, QString *errorMsg = 0 ) const = 0 /Factory/;
174174
%Docstring
175175
:rtype: QgsAbstractGeometry
176176
%End

‎python/plugins/processing/algs/help/qgis.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,9 @@ qgis:fixeddistancebuffer: >
218218

219219
The end cap style parameter controls how line endings are handled in the buffer.
220220

221-
The join style parameter specifies whether round, mitre or beveled joins should be used when offsetting corners in a line.
221+
The join style parameter specifies whether round, miter or beveled joins should be used when offsetting corners in a line.
222222

223-
The mitre limit parameter is only applicable for mitre join styles, and controls the maximum distance from the offset curve to use when creating a mitred join.
223+
The miter limit parameter is only applicable for miter join styles, and controls the maximum distance from the offset curve to use when creating a mitered join.
224224

225225
qgis:fixgeometries: >
226226
This algorithm attempts to create a valid representation of a given invalid geometry without losing any of the input vertices. Already-valid geometries are returned without further intervention. Always outputs multi-geometry layer.
@@ -334,9 +334,9 @@ qgis:offsetline: >
334334

335335
The segments parameter controls the number of line segments to use to approximate a quarter circle when creating rounded offsets.
336336

337-
The join style parameter specifies whether round, mitre or beveled joins should be used when offsetting corners in a line.
337+
The join style parameter specifies whether round, miter or beveled joins should be used when offsetting corners in a line.
338338

339-
The mitre limit parameter is only applicable for mitre join styles, and controls the maximum distance from the offset curve to use when creating a mitred join.
339+
The miter limit parameter is only applicable for miter join styles, and controls the maximum distance from the offset curve to use when creating a mitered join.
340340

341341
qgis:orientedminimumboundingbox: >
342342
This algorithm takes a vector layer and generate a new one with the minimum rectangle that covers all the input features.
@@ -537,9 +537,9 @@ qgis:singlesidedbuffer: >
537537

538538
The segments parameter controls the number of line segments to use to approximate a quarter circle when creating rounded buffers.
539539

540-
The join style parameter specifies whether round, mitre or beveled joins should be used when buffering corners in a line.
540+
The join style parameter specifies whether round, miter or beveled joins should be used when buffering corners in a line.
541541

542-
The mitre limit parameter is only applicable for mitre join styles, and controls the maximum distance from the buffer to use when creating a mitred join.
542+
The miter limit parameter is only applicable for miter join styles, and controls the maximum distance from the buffer to use when creating a mitered join.
543543

544544
qgis:smoothgeometry: >
545545
This algorithm smooths the geometries in a line or polygon layer. It creates a new layer with the same features as the ones in the input layer, but with geometries containing a higher number of vertices and corners in the geometries smoothed out.

‎python/plugins/processing/algs/qgis/Buffer.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333

3434
def buffering(feedback, context, sink, distance, field, useField, source, dissolve, segments, endCapStyle=1,
35-
joinStyle=1, mitreLimit=2):
35+
joinStyle=1, miterLimit=2):
3636

3737
if useField:
3838
field = source.fields().lookupField(field)
@@ -62,7 +62,7 @@ def buffering(feedback, context, sink, distance, field, useField, source, dissol
6262

6363
inGeom = inFeat.geometry()
6464

65-
buffered_geometries.append(inGeom.buffer(float(value), segments, endCapStyle, joinStyle, mitreLimit))
65+
buffered_geometries.append(inGeom.buffer(float(value), segments, endCapStyle, joinStyle, miterLimit))
6666

6767
current += 1
6868
feedback.setProgress(int(current * total))
@@ -86,7 +86,7 @@ def buffering(feedback, context, sink, distance, field, useField, source, dissol
8686
value = distance
8787
inGeom = inFeat.geometry()
8888
outFeat = QgsFeature()
89-
outGeom = inGeom.buffer(float(value), segments, endCapStyle, joinStyle, mitreLimit)
89+
outGeom = inGeom.buffer(float(value), segments, endCapStyle, joinStyle, miterLimit)
9090
outFeat.setGeometry(outGeom)
9191
outFeat.setAttributes(attrs)
9292
sink.addFeature(outFeat, QgsFeatureSink.FastInsert)

‎python/plugins/processing/algs/qgis/FixedDistanceBuffer.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class FixedDistanceBuffer(QgisAlgorithm):
5454
DISSOLVE = 'DISSOLVE'
5555
END_CAP_STYLE = 'END_CAP_STYLE'
5656
JOIN_STYLE = 'JOIN_STYLE'
57-
MITRE_LIMIT = 'MITRE_LIMIT'
57+
MITER_LIMIT = 'MITER_LIMIT'
5858

5959
def icon(self):
6060
return QIcon(os.path.join(pluginPath, 'images', 'ftools', 'buffer.png'))
@@ -83,14 +83,14 @@ def initAlgorithm(self, config=None):
8383
self.tr('End cap style'),
8484
options=self.end_cap_styles, defaultValue=0))
8585
self.join_styles = [self.tr('Round'),
86-
'Mitre',
86+
'Miter',
8787
'Bevel']
8888
self.addParameter(QgsProcessingParameterEnum(
8989
self.JOIN_STYLE,
9090
self.tr('Join style'),
9191
options=self.join_styles, defaultValue=0))
92-
self.addParameter(QgsProcessingParameterNumber(self.MITRE_LIMIT,
93-
self.tr('Mitre limit'), minValue=0, defaultValue=2))
92+
self.addParameter(QgsProcessingParameterNumber(self.MITER_LIMIT,
93+
self.tr('Miter limit'), minValue=0, defaultValue=2))
9494

9595
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Buffer'), QgsProcessing.TypeVectorPolygon))
9696

@@ -108,7 +108,7 @@ def processAlgorithm(self, parameters, context, feedback):
108108
segments = self.parameterAsInt(parameters, self.SEGMENTS, context)
109109
end_cap_style = self.parameterAsEnum(parameters, self.END_CAP_STYLE, context) + 1
110110
join_style = self.parameterAsEnum(parameters, self.JOIN_STYLE, context) + 1
111-
miter_limit = self.parameterAsDouble(parameters, self.MITRE_LIMIT, context)
111+
miter_limit = self.parameterAsDouble(parameters, self.MITER_LIMIT, context)
112112

113113
(sink, dest_id) = self.parameterAsSink(parameters, self.OUTPUT, context,
114114
source.fields(), QgsWkbTypes.Polygon, source.sourceCrs())

‎python/plugins/processing/algs/qgis/OffsetLine.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class OffsetLine(QgisFeatureBasedAlgorithm):
4545
DISTANCE = 'DISTANCE'
4646
SEGMENTS = 'SEGMENTS'
4747
JOIN_STYLE = 'JOIN_STYLE'
48-
MITRE_LIMIT = 'MITRE_LIMIT'
48+
MITER_LIMIT = 'MITER_LIMIT'
4949

5050
def group(self):
5151
return self.tr('Vector geometry tools')
@@ -68,14 +68,14 @@ def initParameters(self, config=None):
6868
type=QgsProcessingParameterNumber.Integer,
6969
minValue=1, defaultValue=8))
7070
self.join_styles = [self.tr('Round'),
71-
'Mitre',
71+
'Miter',
7272
'Bevel']
7373
self.addParameter(QgsProcessingParameterEnum(
7474
self.JOIN_STYLE,
7575
self.tr('Join style'),
7676
options=self.join_styles))
77-
self.addParameter(QgsProcessingParameterNumber(self.MITRE_LIMIT,
78-
self.tr('Mitre limit'), type=QgsProcessingParameterNumber.Double,
77+
self.addParameter(QgsProcessingParameterNumber(self.MITER_LIMIT,
78+
self.tr('Miter limit'), type=QgsProcessingParameterNumber.Double,
7979
minValue=1, defaultValue=2))
8080

8181
def name(self):
@@ -94,7 +94,7 @@ def prepareAlgorithm(self, parameters, context, feedback):
9494
self.distance = self.parameterAsDouble(parameters, self.DISTANCE, context)
9595
self.segments = self.parameterAsInt(parameters, self.SEGMENTS, context)
9696
self.join_style = self.parameterAsEnum(parameters, self.JOIN_STYLE, context) + 1
97-
self.miter_limit = self.parameterAsDouble(parameters, self.MITRE_LIMIT, context)
97+
self.miter_limit = self.parameterAsDouble(parameters, self.MITER_LIMIT, context)
9898
return True
9999

100100
def processFeature(self, feature, feedback):

‎python/plugins/processing/algs/qgis/SingleSidedBuffer.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class SingleSidedBuffer(QgisFeatureBasedAlgorithm):
4040
SIDE = 'SIDE'
4141
SEGMENTS = 'SEGMENTS'
4242
JOIN_STYLE = 'JOIN_STYLE'
43-
MITRE_LIMIT = 'MITRE_LIMIT'
43+
MITER_LIMIT = 'MITER_LIMIT'
4444

4545
def group(self):
4646
return self.tr('Vector geometry tools')
@@ -55,7 +55,7 @@ def __init__(self):
5555
self.sides = [self.tr('Left'),
5656
'Right']
5757
self.join_styles = [self.tr('Round'),
58-
'Mitre',
58+
'Miter',
5959
'Bevel']
6060

6161
def initParameters(self, config=None):
@@ -74,8 +74,8 @@ def initParameters(self, config=None):
7474
self.JOIN_STYLE,
7575
self.tr('Join style'),
7676
options=self.join_styles))
77-
self.addParameter(QgsProcessingParameterNumber(self.MITRE_LIMIT,
78-
self.tr('Mitre limit'), minValue=1, defaultValue=2))
77+
self.addParameter(QgsProcessingParameterNumber(self.MITER_LIMIT,
78+
self.tr('Miter limit'), minValue=1, defaultValue=2))
7979

8080
def name(self):
8181
return 'singlesidedbuffer'
@@ -100,7 +100,7 @@ def prepareAlgorithm(self, parameters, context, feedback):
100100
self.side = QgsGeometry.SideLeft
101101
else:
102102
self.side = QgsGeometry.SideRight
103-
self.miter_limit = self.parameterAsDouble(parameters, self.MITRE_LIMIT, context)
103+
self.miter_limit = self.parameterAsDouble(parameters, self.MITER_LIMIT, context)
104104
return True
105105

106106
def processFeature(self, feature, feedback):

‎python/plugins/processing/algs/qgis/VariableDistanceBuffer.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class VariableDistanceBuffer(QgisAlgorithm):
5353
DISSOLVE = 'DISSOLVE'
5454
END_CAP_STYLE = 'END_CAP_STYLE'
5555
JOIN_STYLE = 'JOIN_STYLE'
56-
MITRE_LIMIT = 'MITRE_LIMIT'
56+
MITER_LIMIT = 'MITER_LIMIT'
5757

5858
def icon(self):
5959
return QIcon(os.path.join(pluginPath, 'images', 'ftools', 'buffer.png'))
@@ -83,14 +83,14 @@ def initAlgorithm(self, config=None):
8383
self.tr('End cap style'),
8484
options=self.end_cap_styles, defaultValue=0))
8585
self.join_styles = [self.tr('Round'),
86-
'Mitre',
86+
'Miter',
8787
'Bevel']
8888
self.addParameter(QgsProcessingParameterEnum(
8989
self.JOIN_STYLE,
9090
self.tr('Join style'),
9191
options=self.join_styles, defaultValue=0))
92-
self.addParameter(QgsProcessingParameterNumber(self.MITRE_LIMIT,
93-
self.tr('Mitre limit'), minValue=0, defaultValue=2))
92+
self.addParameter(QgsProcessingParameterNumber(self.MITER_LIMIT,
93+
self.tr('Miter limit'), minValue=0, defaultValue=2))
9494

9595
self.addParameter(
9696
QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Buffer'), QgsProcessing.TypeVectorPolygon))
@@ -108,7 +108,7 @@ def processAlgorithm(self, parameters, context, feedback):
108108
segments = self.parameterAsInt(parameters, self.SEGMENTS, context)
109109
end_cap_style = self.parameterAsEnum(parameters, self.END_CAP_STYLE, context) + 1
110110
join_style = self.parameterAsEnum(parameters, self.JOIN_STYLE, context) + 1
111-
miter_limit = self.parameterAsDouble(parameters, self.MITRE_LIMIT, context)
111+
miter_limit = self.parameterAsDouble(parameters, self.MITER_LIMIT, context)
112112

113113
field = self.parameterAsString(parameters, self.FIELD, context)
114114

‎python/plugins/processing/tests/testdata/expected/buffer_polys_mitre.gfs renamed to ‎python/plugins/processing/tests/testdata/expected/buffer_polys_miter.gfs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<GMLFeatureClassList>
22
<GMLFeatureClass>
3-
<Name>buffer_polys_mitre</Name>
4-
<ElementPath>buffer_polys_mitre</ElementPath>
3+
<Name>buffer_polys_miter</Name>
4+
<ElementPath>buffer_polys_miter</ElementPath>
55
<GeometryType>3</GeometryType>
66
<SRSName>EPSG:4326</SRSName>
77
<DatasetSpecificInfo>

‎python/plugins/processing/tests/testdata/expected/buffer_polys_mitre.gml renamed to ‎python/plugins/processing/tests/testdata/expected/buffer_polys_miter.gml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,47 +12,47 @@
1212
</gml:boundedBy>
1313

1414
<gml:featureMember>
15-
<ogr:buffer_polys_mitre fid="polys.0">
15+
<ogr:buffer_polys_miter fid="polys.0">
1616
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>-2,-2 -2,4 4,4 4,1 3,1 3,-2 -2,-2</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
1717
<ogr:name>aaaaa</ogr:name>
1818
<ogr:intval>33</ogr:intval>
1919
<ogr:floatval>44.123456</ogr:floatval>
20-
</ogr:buffer_polys_mitre>
20+
</ogr:buffer_polys_miter>
2121
</gml:featureMember>
2222
<gml:featureMember>
23-
<ogr:buffer_polys_mitre fid="polys.1">
23+
<ogr:buffer_polys_miter fid="polys.1">
2424
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>5.0,6.414213562373096 7.93754927857421,3.451405886594554 7.757968851470933,3.017860383945075 2.242031148529061,3.017860383945087 2.062450721425788,3.451405886594566 5.0,6.414213562373096</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
2525
<ogr:name>Aaaaa</ogr:name>
2626
<ogr:intval>-33</ogr:intval>
2727
<ogr:floatval>0</ogr:floatval>
28-
</ogr:buffer_polys_mitre>
28+
</ogr:buffer_polys_miter>
2929
</gml:featureMember>
3030
<gml:featureMember>
31-
<ogr:buffer_polys_mitre fid="polys.2">
31+
<ogr:buffer_polys_miter fid="polys.2">
3232
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>1,4 1,7 4,7 4,4 1,4</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
3333
<ogr:name>bbaaa</ogr:name>
3434
<ogr:floatval>0.123</ogr:floatval>
35-
</ogr:buffer_polys_mitre>
35+
</ogr:buffer_polys_miter>
3636
</gml:featureMember>
3737
<gml:featureMember>
38-
<ogr:buffer_polys_mitre fid="polys.3">
38+
<ogr:buffer_polys_miter fid="polys.3">
3939
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>5,2 11,2 11,-4 5,-4 5,2</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
4040
<ogr:name>ASDF</ogr:name>
4141
<ogr:intval>0</ogr:intval>
42-
</ogr:buffer_polys_mitre>
42+
</ogr:buffer_polys_miter>
4343
</gml:featureMember>
4444
<gml:featureMember>
45-
<ogr:buffer_polys_mitre fid="polys.4">
45+
<ogr:buffer_polys_miter fid="polys.4">
4646
<ogr:intval>120</ogr:intval>
4747
<ogr:floatval>-100291.43213</ogr:floatval>
48-
</ogr:buffer_polys_mitre>
48+
</ogr:buffer_polys_miter>
4949
</gml:featureMember>
5050
<gml:featureMember>
51-
<ogr:buffer_polys_mitre fid="polys.5">
51+
<ogr:buffer_polys_miter fid="polys.5">
5252
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>3.162277660168381,3.0 7.0,1.720759220056127 7.0,-4.618033988749896 1.0,-1.618033988749894 1,3 3.162277660168381,3.0</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
5353
<ogr:name>elim</ogr:name>
5454
<ogr:intval>2</ogr:intval>
5555
<ogr:floatval>3.33</ogr:floatval>
56-
</ogr:buffer_polys_mitre>
56+
</ogr:buffer_polys_miter>
5757
</gml:featureMember>
5858
</ogr:FeatureCollection>

‎python/plugins/processing/tests/testdata/expected/line_offset_mitre.gfs renamed to ‎python/plugins/processing/tests/testdata/expected/line_offset_miter.gfs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<GMLFeatureClassList>
22
<GMLFeatureClass>
3-
<Name>line_offset_mitre</Name>
4-
<ElementPath>line_offset_mitre</ElementPath>
3+
<Name>line_offset_miter</Name>
4+
<ElementPath>line_offset_miter</ElementPath>
55
<GeometryType>2</GeometryType>
66
<SRSName>EPSG:4326</SRSName>
77
<DatasetSpecificInfo>

0 commit comments

Comments
 (0)
Please sign in to comment.