Skip to content

Commit 2317f67

Browse files
nyalldawsonnyalldawson
committedSep 8, 2014
[composer] Use proper prime and double prime symbols for grid annotations
(because good typography and cartography go hand in hand..!)
·
ltr-3_40archive/master_2
1 parent 7ee05af commit 2317f67

File tree

2 files changed

+133
-133
lines changed

2 files changed

+133
-133
lines changed
 

‎src/core/qgspoint.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,12 @@ QString QgsPoint::toDegreesMinutesSeconds( int thePrecision, const bool useSuffi
226226
QString myStrSecondsY = padded ? QString( "%1" ).arg( mySecondsY, digits, 'f', thePrecision, QChar( '0' ) ) : QString::number( mySecondsY, 'f', thePrecision );
227227

228228
QString rep = myXSign + QString::number( myDegreesX ) + QChar( 176 ) +
229-
myMinutesX + QString( "'" ) +
230-
myStrSecondsX + QString( "\"" ) +
229+
myMinutesX + QChar( 0x2032 ) +
230+
myStrSecondsX + QChar( 0x2033 ) +
231231
myXHemisphere + QString( "," ) +
232232
myYSign + QString::number( myDegreesY ) + QChar( 176 ) +
233-
myMinutesY + QString( "'" ) +
234-
myStrSecondsY + QString( "\"" ) +
233+
myMinutesY + QChar( 0x2032 ) +
234+
myStrSecondsY + QChar( 0x2033 ) +
235235
myYHemisphere;
236236
return rep;
237237
}
@@ -312,10 +312,10 @@ QString QgsPoint::toDegreesMinutes( int thePrecision, const bool useSuffix, cons
312312
QString myStrMinutesY = padded ? QString( "%1" ).arg( myFloatMinutesY, digits, 'f', thePrecision, QChar( '0' ) ) : QString::number( myFloatMinutesY, 'f', thePrecision );
313313

314314
QString rep = myXSign + QString::number( myDegreesX ) + QChar( 176 ) +
315-
myStrMinutesX + QString( "'" ) +
315+
myStrMinutesX + QChar( 0x2032 ) +
316316
myXHemisphere + QString( "," ) +
317317
myYSign + QString::number( myDegreesY ) + QChar( 176 ) +
318-
myStrMinutesY + QString( "'" ) +
318+
myStrMinutesY + QChar( 0x2032 ) +
319319
myYHemisphere;
320320
return rep;
321321
}

‎tests/src/core/testqgspoint.cpp

Lines changed: 127 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -120,125 +120,125 @@ void TestQgsPoint::toDegreesMinutesSeconds()
120120

121121
qDebug() << mPoint4.toDegreesMinutesSeconds( 2 );
122122
QString myControlString = QString( "80" ) + QChar( 176 ) +
123-
QString( "0'0.00" ) +
124-
QString( '"' ) +
123+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00" ) +
124+
QChar( 0x2033 ) +
125125
QString( "E,20" ) + QChar( 176 ) +
126-
QString( "0'0.00" ) + QString( '"' ) +
126+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00" ) + QChar( 0x2033 ) +
127127
QString( "N" );
128128
qDebug() << myControlString;
129129
QCOMPARE( mPoint4.toDegreesMinutesSeconds( 2 ), myControlString );
130130

131131
//check if longitudes > 180 or <-180 wrap around
132132
myControlString = QString( "10" ) + QChar( 176 ) +
133-
QString( "0'0.00\"E" ) +
133+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00" ) + QChar( 0x2033 ) + QString( "E" ) +
134134
QString( ",0" ) + QChar( 176 ) +
135-
QString( "0'0.00\"" );
135+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00" ) + QChar( 0x2033 );
136136
QCOMPARE( QgsPoint( 370, 0 ).toDegreesMinutesSeconds( 2 ), myControlString );
137137
myControlString = QString( "10" ) + QChar( 176 ) +
138-
QString( "0'0.00\"W" ) +
138+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00" ) + QChar( 0x2033 ) + QString( "W" ) +
139139
QString( ",0" ) + QChar( 176 ) +
140-
QString( "0'0.00\"" );
140+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00" ) + QChar( 0x2033 );
141141
QCOMPARE( QgsPoint( -370, 0 ).toDegreesMinutesSeconds( 2 ), myControlString );
142142
myControlString = QString( "179" ) + QChar( 176 ) +
143-
QString( "0'0.00\"W" ) +
143+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00" ) + QChar( 0x2033 ) + QString( "W" ) +
144144
QString( ",0" ) + QChar( 176 ) +
145-
QString( "0'0.00\"" );
145+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00" ) + QChar( 0x2033 );
146146
QCOMPARE( QgsPoint( 181, 0 ).toDegreesMinutesSeconds( 2 ), myControlString );
147147
myControlString = QString( "179" ) + QChar( 176 ) +
148-
QString( "0'0.00\"E" ) +
148+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00" ) + QChar( 0x2033 ) + QString( "E" ) +
149149
QString( ",0" ) + QChar( 176 ) +
150-
QString( "0'0.00\"" );
150+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00" ) + QChar( 0x2033 );
151151
QCOMPARE( QgsPoint( -181, 0 ).toDegreesMinutesSeconds( 2 ), myControlString );
152152
myControlString = QString( "1" ) + QChar( 176 ) +
153-
QString( "0'0.00\"W" ) +
153+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00" ) + QChar( 0x2033 ) + QString( "W" ) +
154154
QString( ",0" ) + QChar( 176 ) +
155-
QString( "0'0.00\"" );
155+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00" ) + QChar( 0x2033 );
156156
QCOMPARE( QgsPoint( 359, 0 ).toDegreesMinutesSeconds( 2 ), myControlString );
157157
myControlString = QString( "1" ) + QChar( 176 ) +
158-
QString( "0'0.00\"E" ) +
158+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00" ) + QChar( 0x2033 ) + QString( "E" ) +
159159
QString( ",0" ) + QChar( 176 ) +
160-
QString( "0'0.00\"" );
160+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00" ) + QChar( 0x2033 );
161161
QCOMPARE( QgsPoint( -359, 0 ).toDegreesMinutesSeconds( 2 ), myControlString );
162162

163163
//should be no directional suffixes for 0 degree coordinates
164164
myControlString = QString( "0" ) + QChar( 176 ) +
165-
QString( "0'0.00" ) +
166-
QString( '"' ) +
165+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00" ) +
166+
QChar( 0x2033 ) +
167167
QString( ",0" ) + QChar( 176 ) +
168-
QString( "0'0.00" ) + QString( '"' );
168+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00" ) + QChar( 0x2033 );
169169
QCOMPARE( QgsPoint( 0, 0 ).toDegreesMinutesSeconds( 2 ), myControlString );
170170
//should also be no directional suffix for 0 degree coordinates within specified precision
171171
QCOMPARE( QgsPoint( 0, 0.000001 ).toDegreesMinutesSeconds( 2 ), myControlString );
172172
QCOMPARE( QgsPoint( 0, -0.000001 ).toDegreesMinutesSeconds( 2 ), myControlString );
173173
QCOMPARE( QgsPoint( -0.000001, 0 ).toDegreesMinutesSeconds( 2 ), myControlString );
174174
QCOMPARE( QgsPoint( 0.000001, 0 ).toDegreesMinutesSeconds( 2 ), myControlString );
175175
myControlString = QString( "0" ) + QChar( 176 ) +
176-
QString( "0'0.00000" ) +
177-
QString( '"' ) +
176+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00000" ) +
177+
QChar( 0x2033 ) +
178178
QString( ",0" ) + QChar( 176 ) +
179-
QString( "0'0.00360\"N" );
179+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00360" ) + QChar( 0x2033 ) + QString( "N" );
180180
QCOMPARE( QgsPoint( 0, 0.000001 ).toDegreesMinutesSeconds( 5 ), myControlString );
181181
myControlString = QString( "0" ) + QChar( 176 ) +
182-
QString( "0'0.00000" ) +
183-
QString( '"' ) +
182+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00000" ) +
183+
QChar( 0x2033 ) +
184184
QString( ",0" ) + QChar( 176 ) +
185-
QString( "0'0.00360\"S" );
185+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00360" ) + QChar( 0x2033 ) + QString( "S" );
186186
QCOMPARE( QgsPoint( 0, -0.000001 ).toDegreesMinutesSeconds( 5 ), myControlString );
187187
myControlString = QString( "0" ) + QChar( 176 ) +
188-
QString( "0'0.00360\"E" ) +
188+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00360" ) + QChar( 0x2033 ) + QString( "E" ) +
189189
QString( ",0" ) + QChar( 176 ) +
190-
QString( "0'0.00000" ) + QString( '"' );
190+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00000" ) + QChar( 0x2033 );
191191
QCOMPARE( QgsPoint( 0.000001, 0 ).toDegreesMinutesSeconds( 5 ), myControlString );
192192
myControlString = QString( "0" ) + QChar( 176 ) +
193-
QString( "0'0.00360\"W" ) +
193+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00360" ) + QChar( 0x2033 ) + QString( "W" ) +
194194
QString( ",0" ) + QChar( 176 ) +
195-
QString( "0'0.00000" ) + QString( '"' );
195+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00000" ) + QChar( 0x2033 );
196196
QCOMPARE( QgsPoint( -0.000001, 0 ).toDegreesMinutesSeconds( 5 ), myControlString );
197197

198198
//test rounding does not create seconds >= 60
199199
myControlString = QString( "100" ) + QChar( 176 ) +
200-
QString( "0'0.00\"E" ) +
200+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00" ) + QChar( 0x2033 ) + QString( "E" ) +
201201
QString( ",100" ) + QChar( 176 ) +
202-
QString( "0'0.00\"N" );
202+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00" ) + QChar( 0x2033 ) + QString( "N" );
203203
QCOMPARE( QgsPoint( 99.999999, 99.999999 ).toDegreesMinutesSeconds( 2 ), myControlString );
204204

205205
//should be no directional suffixes for 180 degree longitudes
206206
myControlString = QString( "180" ) + QChar( 176 ) +
207-
QString( "0'0.00" ) +
208-
QString( '"' ) +
207+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00" ) +
208+
QChar( 0x2033 ) +
209209
QString( ",0" ) + QChar( 176 ) +
210-
QString( "0'0.00" ) + QString( '"' );
210+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00" ) + QChar( 0x2033 );
211211
QCOMPARE( QgsPoint( 180, 0 ).toDegreesMinutesSeconds( 2 ), myControlString );
212212
//should also be no directional suffix for 180 degree longitudes within specified precision
213213
QCOMPARE( QgsPoint( 180.000001, 0 ).toDegreesMinutesSeconds( 2 ), myControlString );
214214
QCOMPARE( QgsPoint( 179.999999, 0 ).toDegreesMinutesSeconds( 2 ), myControlString );
215215
myControlString = QString( "179" ) + QChar( 176 ) +
216-
QString( "59'59.99640\"W" ) +
216+
QString( "59" ) + QChar( 0x2032 ) + QString( "59.99640" ) + QChar( 0x2033 ) + QString( "W" ) +
217217
QString( ",0" ) + QChar( 176 ) +
218-
QString( "0'0.00000" ) + QString( '"' );
218+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00000" ) + QChar( 0x2033 );
219219
QCOMPARE( QgsPoint( 180.000001, 0 ).toDegreesMinutesSeconds( 5 ), myControlString );
220220
myControlString = QString( "179" ) + QChar( 176 ) +
221-
QString( "59'59.99640\"E" ) +
221+
QString( "59" ) + QChar( 0x2032 ) + QString( "59.99640" ) + QChar( 0x2033 ) + QString( "E" ) +
222222
QString( ",0" ) + QChar( 176 ) +
223-
QString( "0'0.00000" ) + QString( '"' );
223+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00000" ) + QChar( 0x2033 );
224224
QCOMPARE( QgsPoint( 179.999999, 0 ).toDegreesMinutesSeconds( 5 ), myControlString );
225225
}
226226

227227
void TestQgsPoint::toDegreesMinutesSecondsNoSuffix()
228228
{
229229
QString myControlString = QString( "80" ) + QChar( 176 ) +
230-
QString( "0'0.00" ) +
231-
QString( '"' ) +
230+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00" ) +
231+
QChar( 0x2033 ) +
232232
QString( ",20" ) + QChar( 176 ) +
233-
QString( "0'0.00" ) + QString( '"' );
233+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00" ) + QChar( 0x2033 );
234234
QCOMPARE( mPoint4.toDegreesMinutesSeconds( 2, false ), myControlString );
235235

236236
//test 0 lat/long
237237
myControlString = QString( "0" ) + QChar( 176 ) +
238-
QString( "0'0.00" ) +
239-
QString( '"' ) +
238+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00" ) +
239+
QChar( 0x2033 ) +
240240
QString( ",0" ) + QChar( 176 ) +
241-
QString( "0'0.00" ) + QString( '"' );
241+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00" ) + QChar( 0x2033 );
242242
QVERIFY( QgsPoint( 0, 0 ).toDegreesMinutesSeconds( 2, false ) == myControlString );
243243
//test near zero lat/long
244244
QCOMPARE( QgsPoint( 0, 0.000001 ).toDegreesMinutesSeconds( 2, false ), myControlString );
@@ -248,75 +248,75 @@ void TestQgsPoint::toDegreesMinutesSecondsNoSuffix()
248248
QCOMPARE( QgsPoint( -0.000001, 0 ).toDegreesMinutesSeconds( 2, false ), myControlString );
249249

250250
myControlString = QString( "0" ) + QChar( 176 ) +
251-
QString( "0'0.00000" ) +
252-
QString( '"' ) +
251+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00000" ) +
252+
QChar( 0x2033 ) +
253253
QString( ",0" ) + QChar( 176 ) +
254-
QString( "0'0.00360" ) + QString( '"' );
254+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00360" ) + QChar( 0x2033 );
255255
QCOMPARE( QgsPoint( 0, 0.000001 ).toDegreesMinutesSeconds( 5, false ), myControlString );
256256
myControlString = QString( "0" ) + QChar( 176 ) +
257-
QString( "0'0.00000" ) +
258-
QString( '"' ) +
257+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00000" ) +
258+
QChar( 0x2033 ) +
259259
QString( ",-0" ) + QChar( 176 ) +
260-
QString( "0'0.00360" ) + QString( '"' );
260+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00360" ) + QChar( 0x2033 );
261261
QCOMPARE( QgsPoint( 0, -0.000001 ).toDegreesMinutesSeconds( 5, false ), myControlString );
262262
myControlString = QString( "0" ) + QChar( 176 ) +
263-
QString( "0'0.00360" ) +
264-
QString( '"' ) +
263+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00360" ) +
264+
QChar( 0x2033 ) +
265265
QString( ",0" ) + QChar( 176 ) +
266-
QString( "0'0.00000" ) + QString( '"' );
266+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00000" ) + QChar( 0x2033 );
267267
QCOMPARE( QgsPoint( 0.000001, 0 ).toDegreesMinutesSeconds( 5, false ), myControlString );
268268
myControlString = QString( "-0" ) + QChar( 176 ) +
269-
QString( "0'0.00360" ) +
270-
QString( '"' ) +
269+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00360" ) +
270+
QChar( 0x2033 ) +
271271
QString( ",0" ) + QChar( 176 ) +
272-
QString( "0'0.00000" ) + QString( '"' );
272+
QString( "0" ) + QChar( 0x2032 ) + QString( "0.00000" ) + QChar( 0x2033 );
273273
QCOMPARE( QgsPoint( -0.000001, 0 ).toDegreesMinutesSeconds( 5, false ), myControlString );
274274
}
275275

276276
void TestQgsPoint::toDegreesMinutesSecondsPadded()
277277
{
278278
QString myControlString = QString( "80" ) + QChar( 176 ) +
279-
QString( "00'00.00" ) +
280-
QString( '"' ) +
279+
QString( "00" ) + QChar( 0x2032 ) + QString( "00.00" ) +
280+
QChar( 0x2033 ) +
281281
QString( "E,20" ) + QChar( 176 ) +
282-
QString( "00'00.00" ) + QString( '"' ) +
282+
QString( "00" ) + QChar( 0x2032 ) + QString( "00.00" ) + QChar( 0x2033 ) +
283283
QString( "N" );
284284
qDebug() << myControlString;
285285
QCOMPARE( mPoint4.toDegreesMinutesSeconds( 2, true, true ), myControlString );
286286

287287
//should be no directional suffixes for 0 degree coordinates
288288
myControlString = QString( "0" ) + QChar( 176 ) +
289-
QString( "00'00.00" ) +
290-
QString( '"' ) +
289+
QString( "00" ) + QChar( 0x2032 ) + QString( "00.00" ) +
290+
QChar( 0x2033 ) +
291291
QString( ",0" ) + QChar( 176 ) +
292-
QString( "00'00.00" ) + QString( '"' );
292+
QString( "00" ) + QChar( 0x2032 ) + QString( "00.00" ) + QChar( 0x2033 );
293293
QVERIFY( QgsPoint( 0, 0 ).toDegreesMinutesSeconds( 2, true, true ) == myControlString );
294294
//should also be no directional suffix for 0 degree coordinates within specified precision
295295
QCOMPARE( QgsPoint( 0, 0.000001 ).toDegreesMinutesSeconds( 2, true, true ), myControlString );
296296
QCOMPARE( QgsPoint( 0, -0.000001 ).toDegreesMinutesSeconds( 2, true, true ), myControlString );
297297
QCOMPARE( QgsPoint( -0.000001, 0 ).toDegreesMinutesSeconds( 2, true, true ), myControlString );
298298
QCOMPARE( QgsPoint( 0.000001, 0 ).toDegreesMinutesSeconds( 2, true, true ), myControlString );
299299
myControlString = QString( "0" ) + QChar( 176 ) +
300-
QString( "00'00.00000" ) +
301-
QString( '"' ) +
300+
QString( "00" ) + QChar( 0x2032 ) + QString( "00.00000" ) +
301+
QChar( 0x2033 ) +
302302
QString( ",0" ) + QChar( 176 ) +
303-
QString( "00'00.00360\"N" );
303+
QString( "00" ) + QChar( 0x2032 ) + QString( "00.00360" ) + QChar( 0x2033 ) + QString( "N" );
304304
QCOMPARE( QgsPoint( 0, 0.000001 ).toDegreesMinutesSeconds( 5, true, true ), myControlString );
305305
myControlString = QString( "0" ) + QChar( 176 ) +
306-
QString( "00'00.00000" ) +
307-
QString( '"' ) +
306+
QString( "00" ) + QChar( 0x2032 ) + QString( "00.00000" ) +
307+
QChar( 0x2033 ) +
308308
QString( ",0" ) + QChar( 176 ) +
309-
QString( "00'00.00360\"S" );
309+
QString( "00" ) + QChar( 0x2032 ) + QString( "00.00360" ) + QChar( 0x2033 ) + QString( "S" );
310310
QCOMPARE( QgsPoint( 0, -0.000001 ).toDegreesMinutesSeconds( 5, true, true ), myControlString );
311311
myControlString = QString( "0" ) + QChar( 176 ) +
312-
QString( "00'00.00360\"E" ) +
312+
QString( "00" ) + QChar( 0x2032 ) + QString( "00.00360" ) + QChar( 0x2033 ) + QString( "E" ) +
313313
QString( ",0" ) + QChar( 176 ) +
314-
QString( "00'00.00000" ) + QString( '"' );
314+
QString( "00" ) + QChar( 0x2032 ) + QString( "00.00000" ) + QChar( 0x2033 );
315315
QCOMPARE( QgsPoint( 0.000001, 0 ).toDegreesMinutesSeconds( 5, true, true ), myControlString );
316316
myControlString = QString( "0" ) + QChar( 176 ) +
317-
QString( "00'00.00360\"W" ) +
317+
QString( "00" ) + QChar( 0x2032 ) + QString( "00.00360" ) + QChar( 0x2033 ) + QString( "W" ) +
318318
QString( ",0" ) + QChar( 176 ) +
319-
QString( "00'00.00000" ) + QString( '"' );
319+
QString( "00" ) + QChar( 0x2032 ) + QString( "00.00000" ) + QChar( 0x2033 );
320320
QCOMPARE( QgsPoint( -0.000001, 0 ).toDegreesMinutesSeconds( 5, true, true ), myControlString );
321321
}
322322

@@ -330,117 +330,117 @@ void TestQgsPoint::toDegreesMinutes()
330330

331331
qDebug() << mPoint4.toDegreesMinutes( 2 );
332332
QString myControlString = QString( "80" ) + QChar( 176 ) +
333-
QString( "0.00'" ) +
333+
QString( "0.00" ) + QChar( 0x2032 ) +
334334
QString( "E,20" ) + QChar( 176 ) +
335-
QString( "0.00'N" );
335+
QString( "0.00" ) + QChar( 0x2032 ) + QString( "N" );
336336
qDebug() << myControlString;
337337
QCOMPARE( mPoint4.toDegreesMinutes( 2 ), myControlString );
338338

339339
//check if longitudes > 180 or <-180 wrap around
340340
myControlString = QString( "10" ) + QChar( 176 ) +
341-
QString( "0.00'E" ) +
341+
QString( "0.00" ) + QChar( 0x2032 ) + QString( "E" ) +
342342
QString( ",0" ) + QChar( 176 ) +
343-
QString( "0.00'" );
343+
QString( "0.00" ) + QChar( 0x2032 );
344344
QCOMPARE( QgsPoint( 370, 0 ).toDegreesMinutes( 2 ), myControlString );
345345
myControlString = QString( "10" ) + QChar( 176 ) +
346-
QString( "0.00'W" ) +
346+
QString( "0.00" ) + QChar( 0x2032 ) + QString( "W" ) +
347347
QString( ",0" ) + QChar( 176 ) +
348-
QString( "0.00'" );
348+
QString( "0.00" ) + QChar( 0x2032 );
349349
QCOMPARE( QgsPoint( -370, 0 ).toDegreesMinutes( 2 ), myControlString );
350350
myControlString = QString( "179" ) + QChar( 176 ) +
351-
QString( "0.00'W" ) +
351+
QString( "0.00" ) + QChar( 0x2032 ) + QString( "W" ) +
352352
QString( ",0" ) + QChar( 176 ) +
353-
QString( "0.00'" );
353+
QString( "0.00" ) + QChar( 0x2032 );
354354
QCOMPARE( QgsPoint( 181, 0 ).toDegreesMinutes( 2 ), myControlString );
355355
myControlString = QString( "179" ) + QChar( 176 ) +
356-
QString( "0.00'E" ) +
356+
QString( "0.00" ) + QChar( 0x2032 ) + QString( "E" ) +
357357
QString( ",0" ) + QChar( 176 ) +
358-
QString( "0.00'" );
358+
QString( "0.00" ) + QChar( 0x2032 );
359359
QCOMPARE( QgsPoint( -181, 0 ).toDegreesMinutes( 2 ), myControlString );
360360
myControlString = QString( "1" ) + QChar( 176 ) +
361-
QString( "0.00'W" ) +
361+
QString( "0.00" ) + QChar( 0x2032 ) + QString( "W" ) +
362362
QString( ",0" ) + QChar( 176 ) +
363-
QString( "0.00'" );
363+
QString( "0.00" ) + QChar( 0x2032 );
364364
QCOMPARE( QgsPoint( 359, 0 ).toDegreesMinutes( 2 ), myControlString );
365365
myControlString = QString( "1" ) + QChar( 176 ) +
366-
QString( "0.00'E" ) +
366+
QString( "0.00" ) + QChar( 0x2032 ) + QString( "E" ) +
367367
QString( ",0" ) + QChar( 176 ) +
368-
QString( "0.00'" );
368+
QString( "0.00" ) + QChar( 0x2032 );
369369
QCOMPARE( QgsPoint( -359, 0 ).toDegreesMinutes( 2 ), myControlString );
370370

371371
//should be no directional suffixes for 0 degree coordinates
372372
myControlString = QString( "0" ) + QChar( 176 ) +
373-
QString( "0.00'" ) +
373+
QString( "0.00" ) + QChar( 0x2032 ) +
374374
QString( ",0" ) + QChar( 176 ) +
375-
QString( "0.00'" );
375+
QString( "0.00" ) + QChar( 0x2032 );
376376
QVERIFY( QgsPoint( 0, 0 ).toDegreesMinutes( 2 ) == myControlString );
377377
//should also be no directional suffix for 0 degree coordinates within specified precision
378378
QCOMPARE( QgsPoint( 0, 0.000001 ).toDegreesMinutes( 2 ), myControlString );
379379
QCOMPARE( QgsPoint( 0, -0.000001 ).toDegreesMinutes( 2 ), myControlString );
380380
QCOMPARE( QgsPoint( -0.000001, 0 ).toDegreesMinutes( 2 ), myControlString );
381381
QCOMPARE( QgsPoint( 0.000001, 0 ).toDegreesMinutes( 2 ), myControlString );
382382
myControlString = QString( "0" ) + QChar( 176 ) +
383-
QString( "0.00000'" ) +
383+
QString( "0.00000" ) + QChar( 0x2032 ) +
384384
QString( ",0" ) + QChar( 176 ) +
385-
QString( "0.00006'N" );
385+
QString( "0.00006" ) + QChar( 0x2032 ) + QString( "N" );
386386
QCOMPARE( QgsPoint( 0, 0.000001 ).toDegreesMinutes( 5 ), myControlString );
387387
myControlString = QString( "0" ) + QChar( 176 ) +
388-
QString( "0.00000'" ) +
388+
QString( "0.00000" ) + QChar( 0x2032 ) +
389389
QString( ",0" ) + QChar( 176 ) +
390-
QString( "0.00006'S" );
390+
QString( "0.00006" ) + QChar( 0x2032 ) + QString( "S" );
391391
QCOMPARE( QgsPoint( 0, -0.000001 ).toDegreesMinutes( 5 ), myControlString );
392392
myControlString = QString( "0" ) + QChar( 176 ) +
393-
QString( "0.00006'E" ) +
393+
QString( "0.00006" ) + QChar( 0x2032 ) + QString( "E" ) +
394394
QString( ",0" ) + QChar( 176 ) +
395-
QString( "0.00000'" );
395+
QString( "0.00000" ) + QChar( 0x2032 );
396396
QCOMPARE( QgsPoint( 0.000001, 0 ).toDegreesMinutes( 5 ), myControlString );
397397
myControlString = QString( "0" ) + QChar( 176 ) +
398-
QString( "0.00006'W" ) +
398+
QString( "0.00006" ) + QChar( 0x2032 ) + QString( "W" ) +
399399
QString( ",0" ) + QChar( 176 ) +
400-
QString( "0.00000'" );
400+
QString( "0.00000" ) + QChar( 0x2032 );
401401
QCOMPARE( QgsPoint( -0.000001, 0 ).toDegreesMinutes( 5 ), myControlString );
402402

403403
//test rounding does not create minutes >= 60
404404
myControlString = QString( "100" ) + QChar( 176 ) +
405-
QString( "0.00'E" ) +
405+
QString( "0.00" ) + QChar( 0x2032 ) + QString( "E" ) +
406406
QString( ",100" ) + QChar( 176 ) +
407-
QString( "0.00'N" );
407+
QString( "0.00" ) + QChar( 0x2032 ) + QString( "N" );
408408
QCOMPARE( QgsPoint( 99.999999, 99.999999 ).toDegreesMinutes( 2 ), myControlString );
409409

410410
//should be no directional suffixes for 180 degree longitudes
411411
myControlString = QString( "180" ) + QChar( 176 ) +
412-
QString( "0.00'" ) +
412+
QString( "0.00" ) + QChar( 0x2032 ) +
413413
QString( ",0" ) + QChar( 176 ) +
414-
QString( "0.00'" );
414+
QString( "0.00" ) + QChar( 0x2032 );
415415
QCOMPARE( QgsPoint( 180, 0 ).toDegreesMinutes( 2 ), myControlString );
416416
//should also be no directional suffix for 180 degree longitudes within specified precision
417417
QCOMPARE( QgsPoint( 180.000001, 0 ).toDegreesMinutes( 2 ), myControlString );
418418
QCOMPARE( QgsPoint( 179.999999, 0 ).toDegreesMinutes( 2 ), myControlString );
419419
myControlString = QString( "179" ) + QChar( 176 ) +
420-
QString( "59.99994'W" ) +
420+
QString( "59.99994" ) + QChar( 0x2032 ) + QString( "W" ) +
421421
QString( ",0" ) + QChar( 176 ) +
422-
QString( "0.00000'" );
422+
QString( "0.00000" ) + QChar( 0x2032 );
423423
QCOMPARE( QgsPoint( 180.000001, 0 ).toDegreesMinutes( 5 ), myControlString );
424424
myControlString = QString( "179" ) + QChar( 176 ) +
425-
QString( "59.99994'E" ) +
425+
QString( "59.99994" ) + QChar( 0x2032 ) + QString( "E" ) +
426426
QString( ",0" ) + QChar( 176 ) +
427-
QString( "0.00000'" );
427+
QString( "0.00000" ) + QChar( 0x2032 );
428428
QCOMPARE( QgsPoint( 179.999999, 0 ).toDegreesMinutes( 5 ), myControlString );
429429
}
430430

431431
void TestQgsPoint::toDegreesMinutesNoSuffix()
432432
{
433433
QString myControlString = QString( "80" ) + QChar( 176 ) +
434-
QString( "0.00'" ) +
434+
QString( "0.00" ) + QChar( 0x2032 ) +
435435
QString( ",20" ) + QChar( 176 ) +
436-
QString( "0.00'" );
436+
QString( "0.00" ) + QChar( 0x2032 );
437437
QCOMPARE( mPoint4.toDegreesMinutes( 2, false ), myControlString );
438438

439439
//test 0 lat/long
440440
myControlString = QString( "0" ) + QChar( 176 ) +
441-
QString( "0.00'" ) +
441+
QString( "0.00" ) + QChar( 0x2032 ) +
442442
QString( ",0" ) + QChar( 176 ) +
443-
QString( "0.00'" );
443+
QString( "0.00" ) + QChar( 0x2032 );
444444
QVERIFY( QgsPoint( 0, 0 ).toDegreesMinutes( 2, false ) == myControlString );
445445
//test near zero lat/long
446446
QCOMPARE( QgsPoint( 0, 0.000001 ).toDegreesMinutes( 2, false ), myControlString );
@@ -450,66 +450,66 @@ void TestQgsPoint::toDegreesMinutesNoSuffix()
450450
QCOMPARE( QgsPoint( -0.000001, 0 ).toDegreesMinutes( 2, false ), myControlString );
451451

452452
myControlString = QString( "0" ) + QChar( 176 ) +
453-
QString( "0.00000'" ) +
453+
QString( "0.00000" ) + QChar( 0x2032 ) +
454454
QString( ",0" ) + QChar( 176 ) +
455-
QString( "0.00006'" );
455+
QString( "0.00006" ) + QChar( 0x2032 );
456456
QCOMPARE( QgsPoint( 0, 0.000001 ).toDegreesMinutes( 5, false ), myControlString );
457457
myControlString = QString( "0" ) + QChar( 176 ) +
458-
QString( "0.00000'" ) +
458+
QString( "0.00000" ) + QChar( 0x2032 ) +
459459
QString( ",-0" ) + QChar( 176 ) +
460-
QString( "0.00006'" );
460+
QString( "0.00006" ) + QChar( 0x2032 );
461461
QCOMPARE( QgsPoint( 0, -0.000001 ).toDegreesMinutes( 5, false ), myControlString );
462462
myControlString = QString( "0" ) + QChar( 176 ) +
463-
QString( "0.00006'" ) +
463+
QString( "0.00006" ) + QChar( 0x2032 ) +
464464
QString( ",0" ) + QChar( 176 ) +
465-
QString( "0.00000'" );
465+
QString( "0.00000" ) + QChar( 0x2032 );
466466
QCOMPARE( QgsPoint( 0.000001, 0 ).toDegreesMinutes( 5, false ), myControlString );
467467
myControlString = QString( "-0" ) + QChar( 176 ) +
468-
QString( "0.00006'" ) +
468+
QString( "0.00006" ) + QChar( 0x2032 ) +
469469
QString( ",0" ) + QChar( 176 ) +
470-
QString( "0.00000'" );
470+
QString( "0.00000" ) + QChar( 0x2032 );
471471
QCOMPARE( QgsPoint( -0.000001, 0 ).toDegreesMinutes( 5, false ), myControlString );
472472
}
473473

474474
void TestQgsPoint::toDegreesMinutesPadded()
475475
{
476476
QString myControlString = QString( "80" ) + QChar( 176 ) +
477-
QString( "00.00'" ) +
477+
QString( "00.00" ) + QChar( 0x2032 ) +
478478
QString( "E,20" ) + QChar( 176 ) +
479-
QString( "00.00'N" );
479+
QString( "00.00" ) + QChar( 0x2032 ) + QString( "N" );
480480
qDebug() << myControlString;
481481
QCOMPARE( mPoint4.toDegreesMinutes( 2, true, true ), myControlString );
482482

483483
//should be no directional suffixes for 0 degree coordinates
484484
myControlString = QString( "0" ) + QChar( 176 ) +
485-
QString( "00.00'" ) +
485+
QString( "00.00" ) + QChar( 0x2032 ) +
486486
QString( ",0" ) + QChar( 176 ) +
487-
QString( "00.00'" );
487+
QString( "00.00" ) + QChar( 0x2032 );
488488
QVERIFY( QgsPoint( 0, 0 ).toDegreesMinutes( 2, true, true ) == myControlString );
489489
//should also be no directional suffix for 0 degree coordinates within specified precision
490490
QCOMPARE( QgsPoint( 0, 0.000001 ).toDegreesMinutes( 2, true, true ), myControlString );
491491
QCOMPARE( QgsPoint( 0, -0.000001 ).toDegreesMinutes( 2, true, true ), myControlString );
492492
QCOMPARE( QgsPoint( -0.000001, 0 ).toDegreesMinutes( 2, true, true ), myControlString );
493493
QCOMPARE( QgsPoint( 0.000001, 0 ).toDegreesMinutes( 2, true, true ), myControlString );
494494
myControlString = QString( "0" ) + QChar( 176 ) +
495-
QString( "00.00000'" ) +
495+
QString( "00.00000" ) + QChar( 0x2032 ) +
496496
QString( ",0" ) + QChar( 176 ) +
497-
QString( "00.00006'N" );
497+
QString( "00.00006" ) + QChar( 0x2032 ) + QString( "N" );
498498
QCOMPARE( QgsPoint( 0, 0.000001 ).toDegreesMinutes( 5, true, true ), myControlString );
499499
myControlString = QString( "0" ) + QChar( 176 ) +
500-
QString( "00.00000'" ) +
500+
QString( "00.00000" ) + QChar( 0x2032 ) +
501501
QString( ",0" ) + QChar( 176 ) +
502-
QString( "00.00006'S" );
502+
QString( "00.00006" ) + QChar( 0x2032 ) + QString( "S" );
503503
QCOMPARE( QgsPoint( 0, -0.000001 ).toDegreesMinutes( 5, true, true ), myControlString );
504504
myControlString = QString( "0" ) + QChar( 176 ) +
505-
QString( "00.00006'E" ) +
505+
QString( "00.00006" ) + QChar( 0x2032 ) + QString( "E" ) +
506506
QString( ",0" ) + QChar( 176 ) +
507-
QString( "00.00000'" );
507+
QString( "00.00000" ) + QChar( 0x2032 );
508508
QCOMPARE( QgsPoint( 0.000001, 0 ).toDegreesMinutes( 5, true, true ), myControlString );
509509
myControlString = QString( "0" ) + QChar( 176 ) +
510-
QString( "00.00006'W" ) +
510+
QString( "00.00006" ) + QChar( 0x2032 ) + QString( "W" ) +
511511
QString( ",0" ) + QChar( 176 ) +
512-
QString( "00.00000'" );
512+
QString( "00.00000" ) + QChar( 0x2032 );
513513
QCOMPARE( QgsPoint( -0.000001, 0 ).toDegreesMinutes( 5, true, true ), myControlString );
514514
}
515515

0 commit comments

Comments
 (0)
Please sign in to comment.