Yurik has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/328328 )
Change subject: Bumped shared lib - map: protocol support
......................................................................
Bumped shared lib - map: protocol support
Bug: T153610
Bug: T153734
Change-Id: Ibb9ac018dc06b0dc278f58b4d44a41cc4abfec60
---
M lib/graph2.compiled.js
1 file changed, 33 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Graph
refs/changes/28/328328/1
diff --git a/lib/graph2.compiled.js b/lib/graph2.compiled.js
index 14d7770..8c66667 100644
--- a/lib/graph2.compiled.js
+++ b/lib/graph2.compiled.js
@@ -355,6 +355,7 @@
case 'wikiraw:':
case 'tabular:':
+ case 'map:':
// wikiraw:///MyPage/data
// Get content of a wiki page, where the path is the title
// of the page with an additional leading '/' which gets
removed.
@@ -548,16 +549,40 @@
}
break;
case 'tabular:':
+ case 'map:':
data = this.parseMWApiResponse(data).jsondata;
- var fields = data.schema.fields.map(function(v) { return v.name;
});
- data.data = data.data.map(function(v) {
- var row = {}, i;
- for (i = 0; i < fields.length; i++) {
- // Need to copy nulls too -- Vega has no easy way to test
for undefined
- row[fields[i]] = v[i];
+ var metadata = [{
+ description: data.description,
+ license_code: data.license.code,
+ license_text: data.license.text,
+ license_url: data.license.url,
+ sources: data.sources
+ }];
+ if (opt.graphProtocol === 'tabular:') {
+ var fields = data.schema.fields.map(function (v) {
+ return v.name;
+ });
+ data = {
+ meta: metadata,
+ fields: data.schema.fields,
+ data: data.data.map(function (v) {
+ var row = {}, i;
+ for (i = 0; i < fields.length; i++) {
+ // Need to copy nulls too -- Vega has no easy way
to test for undefined
+ row[fields[i]] = v[i];
+ }
+ return row;
+ })
}
- return row;
- });
+ } else {
+ metadata[0].zoom = data.zoom;
+ metadata[0].latitude = data.latitude;
+ metadata[0].longitude = data.longitude;
+ data = {
+ meta: metadata,
+ data: data.data
+ };
+ }
break;
case 'wikidatasparql:':
data = JSON.parse(data);
--
To view, visit https://gerrit.wikimedia.org/r/328328
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb9ac018dc06b0dc278f58b4d44a41cc4abfec60
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: master
Gerrit-Owner: Yurik <yu...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
