enhancement: staticMap updated with more options for more flexibility…

…. Test updated to reflect changes.
vue-generators · Sep 14, 2016 · 65c8ac2 · 65c8ac2
1 parent 67ed6f3
commit 65c8ac2
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 6 deletions.
diff --git a/src/fields/fieldStaticMap.vue b/src/fields/fieldStaticMap.vue
@@ -4,14 +4,36 @@
 
 <script>
 	import abstractField from "./abstractField";
+	import { defaults } from "lodash";
 
 	export default {
 		mixins: [ abstractField ],
 
 		computed: {
 			mapLink() {
-				if (this.value && this.value.lat && this.value.lng)
-					return `http://maps.googleapis.com/maps/api/staticmap?center=${this.value.lat},${this.value.lng}&zoom=8&scale=false&size=800x300&maptype=roadmap&format=png&visual_refresh=true&markers=size:mid%7Ccolor:0xff0000`;
+				if (this.value) {
+					let lat, lng;
+					let options = defaults(this.schema.staticMapOptions || {}, {
+						lat: "lat",
+						lng: "lng",
+						zoom: 8,
+						sizeX:640,
+						sizeY:640,
+					});
+
+					lat = this.value[options.lat];
+					lng = this.value[options.lng];
+					
+					let url = `http://maps.googleapis.com/maps/api/staticmap?center=${lat},${lng}&zoom=${options.zoom}&size=${options.sizeX}x${options.sizeY}`;
+					
+					let props = ["scale", "format", "maptype", "language", "region", "markers", "path", "visible", "style", "key", "signature"];
+					for (let prop of props) {
+						if (typeof options[prop] !== "undefined") {
+							url += `&${prop}=${options[prop]}`;
+						}
+					}
+					if (lat && lng){ return url; }
+				}
 			}
 		}
 	};
@@ -24,3 +46,5 @@
 		max-width: 100%;
 	}
 </style>
+
+
diff --git a/test/unit/specs/fields/fieldStaticMap.spec.js b/test/unit/specs/fields/fieldStaticMap.spec.js
@@ -19,12 +19,24 @@ describe("fieldStaticMap.vue", function() {
 		let schema = {
 			type: "staticMap",
 			label: "Geo",
-			model: "geo"
+			model: "geo",
+			staticMapOptions: {
+				lat: "latitude",
+				lng: "longitude",
+				zoom: 6,
+				sizeX:640,
+				sizeY:640,
+				scale: 1,
+				format:"png",
+				maptype:"satellite",
+				language:"FR-fr",
+				markers:"size:mid%7Ccolor:0xff0000",
+			}
 		};
 		let model = {
 			geo: {
-				lat: 13.4567,
-				lng: 20.3321
+				latitude: 13.4567,
+				longitude: 20.3321
 			}
 		};
 		let input;
@@ -39,7 +51,7 @@ describe("fieldStaticMap.vue", function() {
 			expect(field.$el).to.be.exist;
 
 			expect(input).to.be.defined;
-			expect(input.src).to.be.equal("http://maps.googleapis.com/maps/api/staticmap?center=13.4567,20.3321&zoom=8&scale=false&size=800x300&maptype=roadmap&format=png&visual_refresh=true&markers=size:mid%7Ccolor:0xff0000");
+			expect(input.src).to.be.equal("http://maps.googleapis.com/maps/api/staticmap?center=13.4567,20.3321&zoom=6&size=640x640&scale=1&format=png&maptype=satellite&language=FR-fr&markers=size:mid%7Ccolor:0xff0000");
 		});
 
 	});