refactor: use geo for sort after backend change

Closes #210
2026-01-05 13:02:54 +00:00 · 2022-05-18 09:41:18 +02:00
parent b7ae2cf019
commit 9efc41a8f8
5 changed files with 201 additions and 81 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -2457,9 +2457,9 @@
      "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="
    },
    "@hapi/hoek": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.2.1.tgz",
-      "integrity": "sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw=="
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
+      "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ=="
    },
    "@hapi/topo": {
      "version": "5.1.0",
@@ -3258,28 +3258,28 @@
      }
    },
    "@openstapps/api": {
-      "version": "0.40.0",
-      "resolved": "https://registry.npmjs.org/@openstapps/api/-/api-0.40.0.tgz",
-      "integrity": "sha512-QM19bC7SDtc6LoFackojZjE0VIxsky+fJEvz7LG4mWsnvTXU7SvU9zqYUDCXY7RItI6GHqcXoFzCfpaZM4VrAw==",
+      "version": "0.41.0",
+      "resolved": "https://registry.npmjs.org/@openstapps/api/-/api-0.41.0.tgz",
+      "integrity": "sha512-ZA584/Njjqa74AFhqpe6mHUkHZ6cT+WVyYEWUCgv0IHSvHYug1O/K/8mGHipUopBYZrbY8sBCoXOQVz+EYE5ig==",
      "requires": {
        "@krlwlfrt/async-pool": "0.7.0",
-        "@openstapps/core": "0.65.1",
+        "@openstapps/core": "0.66.0",
        "@openstapps/core-tools": "0.30.0",
        "@openstapps/logger": "0.8.0",
-        "@types/cli-progress": "3.9.2",
+        "@types/cli-progress": "3.11.0",
        "@types/express": "4.17.13",
        "@types/morgan": "1.9.3",
-        "@types/node": "14.18.3",
+        "@types/node": "14.18.18",
        "@types/traverse": "0.6.32",
        "@types/uuid": "8.3.4",
        "@types/wait-on": "5.3.1",
        "body-parser": "1.20.0",
-        "cli-progress": "3.10.0",
+        "cli-progress": "3.11.1",
        "commander": "8.3.0",
-        "express": "4.17.3",
+        "express": "4.18.1",
        "got": "11.8.3",
        "json-schema": "0.4.0",
-        "moment": "2.29.2",
+        "moment": "2.29.3",
        "morgan": "1.10.0",
        "rfdc": "1.3.0",
        "traverse": "0.6.6",
@@ -3288,9 +3288,127 @@
      },
      "dependencies": {
        "@types/node": {
-          "version": "14.18.3",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.3.tgz",
-          "integrity": "sha512-GtTH2crF4MtOIrrAa+jgTV9JX/PfoUCYr6MiZw7O/dkZu5b6gm5dc1nAL0jwGo4ortSBBtGyeVaxdC8X6V+pLg=="
+          "version": "14.18.18",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.18.tgz",
+          "integrity": "sha512-B9EoJFjhqcQ9OmQrNorItO+OwEOORNn3S31WuiHvZY/dm9ajkB7AKD/8toessEtHHNL+58jofbq7hMMY9v4yig=="
+        },
+        "cookie": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+          "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
+        },
+        "express": {
+          "version": "4.18.1",
+          "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz",
+          "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==",
+          "requires": {
+            "accepts": "~1.3.8",
+            "array-flatten": "1.1.1",
+            "body-parser": "1.20.0",
+            "content-disposition": "0.5.4",
+            "content-type": "~1.0.4",
+            "cookie": "0.5.0",
+            "cookie-signature": "1.0.6",
+            "debug": "2.6.9",
+            "depd": "2.0.0",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "etag": "~1.8.1",
+            "finalhandler": "1.2.0",
+            "fresh": "0.5.2",
+            "http-errors": "2.0.0",
+            "merge-descriptors": "1.0.1",
+            "methods": "~1.1.2",
+            "on-finished": "2.4.1",
+            "parseurl": "~1.3.3",
+            "path-to-regexp": "0.1.7",
+            "proxy-addr": "~2.0.7",
+            "qs": "6.10.3",
+            "range-parser": "~1.2.1",
+            "safe-buffer": "5.2.1",
+            "send": "0.18.0",
+            "serve-static": "1.15.0",
+            "setprototypeof": "1.2.0",
+            "statuses": "2.0.1",
+            "type-is": "~1.6.18",
+            "utils-merge": "1.0.1",
+            "vary": "~1.1.2"
+          }
+        },
+        "finalhandler": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+          "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+          "requires": {
+            "debug": "2.6.9",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "on-finished": "2.4.1",
+            "parseurl": "~1.3.3",
+            "statuses": "2.0.1",
+            "unpipe": "~1.0.0"
+          }
+        },
+        "moment": {
+          "version": "2.29.3",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz",
+          "integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw=="
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        },
+        "send": {
+          "version": "0.18.0",
+          "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+          "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+          "requires": {
+            "debug": "2.6.9",
+            "depd": "2.0.0",
+            "destroy": "1.2.0",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "etag": "~1.8.1",
+            "fresh": "0.5.2",
+            "http-errors": "2.0.0",
+            "mime": "1.6.0",
+            "ms": "2.1.3",
+            "on-finished": "2.4.1",
+            "range-parser": "~1.2.1",
+            "statuses": "2.0.1"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.1.3",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+              "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+            }
+          }
+        },
+        "serve-static": {
+          "version": "1.15.0",
+          "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+          "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+          "requires": {
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "parseurl": "~1.3.3",
+            "send": "0.18.0"
+          }
        }
      }
    },
@@ -3326,9 +3444,9 @@
      }
    },
    "@openstapps/core": {
-      "version": "0.65.1",
-      "resolved": "https://registry.npmjs.org/@openstapps/core/-/core-0.65.1.tgz",
-      "integrity": "sha512-ZffFN3bRMC4eq96KSOnZScfTdx/ioiDuNLVrm0azqBqz+PKncknO65k+hoAClHi8BOlvZc2bPk4/19suas7PQQ==",
+      "version": "0.66.0",
+      "resolved": "https://registry.npmjs.org/@openstapps/core/-/core-0.66.0.tgz",
+      "integrity": "sha512-79oNo8TLjs/oaq/MzcPQx2xiM89kOI4bjV8sQakycmkuke3cI6sdhAaRSAYCNsjCz74VIx/8ht01zKx3jll+Cg==",
      "requires": {
        "@openstapps/core-tools": "0.30.0",
        "@types/geojson": "1.0.6",
@@ -3798,18 +3916,11 @@
      }
    },
    "@types/cli-progress": {
-      "version": "3.9.2",
-      "resolved": "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.9.2.tgz",
-      "integrity": "sha512-VO5/X5Ij+oVgEVjg5u0IXVe3JQSKJX+Ev8C5x+0hPy0AuWyW+bF8tbajR7cPFnDGhs7pidztcac+ccrDtk5teA==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.11.0.tgz",
+      "integrity": "sha512-XhXhBv1R/q2ahF3BM7qT5HLzJNlIL0wbcGyZVjqOTqAybAnsLisd7gy1UCyIqpL+5Iv6XhlSyzjLCnI2sIdbCg==",
      "requires": {
        "@types/node": "*"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "17.0.23",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz",
-          "integrity": "sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw=="
-        }
      }
    },
    "@types/component-emitter": {
@@ -4038,20 +4149,12 @@
      "integrity": "sha512-BiLcfVqGBZCyNCnCH3F4o2GmDLrpy0HeBVnNlyZG4fo88ZiE9SoiBe3C+2ezuwbjlEyT+PDZ17//TAlRxAn75Q==",
      "requires": {
        "@types/node": "*"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "17.0.23",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz",
-          "integrity": "sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw=="
-        }
      }
    },
    "@types/node": {
      "version": "14.18.12",
      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.12.tgz",
-      "integrity": "sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A==",
-      "dev": true
+      "integrity": "sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A=="
    },
    "@types/nodemailer": {
      "version": "6.4.4",
@@ -4189,13 +4292,6 @@
      "integrity": "sha512-2FFOKCF/YydrMUaqg+fkk49qf0e5rDgwt6aQsMzFQzbS419h2gNOXyiwp/o2yYy27bi/C1z+HgfncryjGzlvgQ==",
      "requires": {
        "@types/node": "*"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "17.0.23",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz",
-          "integrity": "sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw=="
-        }
      }
    },
    "@types/ws": {
@@ -6023,11 +6119,11 @@
      }
    },
    "cli-progress": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-3.10.0.tgz",
-      "integrity": "sha512-kLORQrhYCAtUPLZxqsAt2YJGOvRdt34+O6jl5cQGb7iF3dM55FQZlTR+rQyIK9JUcO9bBMwZsTlND+3dmFU2Cw==",
+      "version": "3.11.1",
+      "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-3.11.1.tgz",
+      "integrity": "sha512-TTMA2LHrYaZeNMcgZGO10oYqj9hvd03pltNtVbu4ddeyDTHlYV7gWxsFiuvaQlgwMBFCv1TukcjiODWFlb16tQ==",
      "requires": {
-        "string-width": "^4.2.0"
+        "string-width": "^4.2.3"
      }
    },
    "cli-spinners": {
@@ -6607,7 +6703,8 @@
    "cookie": {
      "version": "0.4.2",
      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="
+      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+      "dev": true
    },
    "cookie-signature": {
      "version": "1.0.6",
@@ -8405,6 +8502,7 @@
      "version": "4.17.3",
      "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz",
      "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==",
+      "dev": true,
      "requires": {
        "accepts": "~1.3.8",
        "array-flatten": "1.1.1",
@@ -8442,6 +8540,7 @@
          "version": "1.19.2",
          "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz",
          "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==",
+          "dev": true,
          "requires": {
            "bytes": "3.1.2",
            "content-type": "~1.0.4",
@@ -8459,6 +8558,7 @@
          "version": "2.6.9",
          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
          "requires": {
            "ms": "2.0.0"
          }
@@ -8467,6 +8567,7 @@
          "version": "1.8.1",
          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
          "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+          "dev": true,
          "requires": {
            "depd": "~1.1.2",
            "inherits": "2.0.4",
@@ -8479,6 +8580,7 @@
          "version": "0.4.24",
          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+          "dev": true,
          "requires": {
            "safer-buffer": ">= 2.1.2 < 3"
          }
@@ -8486,12 +8588,14 @@
        "ms": {
          "version": "2.0.0",
          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
        },
        "on-finished": {
          "version": "2.3.0",
          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
          "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+          "dev": true,
          "requires": {
            "ee-first": "1.1.1"
          }
@@ -8499,12 +8603,14 @@
        "qs": {
          "version": "6.9.7",
          "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
-          "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="
+          "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==",
+          "dev": true
        },
        "raw-body": {
          "version": "2.4.3",
          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz",
          "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
+          "dev": true,
          "requires": {
            "bytes": "3.1.2",
            "http-errors": "1.8.1",
@@ -8515,7 +8621,8 @@
        "statuses": {
          "version": "1.5.0",
          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-          "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+          "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+          "dev": true
        }
      }
    },
@@ -8700,6 +8807,7 @@
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "dev": true,
      "requires": {
        "debug": "2.6.9",
        "encodeurl": "~1.0.2",
@@ -8714,6 +8822,7 @@
          "version": "2.6.9",
          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
          "requires": {
            "ms": "2.0.0"
          }
@@ -8721,12 +8830,14 @@
        "ms": {
          "version": "2.0.0",
          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
        },
        "on-finished": {
          "version": "2.3.0",
          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
          "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+          "dev": true,
          "requires": {
            "ee-first": "1.1.1"
          }
@@ -8734,7 +8845,8 @@
        "statuses": {
          "version": "1.5.0",
          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-          "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+          "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+          "dev": true
        }
      }
    },
@@ -14818,6 +14930,7 @@
      "version": "0.17.2",
      "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz",
      "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==",
+      "dev": true,
      "requires": {
        "debug": "2.6.9",
        "depd": "~1.1.2",
@@ -14838,6 +14951,7 @@
          "version": "2.6.9",
          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
          "requires": {
            "ms": "2.0.0"
          },
@@ -14845,19 +14959,22 @@
            "ms": {
              "version": "2.0.0",
              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+              "dev": true
            }
          }
        },
        "destroy": {
          "version": "1.0.4",
          "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-          "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+          "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+          "dev": true
        },
        "http-errors": {
          "version": "1.8.1",
          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
          "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+          "dev": true,
          "requires": {
            "depd": "~1.1.2",
            "inherits": "2.0.4",
@@ -14869,12 +14986,14 @@
        "ms": {
          "version": "2.1.3",
          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "dev": true
        },
        "on-finished": {
          "version": "2.3.0",
          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
          "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+          "dev": true,
          "requires": {
            "ee-first": "1.1.1"
          }
@@ -14882,7 +15001,8 @@
        "statuses": {
          "version": "1.5.0",
          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-          "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+          "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+          "dev": true
        }
      }
    },
@@ -14961,6 +15081,7 @@
      "version": "1.14.2",
      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz",
      "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==",
+      "dev": true,
      "requires": {
        "encodeurl": "~1.0.2",
        "escape-html": "~1.0.3",
--- a/package.json
+++ b/package.json
@@ -83,9 +83,9 @@
    "@ionic/storage-angular": "3.0.6",
    "@ngx-translate/core": "14.0.0",
    "@ngx-translate/http-loader": "7.0.0",
-    "@openstapps/api": "0.40.0",
+    "@openstapps/api": "0.41.0",
    "@openstapps/configuration": "0.29.0",
-    "@openstapps/core": "0.65.1",
+    "@openstapps/core": "0.66.0",
    "@transistorsoft/capacitor-background-fetch": "0.0.6",
    "capacitor-secure-storage-plugin": "0.6.2",
    "cordova-plugin-calendar": "5.1.6",
--- a/src/app/modules/config/config.provider.spec.ts
+++ b/src/app/modules/config/config.provider.spec.ts
@@ -312,7 +312,7 @@ const sampleIndexResponse: SCIndexResponse = {
        sortTypes: ['ducet'],
      },
      {
-        fieldName: 'geo.point.coordinates',
+        fieldName: 'geo',
        onlyOnTypes: [
          SCThingType.Building,
          SCThingType.PointOfInterest,
@@ -321,7 +321,7 @@ const sampleIndexResponse: SCIndexResponse = {
        sortTypes: ['distance'],
      },
      {
-        fieldName: 'geo.point.coordinates',
+        fieldName: 'geo',
        onlyOnTypes: [
          SCThingType.Building,
          SCThingType.PointOfInterest,
@@ -330,7 +330,7 @@ const sampleIndexResponse: SCIndexResponse = {
        sortTypes: ['distance'],
      },
      {
-        fieldName: 'inPlace.geo.point.coordinates',
+        fieldName: 'inPlace.geo',
        onlyOnTypes: [
          SCThingType.DateSeries,
          SCThingType.Dish,
--- a/src/app/modules/data/list/food-data-list.component.ts
+++ b/src/app/modules/data/list/food-data-list.component.ts
@@ -28,22 +28,6 @@ export class FoodDataListComponent extends SearchPageComponent {
  initialize() {
    this.showDefaultData = true;

-    if (this.positionService.position) {
-      this.sortQuery = [
-        {
-          type: 'distance',
-          order: 'asc',
-          arguments: {
-            field: 'geo.point.coordinates',
-            position: [
-              this.positionService.position.longitude,
-              this.positionService.position.latitude,
-            ],
-          },
-        },
-      ];
-    }
-
    this.sortQuery = [
      {
        arguments: {field: 'name'},
@@ -88,5 +72,21 @@ export class FoodDataListComponent extends SearchPageComponent {
      },
      type: 'boolean',
    };
+
+    if (this.positionService.position) {
+      this.sortQuery = [
+        {
+          type: 'distance',
+          order: 'asc',
+          arguments: {
+            field: 'geo',
+            position: [
+              this.positionService.position.longitude,
+              this.positionService.position.latitude,
+            ],
+          },
+        },
+      ];
+    }
  }
 }
--- a/src/app/modules/map/map.provider.ts
+++ b/src/app/modules/map/map.provider.ts
@@ -134,7 +134,6 @@ export class MapProvider {

  /**
   * Provide places (buildings and canteens)    const result = await this.dataProvider.search(query);
-   
   *
   * @param contextFilter Additional contextual filter (e.g. from the context menu)
   * @param queryText Query (text) of the search query
@@ -223,7 +222,7 @@ export class MapProvider {
          type: 'distance',
          order: 'asc',
          arguments: {
-            field: 'geo.point.coordinates',
+            field: 'geo',
            position: [
              this.positionService.position.longitude,
              this.positionService.position.latitude,