solid-ui 2.4.24 → 2.4.25

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

@@ -263,37 +263,35 @@ function _queryESCODataByName() {
     var _store$fetcher;
     var limit, queryURI, response, text, json;
     return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            if (queryTarget.searchByNameURI) {
-              _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();
-        }
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (queryTarget.searchByNameURI) {
+            _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();
       }
     }, _callee);
   }));
@@ -318,94 +316,92 @@ 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) {
-          case 0:
-            substituteStrings = function _substituteStrings(template) {
-              var limit = queryTarget.limit || AUTOCOMPLETE_LIMIT;
-              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;
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          substituteStrings = function _substituteStrings(template) {
+            var limit = queryTarget.limit || AUTOCOMPLETE_LIMIT;
+            var u1 = template.replace('$(name)', filter).replace('$(limit)', '' + limit).replace('$(language)', language);
+            return u1.replace('$(targetClass)', theClass.toNT());
+          };
+          if (theClass) {
+            _context2.next = 3;
             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;
+          }
+          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;
-          case 46:
-            throw new Error('Query source must have either rest API or SPARQL endpoint.');
-          case 47:
-          case "end":
-            return _context2.stop();
-        }
+          }
+          _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();
       }
     }, _callee2, null, [[18, 24]]);
   }));
@@ -421,46 +417,44 @@ function _queryPublicDataSelect() {
     var _store$fetcher3;
     var myUrlWithParams, queryURI, headers, options, response, text, text2, json, bindings;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
-      while (1) {
-        switch (_context3.prev = _context3.next) {
-          case 0:
-            if (queryTarget.endpoint) {
-              _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);
-            queryURI = myUrlWithParams.href;
-            debug.log(' queryPublicDataSelect uri: ' + queryURI);
-            headers = new Headers();
-            headers.append('Accept', 'application/json');
-            options = {
-              credentials: 'omit',
-              // CORS - as we know it is public
-              headers: headers
-            };
-            _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();
-        }
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          if (queryTarget.endpoint) {
+            _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);
+          queryURI = myUrlWithParams.href;
+          debug.log(' queryPublicDataSelect uri: ' + queryURI);
+          headers = new Headers();
+          headers.append('Accept', 'application/json');
+          options = {
+            credentials: 'omit',
+            // CORS - as we know it is public
+            headers: headers
+          };
+          _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();
       }
     }, _callee3);
   }));
@@ -474,45 +468,43 @@ function _queryPublicDataConstruct() {
     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);
-            queryURI = myUrlWithParams.href;
-            debug.log(' queryPublicDataConstruct uri: ' + queryURI);
-            headers = new Headers();
-            headers.append('Accept', 'text/turtle');
-            options = {
-              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();
-        }
+      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);
+          queryURI = myUrlWithParams.href;
+          debug.log(' queryPublicDataConstruct uri: ' + queryURI);
+          headers = new Headers();
+          headers.append('Accept', 'text/turtle');
+          options = {
+            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();
       }
     }, _callee4);
   }));
@@ -525,36 +517,34 @@ function _loadPublicDataThing() {
   _loadPublicDataThing = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(kb, subject, publicDataID) {
     var iDToFetch, headers;
     return _regenerator["default"].wrap(function _callee5$(_context5) {
-      while (1) {
-        switch (_context5.prev = _context5.next) {
-          case 0:
-            if (!publicDataID.uri.startsWith('https://dbpedia.org/resource/')) {
-              _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;
+      while (1) switch (_context5.prev = _context5.next) {
+        case 0:
+          if (!publicDataID.uri.startsWith('https://dbpedia.org/resource/')) {
+            _context5.next = 4;
             break;
-          case 9:
-            iDToFetch = publicDataID.uri.startsWith('http:') ? kb.sym('https:' + publicDataID.uri.slice(5)) : publicDataID;
-            headers = new Headers();
-            headers.append('Accept', 'text/turtle');
-            return _context5.abrupt("return", kb.fetcher.load(iDToFetch, {
-              credentials: 'omit',
-              headers: headers
-            }));
-          case 13:
-          case "end":
-            return _context5.stop();
-        }
+          }
+          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();
+          headers.append('Accept', 'text/turtle');
+          return _context5.abrupt("return", kb.fetcher.load(iDToFetch, {
+            credentials: 'omit',
+            headers: headers
+          }));
+        case 13:
+        case "end":
+          return _context5.stop();
       }
     }, _callee5);
   }));
@@ -567,19 +557,17 @@ function _getWikidataDetails() {
   _getWikidataDetails = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(kb, solidSubject, publicDataID) {
     var subjRegexp, sparql;
     return _regenerator["default"].wrap(function _callee6$(_context6) {
-      while (1) {
-        switch (_context6.prev = _context6.next) {
-          case 0:
-            subjRegexp = /wd:Q49108/g;
-            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();
-        }
+      while (1) switch (_context6.prev = _context6.next) {
+        case 0:
+          subjRegexp = /wd:Q49108/g;
+          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();
       }
     }, _callee6);
   }));
@@ -592,19 +580,17 @@ function _getWikidataDetailsOld() {
   _getWikidataDetailsOld = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(kb, solidSubject, publicDataID) {
     var sparql, bindings;
     return _regenerator["default"].wrap(function _callee7$(_context7) {
-      while (1) {
-        switch (_context7.prev = _context7.next) {
-          case 0:
-            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();
-        }
+      while (1) switch (_context7.prev = _context7.next) {
+        case 0:
+          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();
       }
     }, _callee7);
   }));
@@ -617,21 +603,19 @@ function _getWikidataLocation() {
   _getWikidataLocation = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(kb, solidSubject, publicDataID) {
     var sparql, bindings;
     return _regenerator["default"].wrap(function _callee8$(_context8) {
-      while (1) {
-        switch (_context8.prev = _context8.next) {
-          case 0:
-            sparql = "select distinct *  where {\n\n  $(subject) wdt:P276 ?location .\n\n  optional { ?location  wdt:P2044  ?elevation }\n  optional { ?location  wdt:P131  ?region }\n  optional { ?location wdt:P625 ?coordinates }\noptional {  ?location  wdt:P17  ?country }\n\n# SERVICE wikibase:label { bd:serviceParam wikibase:language \"fr,en,de,it\" }\n}".replace(subjectRegexp, publicDataID.toNT());
-            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();
-        }
+      while (1) switch (_context8.prev = _context8.next) {
+        case 0:
+          sparql = "select distinct *  where {\n\n  $(subject) wdt:P276 ?location .\n\n  optional { ?location  wdt:P2044  ?elevation }\n  optional { ?location  wdt:P131  ?region }\n  optional { ?location wdt:P625 ?coordinates }\noptional {  ?location  wdt:P17  ?country }\n\n# SERVICE wikibase:label { bd:serviceParam wikibase:language \"fr,en,de,it\" }\n}".replace(subjectRegexp, publicDataID.toNT());
+          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();
       }
     }, _callee8);
   }));
@@ -644,21 +628,19 @@ function _getDbpediaDetails() {
   _getDbpediaDetails = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(kb, solidSubject, publicDataID) {
     var sparql, bindings;
     return _regenerator["default"].wrap(function _callee9$(_context9) {
-      while (1) {
-        switch (_context9.prev = _context9.next) {
-          case 0:
-            // Note below the string form of the named node with <> works in SPARQL
-            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();
-        }
+      while (1) switch (_context9.prev = _context9.next) {
+        case 0:
+          // Note below the string form of the named node with <> works in SPARQL
+          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();
       }
     }, _callee9);
   }));