solid-ui 2.4.23 → 2.4.24

package/lib/widgets/forms/autocomplete/publicData.js

@@ -1,9 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -23,35 +21,24 @@ exports.queryPublicDataByName = queryPublicDataByName;
 exports.queryPublicDataConstruct = queryPublicDataConstruct;
 exports.queryPublicDataSelect = queryPublicDataSelect;
 exports.wikidataParameters = exports.wikidataOutgoingClassMap = exports.wikidataIncomingClassMap = exports.wikidataClasses = exports.variableNameToPredicateMap = void 0;
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _rdflib = require("rdflib");
-
 var _solidLogic = require("solid-logic");
-
 var debug = _interopRequireWildcard(require("../../../debug"));
-
 var ns = _interopRequireWildcard(require("../../../ns"));
-
 var _language = require("./language");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 /* Logic to access public data stores
 *
 * including filtering resut by natural language etc
 * See https://solidos.solidcommunity.net/public/2021/01%20Building%20Solid%20Apps%20which%20use%20Public%20Data.html
 */
-
 /* eslint-disable no-console */
+
 var AUTOCOMPLETE_LIMIT = 200; // How many to get from server
 // With 3000 we could exceed the wikidata timeout
-
 exports.AUTOCOMPLETE_LIMIT = AUTOCOMPLETE_LIMIT;
 var subjectRegexp = /\$\(subject\)/g;
 // Schema.org seems to suggest NGOs are non-profit and Corporaions are for-profit
@@ -89,10 +76,10 @@ exports.fetcherOptionsJsonPublicData = fetcherOptionsJsonPublicData;
 var escoParameters = {
   label: 'ESCO',
   logo: _solidLogic.store.sym('https://ec.europa.eu/esco/portal/static_resource2/images/logo/logo_en.gif'),
-  searchByNameURI: 'https://ec.europa.eu/esco/api/search?language=$(language)&type=occupation&text=$(name)' // endpoint: undefined
+  searchByNameURI: 'https://ec.europa.eu/esco/api/search?language=$(language)&type=occupation&text=$(name)'
+  // endpoint: undefined
   // returnFormat: 'ESCO',
   // targetClass: {}
-
 };
 exports.escoParameters = escoParameters;
 var dbpediaParameters = {
@@ -123,6 +110,7 @@ var wikidataParameters = {
   endpoint: 'https://query.wikidata.org/sparql',
   searchByNameQuery: "SELECT ?subject ?name\n  WHERE {\n    ?klass wdt:P279* $(targetClass) .\n    ?subject wdt:P31 ?klass .\n    ?subject rdfs:label ?name.\n    FILTER regex(?name, \"$(name)\", \"i\")\n  } LIMIT $(limit) ",
   // was SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en" }
+
   insitituteDetailsQuery: "CONSTRUCT\n{  wd:Q49108 schema:name ?itemLabel;\n             schema:logo ?logo;\n              schema:logo  ?sealImage;\n             schema:subOrganization  ?subsidiary .\n                 ?subsidiary schema:name ?subsidiaryLabel .\n}\nWHERE\n{\n   wd:Q49108 # rdfs:label ?itemLabel ;\n             wdt:P154 ?logo;\n              wdt:P158  ?sealImage ;\n             wdt:P355  ?subsidiary .\n          #  ?subsidiary rdfs:label ?subsidiaryLabel .\n\n  SERVICE wikibase:label { bd:serviceParam wikibase:language \"[AUTO_LANGUAGE], fr\". }\n}"
 };
 exports.wikidataParameters = wikidataParameters;
@@ -142,7 +130,6 @@ var wikidataIncomingClassMap = {
   'http://www.wikidata.org/entity/Q2221906': ns.schema('Place'),
   // geographic location
   'http://www.wikidata.org/entity/Q167037': ns.schema('Corporation') // Corporation
-
 };
 exports.wikidataIncomingClassMap = wikidataIncomingClassMap;
 var variableNameToPredicateMap = {
@@ -163,10 +150,8 @@ var variableNameToPredicateMap = {
   "long": ns.schema('longitude')
 };
 exports.variableNameToPredicateMap = variableNameToPredicateMap;
-
 function bindingToTerm(item) {
   var typ = item.type.toLowerCase();
-
   if (typ === 'uri' || typ === 'iri') {
     return _solidLogic.store.sym(item.value);
   } else if (typ === 'literal') {
@@ -179,7 +164,6 @@ function bindingToTerm(item) {
     throw new Error("bindingToTerm: Unexpected type \"".concat(item.type, "\" in sparql binding}"));
   }
 }
-
 function loadFromBindings(kb, solidSubject, bindings, doc) {
   var predMap = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : variableNameToPredicateMap;
   var results = {};
@@ -189,21 +173,18 @@ function loadFromBindings(kb, solidSubject, bindings, doc) {
     for (var key in binding) {
       var result = binding[key];
       var combined = JSON.stringify(result); // ( result.type, result.value )
-
       results[key] = results[key] || new Set();
       results[key].add(combined); // remove duplicates
     }
   });
-
   var _loop = function _loop(key) {
     var values = results[key];
     debug.log("    results ".concat(key, " -> ").concat(values));
     values.forEach(function (combined) {
       var result = JSON.parse(combined);
       var type = result.type,
-          value = result.value;
+        value = result.value;
       var obj;
-
       if (type === 'uri') {
         obj = kb.sym(value);
       } else if (type === 'literal') {
@@ -211,7 +192,6 @@ function loadFromBindings(kb, solidSubject, bindings, doc) {
       } else {
         throw new Error("loadFromBindings:  unexpected type: ".concat(type));
       }
-
       if (key === 'type') {
         if (wikidataIncomingClassMap[value]) {
           obj = wikidataIncomingClassMap[value];
@@ -220,14 +200,12 @@ function loadFromBindings(kb, solidSubject, bindings, doc) {
         }
       } else if (key === 'coordinates') {
         // const latlong = value // Like 'Point(-71.106111111 42.375)'
-        debug.log('         @@@ hey a point: ' + value); // const regexp = /.*\(([-0-9\.-]*) ([-0-9\.-]*)\)/
-
+        debug.log('         @@@ hey a point: ' + value);
+        // const regexp = /.*\(([-0-9\.-]*) ([-0-9\.-]*)\)/
         var regexp = /.*\(([-0-9.-]*) ([-0-9.-]*)\)/;
         var match = regexp.exec(value);
-
         if (match) {
           var _float = ns.xsd('float');
-
           var latitude = new _rdflib.Literal(match[1], null, _float);
           var longitude = new _rdflib.Literal(match[2], null, _float);
           kb.add(solidSubject, ns.schema('longitude'), longitude, doc);
@@ -237,29 +215,23 @@ function loadFromBindings(kb, solidSubject, bindings, doc) {
         }
       } else {
         var pred = predMap[key] || ns.schema(key); // fallback to just using schema.org
-
         kb.add(solidSubject, pred, obj, doc); // @@ deal with non-string and objects
-
         debug.log("  public data ".concat(pred, " ").concat(obj, "."));
       }
     });
   };
-
   for (var key in results) {
     _loop(key);
   }
 }
+
 /* ESCO sopecific
 */
-
-
 function ESCOResultToBindings(json) {
   var results = json._embedded.results; // Array
-
   var bindings = results.map(function (result) {
     var name = result.title;
     var uri = result.uri; // like http://data.europa.eu/esco/occupation/57af9090-55b4-4911-b2d0-86db01c00b02
-
     return {
       name: {
         value: name,
@@ -271,12 +243,12 @@ function ESCOResultToBindings(json) {
       }
     }; // simulate SPARQL bindings
   });
+
   return bindings;
 }
+
 /*  Query all entities of given class and partially matching name
 */
-
-
 function queryESCODataByName(_x, _x2, _x3) {
   return _queryESCODataByName.apply(this, arguments);
 }
@@ -286,12 +258,9 @@ function queryESCODataByName(_x, _x2, _x3) {
 * This will not be needed whn that  WDQS bug fixed.
 * This is aptured in https://github.com/solidos/solid-ui/issues/403
 */
-
-
 function _queryESCODataByName() {
   _queryESCODataByName = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(filter, theClass, queryTarget) {
     var _store$fetcher;
-
     var limit, queryURI, response, text, json;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
@@ -301,34 +270,26 @@ function _queryESCODataByName() {
               _context.next = 2;
               break;
             }
-
             throw new Error('Missing queryTarget.searchByNameURI on queryESCODataByName');
-
           case 2:
             limit = queryTarget.limit || AUTOCOMPLETE_LIMIT;
             queryURI = queryTarget.searchByNameURI.replace('$(name)', filter).replace('$(limit)', '' + limit).replace('$(targetClass)', theClass.toNT());
             debug.log('Querying ESCO data - uri: ' + queryURI);
             _context.next = 7;
             return (_store$fetcher = _solidLogic.store.fetcher) === null || _store$fetcher === void 0 ? void 0 : _store$fetcher.webOperation('GET', queryURI, fetcherOptionsJsonPublicData);
-
           case 7:
             response = _context.sent;
             text = (response === null || response === void 0 ? void 0 : response.responseText) || '';
             debug.log('    Query result  text' + text.slice(0, 500) + '...');
-
             if (!(text.length === 0)) {
               _context.next = 12;
               break;
             }
-
             throw new Error('Wot no text back from ESCO query ' + queryURI);
-
           case 12:
             json = JSON.parse(text); // console.log('Whole JSON return object', json)
-
             debug.log('    ESCO Query result JSON' + JSON.stringify(json, null, 4).slice(0, 500) + '...');
             return _context.abrupt("return", ESCOResultToBindings(json));
-
           case 15:
           case "end":
             return _context.stop();
@@ -338,30 +299,24 @@ function _queryESCODataByName() {
   }));
   return _queryESCODataByName.apply(this, arguments);
 }
-
 function fixWikidataJSON(str) {
   var syntaxProblem = str.indexOf('SPARQL-QUERY');
-  if (syntaxProblem < 0) return str; // console.log('@@ fixWikidataJSON FIXING')
-
+  if (syntaxProblem < 0) return str;
+  // console.log('@@ fixWikidataJSON FIXING')
   debug.warn('  ### Fixing JSON with wikidata error code injection ' + str.slice(syntaxProblem, syntaxProblem + 200));
   var goodness = str.lastIndexOf('}, {');
   return str.slice(0, goodness) + ' } ] } } '; // Close binding, array, bindings, results, root object
 }
 /*  Query all entities of given class and partially matching name
 */
-
-
 function queryPublicDataByName(_x4, _x5, _x6, _x7) {
   return _queryPublicDataByName.apply(this, arguments);
 }
 /* Query a database using SPARQL SELECT
 */
-
-
 function _queryPublicDataByName() {
   _queryPublicDataByName = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(filter, theClass, languages, queryTarget) {
     var substituteStrings, languagePrefs, language, sparql, queryURI, response, _store$fetcher2, text, text2, json, bindings;
-
     return _regenerator["default"].wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
@@ -371,109 +326,82 @@ function _queryPublicDataByName() {
               var u1 = template.replace('$(name)', filter).replace('$(limit)', '' + limit).replace('$(language)', language);
               return u1.replace('$(targetClass)', theClass.toNT());
             };
-
             if (theClass) {
               _context2.next = 3;
               break;
             }
-
             throw new Error('queryPublicDataByName: No class provided');
-
           case 3:
             _context2.next = 5;
             return (0, _language.getPreferredLanguages)();
-
           case 5:
             _context2.t0 = _context2.sent;
-
             if (_context2.t0) {
               _context2.next = 8;
               break;
             }
-
             _context2.t0 = _language.defaultPreferredLanguages;
-
           case 8:
             languagePrefs = _context2.t0;
             language = languagePrefs[0] || 'en';
-
             if (!queryTarget.searchByNameQuery) {
               _context2.next = 16;
               break;
             }
-
             sparql = substituteStrings(queryTarget.searchByNameQuery);
             debug.log('Querying public data - sparql: ' + sparql);
             return _context2.abrupt("return", queryPublicDataSelect(sparql, queryTarget));
-
           case 16:
             if (!queryTarget.searchByNameURI) {
               _context2.next = 46;
               break;
             }
-
             // not sparql - random API
             queryURI = substituteStrings(queryTarget.searchByNameURI);
             _context2.prev = 18;
             _context2.next = 21;
             return (_store$fetcher2 = _solidLogic.store.fetcher) === null || _store$fetcher2 === void 0 ? void 0 : _store$fetcher2.webOperation('GET', queryURI, fetcherOptionsJsonPublicData);
-
           case 21:
             response = _context2.sent;
             _context2.next = 27;
             break;
-
           case 24:
             _context2.prev = 24;
             _context2.t1 = _context2["catch"](18);
             throw new Error("Exception when trying to fetch ".concat(queryURI, " \n ").concat(_context2.t1));
-
           case 27:
             text = response.responseText || ''; // ts
-
             if (!(response.status !== 200)) {
               _context2.next = 30;
               break;
             }
-
             throw new Error("HTTP error status ".concat(response.status, " trying to fetch ").concat(queryURI, " "));
-
           case 30:
             debug.log('    Query result  text' + text.slice(0, 500) + '...');
-
             if (!(text.length === 0)) {
               _context2.next = 33;
               break;
             }
-
             throw new Error('queryPublicDataByName: No text back from public data query ' + queryURI);
-
           case 33:
             text2 = fixWikidataJSON(text); // Kludge: strip of interrupting error message
-
             json = JSON.parse(text2);
             debug.log('    API Query result JSON' + JSON.stringify(json, null, 4).slice(0, 500) + '...');
-
             if (!json._embedded) {
               _context2.next = 42;
               break;
             }
-
             debug.log('      Looks like ESCO');
             bindings = ESCOResultToBindings(json);
             return _context2.abrupt("return", bindings);
-
           case 42:
             alert('Code me: unrecognized API return format');
             throw new Error("*** Need to add code to parse unrecognized API JSON return\n".concat(JSON.stringify(json, null, 4)));
-
           case 44:
             _context2.next = 47;
             break;
-
           case 46:
             throw new Error('Query source must have either rest API or SPARQL endpoint.');
-
           case 47:
           case "end":
             return _context2.stop();
@@ -483,18 +411,14 @@ function _queryPublicDataByName() {
   }));
   return _queryPublicDataByName.apply(this, arguments);
 }
-
 function queryPublicDataSelect(_x8, _x9) {
   return _queryPublicDataSelect.apply(this, arguments);
 }
 /* Load from a database using SPARQL CONSTRUCT
 */
-
-
 function _queryPublicDataSelect() {
   _queryPublicDataSelect = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(sparql, queryTarget) {
     var _store$fetcher3;
-
     var myUrlWithParams, queryURI, headers, options, response, text, text2, json, bindings;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) {
@@ -504,9 +428,7 @@ function _queryPublicDataSelect() {
               _context3.next = 2;
               break;
             }
-
             throw new Error('Missing queryTarget.endpoint required for queryPublicDataSelect');
-
           case 2:
             myUrlWithParams = new URL(queryTarget.endpoint);
             myUrlWithParams.searchParams.append('query', sparql);
@@ -521,25 +443,20 @@ function _queryPublicDataSelect() {
             };
             _context3.next = 11;
             return (_store$fetcher3 = _solidLogic.store.fetcher) === null || _store$fetcher3 === void 0 ? void 0 : _store$fetcher3.webOperation('GET', queryURI, options);
-
           case 11:
             response = _context3.sent;
             text = (response === null || response === void 0 ? void 0 : response.responseText) || '';
-
             if (!(text.length === 0)) {
               _context3.next = 15;
               break;
             }
-
             throw new Error('No text back from query ' + queryURI);
-
           case 15:
             text2 = fixWikidataJSON(text);
             json = JSON.parse(text2);
             debug.log('    Query result JSON' + JSON.stringify(json, null, 4).slice(0, 100) + '...');
             bindings = json.results.bindings;
             return _context3.abrupt("return", bindings);
-
           case 20:
           case "end":
             return _context3.stop();
@@ -549,29 +466,23 @@ function _queryPublicDataSelect() {
   }));
   return _queryPublicDataSelect.apply(this, arguments);
 }
-
 function queryPublicDataConstruct(_x10, _x11, _x12) {
   return _queryPublicDataConstruct.apply(this, arguments);
 }
-
 function _queryPublicDataConstruct() {
   _queryPublicDataConstruct = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(sparql, pubicId, queryTarget) {
     var _store$fetcher4;
-
     var myUrlWithParams, queryURI, headers, options, response, text, report;
     return _regenerator["default"].wrap(function _callee4$(_context4) {
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
             debug.log('queryPublicDataConstruct: sparql:', sparql);
-
             if (queryTarget.endpoint) {
               _context4.next = 3;
               break;
             }
-
             throw new Error('Missing queryTarget.endpoint required for queryPublicDataConstruct');
-
           case 3:
             myUrlWithParams = new URL(queryTarget.endpoint);
             myUrlWithParams.searchParams.append('query', sparql);
@@ -583,27 +494,21 @@ function _queryPublicDataConstruct() {
               credentials: 'omit',
               // CORS // @tsc pain
               headers: headers // ({ Accept: 'text/turtle' } as Headers)
-
             };
             _context4.next = 12;
             return (_store$fetcher4 = _solidLogic.store.fetcher) === null || _store$fetcher4 === void 0 ? void 0 : _store$fetcher4.webOperation('GET', queryURI, options);
-
           case 12:
             response = _context4.sent;
             text = (response === null || response === void 0 ? void 0 : response.responseText) || 'No response text?';
             report = text.length > 500 ? text.slice(0, 200) + ' ... ' + text.slice(-200) : text;
             debug.log('    queryPublicDataConstruct result text:' + report);
-
             if (!(text.length === 0)) {
               _context4.next = 18;
               break;
             }
-
             throw new Error('queryPublicDataConstruct: No text back from construct query:' + queryURI);
-
           case 18:
             (0, _rdflib.parse)(text, _solidLogic.store, pubicId.uri, 'text/turtle');
-
           case 19:
           case "end":
             return _context4.stop();
@@ -613,11 +518,9 @@ function _queryPublicDataConstruct() {
   }));
   return _queryPublicDataConstruct.apply(this, arguments);
 }
-
 function loadPublicDataThing(_x13, _x14, _x15) {
   return _loadPublicDataThing.apply(this, arguments);
 }
-
 function _loadPublicDataThing() {
   _loadPublicDataThing = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(kb, subject, publicDataID) {
     var iDToFetch, headers;
@@ -629,22 +532,17 @@ function _loadPublicDataThing() {
               _context5.next = 4;
               break;
             }
-
             return _context5.abrupt("return", getDbpediaDetails(kb, subject, publicDataID));
-
           case 4:
             if (!publicDataID.uri.match(/^https?:\/\/www\.wikidata\.org\/entity\/.*/)) {
               _context5.next = 9;
               break;
             }
-
             _context5.next = 7;
             return getWikidataDetails(kb, subject, publicDataID);
-
           case 7:
             _context5.next = 13;
             break;
-
           case 9:
             iDToFetch = publicDataID.uri.startsWith('http:') ? kb.sym('https:' + publicDataID.uri.slice(5)) : publicDataID;
             headers = new Headers();
@@ -653,7 +551,6 @@ function _loadPublicDataThing() {
               credentials: 'omit',
               headers: headers
             }));
-
           case 13:
           case "end":
             return _context5.stop();
@@ -663,11 +560,9 @@ function _loadPublicDataThing() {
   }));
   return _loadPublicDataThing.apply(this, arguments);
 }
-
 function getWikidataDetails(_x16, _x17, _x18) {
   return _getWikidataDetails.apply(this, arguments);
 }
-
 function _getWikidataDetails() {
   _getWikidataDetails = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(kb, solidSubject, publicDataID) {
     var subjRegexp, sparql;
@@ -679,10 +574,8 @@ function _getWikidataDetails() {
             sparql = instituteDetailsWikidataQuery.replace(subjRegexp, publicDataID.toNT());
             _context6.next = 4;
             return queryPublicDataConstruct(sparql, publicDataID, wikidataParameters);
-
           case 4:
             debug.log('getWikidataDetails: loaded.', publicDataID);
-
           case 5:
           case "end":
             return _context6.stop();
@@ -692,11 +585,9 @@ function _getWikidataDetails() {
   }));
   return _getWikidataDetails.apply(this, arguments);
 }
-
 function getWikidataDetailsOld(_x19, _x20, _x21) {
   return _getWikidataDetailsOld.apply(this, arguments);
 }
-
 function _getWikidataDetailsOld() {
   _getWikidataDetailsOld = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(kb, solidSubject, publicDataID) {
     var sparql, bindings;
@@ -707,11 +598,9 @@ function _getWikidataDetailsOld() {
             sparql = "select distinct *  where {\n  optional { $(subject)  wdt:P31  ?targetClass } # instance of\n  optional { $(subject)  wdt:P154  ?logo }\n  optional { $(subject)  wdt:P158  ?sealImage }\n# optional { $(subject)  wdt:P159  ?headquartersLocation }\n\noptional { $(subject)  wdt:P17  ?country }\noptional { $(subject)  wdt:P18  ?image }\noptional { $(subject)  wdt:P1813  ?shortName }\n\noptional { $(subject)  wdt:P355  ?subsidiary }\n# SERVICE wikibase:label { bd:serviceParam wikibase:language \"fr,en,de,it\" }\n}".replace(subjectRegexp, publicDataID.toNT());
             _context7.next = 3;
             return queryPublicDataSelect(sparql, wikidataParameters);
-
           case 3:
             bindings = _context7.sent;
             loadFromBindings(kb, publicDataID, bindings, publicDataID.doc()); // arg2 was solidSubject
-
           case 5:
           case "end":
             return _context7.stop();
@@ -721,11 +610,9 @@ function _getWikidataDetailsOld() {
   }));
   return _getWikidataDetailsOld.apply(this, arguments);
 }
-
 function getWikidataLocation(_x22, _x23, _x24) {
   return _getWikidataLocation.apply(this, arguments);
 }
-
 function _getWikidataLocation() {
   _getWikidataLocation = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(kb, solidSubject, publicDataID) {
     var sparql, bindings;
@@ -737,12 +624,10 @@ function _getWikidataLocation() {
             debug.log(' location query sparql:' + sparql);
             _context8.next = 4;
             return queryPublicDataSelect(sparql, wikidataParameters);
-
           case 4:
             bindings = _context8.sent;
             debug.log(' location query bindings:', bindings);
             loadFromBindings(kb, publicDataID, bindings, publicDataID.doc()); // was solidSubject
-
           case 7:
           case "end":
             return _context8.stop();
@@ -752,11 +637,9 @@ function _getWikidataLocation() {
   }));
   return _getWikidataLocation.apply(this, arguments);
 }
-
 function getDbpediaDetails(_x25, _x26, _x27) {
   return _getDbpediaDetails.apply(this, arguments);
 }
-
 function _getDbpediaDetails() {
   _getDbpediaDetails = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(kb, solidSubject, publicDataID) {
     var sparql, bindings;
@@ -768,12 +651,10 @@ function _getDbpediaDetails() {
             sparql = "select distinct ?city, ?state, ?country, ?homepage, ?logo, ?lat, ?long,  WHERE {\n    OPTIONAL { <".concat(publicDataID, "> <http://dbpedia.org/ontology/city> ?city }\n    OPTIONAL { ").concat(publicDataID, " <http://dbpedia.org/ontology/state> ?state }\n    OPTIONAL { ").concat(publicDataID, " <http://dbpedia.org/ontology/country> ?country }\n    OPTIONAL { ").concat(publicDataID, " foaf:homepage ?homepage }\n    OPTIONAL { ").concat(publicDataID, " foaf:lat ?lat; foaf:long ?long }\n    OPTIONAL { ").concat(publicDataID, " <http://dbpedia.org/ontology/country> ?country }\n   }");
             _context9.next = 3;
             return queryPublicDataSelect(sparql, dbpediaParameters);
-
           case 3:
             bindings = _context9.sent;
             loadFromBindings(kb, publicDataID, bindings, publicDataID.doc());
             debug.log('Finished getDbpediaDetails.');
-
           case 6:
           case "end":
             return _context9.stop();