Merge branch 'DEVELOP' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.frontend into DEVELOP
diff --git a/projects/openk/grid-failure-information-map/src/constants/globals.ts b/projects/openk/grid-failure-information-map/src/constants/globals.ts
index 8c84a88..c25e942 100644
--- a/projects/openk/grid-failure-information-map/src/constants/globals.ts
+++ b/projects/openk/grid-failure-information-map/src/constants/globals.ts
@@ -13,6 +13,8 @@
export class Globals {
static OVERVIEW_MAP_INITIAL_LATITUDE = 49.656634;
static OVERVIEW_MAP_INITIAL_LONGITUDE = 8.423207;
+ static OVERVIEW_MAP_INITIAL_ZOOM_FACTOR = 6;
+ static DETAIL_MAP_INITIAL_ZOOM_FACTOR = 10;
static MAX_ZOOM = 19;
static ICON_SIZE_X_COORDINATE = 41;
static ICON_SIZE_Y_COORDINATE = 51;
diff --git a/projects/openk/grid-failure-information-map/src/lib/grid-failure-information-map.component.ts b/projects/openk/grid-failure-information-map/src/lib/grid-failure-information-map.component.ts
index 8401de8..b2b0afa 100644
--- a/projects/openk/grid-failure-information-map/src/lib/grid-failure-information-map.component.ts
+++ b/projects/openk/grid-failure-information-map/src/lib/grid-failure-information-map.component.ts
@@ -70,10 +70,10 @@
if (!!this._mapDetailData.latitude && !!this._mapDetailData.longitude) {
this._initMap(this._mapDetailData.latitude, this._mapDetailData.longitude, this._mapOptions.detailMapInitialZoom);
} else {
- this._initMap(this._overviewMapInitialLatitude, this._overviewMapInitialLongitude, this._mapOptions.overviewMapInitialZoom);
+ this._initMap(this._overviewMapInitialLatitude, this._overviewMapInitialLongitude, this._mapOptions.detailMapInitialZoom);
}
} else {
- this._initMap(this._overviewMapInitialLatitude, this._overviewMapInitialLongitude, this._mapOptions.overviewMapInitialZoom);
+ this._initMap(this._overviewMapInitialLatitude, this._overviewMapInitialLongitude, this._mapOptions.detailMapInitialZoom);
}
this._setDetailMarker();
}
diff --git a/projects/openk/grid-failure-information-map/src/shared/models/map-options.model.ts b/projects/openk/grid-failure-information-map/src/shared/models/map-options.model.ts
index ae5e3dd..90ca03b 100644
--- a/projects/openk/grid-failure-information-map/src/shared/models/map-options.model.ts
+++ b/projects/openk/grid-failure-information-map/src/shared/models/map-options.model.ts
@@ -12,11 +12,12 @@
********************************************************************************/
import { Subject } from 'rxjs';
import { VisibilityConfigurationInterface } from '@openk-libs/grid-failure-information-map/shared/models/visibility-configuration.interface';
+import { Globals } from '@openk-libs/grid-failure-information-map/constants/globals';
export class MapOptions {
public forceResize$: Subject<any> = new Subject<any>();
- public overviewMapInitialZoom: number = null;
- public detailMapInitialZoom: number = null;
+ public overviewMapInitialZoom: number = Globals.OVERVIEW_MAP_INITIAL_ZOOM_FACTOR;
+ public detailMapInitialZoom: number = Globals.DETAIL_MAP_INITIAL_ZOOM_FACTOR;
public extendMarkerInformation: boolean = false;
public overviewMapInitialLatitude: string = null;
public overviewMapInitialLongitude: string = null;
