Merge branch 'bugfix-12142' into release-6.6.4

livecodemichael · livecodemichael · commit b7c680a64538 · 2014-10-13T14:38:05.000+01:00
diff --git a/docs/notes/bugfix-12142.md b/docs/notes/bugfix-12142.md
@@ -0,0 +1 @@
+#     mobileSensorReading("location", false) returns different data compared to mobileCurrentLocation() on Simulator
diff --git a/engine/src/mblsensor.cpp b/engine/src/mblsensor.cpp
@@ -204,7 +204,8 @@ void MCSensorGetLocationOfDevice(MCExecContext& ctxt, char *&r_location)
     if (MCSystemGetLocationReading(t_reading, false))
     {
         r_location = nil;
-        MCCStringFormat(r_location, "%Lf,%Lf,%Lf", t_reading.latitude, t_reading.longitude, t_reading.altitude);
+        // PM-2014-10-09: [[ Bug 12142 ]] The old %Lf format worked for device but failed on simulator.
+        MCCStringFormat(r_location, "%lf,%lf,%lf", t_reading.latitude, t_reading.longitude, t_reading.altitude);
     }
 #endif /* MCSensorGetLocationOfDevice */
 }
@@ -256,7 +257,8 @@ void MCSensorGetHeadingOfDevice(MCExecContext& ctxt, char *&r_heading)
     if (MCSystemGetHeadingReading(t_reading, true))
     {
         r_heading = nil;
-        MCCStringFormat(r_heading, "%Lf", t_reading.heading);
+        // PM-2014-10-09: [[ Bug 12142 ]] The old %Lf format worked for device but failed on simulator. Currently, simulator does not support heading, acceleration or rotation, but since this might change in the future, use %lf instead
+        MCCStringFormat(r_heading, "%lf", t_reading.heading);
     }
 #endif /* MCSensorGetHeadingOfDevice */
 }
@@ -296,7 +298,8 @@ void MCSensorGetAccelerationOfDevice(MCExecContext& ctxt, char *&r_acceleration)
     if (MCSystemGetAccelerationReading(t_reading, true))
     {
         r_acceleration = nil;
-        MCCStringFormat(r_acceleration, "%Lf,%Lf,%Lf", t_reading.x, t_reading.y, t_reading.z);
+        // PM-2014-10-09: [[ Bug 12142 ]] The old %Lf format worked for device but failed on simulator. Currently, simulator does not support heading, acceleration or rotation, but since this might change in the future, use %lf instead
+        MCCStringFormat(r_acceleration, "%lf,%lf,%lf", t_reading.x, t_reading.y, t_reading.z);
     }
 #endif /* MCSensorGetAccelerationOfDevice */
 }
@@ -336,7 +339,8 @@ void MCSensorGetRotationRateOfDevice(MCExecContext& ctxt, char *&r_rotation_rate
     if (MCSystemGetRotationRateReading(t_reading, true))
     {
         r_rotation_rate = nil;
-        MCCStringFormat(r_rotation_rate, "%Lf,%Lf,%Lf", t_reading.x, t_reading.y, t_reading.z);
+        // PM-2014-10-09: [[ Bug 12142 ]] The old %Lf format worked for device but failed on simulator. Currently, simulator does not support heading, acceleration or rotation, but since this might change in the future, use %lf instead
+        MCCStringFormat(r_rotation_rate, "%lf,%lf,%lf", t_reading.x, t_reading.y, t_reading.z);
     }
 #endif /* MCSensorGetRotationRateOfDevice */
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# mobileSensorReading("location", false) returns different data compared to mobileCurrentLocation() on Simulator`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,8 @@ void MCSensorGetLocationOfDevice(MCExecContext& ctxt, char *&r_location)`
`204`	`204`	`if (MCSystemGetLocationReading(t_reading, false))`
`205`	`205`	`{`
`206`	`206`	`r_location = nil;`
`207`		`- MCCStringFormat(r_location, "%Lf,%Lf,%Lf", t_reading.latitude, t_reading.longitude, t_reading.altitude);`
	`207`	`+ // PM-2014-10-09: [[ Bug 12142 ]] The old %Lf format worked for device but failed on simulator.`
	`208`	`+ MCCStringFormat(r_location, "%lf,%lf,%lf", t_reading.latitude, t_reading.longitude, t_reading.altitude);`
`208`	`209`	`}`
`209`	`210`	`#endif /* MCSensorGetLocationOfDevice */`
`210`	`211`	`}`
`@@ -256,7 +257,8 @@ void MCSensorGetHeadingOfDevice(MCExecContext& ctxt, char *&r_heading)`
`256`	`257`	`if (MCSystemGetHeadingReading(t_reading, true))`
`257`	`258`	`{`
`258`	`259`	`r_heading = nil;`
`259`		`- MCCStringFormat(r_heading, "%Lf", t_reading.heading);`
	`260`	`+ // PM-2014-10-09: [[ Bug 12142 ]] The old %Lf format worked for device but failed on simulator. Currently, simulator does not support heading, acceleration or rotation, but since this might change in the future, use %lf instead`
	`261`	`+ MCCStringFormat(r_heading, "%lf", t_reading.heading);`
`260`	`262`	`}`
`261`	`263`	`#endif /* MCSensorGetHeadingOfDevice */`
`262`	`264`	`}`
`@@ -296,7 +298,8 @@ void MCSensorGetAccelerationOfDevice(MCExecContext& ctxt, char *&r_acceleration)`
`296`	`298`	`if (MCSystemGetAccelerationReading(t_reading, true))`
`297`	`299`	`{`
`298`	`300`	`r_acceleration = nil;`
`299`		`- MCCStringFormat(r_acceleration, "%Lf,%Lf,%Lf", t_reading.x, t_reading.y, t_reading.z);`
	`301`	`+ // PM-2014-10-09: [[ Bug 12142 ]] The old %Lf format worked for device but failed on simulator. Currently, simulator does not support heading, acceleration or rotation, but since this might change in the future, use %lf instead`
	`302`	`+ MCCStringFormat(r_acceleration, "%lf,%lf,%lf", t_reading.x, t_reading.y, t_reading.z);`
`300`	`303`	`}`
`301`	`304`	`#endif /* MCSensorGetAccelerationOfDevice */`
`302`	`305`	`}`
`@@ -336,7 +339,8 @@ void MCSensorGetRotationRateOfDevice(MCExecContext& ctxt, char *&r_rotation_rate`
`336`	`339`	`if (MCSystemGetRotationRateReading(t_reading, true))`
`337`	`340`	`{`
`338`	`341`	`r_rotation_rate = nil;`
`339`		`- MCCStringFormat(r_rotation_rate, "%Lf,%Lf,%Lf", t_reading.x, t_reading.y, t_reading.z);`
	`342`	`+ // PM-2014-10-09: [[ Bug 12142 ]] The old %Lf format worked for device but failed on simulator. Currently, simulator does not support heading, acceleration or rotation, but since this might change in the future, use %lf instead`
	`343`	`+ MCCStringFormat(r_rotation_rate, "%lf,%lf,%lf", t_reading.x, t_reading.y, t_reading.z);`
`340`	`344`	`}`
`341`	`345`	`#endif /* MCSensorGetRotationRateOfDevice */`
`342`	`346`	`}`