organise imports

package.json

@@ -18,7 +18,7 @@
     "all": "npm run preprocess && npm run conflate && npm run action && npm run upload",
     "changelog": "ts-node src/changelog",
     "changesetWatch": "ts-node src/changesetWatch",
-    "lint": "eslint --fix --ignore-path .gitignore . && tsc",
+    "lint": "eslint --ignore-path .gitignore . && tsc",
     "pretest": "cp src/__tests__/bin/osmconvert src/__tests__/bin/osmconvert2 && chmod u+x src/__tests__/bin/osmconvert2",
     "test": "jest"
   },

src/action/createIndex.ts

@@ -1,8 +1,8 @@
 import { promises as fs } from 'node:fs';
 import { join } from 'node:path';
 import { GeoJson, HandlerReturnWithBBox } from '../types';
-import { calcCount, CDN_URL, mock, suburbsFolder } from './util';
 import { hash } from '../common';
+import { calcCount, CDN_URL, mock, suburbsFolder } from './util';
 
 function toId(suburb: string) {
   // macrons are url safe

src/changelog/processChangelog.ts

@@ -1,6 +1,6 @@
-import fetch from 'node-fetch';
 import { promises as fs, createReadStream } from 'node:fs';
 import { join } from 'node:path';
+import fetch from 'node-fetch';
 import csv from 'csv-parser';
 import { ChangelogJson, LinzChangelog } from '../types';
 

src/changesetWatch/index.ts

@@ -5,9 +5,9 @@ import {
   listChangesets,
 } from 'osm-api';
 import { config as dotenv } from 'dotenv';
+import { timeout, fetchIgnoreList } from '../common';
 import { watchArea } from './constants';
 import { updateIgnoreList, updateLastCheckDate } from './api';
-import { timeout, fetchIgnoreList } from '../common';
 import { CSWithDiff, patchOsmChange } from './patchOsmChange';
 import { checkDiffsForAddress } from './checkDiffsForAddress';
 

src/common/fetchIgnoreList.ts

@@ -1,7 +1,7 @@
 import { createReadStream } from 'node:fs';
+import { join } from 'node:path';
 import fetch from 'node-fetch';
 import csv from 'csv-parser';
-import { join } from 'node:path';
 import { IgnoreFile, mock } from '../preprocess/const';
 
 export const spreadsheetId = '1BNrUQof78t-OZlCHF3n_MKnYDARFoCRZB7xKxQPmKds';

src/extraLayers/geodetic/checkStatus.ts

@@ -1,7 +1,7 @@
 import { exec } from 'node:child_process';
 import { promisify } from 'node:util';
-import csv from 'csv-parser';
 import { Readable } from 'node:stream';
+import csv from 'csv-parser';
 import { LINZCSVItem, LINZMarker } from './const';
 import { csvToMarker } from './readLINZData';
 

src/extraLayers/geodetic/readLINZData.ts

@@ -1,9 +1,9 @@
 import { createReadStream } from 'node:fs';
-import csv from 'csv-parser';
 import { join } from 'node:path';
-import { beaconTypes, LINZCSVItem, LINZMarker, markConditions } from './const';
+import csv from 'csv-parser';
 import { BBox } from '../../types';
 import { withinBBox } from '../../common';
+import { beaconTypes, LINZCSVItem, LINZMarker, markConditions } from './const';
 
 type Structure = false | [string, string?, string?];
 

src/extraLayers/linzTopo/_specialLinzLayers.ts

@@ -1,7 +1,7 @@
 import { promises as fs, createReadStream } from 'node:fs';
-import csv from 'csv-parser';
 import { join } from 'node:path';
 import { F_OK } from 'node:constants';
+import csv from 'csv-parser';
 import { Query } from 'which-polygon';
 import {
   ChunkSize,
@@ -10,9 +10,9 @@ import {
   GeoJsonFeature,
   Tags,
 } from '../../types';
-import { wktToGeoJson } from './geoOperations';
 import { IgnoreFile } from '../../preprocess/const';
 import { getFirstCoord, hash } from '../../common';
+import { wktToGeoJson } from './geoOperations';
 import { Chart, getBestChart } from './seamarkTagging';
 
 const existsAsync = (path: string) =>

src/extraLayers/linzTopo/seamarkTagging/nauticalChartIndex.ts

@@ -1,10 +1,10 @@
 import { createReadStream } from 'node:fs';
+import { join } from 'node:path';
 import csv from 'csv-parser';
 import { Query } from 'which-polygon';
-import { join } from 'node:path';
 import { GeoJson, GeoJsonFeature } from '../../../types';
-import { fixChartName } from './helpers';
 import { wktToGeoJson } from '../geoOperations';
+import { fixChartName } from './helpers';
 
 const filePath = join(
   __dirname,

src/preprocess/processLinzData.ts

@@ -2,8 +2,8 @@ import { promises as fs, createReadStream } from 'node:fs';
 import { join } from 'node:path';
 import csv from 'csv-parser';
 import { LinzSourceAddress, LinzData } from '../types';
-import { linzTempFile, mock, ignoreFile, IgnoreFile } from './const';
 import { nzgbNamesTable } from '../common/nzgbFile';
+import { linzTempFile, mock, ignoreFile, IgnoreFile } from './const';
 
 const input = join(
   __dirname,

src/preprocess/stackLinzData.ts

@@ -1,6 +1,6 @@
 import { promises as fs, readFileSync } from 'node:fs';
-import whichPolygon from 'which-polygon';
 import { join } from 'node:path';
+import whichPolygon from 'which-polygon';
 import { LinzData, LinzAddr, OSMData, CouldStackData, GeoJson } from '../types';
 import { toStackId, uniq } from '../common';
 import { linzFile, linzTempFile, mock, osmFile, stackFile } from './const';

src/upload/index.ts

@@ -4,8 +4,8 @@ import { BlobServiceClient, ContainerClient } from '@azure/storage-blob';
 import { config as dotenv } from 'dotenv';
 import { lookup } from 'mime-types';
 import fetch from 'node-fetch';
-import { uploadStatsToGH } from './uploadStatsToGH';
 import { CDN_URL } from '../action/util';
+import { uploadStatsToGH } from './uploadStatsToGH';
 
 dotenv();