diff options
| author | Terry Truong <terry06890@gmail.com> | 2022-05-13 00:08:16 +1000 |
|---|---|---|
| committer | Terry Truong <terry06890@gmail.com> | 2022-05-13 00:08:16 +1000 |
| commit | 0d3eda30c79e6c79ff1a82f5b8104602d03b8b0c (patch) | |
| tree | c53c7dbe0c6c0a85b1e2ae87faacb1f980d2ee69 | |
| parent | 670b17f94d17514ea679261669978dbc7077bef8 (diff) | |
Fix inaccurate tile-info data when using reduced tree
| -rwxr-xr-x | backend/server.py | 6 | ||||
| -rw-r--r-- | src/components/TileInfoModal.vue | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/backend/server.py b/backend/server.py index 6d2970d..0b214b3 100755 --- a/backend/server.py +++ b/backend/server.py @@ -109,7 +109,7 @@ def lookupName(name, useReducedTree): hasMore = True del results[-1] return [results, hasMore] -def lookupNodeInfo(name): +def lookupNodeInfo(name, useReducedTree): cur = dbCon.cursor() # Get node desc row = cur.execute("SELECT desc, redirected from descs WHERE descs.name = ?", (name,)).fetchone() @@ -122,7 +122,7 @@ def lookupNodeInfo(name): if row != None: imgInfo = {"eolId": row[0], "sourceUrl": row[1], "license": row[2], "copyrightOwner": row[3]} # Get other info - temp = lookupNodes([name], False) + temp = lookupNodes([name], useReducedTree) nodeObj = temp[name] if name in temp else None # return {"desc": desc, "imgInfo": imgInfo, "nodeObj": nodeObj} @@ -183,7 +183,7 @@ class DbServer(BaseHTTPRequestHandler): self.respondJson(lookupName(name, useReducedTree)) return elif reqType == "info": - self.respondJson(lookupNodeInfo(name)) + self.respondJson(lookupNodeInfo(name, useReducedTree)) return self.send_response(404) self.end_headers() diff --git a/src/components/TileInfoModal.vue b/src/components/TileInfoModal.vue index 4b904b2..6cb0f18 100644 --- a/src/components/TileInfoModal.vue +++ b/src/components/TileInfoModal.vue @@ -54,6 +54,7 @@ export default defineComponent({ let url = new URL(window.location.href); url.pathname = '/data/info'; url.search = '?name=' + encodeURIComponent(this.nodeName); + url.search += this.uiOpts.useReducedTree ? '&tree=reduced' : ''; fetch(url.toString()) .then(response => response.json()) .then(obj => { |