From 55783a8f2d751b6466c98e331d693e1a52beb8f5 Mon Sep 17 00:00:00 2001 From: Gabriel Bruno Date: Mon, 16 Dec 2024 10:45:41 -0500 Subject: [PATCH] The lint warnings from chaire-lib-common (other than "unexpected any") have been removed. 311 warnings got removed (476 to 165). --- packages/chaire-lib-common/jest.config.js | 2 + .../src/api/TrRouting/index.ts | 2 + .../src/config/Preferences.ts | 8 +- ...pingTagsToTripGenerationHandbookLandUse.ts | 313 +++++++++--------- .../src/services/dataSource/DataSource.ts | 1 - .../geodata/FindOverlappingFeatures.ts | 2 +- .../src/services/objects/osm/OsmBuilding.ts | 5 +- .../src/services/routing/RoutingResult.ts | 2 - .../services/routing/RoutingResultUtils.ts | 1 - .../services/routing/TransitRoutingResult.ts | 2 +- .../src/services/zones/ZoneCollection.ts | 3 +- .../OsmDataPreparationNonResidential.ts | 1 - .../OsmDataPreparationResidential.ts | 2 +- .../tasks/dataImport/assignWeightToPOIs.ts | 56 ++-- .../dataImport/data/osmGeojsonService.ts | 14 +- .../dataImport/prepareOsmDataForImport.ts | 1 - .../test/services/events/EventManagerMock.ts | 1 + .../src/utils/LodashExtensions.ts | 2 +- 18 files changed, 211 insertions(+), 207 deletions(-) diff --git a/packages/chaire-lib-common/jest.config.js b/packages/chaire-lib-common/jest.config.js index 1e1a72ac..25fbd20f 100644 --- a/packages/chaire-lib-common/jest.config.js +++ b/packages/chaire-lib-common/jest.config.js @@ -5,6 +5,8 @@ * License text available at https://opensource.org/licenses/MIT */ /* eslint-disable n/no-unpublished-require */ +/* eslint-disable @typescript-eslint/no-var-requires */ +/* eslint-disable @typescript-eslint/no-require-imports */ const baseConfig = require('../../tests/jest.config.base'); module.exports = { diff --git a/packages/chaire-lib-common/src/api/TrRouting/index.ts b/packages/chaire-lib-common/src/api/TrRouting/index.ts index 2a224873..968d82a3 100644 --- a/packages/chaire-lib-common/src/api/TrRouting/index.ts +++ b/packages/chaire-lib-common/src/api/TrRouting/index.ts @@ -4,7 +4,9 @@ * This file is licensed under the MIT License. * License text available at https://opensource.org/licenses/MIT */ +/* eslint-disable-next-line @typescript-eslint/no-unused-vars */ import * as TrRoutingTypes from './base'; +/* eslint-disable-next-line @typescript-eslint/no-unused-vars */ import * as TrRoutingV2 from './trRoutingApiV2'; export * from './base'; diff --git a/packages/chaire-lib-common/src/config/Preferences.ts b/packages/chaire-lib-common/src/config/Preferences.ts index 73dd46bd..2385455a 100644 --- a/packages/chaire-lib-common/src/config/Preferences.ts +++ b/packages/chaire-lib-common/src/config/Preferences.ts @@ -218,7 +218,7 @@ export class PreferencesClass extends ObjectWithHistory { + public delete(_socket: any): Promise { return new Promise((resolve) => { resolve(null); }); @@ -314,7 +314,7 @@ export class PreferencesClass extends ObjectWithHistory number | undefined; // returns the number of trips generated per day, taking only half, because the trip generation manual gives in and out trips. const tripGenerationFunctionsByLandUseCode: { [key: string]: TripGenerationFunction } = { - '21': function (floorAreaSqMeters, employeesCount, capacity) { + //TODO: Many functions here are unimplemented or have unused arguments. + '21': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size: 1, not suitable, sample too low, 10.28/2 trips / employee - '22': function (floorAreaSqMeters, employeesCount, capacity) { + '22': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size: 1, not suitable, sample too low, 14.94/2 trips / employee - '30': function (floorAreaSqMeters, employeesCount, capacity) { + '30': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountPersonFunction(0.91 * 10, employeesCount) : floorAreaSqMeters ? weightCountPersonFunction(2.14 * 10, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 2, persons, peak hour (*10) - '90': function (floorAreaSqMeters, employeesCount, capacity) { + '90': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // in parking spaces, not suitable - '110': function (floorAreaSqMeters, employeesCount, capacity) { + '110': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleLogarithmicFunction(0.77, employeesCount, 2.15) : floorAreaSqMeters ? weightCountVehicleFunction(4.87, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 37 - '130': function (floorAreaSqMeters, employeesCount, capacity) { + '130': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleLogarithmicFunction(0.68, employeesCount, 3.34) : floorAreaSqMeters ? weightCountVehicleLogarithmicFunction(0.52, floorAreaSqMeters * sqMetersToThousandSqFeet, 4.45) : undefined; }, // sample size: 27 - '140': function (floorAreaSqMeters, employeesCount, capacity) { + '140': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleLogarithmicFunction(0.89, employeesCount, 1.68) : floorAreaSqMeters ? weightCountVehicleFunction(4.75, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 53 - '150': function (floorAreaSqMeters, employeesCount, capacity) { + '150': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleLogarithmicFunction(0.82, employeesCount, 2.33) : floorAreaSqMeters ? weightCountVehicleFunction(1.71, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 31 - '151': function (floorAreaSqMeters, employeesCount, capacity) { + '151': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(1.45, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 16 - '154': function (floorAreaSqMeters, employeesCount, capacity) { + '154': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(1.4, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 91 - '155': function (floorAreaSqMeters, employeesCount, capacity) { + '155': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleLogarithmicFunction(0.77, employeesCount, 2.52) : floorAreaSqMeters ? weightCountVehicleFunction(1.81, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 10 - '156': function (floorAreaSqMeters, employeesCount, capacity) { + '156': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(4.6, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 8 - '157': function (floorAreaSqMeters, employeesCount, capacity) { + '157': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(2.12, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 5 - '160': function (floorAreaSqMeters, employeesCount, capacity) { + '160': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(0.99, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 2 - '170': function (floorAreaSqMeters, employeesCount, capacity) { + '170': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(3.85, employeesCount) : floorAreaSqMeters ? weightCountVehicleLogarithmicFunction(0.74, floorAreaSqMeters * sqMetersToThousandSqFeet, 2.73) : undefined; }, // sample size: 13 - '180': function (floorAreaSqMeters, employeesCount, capacity) { + '180': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(3.63, employeesCount) : floorAreaSqMeters ? weightCountVehicleFunction(9.82, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 20 - '190': function (floorAreaSqMeters, employeesCount, capacity) { + '190': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size: 1, not suitable, sample too low, 0.69/2 trips / thousand sq feet - '310': function (floorAreaSqMeters, employeesCount, capacity) { + '310': function (_floorAreaSqMeters, employeesCount, capacity) { return capacity ? weightCountVehicleFunction(7.99, capacity) : employeesCount ? weightCountVehicleFunction(14.34, employeesCount) : undefined; }, // sample size: 5, capacity = number of rooms - '311': function (floorAreaSqMeters, employeesCount, capacity) { + '311': function (_floorAreaSqMeters, _employeesCount, capacity) { return capacity ? weightCountVehicleFunction(4.4, capacity) : undefined; }, // sample size: 7, capacity = number of rooms - '312': function (floorAreaSqMeters, employeesCount, capacity) { + '312': function (_floorAreaSqMeters, _employeesCount, capacity) { return capacity ? weightCountVehicleFunction(4.02, capacity) : undefined; }, // sample size: 10, capacity = number of rooms - '320': function (floorAreaSqMeters, employeesCount, capacity) { + '320': function (_floorAreaSqMeters, _employeesCount, capacity) { return capacity ? weightCountVehicleFunction(3.35, capacity) : undefined; }, // sample size: 6, capacity = number of rooms - '330': function (floorAreaSqMeters, employeesCount, capacity) { + '330': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // no data for whole day - '411': function (floorAreaSqMeters, employeesCount, capacity) { + '411': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // inconsistent data and sample size too low - '416': function (floorAreaSqMeters, employeesCount, capacity) { + '416': function (_floorAreaSqMeters, _employeesCount, capacity) { return capacity ? weightCountVehicleFunction(0.21, capacity) : undefined; }, // sample size: 4, capacity = number of campsites, no winter trips - '420': function (floorAreaSqMeters, employeesCount, capacity) { + '420': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // inconsistent data and sample size too low, no winter trips - '430': function (floorAreaSqMeters, employeesCount, capacity) { + '430': function (floorAreaSqMeters, _employeesCount, capacity) { return capacity ? weightCountVehicleFunction(30.38, capacity) : floorAreaSqMeters ? weightCountVehicleFunction(3.74, (floorAreaSqMeters * acresToThousandSqFeet) / sqMetersToThousandSqFeet) : undefined; }, // sample size: 4, capacity = number of holes, no winter trips, original area in acres, seems a bit high, but plausible - '431': function (floorAreaSqMeters, employeesCount, capacity) { + '431': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low, no winter trips - '432': function (floorAreaSqMeters, employeesCount, capacity) { + '432': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low, no winter trips - '433': function (floorAreaSqMeters, employeesCount, capacity) { + '433': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low, no winter trips - '434': function (floorAreaSqMeters, employeesCount, capacity) { + '434': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low, no winter trips - '435': function (floorAreaSqMeters, employeesCount, capacity) { + '435': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(3.58 * 10, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 3, data for one peak hour multiplied by 10 - '436': function (floorAreaSqMeters, employeesCount, capacity) { + '436': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(1.5 * 10, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 3, data for one peak hour multiplied by 10 - '437': function (floorAreaSqMeters, employeesCount, capacity) { + '437': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '440': function (floorAreaSqMeters, employeesCount, capacity) { + '440': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '445': function (floorAreaSqMeters, employeesCount, capacity) { + '445': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '452': function (floorAreaSqMeters, employeesCount, capacity) { + '452': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '453': function (floorAreaSqMeters, employeesCount, capacity) { + '453': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '454': function (floorAreaSqMeters, employeesCount, capacity) { + '454': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '462': function (floorAreaSqMeters, employeesCount, capacity) { + '462': function (_floorAreaSqMeters, _employeesCount, capacity) { return capacity ? capacity : undefined; }, // sample size: 2, capacity = number of attendees - '465': function (floorAreaSqMeters, employeesCount, capacity) { + '465': function (_floorAreaSqMeters, _employeesCount, capacity) { return capacity ? weightCountVehicleFunction(45.17, capacity) : undefined; }, // sample size: 3, capacity = number of rinks - '466': function (floorAreaSqMeters, employeesCount, capacity) { + '466': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '470': function (floorAreaSqMeters, employeesCount, capacity) { + '470': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '473': function (floorAreaSqMeters, employeesCount, capacity) { + '473': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(388.18, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 4 - '480': function (floorAreaSqMeters, employeesCount, capacity) { + '480': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '482': function (floorAreaSqMeters, employeesCount, capacity) { + '482': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '488': function (floorAreaSqMeters, employeesCount, capacity) { + '488': function (_floorAreaSqMeters, _employeesCount, capacity) { return capacity ? weightCountVehicleFunction(71.33, capacity) : undefined; }, // sample size: 3, capacity = number of fields/pitches - '490': function (floorAreaSqMeters, employeesCount, capacity) { + '490': function (_floorAreaSqMeters, _employeesCount, capacity) { return capacity ? weightCountVehicleFunction(30.32, capacity) : undefined; }, // sample size: 2, capacity = number of courts - '491': function (floorAreaSqMeters, employeesCount, capacity) { + '491': function (_floorAreaSqMeters, _employeesCount, capacity) { return capacity ? weightCountVehicleFunction(27.71, capacity) : undefined; }, // sample size: 2, capacity = number of courts - '492': function (floorAreaSqMeters, employeesCount, capacity) { + '492': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(1.31 * 10, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 6 - '493': function (floorAreaSqMeters, employeesCount, capacity) { + '493': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(3.16 * 10, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 2 - '495': function (floorAreaSqMeters, employeesCount, capacity) { + '495': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(28.82, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 4 - '501': function (floorAreaSqMeters, employeesCount, capacity) { + '501': function (_floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(0.39, employeesCount) : undefined; }, // sample size: 6 - '520': function (floorAreaSqMeters, employeesCount, capacity) { + '520': function (_floorAreaSqMeters, employeesCount, capacity) { return capacity ? weightCountVehicleFunction(2.27, capacity) : employeesCount ? weightCountVehicleFunction(22.5, employeesCount) : undefined; }, // sample size: 12-16, capacity = number of students - '522': function (floorAreaSqMeters, employeesCount, capacity) { + '522': function (_floorAreaSqMeters, employeesCount, capacity) { return capacity ? weightCountVehicleFunction(2.1, capacity) : employeesCount ? weightCountVehicleFunction(23.41, employeesCount) : undefined; }, // sample size: 6-14, capacity = number of students - '525': function (floorAreaSqMeters, employeesCount, capacity) { + '525': function (_floorAreaSqMeters, employeesCount, capacity) { return capacity ? weightCountVehicleFunction(1.94, capacity) : employeesCount ? weightCountVehicleFunction(21.95, employeesCount) : undefined; }, // sample size: 30-31, capacity = number of students - '528': function (floorAreaSqMeters, employeesCount, capacity) { + '528': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(5.08, employeesCount) : floorAreaSqMeters ? weightCountVehicleFunction(14.37, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 11 - '530': function (floorAreaSqMeters, employeesCount, capacity) { + '530': function (_floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? 0.5 * avgVehicleOccupancy * employeesCount * 8.86 : undefined; }, // sample size: 7 - '532': function (floorAreaSqMeters, employeesCount, capacity) { + '532': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '534': function (floorAreaSqMeters, employeesCount, capacity) { + '534': function (_floorAreaSqMeters, employeesCount, capacity) { return capacity ? weightCountVehicleFunction(2.17, capacity) : employeesCount ? weightCountVehicleFunction(15.12, employeesCount) : undefined; }, // sample size: 2-3, capacity = number of students - '536': function (floorAreaSqMeters, employeesCount, capacity) { + '536': function (_floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(13.93, employeesCount) : undefined; }, // sample size: 5 - '538': function (floorAreaSqMeters, employeesCount, capacity) { + '538': function (_floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(13.75, employeesCount) : undefined; }, // sample size: 3 - '540': function (floorAreaSqMeters, employeesCount, capacity) { + '540': function (_floorAreaSqMeters, employeesCount, capacity) { return capacity ? weightCountVehicleFunction(1.15, capacity) : employeesCount ? weightCountVehicleFunction(14.61, employeesCount) : undefined; }, // sample size: 10-12, capacity = number of students - '550': function (floorAreaSqMeters, employeesCount, capacity) { + '550': function (_floorAreaSqMeters, employeesCount, capacity) { return capacity ? weightCountVehicleFunction(1.56, capacity) : employeesCount ? weightCountVehicleFunction(8.89, employeesCount) : undefined; }, // sample size: 2-5, capacity = number of students - '560': function (floorAreaSqMeters, employeesCount, capacity) { + '560': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(7.6, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 5 - '561': function (floorAreaSqMeters, employeesCount, capacity) { + '561': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '562': function (floorAreaSqMeters, employeesCount, capacity) { + '562': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '565': function (floorAreaSqMeters, employeesCount, capacity) { + '565': function (_floorAreaSqMeters, employeesCount, capacity) { return capacity ? weightCountVehicleFunction(4.09, capacity) : employeesCount ? weightCountVehicleFunction(21.38, employeesCount) : undefined; }, // sample size: 14-28, capacity = number of children - '566': function (floorAreaSqMeters, employeesCount, capacity) { + '566': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(51.75, employeesCount) : floorAreaSqMeters ? weightCountVehicleFunction(6.02, (floorAreaSqMeters * acresToThousandSqFeet) / sqMetersToThousandSqFeet) : undefined; }, // sample size: 5, original area in acres - '571': function (floorAreaSqMeters, employeesCount, capacity) { + '571': function (_floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(3.04, employeesCount) : undefined; }, // sample size: 9 - '575': function (floorAreaSqMeters, employeesCount, capacity) { + '575': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(4.8, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 3 - '580': function (floorAreaSqMeters, employeesCount, capacity) { + '580': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '590': function (floorAreaSqMeters, employeesCount, capacity) { + '590': function (floorAreaSqMeters, employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(72.05, floorAreaSqMeters * sqMetersToThousandSqFeet) : employeesCount @@ -601,93 +602,93 @@ const tripGenerationFunctionsByLandUseCode: { [key: string]: TripGenerationFunct ? weightCountVehicleFunction(6.75, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 3-9, capacity = beds - '630': function (floorAreaSqMeters, employeesCount, capacity) { + '630': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(13.9, employeesCount) : floorAreaSqMeters ? weightCountVehicleFunction(37.6, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 8-9 - '640': function (floorAreaSqMeters, employeesCount, capacity) { + '640': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(12.69, employeesCount) : floorAreaSqMeters ? weightCountVehicleFunction(21.5, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 6 - '650': function (floorAreaSqMeters, employeesCount, capacity) { + '650': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(24.94, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 4 - '710': function (floorAreaSqMeters, employeesCount, capacity) { + '710': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleLogarithmicFunction(0.76, employeesCount, 2.74) : floorAreaSqMeters ? weightCountVehicleLogarithmicFunction(0.87, floorAreaSqMeters * sqMetersToThousandSqFeet, 3.05) : undefined; }, // sample size: 52-59 - '712': function (floorAreaSqMeters, employeesCount, capacity) { + '712': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(7.86, employeesCount) : floorAreaSqMeters ? weightCountVehicleFunction(14.39, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 17-21 - '714': function (floorAreaSqMeters, employeesCount, capacity) { + '714': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(2.31, employeesCount) : floorAreaSqMeters ? weightCountVehicleFunction(7.95, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 6-7 - '715': function (floorAreaSqMeters, employeesCount, capacity) { + '715': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(3.85, employeesCount) : floorAreaSqMeters ? weightCountVehicleFunction(13.07, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 12 - '720': function (floorAreaSqMeters, employeesCount, capacity) { + '720': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(8.71, employeesCount) : floorAreaSqMeters ? weightCountVehicleFunction(36.0, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 14-18 - '730': function (floorAreaSqMeters, employeesCount, capacity) { + '730': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(7.45, employeesCount) : floorAreaSqMeters ? weightCountVehicleFunction(22.59, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 7 - '731': function (floorAreaSqMeters, employeesCount, capacity) { + '731': function (_floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(2.94 * 10, employeesCount) : undefined; }, // sample size: 2 - '732': function (floorAreaSqMeters, employeesCount, capacity) { + '732': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(25.4, employeesCount) : floorAreaSqMeters ? weightCountVehicleFunction(103.94, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 7-8 - '750': function (floorAreaSqMeters, employeesCount, capacity) { + '750': function (floorAreaSqMeters, employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(11.07, floorAreaSqMeters * sqMetersToThousandSqFeet) : employeesCount ? weightCountVehicleFunction(3.54, employeesCount) : undefined; }, // sample size: 2-10 - '760': function (floorAreaSqMeters, employeesCount, capacity) { + '760': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(3.37, employeesCount) : floorAreaSqMeters ? weightCountVehicleFunction(11.08, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 20-22 - '770': function (floorAreaSqMeters, employeesCount, capacity) { + '770': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(4.04, employeesCount) : floorAreaSqMeters @@ -695,129 +696,129 @@ const tripGenerationFunctionsByLandUseCode: { [key: string]: TripGenerationFunct : undefined; }, // sample size: 12-16 - '810': function (floorAreaSqMeters, employeesCount, capacity) { + '810': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(1.4 * 10, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 7 - '811': function (floorAreaSqMeters, employeesCount, capacity) { + '811': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(0.99 * 10, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 3 - '812': function (floorAreaSqMeters, employeesCount, capacity) { + '812': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(25.77, employeesCount) : floorAreaSqMeters ? weightCountVehicleFunction(17.05, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 13 - '813': function (floorAreaSqMeters, employeesCount, capacity) { + '813': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(50.52, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 72 - '814': function (floorAreaSqMeters, employeesCount, capacity) { + '814': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(63.66, employeesCount) : floorAreaSqMeters ? weightCountVehicleFunction(95.59, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 29 - '815': function (floorAreaSqMeters, employeesCount, capacity) { + '815': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(53.87, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 21 - '816': function (floorAreaSqMeters, employeesCount, capacity) { + '816': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(27.69, employeesCount) : floorAreaSqMeters ? weightCountVehicleFunction(8.07, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 4 - '817': function (floorAreaSqMeters, employeesCount, capacity) { + '817': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(21.83, employeesCount) : floorAreaSqMeters ? weightCountVehicleFunction(68.1, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 10 - '818': function (floorAreaSqMeters, employeesCount, capacity) { + '818': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(0.3 * 10, employeesCount) : floorAreaSqMeters ? weightCountVehicleFunction(2.41 * 10, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 6 - '820': function (floorAreaSqMeters, employeesCount, capacity) { + '820': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(37.01, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 108 - '821': function (floorAreaSqMeters, employeesCount, capacity) { + '821': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(67.52, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 7 (Without supermarket, with supermarket: weight = 94.49) - '822': function (floorAreaSqMeters, employeesCount, capacity) { + '822': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(54.45, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 4 - '823': function (floorAreaSqMeters, employeesCount, capacity) { + '823': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(26.59, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 11 - '840': function (floorAreaSqMeters, employeesCount, capacity) { + '840': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(27.84, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 18 - '841': function (floorAreaSqMeters, employeesCount, capacity) { + '841': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(27.06, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 14 - '842': function (floorAreaSqMeters, employeesCount, capacity) { + '842': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(5.0, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 5 - '843': function (floorAreaSqMeters, employeesCount, capacity) { + '843': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(54.57, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 14 - '848': function (floorAreaSqMeters, employeesCount, capacity) { + '848': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(27.69, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 13 - '849': function (floorAreaSqMeters, employeesCount, capacity) { + '849': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(20.37, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 12 - '850': function (floorAreaSqMeters, employeesCount, capacity) { + '850': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(93.84, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 22 - '851': function (floorAreaSqMeters, employeesCount, capacity) { + '851': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(762.28, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 8 - '857': function (floorAreaSqMeters, employeesCount, capacity) { + '857': function (floorAreaSqMeters, employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(42.46, floorAreaSqMeters * sqMetersToThousandSqFeet) : employeesCount ? weightCountVehicleFunction(32.21, employeesCount) : undefined; }, // sample size: 10-20 - '858': function (floorAreaSqMeters, employeesCount, capacity) { + '858': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction( 174.9 * 10, @@ -825,212 +826,212 @@ const tripGenerationFunctionsByLandUseCode: { [key: string]: TripGenerationFunct ) : undefined; }, // sample size: 2, peak hour - '860': function (floorAreaSqMeters, employeesCount, capacity) { + '860': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '861': function (floorAreaSqMeters, employeesCount, capacity) { + '861': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(23.78, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 8 - '862': function (floorAreaSqMeters, employeesCount, capacity) { + '862': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(30.74, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 19 - '863': function (floorAreaSqMeters, employeesCount, capacity) { + '863': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(41.05, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 5 - '864': function (floorAreaSqMeters, employeesCount, capacity) { + '864': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(5.0 * 10, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 2, peak hour - '865': function (floorAreaSqMeters, employeesCount, capacity) { + '865': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '866': function (floorAreaSqMeters, employeesCount, capacity) { + '866': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(3.55 * 10, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 5, peak hour - '867': function (floorAreaSqMeters, employeesCount, capacity) { + '867': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(2.77 * 10, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 5, peak hour - '868': function (floorAreaSqMeters, employeesCount, capacity) { + '868': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '869': function (floorAreaSqMeters, employeesCount, capacity) { + '869': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(20.0, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 8 - '872': function (floorAreaSqMeters, employeesCount, capacity) { + '872': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '875': function (floorAreaSqMeters, employeesCount, capacity) { + '875': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(22.88, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 5 - '876': function (floorAreaSqMeters, employeesCount, capacity) { + '876': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '879': function (floorAreaSqMeters, employeesCount, capacity) { + '879': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '880': function (floorAreaSqMeters, employeesCount, capacity) { + '880': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(90.08, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 6 - '881': function (floorAreaSqMeters, employeesCount, capacity) { + '881': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(108.4, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 16 - '882': function (floorAreaSqMeters, employeesCount, capacity) { + '882': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(211.12, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 7 - '890': function (floorAreaSqMeters, employeesCount, capacity) { + '890': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(6.3, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 19 - '895': function (floorAreaSqMeters, employeesCount, capacity) { + '895': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(9.78, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 2 - '897': function (floorAreaSqMeters, employeesCount, capacity) { + '897': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '899': function (floorAreaSqMeters, employeesCount, capacity) { + '899': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(107.21, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 5 - '911': function (floorAreaSqMeters, employeesCount, capacity) { + '911': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(5.27 * 10, employeesCount) : floorAreaSqMeters ? weightCountVehicleFunction(12.13 * 10, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 3-8, peak hour - '912': function (floorAreaSqMeters, employeesCount, capacity) { + '912': function (floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(32.73, employeesCount) : floorAreaSqMeters ? weightCountVehicleFunction(100.35, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 19 - '918': function (floorAreaSqMeters, employeesCount, capacity) { + '918': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '920': function (floorAreaSqMeters, employeesCount, capacity) { + '920': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '926': function (floorAreaSqMeters, employeesCount, capacity) { + '926': function (_floorAreaSqMeters, _employeesCount, capacity) { return capacity ? weightCountVehicleFunction(6.16 * 10, capacity) : undefined; }, // sample size: 4, capacity: food carts, peak hour - '930': function (floorAreaSqMeters, employeesCount, capacity) { + '930': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '931': function (floorAreaSqMeters, employeesCount, capacity) { + '931': function (floorAreaSqMeters, employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(83.84, floorAreaSqMeters * sqMetersToThousandSqFeet) : employeesCount ? weightCountVehicleFunction(0.69 * 10, employeesCount) : undefined; }, // sample size: 3-10, peak hour for employee count - '932': function (floorAreaSqMeters, employeesCount, capacity) { + '932': function (floorAreaSqMeters, employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(107.2, floorAreaSqMeters * sqMetersToThousandSqFeet) : employeesCount ? weightCountVehicleFunction(21.26, employeesCount) : undefined; }, // sample size: 31-50 - '933': function (floorAreaSqMeters, employeesCount, capacity) { + '933': function (floorAreaSqMeters, employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(450.49, floorAreaSqMeters * sqMetersToThousandSqFeet) : employeesCount ? weightCountVehicleFunction(54.81, employeesCount) : undefined; }, // sample size: 5-6 - '934': function (floorAreaSqMeters, employeesCount, capacity) { + '934': function (floorAreaSqMeters, employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(467.48, floorAreaSqMeters * sqMetersToThousandSqFeet) : employeesCount ? weightCountVehicleFunction(44.52, employeesCount) : undefined; }, // sample size: 28-71 - '935': function (floorAreaSqMeters, employeesCount, capacity) { + '935': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '936': function (floorAreaSqMeters, employeesCount, capacity) { + '936': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(93.08 * 10, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 25 - '937': function (floorAreaSqMeters, employeesCount, capacity) { + '937': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(533.57, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 6 - '938': function (floorAreaSqMeters, employeesCount, capacity) { + '938': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '941': function (floorAreaSqMeters, employeesCount, capacity) { + '941': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '942': function (floorAreaSqMeters, employeesCount, capacity) { + '942': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(2.25 * 10, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 6, peak hour - '943': function (floorAreaSqMeters, employeesCount, capacity) { + '943': function (floorAreaSqMeters, employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(16.6, floorAreaSqMeters * sqMetersToThousandSqFeet) : employeesCount ? weightCountVehicleFunction(11.44, employeesCount) : undefined; }, // sample size: 27 - '944': function (floorAreaSqMeters, employeesCount, capacity) { + '944': function (_floorAreaSqMeters, employeesCount, _capacity) { return employeesCount ? weightCountVehicleFunction(275.78, employeesCount) : undefined; }, // sample size: 12 - '945': function (floorAreaSqMeters, employeesCount, capacity) { + '945': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // n/a, needs number of fueling positions - '947': function (floorAreaSqMeters, employeesCount, capacity) { + '947': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '948': function (floorAreaSqMeters, employeesCount, capacity) { + '948': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '949': function (floorAreaSqMeters, employeesCount, capacity) { + '949': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // sample size too low - '950': function (floorAreaSqMeters, employeesCount, capacity) { + '950': function (_floorAreaSqMeters, _employeesCount, _capacity) { return undefined; }, // n/a, needs number of fueling positions - '970': function (floorAreaSqMeters, employeesCount, capacity) { + '970': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(45.96, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 5 - '971': function (floorAreaSqMeters, employeesCount, capacity) { + '971': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(61.69, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; }, // sample size: 2 - '975': function (floorAreaSqMeters, employeesCount, capacity) { + '975': function (floorAreaSqMeters, _employeesCount, _capacity) { return floorAreaSqMeters ? weightCountVehicleFunction(11.36 * 10, floorAreaSqMeters * sqMetersToThousandSqFeet) : undefined; diff --git a/packages/chaire-lib-common/src/services/dataSource/DataSource.ts b/packages/chaire-lib-common/src/services/dataSource/DataSource.ts index e362acf1..b9260f02 100644 --- a/packages/chaire-lib-common/src/services/dataSource/DataSource.ts +++ b/packages/chaire-lib-common/src/services/dataSource/DataSource.ts @@ -7,7 +7,6 @@ import { ObjectWithHistory } from '../../utils/objects/ObjectWithHistory'; import { GenericAttributes } from '../../utils/objects/GenericObject'; import serviceLocator from '../../utils/ServiceLocator'; -import { _isBlank } from '../../utils/LodashExtensions'; export const dataSourceTypesArray = [ 'none', diff --git a/packages/chaire-lib-common/src/services/geodata/FindOverlappingFeatures.ts b/packages/chaire-lib-common/src/services/geodata/FindOverlappingFeatures.ts index 78e9675f..4d2cb7a7 100644 --- a/packages/chaire-lib-common/src/services/geodata/FindOverlappingFeatures.ts +++ b/packages/chaire-lib-common/src/services/geodata/FindOverlappingFeatures.ts @@ -114,7 +114,7 @@ export const getOverlappingIndices = ( ) { overlappingIndices.push(index); } - } catch (e) { + } catch { // Unsupported geometry in overlap or within, just ignore instead of checking all types } } else if (comparisonMethod(toCompare.geometry, feature.geometry)) { diff --git a/packages/chaire-lib-common/src/services/objects/osm/OsmBuilding.ts b/packages/chaire-lib-common/src/services/objects/osm/OsmBuilding.ts index 321afb69..18761141 100644 --- a/packages/chaire-lib-common/src/services/objects/osm/OsmBuilding.ts +++ b/packages/chaire-lib-common/src/services/objects/osm/OsmBuilding.ts @@ -4,6 +4,7 @@ * This file is licensed under the MIT License. * License text available at https://opensource.org/licenses/MIT */ -import OsmElement from './OsmElement'; -export default class OsmBuilding {} +export default class OsmBuilding { + //TODO: Implement this class, or delete it. +} diff --git a/packages/chaire-lib-common/src/services/routing/RoutingResult.ts b/packages/chaire-lib-common/src/services/routing/RoutingResult.ts index 119721de..afc8ef6d 100644 --- a/packages/chaire-lib-common/src/services/routing/RoutingResult.ts +++ b/packages/chaire-lib-common/src/services/routing/RoutingResult.ts @@ -4,8 +4,6 @@ * This file is licensed under the MIT License. * License text available at https://opensource.org/licenses/MIT */ -import _get from 'lodash/get'; - import Preferences from '../../config/Preferences'; import { Route } from './RoutingService'; import { RoutingOrTransitMode, RoutingMode } from '../../config/routingModes'; diff --git a/packages/chaire-lib-common/src/services/routing/RoutingResultUtils.ts b/packages/chaire-lib-common/src/services/routing/RoutingResultUtils.ts index 81c1be55..b59df1d8 100644 --- a/packages/chaire-lib-common/src/services/routing/RoutingResultUtils.ts +++ b/packages/chaire-lib-common/src/services/routing/RoutingResultUtils.ts @@ -4,7 +4,6 @@ * This file is licensed under the MIT License. * License text available at https://opensource.org/licenses/MIT */ -import { _isBlank } from '../../utils/LodashExtensions'; import { RoutingMode } from '../../config/routingModes'; import { TransitRoutingResult, TransitRoutingResultData } from './TransitRoutingResult'; import { RoutingResult, UnimodalRoutingResult, UnimodalRoutingResultData } from './RoutingResult'; diff --git a/packages/chaire-lib-common/src/services/routing/TransitRoutingResult.ts b/packages/chaire-lib-common/src/services/routing/TransitRoutingResult.ts index 02e24e7d..f5f851c4 100644 --- a/packages/chaire-lib-common/src/services/routing/TransitRoutingResult.ts +++ b/packages/chaire-lib-common/src/services/routing/TransitRoutingResult.ts @@ -260,7 +260,7 @@ export class TransitRoutingResult implements RoutingResult { const walkingSegmentsGeojson: GeoJSON.Feature[] = []; const routingResults = await Promise.allSettled(walkingSegmentsRoutingPromises); - routingResults.forEach((walkingRoutingResult, routingIndex) => { + routingResults.forEach((walkingRoutingResult, _routingIndex) => { if (walkingRoutingResult.status === 'rejected') { return; } diff --git a/packages/chaire-lib-common/src/services/zones/ZoneCollection.ts b/packages/chaire-lib-common/src/services/zones/ZoneCollection.ts index a70c21dd..75d648ff 100644 --- a/packages/chaire-lib-common/src/services/zones/ZoneCollection.ts +++ b/packages/chaire-lib-common/src/services/zones/ZoneCollection.ts @@ -36,7 +36,8 @@ class ZoneCollection extends GenericObjectCollection implements Progressab this._eventManager.emitProgress(`${ZoneCollection.displayName}${progressEventName}`, completeRatio); } - newObject(attribs: Partial, isNew = false, collectionManager?: CollectionManager): Zone { + //TODO: Add functionality to the _collectionManager argument, or remove it. + newObject(attribs: Partial, isNew = false, _collectionManager?: CollectionManager): Zone { return new Zone(attribs, isNew); } diff --git a/packages/chaire-lib-common/src/tasks/dataImport/OsmDataPreparationNonResidential.ts b/packages/chaire-lib-common/src/tasks/dataImport/OsmDataPreparationNonResidential.ts index d46a9752..83af42a0 100644 --- a/packages/chaire-lib-common/src/tasks/dataImport/OsmDataPreparationNonResidential.ts +++ b/packages/chaire-lib-common/src/tasks/dataImport/OsmDataPreparationNonResidential.ts @@ -15,7 +15,6 @@ import { default as osmGeojsonService } from './data/osmGeojsonService'; import { getEntrancesForBuilding, findOsmData, FeatureEntrancesOptions } from './data/osmRawDataService'; -import { _toInteger } from '../../utils/LodashExtensions'; import { splitOverlappingFeatures, getOverlappingIndices, diff --git a/packages/chaire-lib-common/src/tasks/dataImport/OsmDataPreparationResidential.ts b/packages/chaire-lib-common/src/tasks/dataImport/OsmDataPreparationResidential.ts index b5f84499..f65e97e4 100644 --- a/packages/chaire-lib-common/src/tasks/dataImport/OsmDataPreparationResidential.ts +++ b/packages/chaire-lib-common/src/tasks/dataImport/OsmDataPreparationResidential.ts @@ -13,7 +13,7 @@ import { ZoneGeojsonProperties, default as osmGeojsonService } from './data/osmGeojsonService'; -import { getOsmNodesFor, getEntrancesForBuilding } from './data/osmRawDataService'; +import { getEntrancesForBuilding } from './data/osmRawDataService'; import { _toInteger } from '../../utils/LodashExtensions'; import { queryResidentialZones, queryZonesWithResidences } from '../../config/osm/osmFlatsLanduseTags'; import { findOverlappingFeatures } from '../../services/geodata/FindOverlappingFeatures'; diff --git a/packages/chaire-lib-common/src/tasks/dataImport/assignWeightToPOIs.ts b/packages/chaire-lib-common/src/tasks/dataImport/assignWeightToPOIs.ts index 8efed465..96ba1d2b 100644 --- a/packages/chaire-lib-common/src/tasks/dataImport/assignWeightToPOIs.ts +++ b/packages/chaire-lib-common/src/tasks/dataImport/assignWeightToPOIs.ts @@ -4,19 +4,12 @@ * This file is licensed under the MIT License. * License text available at https://opensource.org/licenses/MIT */ -import _uniq from 'lodash/uniq'; import _uniqBy from 'lodash/uniqBy'; -import _flatten from 'lodash/flatten'; import GenericDataImportTask from './genericDataImportTask'; import GeoJSON from 'geojson'; -import { DataGeojson, DataFileGeojson } from './data/dataGeojson'; +import { DataFileGeojson } from './data/dataGeojson'; import { SingleGeoFeature } from '../../services/geodata/GeoJSONUtils'; -import { PromptGeojsonPolygonService } from '../../services/prompt/promptGeojsonService'; import { PointOfInterest } from './data/osmGeojsonService'; -import { - landUseCodesByOsmTag, - tripGenerationFunctionsByLandUseCode -} from '../../config/osm/osmMappingTagsToTripGenerationHandbookLandUse'; import { poiWeightCategories, poiIgnoredQueries } from '../../config/osm/osmPoiCategories'; import { _isBlank } from '../../utils/LodashExtensions'; @@ -27,28 +20,29 @@ const poiIgnoredTags = poiIgnoredQueries.map((query) => { // TODO: make sure we do not have duplicate (like sport center as a node and as a building, wighted twice) // TODO: deal with access=private on buildings and/or POIs (should we include them or not, and if so, which?) -const getLanduseCodesFromProperty = (properties: { [key: string]: any }): number[] => { - const propertiesToMatch = Object.keys(properties).filter((prop) => landUseCodesByOsmTag[prop] !== undefined); - const possibleLandUseCodes = _uniq( - _flatten( - propertiesToMatch.map((prop) => { - const propValue = properties[prop]; - const matchProp = landUseCodesByOsmTag[prop]; - const matchValue = matchProp[propValue]; - if (matchValue !== undefined) { - return matchValue; - } - return matchProp['_default']; - }) - ) - ); - const landUseCodes = possibleLandUseCodes.filter((val) => val !== undefined && val !== null); - // TODO Validate if there are many possible categories? - // TODO: deal with Walmart, Costco, Canadian Tire + others with separate POIs inside the main building: - // garden center, supermarket, department store, pharmacy, tire store, car repair, fast food, etc. - // TODO: deal with building:part to separate floor area of large buildings when available - return landUseCodes as number[]; -}; +// TODO: This function is only used in code that was commented in this file. If this code is eventually uncommented, re-enable, otherwise delete it. +// const getLanduseCodesFromProperty = (properties: { [key: string]: any }): number[] => { +// const propertiesToMatch = Object.keys(properties).filter((prop) => landUseCodesByOsmTag[prop] !== undefined); +// const possibleLandUseCodes = _uniq( +// _flatten( +// propertiesToMatch.map((prop) => { +// const propValue = properties[prop]; +// const matchProp = landUseCodesByOsmTag[prop]; +// const matchValue = matchProp[propValue]; +// if (matchValue !== undefined) { +// return matchValue; +// } +// return matchProp['_default']; +// }) +// ) +// ); +// const landUseCodes = possibleLandUseCodes.filter((val) => val !== undefined && val !== null); +// // TODO Validate if there are many possible categories? +// // TODO: deal with Walmart, Costco, Canadian Tire + others with separate POIs inside the main building: +// // garden center, supermarket, department store, pharmacy, tire store, car repair, fast food, etc. +// // TODO: deal with building:part to separate floor area of large buildings when available +// return landUseCodes as number[]; +// }; export default class assignWeightToPOIs extends GenericDataImportTask { private _warnings: string[] = []; @@ -315,7 +309,6 @@ export default class assignWeightToPOIs extends GenericDataImportTask { private async categorizePOIs(poiDataSource: DataFileGeojson): Promise { const allPois = (poiDataSource.queryOr([{}]) || []).filter((poi) => { - let ignoredMatched = false; for (let i = 0, count = poiIgnoredTags.length; i < count; i++) { const tags = poiIgnoredTags[i] || {}; let allTagsMatch = true; @@ -325,7 +318,6 @@ export default class assignWeightToPOIs extends GenericDataImportTask { } } if (allTagsMatch) { - ignoredMatched = true; return false; } } diff --git a/packages/chaire-lib-common/src/tasks/dataImport/data/osmGeojsonService.ts b/packages/chaire-lib-common/src/tasks/dataImport/data/osmGeojsonService.ts index 45f4e5d0..b8480b6a 100644 --- a/packages/chaire-lib-common/src/tasks/dataImport/data/osmGeojsonService.ts +++ b/packages/chaire-lib-common/src/tasks/dataImport/data/osmGeojsonService.ts @@ -251,7 +251,8 @@ const isIndustrialArea = function (properties: { [name: string]: any }): boolean * Get the building or POI (node) category * @param properties The properties of the feature for which to check for the category */ -const getCategory = function (properties: { [name: string]: any }): string | null { +const getCategory = function (_properties: { [name: string]: any }): string | null { + // TODO: Make this function do something, or delete it. return null; }; @@ -259,7 +260,8 @@ const getCategory = function (properties: { [name: string]: any }): string | nul * Get the building or POI (node) detailed category * @param properties The properties of the feature for which to check for the category */ -const getCategoryDetailed = function (properties: { [name: string]: any }): string | null { +const getCategoryDetailed = function (_properties: { [name: string]: any }): string | null { + // TODO: Make this function do something, or delete it. return null; }; @@ -310,6 +312,14 @@ const getGeojsonsFromRawData = ( export default { isRetirementHome, isPark, + isPlayground, + isSportPitch, + isSchool, + isCollege, + isUniversity, + isCommercialBuilding, + isIndustrialBuilding, + isReligiousArea, isResidentialArea, isCommercialArea, isIndustrialArea, diff --git a/packages/chaire-lib-common/src/tasks/dataImport/prepareOsmDataForImport.ts b/packages/chaire-lib-common/src/tasks/dataImport/prepareOsmDataForImport.ts index 93220e3d..bc4f3e34 100644 --- a/packages/chaire-lib-common/src/tasks/dataImport/prepareOsmDataForImport.ts +++ b/packages/chaire-lib-common/src/tasks/dataImport/prepareOsmDataForImport.ts @@ -7,7 +7,6 @@ import GenericDataImportTask from './genericDataImportTask'; import { DataFileOsmRaw } from './data/dataOsmRaw'; import { DataFileGeojson } from './data/dataGeojson'; -import { _toInteger } from '../../utils/LodashExtensions'; import OsmDataPreparationResidential from './OsmDataPreparationResidential'; import OsmDataPreparationNonResidential from './OsmDataPreparationNonResidential'; diff --git a/packages/chaire-lib-common/src/test/services/events/EventManagerMock.ts b/packages/chaire-lib-common/src/test/services/events/EventManagerMock.ts index 81e444bc..c275ffc8 100644 --- a/packages/chaire-lib-common/src/test/services/events/EventManagerMock.ts +++ b/packages/chaire-lib-common/src/test/services/events/EventManagerMock.ts @@ -7,6 +7,7 @@ import EventManagerImpl, { EventManager } from '../../../services/events/EventManager'; import serviceLocator from '../../../utils/ServiceLocator'; +/* eslint-disable-next-line @typescript-eslint/no-unused-vars */ const eventMngr = new EventManagerImpl(); const mockEmit: jest.MockedFunction<(event: string | Event, ...args: any[]) => void> = jest.fn(); diff --git a/packages/chaire-lib-common/src/utils/LodashExtensions.ts b/packages/chaire-lib-common/src/utils/LodashExtensions.ts index da3f58f8..8142bc99 100644 --- a/packages/chaire-lib-common/src/utils/LodashExtensions.ts +++ b/packages/chaire-lib-common/src/utils/LodashExtensions.ts @@ -157,7 +157,7 @@ const _makeStringUnique = (str: string, otherStrings: string[]): string => { }; const _isEmail = (maybeEmail: string): boolean => { - return /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test( + return /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test( maybeEmail ); };