dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update map bundles

Browse Source
This commit is contained in:
Artem Halushko 2020-04-27 16:10:46 +03:00
parent 26e5f69b32
commit 4f8942b112
3 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
application/src/main/data/json/system/widget_bundles/maps.json
View File

File diff suppressed because one or more lines are too long

22
ui-ngx/src/app/core/schema-utils.ts
View File

@ -62,19 +62,21 @@ export function mergeSchemes(schemes: JsonSettingsSchema[]): JsonSettingsSchema
}, initSchema());
}
export function addCondition(schema: JsonSettingsSchema, condition: string): JsonSettingsSchema {
export function addCondition(schema: JsonSettingsSchema, condition: string, exclude: string[] = []): JsonSettingsSchema {
schema.form = schema.form.map(element => {
if (typeof element === 'string') {
return {
key: element,
condition
if (!exclude.includes(element)) {
if (typeof element === 'string') {
return {
key: element,
condition
}
}
}
if (typeof element === 'object') {
if (element.condition) {
element.condition += ' && ' + condition
if (typeof element === 'object') {
if (element.condition) {
element.condition += ' && ' + condition
}
else element.condition = condition;
}
else element.condition = condition;
}
return element;
});

32
ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts
View File

@ -94,21 +94,20 @@ export class MapWidgetController implements MapWidgetInterface {
public static settingsSchema(mapProvider: MapProviders, drawRoutes: boolean): JsonSettingsSchema {
const schema = initSchema();
addToSchema(schema, this.getProvidersSchema(mapProvider));
if (mapProvider !== 'image-map') {
addGroupInfo(schema, 'Map Provider Settings');
addToSchema(schema, commonMapSettingsSchema);
addGroupInfo(schema, 'Common Map Settings');
addToSchema(schema, addCondition(mapPolygonSchema, 'model.showPolygon === true'));
addGroupInfo(schema, 'Polygon Settings');
if (drawRoutes) {
addToSchema(schema, routeMapSettingsSchema);
addGroupInfo(schema, 'Route Map Settings');
} else if (mapProvider !== 'image-map') {
const clusteringSchema = mergeSchemes([markerClusteringSettingsSchema,
addCondition(markerClusteringSettingsSchemaLeaflet, `model.useClusterMarkers === true`)])
addToSchema(schema, clusteringSchema);
addGroupInfo(schema, 'Markers Clustering Settings');
}
addGroupInfo(schema, 'Map Provider Settings');
addToSchema(schema, addCondition(commonMapSettingsSchema, 'model.provider !== "image-map"'));
addGroupInfo(schema, 'Common Map Settings');
addToSchema(schema, addCondition(mapPolygonSchema, 'model.showPolygon=== true', ['showPolygon']));
addGroupInfo(schema, 'Polygon Settings');
if (drawRoutes) {
addToSchema(schema, routeMapSettingsSchema);
addGroupInfo(schema, 'Route Map Settings');
} else {
const clusteringSchema = mergeSchemes([markerClusteringSettingsSchema,
addCondition(markerClusteringSettingsSchemaLeaflet,
`model.useClusterMarkers === true && model.provider !== "image-map"`)])
addToSchema(schema, clusteringSchema);
addGroupInfo(schema, 'Markers Clustering Settings');
}
return schema;
}
@ -162,7 +161,6 @@ export class MapWidgetController implements MapWidgetInterface {
}
setMarkerLocation = (e) => {
console.log("setMarkerLocation -> e", e)
const attributeService = this.ctx.$injector.get(AttributeService);
const entityId: EntityId = {
@ -186,7 +184,7 @@ export class MapWidgetController implements MapWidgetInterface {
initSettings(settings: UnitedMapSettings): UnitedMapSettings {
const functionParams = ['data', 'dsData', 'dsIndex'];
this.provider = settings.provider || this.mapProvider;
if (!settings.mapProviderHere) {
if (this.provider === MapProviders.here && !settings.mapProviderHere) {
if (settings.mapProvider && hereProviders.includes(settings.mapProvider))
settings.mapProviderHere = settings.mapProvider
else settings.mapProviderHere = hereProviders[0];