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

Merge pull request #1610 from vvlladd28/feacher/add_map_here

Browse Source 
Add new map provider HERE
This commit is contained in:
Igor Kulikov 2019-04-17 12:07:34 +03:00 committed by GitHub
commit 852ae61a8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 101 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

61
ui/src/app/widget/lib/map-widget2.js
View File

@ -88,7 +88,10 @@ export default class TbMapWidgetV2 {
} else {
openStreetMapProvider.name = settings.mapProvider;
}
this.map = new TbOpenStreetMap($element, this.utils, initCallback, this.defaultZoomLevel, this.dontFitMapBounds, minZoomLevel, openStreetMapProvider);
} else if (mapProvider === 'here') {
this.map = new TbOpenStreetMap($element, this.utils, initCallback, this.defaultZoomLevel, this.dontFitMapBounds, minZoomLevel, settings.mapProvider, settings.credentials);
} else if (mapProvider === 'image-map') {
this.map = new TbImageMap(this.ctx, $element, this.utils, initCallback,
settings.mapImageUrl,
@ -670,6 +673,8 @@ export default class TbMapWidgetV2 {
return imageMapSettingsSchema;
} else if (mapProvider === 'tencent-map') {
schema = angular.copy(tencentMapSettingsSchema);
} else if (mapProvider === 'here') {
schema = angular.copy(hereMapSettingsSchema);
}
angular.merge(schema.schema.properties, commonMapSettingsSchema.schema.properties);
schema.schema.required = schema.schema.required.concat(commonMapSettingsSchema.schema.required);
@ -797,6 +802,62 @@ const tencentMapSettingsSchema =
]
};
const hereMapSettingsSchema =
{
"schema": {
"title": "HERE Map Configuration",
"type": "object",
"properties": {
"mapProvider": {
"title": "Map layer",
"type": "string",
"default": "HERE.normalDay"
},
"credentials":{
"type": "object",
"properties": {
"app_id": {
"title": "HERE app id",
"type": "string"
},
"app_code": {
"title": "HERE app code",
"type": "string"
}
},
"required": ["app_id", "app_code"]
}
},
"required": []
},
"form": [
{
"key": "mapProvider",
"type": "rc-select",
"multiple": false,
"items": [
{
"value": "HERE.normalDay",
"label": "HERE.normalDay (Default)"
},
{
"value": "HERE.normalNight",
"label": "HERE.normalNight"
},
{
"value": "HERE.hybridDay",
"label": "HERE.hybridDay"
},
{
"value": "HERE.terrainDay",
"label": "HERE.terrainDay"
}
]
},
"credentials"
]
};
const openstreetMapSettingsSchema =
{
"schema": {

12
ui/src/app/widget/lib/openstreet-map.js
View File

@ -19,7 +19,7 @@ import 'leaflet-providers';
export default class TbOpenStreetMap {
constructor($containerElement, utils, initCallback, defaultZoomLevel, dontFitMapBounds, minZoomLevel, mapProvider) {
constructor($containerElement, utils, initCallback, defaultZoomLevel, dontFitMapBounds, minZoomLevel, mapProvider, credentials) {
this.utils = utils;
this.defaultZoomLevel = defaultZoomLevel;
@ -29,14 +29,18 @@ export default class TbOpenStreetMap {
if (!mapProvider) {
mapProvider = {
name: "OpenStreetMap.Mapnik"
name: "OpenStreetMap.Mapnik"
};
}
if (mapProvider.startsWith("HERE.")) {
credentials.app_id = credentials.app_id || "AhM6TzD9ThyK78CT3ptx";
credentials.app_code = credentials.app_code || "p6NPiITB3Vv0GMUFnkLOOg";
}
this.map = L.map($containerElement[0]).setView([0, 0], this.defaultZoomLevel || 8);
var tileLayer = mapProvider.isCustom ? L.tileLayer(mapProvider.name) : L.tileLayer.provider(mapProvider.name);
var tileLayer = mapProvider.isCustom ? L.tileLayer(mapProvider.name) : L.tileLayer.provider(mapProvider.name, credentials);
tileLayer.addTo(this.map);
if (initCallback) {