Merge pull request #7103 from pjonsson/unused-imports

More import warning fixes

lib/Core/loadBlob.ts

@@ -1,9 +1,7 @@
 import Resource from "terriajs-cesium/Source/Core/Resource";
 import JsonValue from "./Json";
 import loadJson from "./loadJson";
-import URI from "urijs";
 import {
-  configure as zipConfigure,
   ZipReader,
   BlobReader as ZipBlobReader,
   Data64URIWriter as ZipData64URIWriter,

lib/Core/uriHelpers.ts

@@ -1,5 +1,3 @@
-import URI from "urijs";
-
 export const getUriWithoutPath = (anyUri: uri.URI) => {
   if (!anyUri) {
     return undefined;

lib/Map/Leaflet/ImageryProviderLeafletGridLayer.ts

@@ -1,4 +1,4 @@
-import L, { TileEvent } from "leaflet";
+import L from "leaflet";
 import {
   autorun,
   computed,

lib/Map/Leaflet/ImageryProviderLeafletTileLayer.ts

@@ -19,7 +19,6 @@ import ImageryLayerFeatureInfo from "terriajs-cesium/Source/Scene/ImageryLayerFe
 import ImageryProvider from "terriajs-cesium/Source/Scene/ImageryProvider";
 import SplitDirection from "terriajs-cesium/Source/Scene/SplitDirection";
 import isDefined from "../../Core/isDefined";
-import pollToPromise from "../../Core/pollToPromise";
 import TerriaError from "../../Core/TerriaError";
 import Leaflet from "../../Models/Leaflet";
 import getUrlForImageryTile from "../ImageryProvider/getUrlForImageryTile";

lib/ModelMixins/GetCapabilitiesMixin.ts

@@ -1,4 +1,4 @@
-import { computed, makeObservable, override } from "mobx";
+import { makeObservable, override } from "mobx";
 import AbstractConstructor from "../Core/AbstractConstructor";
 import Model from "../Models/Definition/Model";
 import StratumOrder from "../Models/Definition/StratumOrder";

lib/ModelMixins/MinMaxLevelMixin.ts

@@ -4,9 +4,9 @@ import Request from "terriajs-cesium/Source/Core/Request";
 import AbstractConstructor from "../Core/AbstractConstructor";
 import isDefined from "../Core/isDefined";
 import Model from "../Models/Definition/Model";
-import { scaleDenominatorToLevel } from "./../Core/scaleToDenominator";
+import { scaleDenominatorToLevel } from "../Core/scaleToDenominator";
 import CommonStrata from "./../Models/Definition/CommonStrata";
-import { MinMaxLevelTraits } from "./../Traits/TraitsClasses/MinMaxLevelTraits";
+import { MinMaxLevelTraits } from "../Traits/TraitsClasses/MinMaxLevelTraits";
 
 type BaseType = Model<MinMaxLevelTraits>;
 

lib/ModelMixins/TimeFilterMixin.ts

@@ -30,7 +30,6 @@ import TimeFilterTraits, {
 } from "../Traits/TraitsClasses/TimeFilterTraits";
 import DiscretelyTimeVaryingMixin from "./DiscretelyTimeVaryingMixin";
 import MappableMixin, { ImageryParts } from "./MappableMixin";
-import TimeVarying from "./TimeVarying";
 
 type BaseType = Model<TimeFilterTraits> & MappableMixin.Instance;
 

lib/Models/Catalog/CatalogGroups/OpenDataSoftCatalogGroup.ts

@@ -3,7 +3,6 @@ import { Dataset, Facet } from "@opendatasoft/api-client/dist/client/types";
 import i18next from "i18next";
 import { action, computed, runInAction, makeObservable } from "mobx";
 import URI from "urijs";
-import filterOutUndefined from "../../../Core/filterOutUndefined";
 import isDefined from "../../../Core/isDefined";
 import runLater from "../../../Core/runLater";
 import CatalogMemberMixin from "../../../ModelMixins/CatalogMemberMixin";

lib/Models/Catalog/CatalogItems/ApiTableCatalogItem.ts

@@ -5,7 +5,6 @@ import URI from "urijs";
 import isDefined from "../../../Core/isDefined";
 import loadJson from "../../../Core/loadJson";
 import AutoRefreshingMixin from "../../../ModelMixins/AutoRefreshingMixin";
-import CatalogMemberMixin from "../../../ModelMixins/CatalogMemberMixin";
 import TableMixin from "../../../ModelMixins/TableMixin";
 import TableAutomaticStylesStratum from "../../../Table/TableAutomaticStylesStratum";
 import ApiRequestTraits from "../../../Traits/TraitsClasses/ApiRequestTraits";

lib/Models/Catalog/CatalogItems/CesiumTerrainCatalogItem.ts

@@ -7,7 +7,6 @@ import {
 } from "mobx";
 import CesiumTerrainProvider from "terriajs-cesium/Source/Core/CesiumTerrainProvider";
 import IonResource from "terriajs-cesium/Source/Core/IonResource";
-import TerriaError from "../../../Core/TerriaError";
 import CatalogMemberMixin from "../../../ModelMixins/CatalogMemberMixin";
 import MappableMixin from "../../../ModelMixins/MappableMixin";
 import UrlMixin from "../../../ModelMixins/UrlMixin";

lib/Models/Catalog/CatalogItems/GeoRssCatalogItem.ts

@@ -12,9 +12,7 @@ import {
   geoRss2ToGeoJson,
   geoRssAtomToGeoJson
 } from "../../../Map/Vector/geoRssConvertor";
-import CatalogMemberMixin from "../../../ModelMixins/CatalogMemberMixin";
 import GeoJsonMixin from "../../../ModelMixins/GeojsonMixin";
-import UrlMixin from "../../../ModelMixins/UrlMixin";
 import { InfoSectionTraits } from "../../../Traits/TraitsClasses/CatalogMemberTraits";
 import GeoRssCatalogItemTraits from "../../../Traits/TraitsClasses/GeoRssCatalogItemTraits";
 import CreateModel from "../../Definition/CreateModel";

lib/Models/Catalog/CatalogItems/MapboxVectorTileCatalogItem.ts

@@ -1,12 +1,6 @@
 import bbox from "@turf/bbox";
 import i18next from "i18next";
-import {
-  computed,
-  observable,
-  runInAction,
-  makeObservable,
-  override
-} from "mobx";
+import { computed, runInAction, makeObservable, override } from "mobx";
 import {
   GeomType,
   json_style,

lib/Models/Catalog/CatalogItems/ShapefileCatalogItem.ts

@@ -6,7 +6,6 @@ import isDefined from "../../../Core/isDefined";
 import JsonValue, { isJsonObject, JsonArray } from "../../../Core/Json";
 import loadBlob, { isZip } from "../../../Core/loadBlob";
 import TerriaError from "../../../Core/TerriaError";
-import CatalogMemberMixin from "../../../ModelMixins/CatalogMemberMixin";
 import GeoJsonMixin, {
   FeatureCollectionWithCrs
 } from "../../../ModelMixins/GeojsonMixin";

lib/Models/Catalog/CatalogItems/SocrataMapViewCatalogItem.ts

@@ -1,7 +1,6 @@
 import { computed, runInAction, makeObservable } from "mobx";
 import loadJson from "../../../Core/loadJson";
 import TerriaError from "../../../Core/TerriaError";
-import CatalogMemberMixin from "../../../ModelMixins/CatalogMemberMixin";
 import GeoJsonMixin, {
   toFeatureCollection
 } from "../../../ModelMixins/GeojsonMixin";

lib/Models/Catalog/CatalogReferences/ThreddsItemReference.ts

@@ -8,7 +8,6 @@ import ThreddsCatalogGroup, {
   ThreddsDataset
 } from "../CatalogGroups/ThreddsCatalogGroup";
 import CatalogMemberFactory from "../CatalogMemberFactory";
-import CommonStrata from "../../Definition/CommonStrata";
 import CreateModel from "../../Definition/CreateModel";
 import LoadableStratum from "../../Definition/LoadableStratum";
 import { BaseModel } from "../../Definition/Model";

lib/Models/Catalog/Esri/ArcGisFeatureServerCatalogGroup.ts

@@ -6,7 +6,7 @@ import isDefined from "../../../Core/isDefined";
 import loadJson from "../../../Core/loadJson";
 import replaceUnderscores from "../../../Core/replaceUnderscores";
 import runLater from "../../../Core/runLater";
-import TerriaError, { networkRequestError } from "../../../Core/TerriaError";
+import { networkRequestError } from "../../../Core/TerriaError";
 import CatalogMemberMixin from "../../../ModelMixins/CatalogMemberMixin";
 import GroupMixin from "../../../ModelMixins/GroupMixin";
 import UrlMixin from "../../../ModelMixins/UrlMixin";

lib/Models/Catalog/Esri/ArcGisFeatureServerCatalogItem.ts

@@ -9,11 +9,9 @@ import replaceUnderscores from "../../../Core/replaceUnderscores";
 import { networkRequestError } from "../../../Core/TerriaError";
 import featureDataToGeoJson from "../../../Map/PickedFeatures/featureDataToGeoJson";
 import proj4definitions from "../../../Map/Vector/Proj4Definitions";
-import CatalogMemberMixin from "../../../ModelMixins/CatalogMemberMixin";
 import GeoJsonMixin, {
   FeatureCollectionWithCrs
 } from "../../../ModelMixins/GeojsonMixin";
-import UrlMixin from "../../../ModelMixins/UrlMixin";
 import ArcGisFeatureServerCatalogItemTraits from "../../../Traits/TraitsClasses/ArcGisFeatureServerCatalogItemTraits";
 import { InfoSectionTraits } from "../../../Traits/TraitsClasses/CatalogMemberTraits";
 import { RectangleTraits } from "../../../Traits/TraitsClasses/MappableTraits";

lib/Models/Catalog/Ows/WebFeatureServiceCatalogGroup.ts

@@ -5,7 +5,7 @@ import filterOutUndefined from "../../../Core/filterOutUndefined";
 import isDefined from "../../../Core/isDefined";
 import replaceUnderscores from "../../../Core/replaceUnderscores";
 import runLater from "../../../Core/runLater";
-import TerriaError, { networkRequestError } from "../../../Core/TerriaError";
+import { networkRequestError } from "../../../Core/TerriaError";
 import CatalogMemberMixin from "../../../ModelMixins/CatalogMemberMixin";
 import GetCapabilitiesMixin from "../../../ModelMixins/GetCapabilitiesMixin";
 import GroupMixin from "../../../ModelMixins/GroupMixin";

lib/Models/Catalog/Ows/WebMapServiceCapabilities.ts

@@ -2,7 +2,7 @@ import { createTransformer } from "mobx-utils";
 import defined from "terriajs-cesium/Source/Core/defined";
 import isReadOnlyArray from "../../../Core/isReadOnlyArray";
 import loadXML from "../../../Core/loadXML";
-import TerriaError, { networkRequestError } from "../../../Core/TerriaError";
+import { networkRequestError } from "../../../Core/TerriaError";
 import xml2json from "../../../ThirdParty/xml2json";
 import { RectangleTraits } from "../../../Traits/TraitsClasses/MappableTraits";
 import {

lib/Models/Catalog/Ows/WebMapTileServiceCatalogGroup.ts

@@ -5,7 +5,7 @@ import filterOutUndefined from "../../../Core/filterOutUndefined";
 import isDefined from "../../../Core/isDefined";
 import replaceUnderscores from "../../../Core/replaceUnderscores";
 import runLater from "../../../Core/runLater";
-import TerriaError, { networkRequestError } from "../../../Core/TerriaError";
+import { networkRequestError } from "../../../Core/TerriaError";
 import CatalogMemberMixin from "../../../ModelMixins/CatalogMemberMixin";
 import GetCapabilitiesMixin from "../../../ModelMixins/GetCapabilitiesMixin";
 import GroupMixin from "../../../ModelMixins/GroupMixin";

lib/Models/Catalog/Ows/WebProcessingServiceCapabilities.ts

@@ -2,7 +2,7 @@ import i18next from "i18next";
 import filterOutUndefined from "../../../Core/filterOutUndefined";
 import { isJsonObject, isJsonString } from "../../../Core/Json";
 import loadXML from "../../../Core/loadXML";
-import TerriaError, { networkRequestError } from "../../../Core/TerriaError";
+import { networkRequestError } from "../../../Core/TerriaError";
 import xml2json from "../../../ThirdParty/xml2json";
 import {
   OnlineResource,

lib/Models/Catalog/Ows/WebProcessingServiceCatalogFunctionJob.ts

@@ -12,7 +12,7 @@ import {
 import Mustache from "mustache";
 import URI from "urijs";
 import isDefined from "../../../Core/isDefined";
-import { JsonObject, isJsonObject } from "../../../Core/Json";
+import { JsonObject } from "../../../Core/Json";
 import TerriaError from "../../../Core/TerriaError";
 import CatalogFunctionJobMixin from "../../../ModelMixins/CatalogFunctionJobMixin";
 import CatalogMemberMixin from "../../../ModelMixins/CatalogMemberMixin";

lib/Models/Catalog/Ows/WebProcessingServiceCatalogGroup.ts

@@ -2,7 +2,6 @@ import i18next from "i18next";
 import { action, computed, runInAction, makeObservable } from "mobx";
 import URI from "urijs";
 import filterOutUndefined from "../../../Core/filterOutUndefined";
-import { isJsonObject } from "../../../Core/Json";
 import replaceUnderscores from "../../../Core/replaceUnderscores";
 import runLater from "../../../Core/runLater";
 import TerriaError from "../../../Core/TerriaError";

lib/Models/Catalog/SdmxJson/SdmxJsonServerStratum.ts

@@ -7,12 +7,10 @@ import flatten from "../../../Core/flatten";
 import isDefined from "../../../Core/isDefined";
 import { regexMatches } from "../../../Core/regexMatches";
 import TerriaError from "../../../Core/TerriaError";
-import { InfoSectionTraits } from "../../../Traits/TraitsClasses/CatalogMemberTraits";
 import ModelReference from "../../../Traits/ModelReference";
 import SdmxCatalogGroupTraits from "../../../Traits/TraitsClasses/SdmxCatalogGroupTraits";
 import CatalogGroup from "../CatalogGroup";
 import CommonStrata from "../../Definition/CommonStrata";
-import createStratumInstance from "../../Definition/createStratumInstance";
 import LoadableStratum from "../../Definition/LoadableStratum";
 import { BaseModel } from "../../Definition/Model";
 import proxyCatalogItemUrl from "../proxyCatalogItemUrl";

lib/Models/ItemSearchProviders/ItemSearchProvider.ts

@@ -1,5 +1,3 @@
-import BoundingSphere from "terriajs-cesium/Source/Core/BoundingSphere";
-import Cartographic from "terriajs-cesium/Source/Core/Cartographic";
 import { SearchParameterTraits } from "../../Traits/TraitsClasses/SearchableItemTraits";
 
 export type ItemSearchParameter =

lib/Models/SearchProviders/upsertSearchProviderFromJson.ts

@@ -3,7 +3,6 @@ import { runInAction } from "mobx";
 import Result from "../../Core/Result";
 import TerriaError from "../../Core/TerriaError";
 import { applyTranslationIfExists } from "../../Language/languageHelpers";
-import SearchProviderMixin from "../../ModelMixins/SearchProviders/SearchProviderMixin";
 import CommonStrata from "../Definition/CommonStrata";
 import { BaseModel } from "../Definition/Model";
 import updateModelFromJson from "../Definition/updateModelFromJson";

lib/Models/Workflows/TableStylingWorkflow.ts

@@ -6,8 +6,7 @@ import {
   ObservableMap,
   reaction,
   runInAction,
-  makeObservable,
-  override
+  makeObservable
 } from "mobx";
 import filterOutUndefined from "../../Core/filterOutUndefined";
 import isDefined from "../../Core/isDefined";

lib/ReactViews/Custom/FeedbackLinkCustomComponent.tsx

@@ -1,6 +1,6 @@
 import i18next from "i18next";
 import { runInAction } from "mobx";
-import React, { ReactElement, ReactNode } from "react";
+import React, { ReactElement } from "react";
 import ViewState from "../../ReactViewModels/ViewState";
 import { RawButton } from "../../Styled/Button";
 import Text from "../../Styled/Text";

lib/ReactViews/Custom/parseCustomHtmlToReact.ts

@@ -6,7 +6,6 @@ import React, {
   DetailedReactHTMLElement,
   ReactElement
 } from "react";
-import styled from "styled-components";
 import CustomComponent, {
   DomElement,
   ProcessNodeContext

lib/ReactViews/Errors/RaiseToUserErrorBoundary.tsx

@@ -1,5 +1,5 @@
 import React, { ErrorInfo } from "react";
-import TerriaError, { TerriaErrorOverrides } from "../../Core/TerriaError";
+import { TerriaErrorOverrides } from "../../Core/TerriaError";
 import ViewState from "../../ReactViewModels/ViewState";
 
 type PropsType = {

lib/ReactViews/ExplorerWindow/ExplorerWindow.tsx

@@ -1,7 +1,6 @@
 import { action } from "mobx";
 import { observer } from "mobx-react";
 import React from "react";
-import ViewState from "../../ReactViewModels/ViewState";
 import { useViewState } from "../Context";
 import ModalPopup from "./ModalPopup";
 import Tabs from "./Tabs";

lib/ReactViews/FeatureInfo/FeatureInfoPanel.tsx

@@ -7,7 +7,6 @@ import { withTranslation } from "react-i18next";
 import Cartesian3 from "terriajs-cesium/Source/Core/Cartesian3";
 import Ellipsoid from "terriajs-cesium/Source/Core/Ellipsoid";
 import CesiumMath from "terriajs-cesium/Source/Core/Math";
-import DataSource from "terriajs-cesium/Source/DataSources/DataSource";
 import Entity from "terriajs-cesium/Source/DataSources/Entity";
 import flatten from "../../Core/flatten";
 import isDefined from "../../Core/isDefined";
@@ -21,7 +20,6 @@ import TerriaFeature from "../../Models/Feature/Feature";
 import {
   addMarker,
   isMarkerVisible,
-  LOCATION_MARKER_DATA_SOURCE_NAME,
   removeMarker
 } from "../../Models/LocationMarkerUtils";
 import Terria from "../../Models/Terria";

lib/ReactViews/FeatureInfo/FeatureInfoSection.tsx

@@ -12,7 +12,7 @@ import {
 import { observer } from "mobx-react";
 import { IDisposer } from "mobx-utils";
 import Mustache from "mustache";
-import React, { Ref } from "react";
+import React from "react";
 import { withTranslation } from "react-i18next";
 import styled from "styled-components";
 import Cartesian3 from "terriajs-cesium/Source/Core/Cartesian3";

lib/ReactViews/Feedback/FeedbackForm.tsx

@@ -17,7 +17,7 @@ import parseCustomMarkdownToReact, {
   parseCustomMarkdownToReactWithOptions
 } from "../Custom/parseCustomMarkdownToReact";
 import { WithViewState, withViewState } from "../Context";
-import { applyTranslationIfExists } from "./../../Language/languageHelpers";
+import { applyTranslationIfExists } from "../../Language/languageHelpers";
 
 interface IProps extends WithTranslation, WithViewState {
   theme: DefaultTheme;

lib/ReactViews/Map/BottomBar/DistanceLegend.tsx

@@ -2,7 +2,7 @@
 import L from "leaflet";
 import { runInAction } from "mobx";
 import { observer } from "mobx-react";
-import React, { FC, useEffect, useState, memo } from "react";
+import React, { FC, useEffect, useState } from "react";
 import { useTheme } from "styled-components";
 import Cartesian2 from "terriajs-cesium/Source/Core/Cartesian2";
 import EllipsoidGeodesic from "terriajs-cesium/Source/Core/EllipsoidGeodesic";

lib/ReactViews/Map/Panels/SharePanel/ShareUrl/ShareUrlWarning.tsx

@@ -1,7 +1,6 @@
 import React, { FC } from "react";
 import { Trans, useTranslation } from "react-i18next";
 import styled from "styled-components";
-import { reaction } from "mobx";
 import { observer } from "mobx-react";
 
 import { getName } from "../../../../../ModelMixins/CatalogMemberMixin";

lib/ReactViews/Map/Panels/ToolsPanel/CountDatasets.tsx

@@ -2,8 +2,7 @@
 
 import { observer } from "mobx-react";
 import React, { useState } from "react";
-import { useTranslation, withTranslation } from "react-i18next";
-import defined from "terriajs-cesium/Source/Core/defined";
+import { useTranslation } from "react-i18next";
 import {
   applyTranslationIfExists,
   TRANSLATE_KEY_PREFIX

lib/ReactViews/Notification/MapInteractionWindow.tsx

@@ -3,7 +3,6 @@
 import classNames from "classnames";
 import { Lambda, observable, reaction, makeObservable } from "mobx";
 import { observer } from "mobx-react";
-import PropTypes from "prop-types";
 import React from "react";
 import styled from "styled-components";
 import isDefined from "../../Core/isDefined";

lib/ReactViews/Preview/ExportData.tsx

@@ -5,7 +5,6 @@ import { withTranslation, WithTranslation } from "react-i18next";
 import Styles from "./mappable-preview.scss";
 import { observer } from "mobx-react";
 
-import TerriaError from "../../Core/TerriaError";
 import isDefined from "../../Core/isDefined";
 import ExportableMixin from "../../ModelMixins/ExportableMixin";
 const FileSaver = require("file-saver");

lib/ReactViews/StandardUserInterface/TrainerBar/TrainerBar.tsx

@@ -18,7 +18,7 @@ import Spacing from "../../../Styled/Spacing";
 import Text, { TextSpan } from "../../../Styled/Text";
 import measureElement, { MeasureElementProps } from "../../HOCs/measureElement";
 import { WithViewState, withViewState } from "../../Context";
-import { applyTranslationIfExists } from "./../../../Language/languageHelpers";
+import { applyTranslationIfExists } from "../../../Language/languageHelpers";
 
 const StyledHtml: any =
   require("../../Map/Panels/HelpPanel/StyledHtml").default;

lib/ReactViews/Story/StoryPanel/StoryButtons.tsx

@@ -1,9 +1,8 @@
 import React from "react";
 import { useTranslation } from "react-i18next";
 import styled, { useTheme } from "styled-components";
-import Button, { RawButton } from "../../../Styled/Button";
+import { RawButton } from "../../../Styled/Button";
 import Icon, { StyledIcon } from "../../../Styled/Icon";
-import Styles from "../story-panel.scss";
 
 interface BtnProp {
   onClick: () => void;

lib/ReactViews/Tools/PedestrianMode/DropPedestrianToGround.tsx

@@ -3,7 +3,6 @@ import { useTranslation } from "react-i18next";
 import Cartesian2 from "terriajs-cesium/Source/Core/Cartesian2";
 import Cartesian3 from "terriajs-cesium/Source/Core/Cartesian3";
 import Cartographic from "terriajs-cesium/Source/Core/Cartographic";
-import Ellipsoid from "terriajs-cesium/Source/Core/Ellipsoid";
 import EllipsoidTerrainProvider from "terriajs-cesium/Source/Core/EllipsoidTerrainProvider";
 import sampleTerrainMostDetailed from "terriajs-cesium/Source/Core/sampleTerrainMostDetailed";
 import ScreenSpaceEventHandler from "terriajs-cesium/Source/Core/ScreenSpaceEventHandler";

lib/ReactViews/Tour/TourPortal.jsx

@@ -24,7 +24,7 @@ import Caret from "../Generic/Caret";
 import CloseButton from "../Generic/CloseButton";
 import { useWindowSize } from "../Hooks/useWindowSize";
 import { useViewState } from "../Context";
-import { applyTranslationIfExists } from "./../../Language/languageHelpers";
+import { applyTranslationIfExists } from "../../Language/languageHelpers";
 import {
   calculateLeftPosition,
   calculateTopPosition,

lib/ReactViews/Workbench/Controls/ViewingControls.tsx

@@ -32,10 +32,7 @@ import CommonStrata from "../../../Models/Definition/CommonStrata";
 import hasTraits from "../../../Models/Definition/hasTraits";
 import Model, { BaseModel } from "../../../Models/Definition/Model";
 import getAncestors from "../../../Models/getAncestors";
-import {
-  default as ViewingControlsModel,
-  ViewingControl
-} from "../../../Models/ViewingControls";
+import { ViewingControl } from "../../../Models/ViewingControls";
 import ViewState from "../../../ReactViewModels/ViewState";
 import AnimatedSpinnerIcon from "../../../Styled/AnimatedSpinnerIcon";
 import Box from "../../../Styled/Box";