Showing
2 changed files
with
24 additions
and
12 deletions
@@ -14,22 +14,28 @@ | @@ -14,22 +14,28 @@ | ||
14 | /// limitations under the License. | 14 | /// limitations under the License. |
15 | /// | 15 | /// |
16 | 16 | ||
17 | -import { MapProviders, UnitedMapSettings, providerSets, hereProviders, defaultSettings } from './map-models'; | 17 | +import { defaultSettings, hereProviders, MapProviders, providerSets, UnitedMapSettings } from './map-models'; |
18 | import LeafletMap from './leaflet-map'; | 18 | import LeafletMap from './leaflet-map'; |
19 | import { | 19 | import { |
20 | - commonMapSettingsSchema, | ||
21 | - routeMapSettingsSchema, | ||
22 | - markerClusteringSettingsSchema, | ||
23 | - markerClusteringSettingsSchemaLeaflet, | ||
24 | - mapProviderSchema, | ||
25 | - mapPolygonSchema | 20 | + commonMapSettingsSchema, |
21 | + mapPolygonSchema, | ||
22 | + mapProviderSchema, | ||
23 | + markerClusteringSettingsSchema, | ||
24 | + markerClusteringSettingsSchemaLeaflet, | ||
25 | + routeMapSettingsSchema | ||
26 | } from './schemes'; | 26 | } from './schemes'; |
27 | -import { MapWidgetStaticInterface, MapWidgetInterface } from './map-widget.interface'; | ||
28 | -import { initSchema, addToSchema, mergeSchemes, addCondition, addGroupInfo } from '@core/schema-utils'; | 27 | +import { MapWidgetInterface, MapWidgetStaticInterface } from './map-widget.interface'; |
28 | +import { addCondition, addGroupInfo, addToSchema, initSchema, mergeSchemes } from '@core/schema-utils'; | ||
29 | import { of, Subject } from 'rxjs'; | 29 | import { of, Subject } from 'rxjs'; |
30 | import { WidgetContext } from '@app/modules/home/models/widget-component.models'; | 30 | import { WidgetContext } from '@app/modules/home/models/widget-component.models'; |
31 | import { getDefCenterPosition, parseArray, parseData, parseFunction, parseWithTranslation } from './maps-utils'; | 31 | import { getDefCenterPosition, parseArray, parseData, parseFunction, parseWithTranslation } from './maps-utils'; |
32 | -import { JsonSettingsSchema, WidgetActionDescriptor, DatasourceType, widgetType, Datasource } from '@shared/models/widget.models'; | 32 | +import { |
33 | + Datasource, | ||
34 | + DatasourceType, | ||
35 | + JsonSettingsSchema, | ||
36 | + WidgetActionDescriptor, | ||
37 | + widgetType | ||
38 | +} from '@shared/models/widget.models'; | ||
33 | import { EntityId } from '@shared/models/id/entity-id'; | 39 | import { EntityId } from '@shared/models/id/entity-id'; |
34 | import { AttributeScope, DataKeyType, LatestTelemetry } from '@shared/models/telemetry/telemetry.models'; | 40 | import { AttributeScope, DataKeyType, LatestTelemetry } from '@shared/models/telemetry/telemetry.models'; |
35 | import { AttributeService } from '@core/http/attribute.service'; | 41 | import { AttributeService } from '@core/http/attribute.service'; |
@@ -39,7 +45,13 @@ import { UtilsService } from '@core/services/utils.service'; | @@ -39,7 +45,13 @@ import { UtilsService } from '@core/services/utils.service'; | ||
39 | // @dynamic | 45 | // @dynamic |
40 | export class MapWidgetController implements MapWidgetInterface { | 46 | export class MapWidgetController implements MapWidgetInterface { |
41 | 47 | ||
42 | - constructor(public mapProvider: MapProviders, private drawRoutes: boolean, public ctx: WidgetContext, $element: HTMLElement, isEdit?) { | 48 | + constructor( |
49 | + public mapProvider: MapProviders, | ||
50 | + private drawRoutes: boolean, | ||
51 | + public ctx: WidgetContext, | ||
52 | + $element: HTMLElement, | ||
53 | + isEdit?: boolean | ||
54 | + ) { | ||
43 | if (this.map) { | 55 | if (this.map) { |
44 | this.map.map.remove(); | 56 | this.map.map.remove(); |
45 | delete this.map; | 57 | delete this.map; |