Skip to content

enhancement: staticMap updated with more options for more flexibility… #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
icebob merged 1 commit into from
Sep 14, 2016
Merged

enhancement: staticMap updated with more options for more flexibility… #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions src/fields/fieldStaticMap.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}
}
}
};
Expand All @@ -24,3 +46,5 @@
max-width: 100%;
}
</style>


20 changes: 16 additions & 4 deletions test/unit/specs/fields/fieldStaticMap.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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");
});

});
Expand Down