Replace map with object types

Author: sgreenbury

popgetter-browser/web/src/lib/rust_worker.ts

@@ -43,7 +43,7 @@ export class RustBackend {
     return result;
   }
 
-  async search(search_params: Map<any, any>, offset: number): Promise<String> {
+  async search(search_params: {}, offset: number): Promise<String> {
     if (!this.inner) {
       throw new Error("RustBackend not initialised");
     }
@@ -52,15 +52,15 @@ export class RustBackend {
     return result;
   }
 
-  async downloadMetrics(params: Map<any, any>): Promise<String> {
+  async downloadMetrics(params: {}): Promise<String> {
     if (!this.inner) {
       throw new Error("RustBackend not initialised");
     }
     const result = JSON.parse(await this.inner!.downloadMetrics(params));
     // console.log("RustBackend.getCountries result", result);
     return result;
   }
-  async downloadGeoms(params: Map<any, any>): Promise<String> {
+  async downloadGeoms(params: {}): Promise<String> {
     if (!this.inner) {
       throw new Error("RustBackend not initialised");
     }
@@ -69,7 +69,7 @@ export class RustBackend {
     return result;
   }
   async downloadDataRequestMetrics(
-    data_request_spec: Map<any, any>,
+    data_request_spec: {},
   ): Promise<String> {
     if (!this.inner) {
       throw new Error("RustBackend not initialised");
@@ -80,7 +80,7 @@ export class RustBackend {
     return result;
   }
   async downloadDataRequestMetricsSql(
-    data_request_spec: Map<any, any>,
+    data_request_spec: {},
   ): Promise<String> {
     if (!this.inner) {
       throw new Error("RustBackend not initialised");
@@ -90,7 +90,7 @@ export class RustBackend {
     return result;
   }
   async downloadDataRequestGeoms(
-    data_request_spec: Map<any, any>,
+    data_request_spec: {},
   ): Promise<String> {
     if (!this.inner) {
       throw new Error("RustBackend not initialised");
@@ -102,7 +102,7 @@ export class RustBackend {
     return result;
   }
   async downloadDataRequestGeomsPmtiles(
-    data_request_spec: Map<any, any>,
+    data_request_spec: {},
   ): Promise<String> {
     if (!this.inner) {
       throw new Error("RustBackend not initialised");
@@ -113,7 +113,7 @@ export class RustBackend {
     return result;
   }
 
-  async downloadDataRequest(data_request_spec: Map<any, any>): Promise<String> {
+  async downloadDataRequest(data_request_spec: {}): Promise<String> {
     if (!this.inner) {
       throw new Error("RustBackend not initialised");
     }

popgetter-browser/web/src/routes/DownloadMode.svelte

@@ -93,7 +93,7 @@
     }
   });
 
-  async function setPreviewedMetrics(): Promise<Array<Map<any, any>>> {
+  async function setPreviewedMetrics(): Promise<Array<{}>> {
     const metricsDownload = $selectedMetricsList.map((record) => ({
       MetricId: {
         id: record.metric_id,
@@ -126,7 +126,7 @@
   }
 
   // TODO: consider if can be async to enable preview to be generated here
-  function add(record: Map<any, any>) {
+  function add(record: {}) {
     console.log(record);
     $selectedMetricsList.indexOf(record) === -1
       ? $selectedMetricsList.push(record)
@@ -137,7 +137,7 @@
   }
 
   // TODO: consider if previewed metrics can be updated here too
-  export function remove(record: Map<any, any>) {
+  export function remove(record: {}) {
     console.log(record);
     const index = $selectedMetricsList.indexOf(record);
     if (index > -1) {
@@ -148,7 +148,7 @@
     return;
   }
 
-  async function search(x, offset): Promise<Array<Map<any, any>>> {
+  async function search(x, offset): Promise<Array<{}>> {
     try {
       const loaded = await $rustBackend!.isLoaded();
       if (!loaded) {
@@ -173,8 +173,7 @@
     ];
   }
 
-  // async function download(dataRequestSpec): Promise<Array<Map<any, any>>> {
-  async function download(dataRequestSpec): Promise<any> {
+  async function download(dataRequestSpec: {}): Promise<Array<{}>> {
     const loaded = await $rustBackend!.isLoaded();
     if (!loaded) {
       await $rustBackend!.initialise();
@@ -198,8 +197,8 @@
   let searchParams = {};
 
   // For search results
-  let data: Array<Map<any, any>> = [];
-  let items: Array<Map<any, any>> = [];
+  let data: Array<{}> = [];
+  let items: Array<{}> = [];
 
   // For downloaded geojson
   let gj: FeatureCollection = {

popgetter-browser/web/src/routes/PreviewedMetrics.svelte

@@ -19,7 +19,7 @@
   import * as d3 from "d3-scale";
   import { interpolateViridis } from "d3-scale-chromatic";
 
-  function setPreviewMetricMap(item: Map<any, any>) {
+  function setPreviewMetricMap(item: {}) {
     console.log("Set preview metric map: ", item);
     previewMetricMap.set(item);
     // console.log($previewMetricMap)

popgetter-browser/web/src/routes/SelectedMetrics.svelte

@@ -10,7 +10,7 @@
     TableHeadCell,
   } from "flowbite-svelte";
 
-  function remove(record: Map<any, any>) {
+  function remove(record: {}) {
     console.log(record);
     const index = $selectedMetricsList.indexOf(record);
     if (index > -1) {

popgetter-browser/web/src/routes/globals.ts

@@ -25,15 +25,15 @@ export const rustIsLoaded = writable(false);
 export type Mode = { kind: "title" } | { kind: "level" } | { kind: "download" };
 
 export const mode: Writable<Mode> = writable({ kind: "title" });
-export const countries: Writable<Array<any>> = writable([]);
+export const countries: Writable<Array<{}>> = writable([]);
 export const selectedCountry: Writable<String> = writable("");
 export const selectedLevel: Writable<String> = writable("");
-export const selectedMetricsList: Writable<Array<Map<any, any>>> = writable([]);
-export const previewedMetricsList: Writable<Array<Map<any, any>>> = writable(
+export const selectedMetricsList: Writable<Array<{}>> = writable([]);
+export const previewedMetricsList: Writable<Array<{}>> = writable(
   [],
 );
 // Metric metadata to preview on map
-export const previewMetricMap: Writable<Map<any, any>> = writable({});
+export const previewMetricMap: Writable<{}> = writable({});
 // Colours for previewMetricMap
-export const previewMetricMapColors: Writable<Array<String>> = writable([]);
+export const previewMetricMapColors: Writable<Array<{}>> = writable([]);
 export const tileUrl = writable("pmtiles://https://popgetter.blob.core.windows.net/dev/v0.2/usa/geometries/tract_2019.pmtiles");