Maintain geolocation data format through serialization.

Author: miciasto

CliClient/tests/models_BaseItem.js

@@ -58,15 +58,38 @@ describe('models_BaseItem', function() {
 	}));
 
 	it('should correctly unserialize note timestamps', asyncTest(async () => {
-		let folder = await Folder.save({ title: 'folder' });
+		const folder = await Folder.save({ title: 'folder' });
 		let note = await Note.save({ title: 'note', parent_id: folder.id });
 
-		let serialized = await Note.serialize(note);
-		let unserialized = await Note.unserialize(serialized);
+		const serialized = await Note.serialize(note);
+		const unserialized = await Note.unserialize(serialized);
 
 		expect(unserialized.created_time).toEqual(note.created_time);
 		expect(unserialized.updated_time).toEqual(note.updated_time);
 		expect(unserialized.user_created_time).toEqual(note.user_created_time);
 		expect(unserialized.user_updated_time).toEqual(note.user_updated_time);
+    }));
+
+	it('should serialize geolocation fields', asyncTest(async () => {
+		const folder = await Folder.save({ title: 'folder' });
+		let note = await Note.save({ title: 'note', parent_id: folder.id });
+		note = await Note.load(note.id);
+
+		let serialized = await Note.serialize(note);
+		let unserialized = await Note.unserialize(serialized);
+
+		expect(unserialized.latitude).toEqual('0.00000000');
+		expect(unserialized.longitude).toEqual('0.00000000');
+		expect(unserialized.altitude).toEqual('0.0000');
+
+		await Note.updateGeolocation(note.id);
+		note = await Note.load(note.id);
+
+		serialized = await Note.serialize(note);
+		unserialized = await Note.unserialize(serialized);
+
+		expect(unserialized.latitude).toEqual(note.latitude);
+		expect(unserialized.longitude).toEqual(note.longitude);
+		expect(unserialized.altitude).toEqual(note.altitude);
 	}));
 });

ReactNativeClient/lib/models/BaseItem.js

@@ -255,14 +255,17 @@ class BaseItem extends BaseModel {
 		const ItemClass = this.itemClass(type);
 
 		if (['title_diff', 'body_diff'].indexOf(propName) >= 0) {
-			if (!propValue) return '';
-			propValue = JSON.parse(propValue);
-		} else {
+ 			if (!propValue) return '';
+ 			propValue = JSON.parse(propValue);
+		} else if (['longitude', 'latitude', 'altitude'].indexOf(propName) >= 0) {
+			const places = (propName === 'altitude') ? 4 : 8;
+			propValue = Number(propValue).toFixed(places);
+ 		} else {
 			if (['created_time', 'updated_time', 'user_created_time', 'user_updated_time'].indexOf(propName) >= 0) {
 				propValue = (!propValue) ? '0' : moment(propValue, 'YYYY-MM-DDTHH:mm:ss.SSSZ').format('x');
 			}
 			propValue = Database.formatValue(ItemClass.fieldType(propName), propValue);
-		}
+ 		}
 
 		return propValue;
 	}