Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

UI updates: added support for map settings per realm

Rich Turnerc6896b3f9738
diff --git a/deployment/map/mapsettings.json b/deployment/map/mapsettings.json
index 7ecd6266e..05c307817 100644
--- a/deployment/map/mapsettings.json
+++ b/deployment/map/mapsettings.json
@@ -1,9 +1,21 @@
{
- "center": [5.4774, 51.4370],
- "maxBounds": [5.343, 51.378, 5.591, 51.509],
- "zoom": 13,
- "maxZoom": 19,
- "boxZoom": false,
+ "options": {
+ "default": {
+ "center": [5.4774, 51.4370],
+ "bounds": [5.343, 51.378, 5.591, 51.509],
+ "zoom": 13,
+ "maxZoom": 19,
+ "boxZoom": false
+ },
+ "customerA": {
+ "center": [5.4774, 51.4370],
+ "bounds": [5.343, 51.378, 5.591, 51.509],
+ "zoom": 13,
+ "minZoom": 14,
+ "maxZoom": 19,
+ "boxZoom": false
+ }
+ },
"version": 8,
"sources": {
"vector_tiles": {
diff --git a/manager/src/main/java/org/openremote/manager/map/MapResourceImpl.java b/manager/src/main/java/org/openremote/manager/map/MapResourceImpl.java
index 48eeaff2a..da388d5d9 100644
--- a/manager/src/main/java/org/openremote/manager/map/MapResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/map/MapResourceImpl.java
@@ -63,9 +63,4 @@ public class MapResourceImpl extends WebResource implements MapResource {
throw new WebApplicationException(Response.Status.NOT_FOUND);
}
}
-
- @Override
- public ObjectValue getSource(RequestParams requestParams) {
- return mapService.getMapSource(getAuthenticatedRealm(), identityService.getExternalServerUri().clone());
- }
}
diff --git a/manager/src/main/java/org/openremote/manager/map/MapService.java b/manager/src/main/java/org/openremote/manager/map/MapService.java
index aa3286232..9c2fcec40 100644
--- a/manager/src/main/java/org/openremote/manager/map/MapService.java
+++ b/manager/src/main/java/org/openremote/manager/map/MapService.java
@@ -98,8 +98,11 @@ public class MapService implements ContainerService {
ArrayValue vectorLayer = Values.<ObjectValue>parse(resultMap.get("json")).flatMap(json -> json.getArray("vector_layers")).orElse(null);
int maxZoom = Integer.valueOf(resultMap.get("maxzoom"));
int minZoom = Integer.valueOf(resultMap.get("minzoom"));
+ ArrayValue center = Values.parse(resultMap.get("center")).flatMap(Values::getArray).orElse(null);
+ ArrayValue bounds = Values.parse(resultMap.get("bounds")).flatMap(Values::getArray).orElse(null);
+
if (!TextUtil.isNullOrEmpty(attribution) && vectorLayer != null && !vectorLayer.isEmpty() && maxZoom > 0) {
- metadata = new Metadata(attribution, vectorLayer, maxZoom, minZoom);
+ metadata = new Metadata(attribution, vectorLayer, bounds, center, maxZoom, minZoom);
}
} catch (Exception ex) {
metadata = new Metadata();
@@ -206,6 +209,33 @@ public class MapService implements ContainerService {
LOG.warning("Map meta data could not be loaded, map functionality will not work");
return;
}
+
+ ObjectValue options = mapConfig.getObject("options").orElse(Values.createObject());
+ ObjectValue defaultOptions = options.getObject("default").orElse(Values.createObject());
+ options.put("default", defaultOptions);
+ mapConfig.put("options", options);
+
+ if (!defaultOptions.hasKey("maxZoom")) {
+ defaultOptions.put("maxZoom", metadata.maxZoom);
+ }
+ if (!defaultOptions.hasKey("minZoom")) {
+ defaultOptions.put("minZoom", metadata.minZoom);
+ }
+
+ if (metadata.getCenter() != null) {
+ if (!defaultOptions.hasKey("center")) {
+ ArrayValue center = metadata.getCenter().deepCopy();
+ center.remove(2);
+ defaultOptions.put("center", center);
+ }
+ if (!defaultOptions.hasKey("zoom")) {
+ defaultOptions.put("zoom", metadata.getCenter().getNumber(2).orElse(13d));
+ }
+ }
+
+ if (!defaultOptions.hasKey("bounds") && metadata.getBounds() != null) {
+ defaultOptions.put("bounds", metadata.getBounds());
+ }
}
@Override
@@ -236,15 +266,36 @@ public class MapService implements ContainerService {
// Set vector_tiles URL to MapResource getSource endpoint
mapSettings.getObject("sources")
.flatMap(s -> s.getObject("vector_tiles"))
- .ifPresent(vectorTilesObj ->
- vectorTilesObj.put(
- "url",
- baseUriBuilder.clone()
- .replacePath(API_PATH)
- .path(realm)
- .path("map/source")
- .build()
- .toString()));
+ .ifPresent(vectorTilesObj -> {
+
+ vectorTilesObj.remove("url");
+
+ vectorTilesObj.put("attribution", metadata.attribution);
+ vectorTilesObj.put("maxzoom", metadata.maxZoom);
+ vectorTilesObj.put("minzoom", metadata.minZoom);
+ vectorTilesObj.put("vector_layers", metadata.vectorLayers);
+
+ mapConfig.getArray("center").ifPresent(center ->
+ mapConfig.getNumber("zoom").ifPresent(zoom -> {
+ ArrayValue centerArray = center.deepCopy();
+ centerArray.add(Values.create(zoom));
+ vectorTilesObj.put("center", centerArray);
+ }));
+
+ ArrayValue tilesArray = Values.createArray();
+ String tileUrl = baseUriBuilder.clone().replacePath(API_PATH).path(realm).path("map/tile").build().toString() + "/{z}/{x}/{y}";
+ tilesArray.set(0, tileUrl);
+ vectorTilesObj.put("tiles", tilesArray);
+
+// vectorTilesObj.put(
+// "url",
+// baseUriBuilder.clone()
+// .replacePath(API_PATH)
+// .path(realm)
+// .path("map/source")
+// .build()
+// .toString());
+ });
// Set sprite URL to shared folder
mapSettings.getString("sprite").ifPresent(sprite -> {
@@ -265,51 +316,9 @@ public class MapService implements ContainerService {
mapSettings.put("glyphs", glyphsUri);
});
- if (!mapSettings.hasKey("maxZoom")) {
- mapSettings.put("maxZoom", metadata.maxZoom);
- }
- if (!mapSettings.hasKey("minZoom")) {
- mapSettings.put("minZoom", metadata.minZoom);
- }
-
return mapSettings;
}
- /**
- * Dynamically build Mapbox GL sources using metadata from mbtiles DB
- */
- public ObjectValue getMapSource(String realm, UriBuilder baseUriBuilder) {
-
- if (mapSource != null) {
- return mapSource;
- }
-
- mapSource = Values.createObject();
-
- if (!metadata.isValid() || !mapConfig.hasKeys()) {
- return mapSource;
- }
-
- mapSource.put("attribution", metadata.attribution);
- mapSource.put("maxzoom", metadata.maxZoom);
- mapSource.put("minzoom", metadata.minZoom);
- mapSource.put("vector_layers", metadata.vectorLayers);
-
- mapConfig.getArray("center").ifPresent(center ->
- mapConfig.getNumber("zoom").ifPresent(zoom -> {
- ArrayValue centerArray = center.deepCopy();
- centerArray.add(Values.create(zoom));
- mapSource.put("center", centerArray);
- }));
-
- ArrayValue tilesArray = Values.createArray();
- String tileUrl = baseUriBuilder.clone().replacePath(API_PATH).path(realm).path("map/tile").build().toString() + "/{z}/{x}/{y}";
- tilesArray.set(0, tileUrl);
- mapSource.put("tiles", tilesArray);
-
- return mapSource;
- }
-
/**
* Dynamically build Mapbox JS settings based on mapsettings.json
*/
@@ -325,27 +334,15 @@ public class MapService implements ContainerService {
return mapSettingsJs;
}
- mapSettingsJs.put("attribution", metadata.attribution);
- mapSettingsJs.put("maxzoom", mapConfig.getNumber("maxZoom").map(Double::intValue).orElse(metadata.maxZoom));
- mapSettingsJs.put("minzoom", mapConfig.getNumber("minZoom").map(Double::intValue).orElse(metadata.minZoom));
- if (mapConfig.hasKey("zoom")) {
- mapSettingsJs.put("zoom", mapConfig.getNumber("zoom").orElse(0d));
- }
- mapSettingsJs.put("format", "png");
- mapSettingsJs.put("type", "baselayer");
-
- mapConfig.getArray("center").ifPresent(center ->
- mapConfig.getNumber("zoom").ifPresent(zoom -> {
- ArrayValue centerArray = center.deepCopy();
- centerArray.add(Values.create(zoom));
- mapSettingsJs.put("center", centerArray);
- }));
-
- mapConfig.getArray("maxBounds").ifPresent(maxBounds -> mapSettingsJs.put("bounds", maxBounds.deepCopy()));
-
ArrayValue tilesArray = Values.createArray();
String tileUrl = baseUriBuilder.clone().replacePath(RASTER_MAP_TILE_PATH).build().toString() + "/{z}/{x}/{y}.png";
tilesArray.set(0, tileUrl);
+
+ mapSettingsJs.put("options", mapConfig.getObject("options").orElse(null));
+
+ mapSettingsJs.put("attribution", metadata.attribution);
+ mapSettingsJs.put("format", "png");
+ mapSettingsJs.put("type", "baselayer");
mapSettingsJs.put("tiles", tilesArray);
return mapSettingsJs;
@@ -394,11 +391,15 @@ public class MapService implements ContainerService {
protected ArrayValue vectorLayers;
protected int maxZoom;
protected int minZoom;
+ protected ArrayValue bounds;
+ protected ArrayValue center;
protected boolean valid;
- public Metadata(String attribution, ArrayValue vectorLayers, int maxZoom, int minZoom) {
+ public Metadata(String attribution, ArrayValue vectorLayers, ArrayValue bounds, ArrayValue center, int maxZoom, int minZoom) {
this.attribution = attribution;
this.vectorLayers = vectorLayers;
+ this.bounds = bounds;
+ this.center = center;
this.maxZoom = maxZoom;
this.minZoom = minZoom;
valid = true;
@@ -415,6 +416,14 @@ public class MapService implements ContainerService {
return vectorLayers;
}
+ public ArrayValue getBounds() {
+ return bounds;
+ }
+
+ public ArrayValue getCenter() {
+ return center;
+ }
+
public int getMaxZoom() {
return maxZoom;
}
diff --git a/model/src/main/java/org/openremote/model/map/MapResource.java b/model/src/main/java/org/openremote/model/map/MapResource.java
index 5fe067969..f16aa1890 100644
--- a/model/src/main/java/org/openremote/model/map/MapResource.java
+++ b/model/src/main/java/org/openremote/model/map/MapResource.java
@@ -60,15 +60,4 @@ public interface MapResource {
@Path("tile/{zoom}/{column}/{row}")
@SuppressWarnings("unusable-by-js")
byte[] getTile(@PathParam("zoom")int zoom, @PathParam("column")int column, @PathParam("row")int row);
-
- /**
- * Gets the vector tile sources data used by Mapbox GL
- */
- @GET
- @Path("source")
- @Produces(MediaType.APPLICATION_JSON)
- @SuccessStatusCode(200)
- @RolesAllowed({"read:map"})
- @SuppressWarnings("unusable-by-js")
- ObjectValue getSource(@BeanParam RequestParams requestParams);
}
diff --git a/ui/component/core/src/index.ts b/ui/component/core/src/index.ts
index f43bc284f..e5226e44c 100644
--- a/ui/component/core/src/index.ts
+++ b/ui/component/core/src/index.ts
@@ -298,6 +298,13 @@ export class Manager {
return undefined;
}
+ public getRealm(): string | undefined {
+ if (this._config) {
+ return this._config.realm;
+ }
+ return undefined;
+ }
+
// TODO: Native shell support
protected isNative(): boolean {
// return this.console && this.console.enabled;
@@ -305,7 +312,7 @@ export class Manager {
}
protected onAuthenticated() {
- console.log("Authentication successful");
+
}
// NOTE: The below works with Keycloak 2.x JS API - They made breaking changes in newer versions
diff --git a/ui/component/or-map/@types/mapbox.js.d.ts b/ui/component/or-map/@types/mapbox.js.d.ts
index ae43c0188..7544a4029 100644
--- a/ui/component/or-map/@types/mapbox.js.d.ts
+++ b/ui/component/or-map/@types/mapbox.js.d.ts
@@ -9,7 +9,7 @@ declare module "mapbox.js" {
type LatLngBoundsLike = [LatLngLike, LatLngLike] | LatLngBounds;
export interface MapOptions {
- zoom: number,
+ zoom?: number,
boxZoom?: boolean;
center?: LatLngLike;
maxBounds?: LatLngBoundsLike;
@@ -84,6 +84,9 @@ declare module "mapbox.js" {
namespace mapbox {
export class map {
constructor(element: string | Element, tilejson: object, options?: MapOptions);
+ getBoundsZoom(bounds: LatLngBoundsLike, inside?: boolean): number;
+ setMaxZoom(zoom: number): this;
+ setMinZoom(zoom: number): this;
}
}
diff --git a/ui/component/or-map/src/mapwidget.ts b/ui/component/or-map/src/mapwidget.ts
index 1ff617b34..094319220 100644
--- a/ui/component/or-map/src/mapwidget.ts
+++ b/ui/component/or-map/src/mapwidget.ts
@@ -51,25 +51,46 @@ export class MapWidget {
style.id = "mapboxJsStyle";
style.textContent = MapWidget._mapboxJsStyle.default.toString();
this._styleParent.appendChild(style);
-
const settingsResponse = await rest.api.MapResource.getSettingsJs();
const settings = <any> settingsResponse.data;
- const options: MapOptions = {
- zoom: <number>settings.zoom + 1, // JS zoom is out by one compared to GL
- minZoom: settings.minZoom || 0,
- maxZoom: settings.maxZoom || 22,
- boxZoom: settings.boxZoom || false,
- };
- if (settings.bounds) {
- let b = settings.bounds;
- options.maxBounds = [
- [b[1], b[0]],
- [b[3], b[2]],
- ];
+
+ // Load options for current realm or fallback to default if exist
+ let settingOptions : any = settings.options ? settings.options[openremote.getRealm() || "default"] ? settings.options[openremote.getRealm() || "default"] : settings.options.default : null;
+ let options: MapOptions | undefined;
+ if (settingOptions) {
+ options = {};
+
+ // JS zoom is out by one compared to GL
+ options.zoom = settingOptions.zoom ? settingOptions.zoom + 1 : undefined;
+ options.maxZoom = settingOptions.maxZoom;
+ options.minZoom = settingOptions.minZoom;
+ options.boxZoom = settingOptions.boxZoom;
+
+ // JS uses lat then lng unlike GL
+ if (settingOptions.bounds) {
+ let b = settingOptions.bounds;
+ options.maxBounds = [
+ [b[1], b[0]],
+ [b[3], b[2]],
+ ];
+ }
+ if (settingOptions.center) {
+ let c = settingOptions.center;
+ options.center = [
+ c[1], c[0]
+ ];
+ }
}
this._mapJs = new L.mapbox.map(this._mapContainer, settings, options);
+ if (options && options.maxBounds) {
+ const minZoom = this._mapJs.getBoundsZoom(options.maxBounds, true);
+ if (!options.minZoom || options.minZoom < minZoom) {
+ this._mapJs.setMinZoom(minZoom);
+ }
+ }
+
} else {
if (!MapWidget._mapboxGlStyle) {
// @ts-ignore
@@ -86,14 +107,12 @@ export class MapWidget {
const settingsResponse = await rest.api.MapResource.getSettings();
const settings = <any> settingsResponse.data;
- const options: MapboxOptions = {
+ // Load options for current realm or fallback to default if exist
+ let settingOptions : any = settings.options ? settings.options[openremote.getRealm() || "default"] ? settings.options[openremote.getRealm() || "default"] : settings.options.default : null;
+ let options: MapboxOptions = {
container: this._mapContainer,
style: <MapboxStyle> settings,
attributionControl: true,
- minZoom: settings.minZoom || 0,
- maxZoom: settings.maxZoom || 0,
- maxBounds: settings.maxBounds || null,
- boxZoom: settings.boxZoom || false,
transformRequest: (url, resourceType) => {
return {
url: url,
@@ -102,6 +121,15 @@ export class MapWidget {
}
};
+ if (settingOptions) {
+ options.minZoom = settingOptions.minZoom;
+ options.maxZoom = settingOptions.maxZoom;
+ options.maxBounds = settingOptions.bounds;
+ options.boxZoom = settingOptions.boxZoom;
+ options.zoom = settingOptions.zoom;
+ options.center = settingOptions.center;
+ }
+
this._mapGl = new map.Map(options);
}
}