diff --git a/cypress/tests/add-data-url.cy.ts b/cypress/tests/add-data-url.cy.ts index c2ea2522c1..1f4f28677b 100644 --- a/cypress/tests/add-data-url.cy.ts +++ b/cypress/tests/add-data-url.cy.ts @@ -1,9 +1,9 @@ function checkIfLayerAdded(layerName) { cy.get(`hs-panel-header[name="layermanager"]`).should('be.visible'); cy.get( - 'hs-layermanager-layer-list li:first .d-flex button.hs-lm-item-visibility', + 'hs-layer-manager-layer-list li:first .d-flex button.hs-lm-item-visibility', ).should('have.class', 'hs-checkmark'); - cy.get('hs-layermanager-layer-list li:first .hs-lm-item-title').should( + cy.get('hs-layer-manager-layer-list li:first .hs-lm-item-title').should( 'have.text', ` ${layerName} `, //Extra padding around title ); @@ -39,7 +39,7 @@ describe('Hslayers application', () => { //Open layer manager cy.get('.hs-sidebar-item[data-cy="layermanager"]').click(); //Turn off all layers - cy.get('hs-layermanager-layer-list li .d-flex button.hs-checkmark').each( + cy.get('hs-layer-manager-layer-list li .d-flex button.hs-checkmark').each( (button) => { cy.wrap(button).click(); }, diff --git a/cypress/tests/layermanager.cy.ts b/cypress/tests/layermanager.cy.ts index ab1faca6a6..db73d3efde 100644 --- a/cypress/tests/layermanager.cy.ts +++ b/cypress/tests/layermanager.cy.ts @@ -4,7 +4,7 @@ describe('Hslayers application', () => { //Open layer manager cy.get('.hs-sidebar-item[data-cy="layermanager"]').click(); //Turn off all layers - cy.get('hs-layermanager-layer-list li .d-flex button.hs-checkmark').each( + cy.get('hs-layer-manager-layer-list li .d-flex button.hs-checkmark').each( (button) => { cy.wrap(button).click(); }, diff --git a/cypress/tests/sidebar.cy.ts b/cypress/tests/sidebar.cy.ts index 7dc6283c28..0b065e0702 100644 --- a/cypress/tests/sidebar.cy.ts +++ b/cypress/tests/sidebar.cy.ts @@ -4,7 +4,7 @@ describe('Hslayers application', () => { //Open layer manager cy.get('.hs-sidebar-item[data-cy="layermanager"]').click(); //Turn off all layers - cy.get('hs-layermanager-layer-list li .d-flex button.hs-checkmark').each( + cy.get('hs-layer-manager-layer-list li .d-flex button.hs-checkmark').each( (button) => { cy.wrap(button).click(); }, diff --git a/cypress/tests/styles.cy.ts b/cypress/tests/styles.cy.ts index 7ba6119333..3e16020099 100644 --- a/cypress/tests/styles.cy.ts +++ b/cypress/tests/styles.cy.ts @@ -4,7 +4,7 @@ describe('Hslayers application', () => { //Open layer manager cy.get('.hs-sidebar-item[data-cy="layermanager"]').click(); //Turn off all layers - cy.get('hs-layermanager-layer-list li .d-flex button.hs-checkmark').each( + cy.get('hs-layer-manager-layer-list li .d-flex button.hs-checkmark').each( (button) => { cy.wrap(button).click(); }, diff --git a/projects/hslayers-material/src/lib/layout/layout.component.html b/projects/hslayers-material/src/lib/layout/layout.component.html index 389b5763f0..1c09b9b6e8 100644 --- a/projects/hslayers-material/src/lib/layout/layout.component.html +++ b/projects/hslayers-material/src/lib/layout/layout.component.html @@ -9,7 +9,7 @@ - + diff --git a/projects/hslayers/src/common/get-capabilities/dimension-time.service.ts b/projects/hslayers/src/common/get-capabilities/dimension-time.service.ts index 18aed63f8d..02e8452c33 100644 --- a/projects/hslayers/src/common/get-capabilities/dimension-time.service.ts +++ b/projects/hslayers/src/common/get-capabilities/dimension-time.service.ts @@ -4,7 +4,7 @@ import {Subject} from 'rxjs'; import {ImageWMS, Source, TileWMS} from 'ol/source'; import {Layer} from 'ol/layer'; -import {HsLayerDescriptor} from '../../components/layermanager/layer-descriptor.interface'; +import {HsLayerDescriptor} from '../../components/layer-manager/layer-descriptor.interface'; import {HsLogService} from '../log/log.service'; import {HsUtilsService} from '../../components/utils/utils.service'; import {HsWmsLayer} from './wms-get-capabilities-response.interface'; diff --git a/projects/hslayers/src/common/layer-shifting/layer-shifting.service.ts b/projects/hslayers/src/common/layer-shifting/layer-shifting.service.ts index 2acb4a81dc..c0cda236a2 100644 --- a/projects/hslayers/src/common/layer-shifting/layer-shifting.service.ts +++ b/projects/hslayers/src/common/layer-shifting/layer-shifting.service.ts @@ -4,7 +4,7 @@ import {Layer} from 'ol/layer'; import {Source} from 'ol/source'; import {HsEventBusService} from '../../components/core/event-bus.service'; -import {HsLayerManagerService} from '../../components/layermanager/layermanager.service'; +import {HsLayerManagerService} from '../../components/layer-manager/layer-manager.service'; import {HsMapService} from '../../components/map/map.service'; import {HsUtilsService} from '../../components/utils/utils.service'; import {getBase} from '../layer-extensions'; diff --git a/projects/hslayers/src/components/add-data/add-data.component.ts b/projects/hslayers/src/components/add-data/add-data.component.ts index e8adcb1de0..5de293de78 100644 --- a/projects/hslayers/src/components/add-data/add-data.component.ts +++ b/projects/hslayers/src/components/add-data/add-data.component.ts @@ -10,7 +10,7 @@ import {HsGetCapabilitiesErrorComponent} from './common/capabilities-error-dialo import {HsLanguageService} from '../language/language.service'; import {HsLayoutService} from '../layout/layout.service'; import {HsPanelBaseComponent} from '../layout/panels/panel-base.component'; -import {HsShareUrlService} from '../permalink/share-url.service'; +import {HsShareUrlService} from '../share/share-url.service'; import {HsSidebarService} from '../sidebar/sidebar.service'; import {servicesSupportedByUrl} from './url/services-supported.const'; diff --git a/projects/hslayers/src/components/add-data/catalogue/catalogue.service.ts b/projects/hslayers/src/components/add-data/catalogue/catalogue.service.ts index f65e3f5dfc..6cba9870a5 100644 --- a/projects/hslayers/src/components/add-data/catalogue/catalogue.service.ts +++ b/projects/hslayers/src/components/add-data/catalogue/catalogue.service.ts @@ -494,7 +494,7 @@ export class HsAddDataCatalogueService extends HsAddDataCatalogueParams { }, }); } - this.hsLayoutService.setMainPanel('layermanager'); + this.hsLayoutService.setMainPanel('layerManager'); } } else if (['KML', 'GEOJSON'].includes(whatToAdd.type)) { const layer = await this.hsAddDataVectorService.addVectorLayer( @@ -518,7 +518,7 @@ export class HsAddDataCatalogueService extends HsAddDataCatalogueParams { layer: whatToAdd.recordType === 'dataset' ? whatToAdd.name : undefined, }); } else { - this.hsLayoutService.setMainPanel('layermanager'); + this.hsLayoutService.setMainPanel('layerManager'); } return whatToAdd.type; } diff --git a/projects/hslayers/src/components/add-data/common/target-position/target-position.component.ts b/projects/hslayers/src/components/add-data/common/target-position/target-position.component.ts index 6f5a34740d..f4f92e4ec1 100644 --- a/projects/hslayers/src/components/add-data/common/target-position/target-position.component.ts +++ b/projects/hslayers/src/components/add-data/common/target-position/target-position.component.ts @@ -3,8 +3,8 @@ import {Component, EventEmitter, Input, Output} from '@angular/core'; import {Layer} from 'ol/layer'; import {Source} from 'ol/source'; -import {HsLayerDescriptor} from '../../../layermanager/layer-descriptor.interface'; -import {HsLayerManagerService} from '../../../layermanager/layermanager.service'; +import {HsLayerDescriptor} from '../../../layer-manager/layer-descriptor.interface'; +import {HsLayerManagerService} from '../../../layer-manager/layer-manager.service'; import {HsLayerUtilsService} from '../../../utils/layer-utils.service'; @Component({ diff --git a/projects/hslayers/src/components/add-data/file/file-base.component.ts b/projects/hslayers/src/components/add-data/file/file-base.component.ts index 5f0d2f0ff7..eb76e895ff 100644 --- a/projects/hslayers/src/components/add-data/file/file-base.component.ts +++ b/projects/hslayers/src/components/add-data/file/file-base.component.ts @@ -67,7 +67,7 @@ export class HsAddDataFileBaseComponent .pipe(takeUntil(this.end)) .subscribe((success) => { if (success) { - this.hsLayoutService.setMainPanel('layermanager'); + this.hsLayoutService.setMainPanel('layerManager'); this.hsAddDataCommonService.setPanelToCatalogue(); } this.setDataToDefault(); diff --git a/projects/hslayers/src/components/add-data/url/add-data-url.component.ts b/projects/hslayers/src/components/add-data/url/add-data-url.component.ts index 1fe00697cd..7b187b591b 100644 --- a/projects/hslayers/src/components/add-data/url/add-data-url.component.ts +++ b/projects/hslayers/src/components/add-data/url/add-data-url.component.ts @@ -11,7 +11,7 @@ import {HsDialogContainerService} from '../../layout/dialogs/dialog-container.se import {HsLanguageService} from '../../language/language.service'; import {HsLayoutService} from '../../layout/layout.service'; import {HsLogService} from '../../../common/log/log.service'; -import {HsShareUrlService} from '../../permalink/share-url.service'; +import {HsShareUrlService} from '../../share/share-url.service'; import {servicesSupportedByUrl} from './services-supported.const'; @Component({ diff --git a/projects/hslayers/src/components/add-data/url/arcgis/arcgis.service.ts b/projects/hslayers/src/components/add-data/url/arcgis/arcgis.service.ts index 53d5dd6909..990794887f 100644 --- a/projects/hslayers/src/components/add-data/url/arcgis/arcgis.service.ts +++ b/projects/hslayers/src/components/add-data/url/arcgis/arcgis.service.ts @@ -236,7 +236,7 @@ export class HsUrlArcGisService implements HsUrlTypeServiceModel { this.setDataToDefault(); this.hsAddDataCommonService.setPanelToCatalogue(); if (collection.length > 0) { - this.hsLayoutService.setMainPanel('layermanager'); + this.hsLayoutService.setMainPanel('layerManager'); } return collection; } diff --git a/projects/hslayers/src/components/add-data/url/geosparql/geosparql.component.ts b/projects/hslayers/src/components/add-data/url/geosparql/geosparql.component.ts index fa70180e93..2aa6261d16 100644 --- a/projects/hslayers/src/components/add-data/url/geosparql/geosparql.component.ts +++ b/projects/hslayers/src/components/add-data/url/geosparql/geosparql.component.ts @@ -67,7 +67,7 @@ export class HsUrlGeoSparqlComponent { const response: {layer; complete: boolean} = await this.hsAddDataVectorService.addNewLayer(this.data); if (response.complete) { - this.hsLayoutService.setMainPanel('layermanager'); + this.hsLayoutService.setMainPanel('layerManager'); this.setDataToDefault(); } } diff --git a/projects/hslayers/src/components/add-data/url/wfs/wfs.service.ts b/projects/hslayers/src/components/add-data/url/wfs/wfs.service.ts index 5dc17f5abb..b1fb165369 100644 --- a/projects/hslayers/src/components/add-data/url/wfs/wfs.service.ts +++ b/projects/hslayers/src/components/add-data/url/wfs/wfs.service.ts @@ -509,6 +509,6 @@ export class HsUrlWfsService implements HsUrlTypeServiceModel { ); this.hsMapService.getMap().addLayer(l); } - this.hsLayoutService.setMainPanel('layermanager'); + this.hsLayoutService.setMainPanel('layerManager'); } } diff --git a/projects/hslayers/src/components/add-data/url/wms/wms.service.ts b/projects/hslayers/src/components/add-data/url/wms/wms.service.ts index 778b066897..845ff2dcf5 100644 --- a/projects/hslayers/src/components/add-data/url/wms/wms.service.ts +++ b/projects/hslayers/src/components/add-data/url/wms/wms.service.ts @@ -394,7 +394,7 @@ export class HsUrlWmsService implements HsUrlTypeServiceModel { this.setDataToDefault(); this.hsAddDataCommonService.setPanelToCatalogue(); if (collection.length > 0) { - this.hsLayoutService.setMainPanel('layermanager'); + this.hsLayoutService.setMainPanel('layerManager'); } return collection; } diff --git a/projects/hslayers/src/components/add-data/url/wmts/wmts.service.ts b/projects/hslayers/src/components/add-data/url/wmts/wmts.service.ts index 18d22b4535..c05f12b8a3 100644 --- a/projects/hslayers/src/components/add-data/url/wmts/wmts.service.ts +++ b/projects/hslayers/src/components/add-data/url/wmts/wmts.service.ts @@ -151,7 +151,7 @@ export class HsUrlWmtsService implements HsUrlTypeServiceModel { this.setDataToDefault(); this.hsAddDataCommonService.setPanelToCatalogue(); if (collection.length > 0) { - this.hsLayoutService.setMainPanel('layermanager'); + this.hsLayoutService.setMainPanel('layerManager'); } return collection; //FIX ME: to implement diff --git a/projects/hslayers/src/components/add-data/vector/vector-data.type.ts b/projects/hslayers/src/components/add-data/vector/vector-data.type.ts index b036f59d69..e333ccd65d 100644 --- a/projects/hslayers/src/components/add-data/vector/vector-data.type.ts +++ b/projects/hslayers/src/components/add-data/vector/vector-data.type.ts @@ -4,7 +4,7 @@ import {Source} from 'ol/source'; import {Vector as VectorLayer} from 'ol/layer'; import {Vector as VectorSource} from 'ol/source'; -import {HsLayerDescriptor} from '../../layermanager/layer-descriptor.interface'; +import {HsLayerDescriptor} from '../../layer-manager/layer-descriptor.interface'; import {accessRightsModel} from '../common/access-rights.model'; export type VectorDataObject = { diff --git a/projects/hslayers/src/components/add-data/vector/vector-file/vector-file.component.ts b/projects/hslayers/src/components/add-data/vector/vector-file/vector-file.component.ts index 826fe2a1f0..366376ca05 100644 --- a/projects/hslayers/src/components/add-data/vector/vector-file/vector-file.component.ts +++ b/projects/hslayers/src/components/add-data/vector/vector-file/vector-file.component.ts @@ -18,7 +18,7 @@ import {HsAddDataVectorService} from '../vector.service'; import {HsCommonLaymanService} from '../../../../common/layman/layman.service'; import {HsConfig} from '../../../../config.service'; import {HsLanguageService} from '../../../language/language.service'; -import {HsLayerManagerService} from '../../../layermanager/layermanager.service'; +import {HsLayerManagerService} from '../../../layer-manager/layer-manager.service'; import {HsLayerUtilsService} from '../../../utils/layer-utils.service'; import {HsLayoutService} from '../../../layout/layout.service'; import {HsMapService} from '../../../map/map.service'; @@ -146,7 +146,7 @@ export class HsAddDataVectorFileComponent * After layer has successfully been added to the map, move to LM panel and clean up the code */ moveToLayerManager(): void { - this.hsLayoutService.setMainPanel('layermanager'); + this.hsLayoutService.setMainPanel('layerManager'); this.hsAddDataVectorService.setPanelToCatalogue(); this.setToDefault(); } diff --git a/projects/hslayers/src/components/add-data/vector/vector-url-parser.service.ts b/projects/hslayers/src/components/add-data/vector/vector-url-parser.service.ts index 4d5a947a48..70aac95783 100644 --- a/projects/hslayers/src/components/add-data/vector/vector-url-parser.service.ts +++ b/projects/hslayers/src/components/add-data/vector/vector-url-parser.service.ts @@ -2,7 +2,7 @@ import {Injectable} from '@angular/core'; import {HsAddDataVectorService} from './vector.service'; import {HsMapService} from '../../map/map.service'; -import {HsShareUrlService} from '../../permalink/share-url.service'; +import {HsShareUrlService} from '../../share/share-url.service'; @Injectable({ providedIn: 'root', diff --git a/projects/hslayers/src/components/add-data/vector/vector-url/vector-url.component.ts b/projects/hslayers/src/components/add-data/vector/vector-url/vector-url.component.ts index 069f2c1be2..e590256c55 100644 --- a/projects/hslayers/src/components/add-data/vector/vector-url/vector-url.component.ts +++ b/projects/hslayers/src/components/add-data/vector/vector-url/vector-url.component.ts @@ -59,7 +59,7 @@ export class HsAddDataVectorUrlComponent implements OnInit, OnDestroy { const response: {layer; complete: boolean} = await this.hsAddDataVectorService.addNewLayer(this.data); if (response.complete) { - this.hsLayoutService.setMainPanel('layermanager'); + this.hsLayoutService.setMainPanel('layerManager'); this.setDataToDefault(); } } diff --git a/projects/hslayers/src/components/compositions/compositions-catalogue.service.ts b/projects/hslayers/src/components/compositions/compositions-catalogue.service.ts index 251877b45b..5dcdddb089 100644 --- a/projects/hslayers/src/components/compositions/compositions-catalogue.service.ts +++ b/projects/hslayers/src/components/compositions/compositions-catalogue.service.ts @@ -78,7 +78,7 @@ export class HsCompositionsCatalogueService { }); this.hsLayoutService.mainpanel$.subscribe((which) => { if ( - this.hsLayoutService.mainpanel === 'composition_browser' || + this.hsLayoutService.mainpanel === 'compositions' || this.hsLayoutService.mainpanel === 'composition' ) { this.loadFilteredCompositions(); @@ -90,7 +90,7 @@ export class HsCompositionsCatalogueService { hsUtilsService.debounce( ({map, event, extent}) => { if ( - (this.hsLayoutService.mainpanel != 'composition_browser' && + (this.hsLayoutService.mainpanel != 'compositions' && this.hsLayoutService.mainpanel != 'composition') || this.extentChangeSuppressed ) { @@ -124,7 +124,7 @@ export class HsCompositionsCatalogueService { this.hsCommonLaymanService.authChange.subscribe((endpoint) => { if ( - this.hsLayoutService.mainpanel != 'composition_browser' && + this.hsLayoutService.mainpanel != 'compositions' && this.hsLayoutService.mainpanel != 'composition' ) { return; diff --git a/projects/hslayers/src/components/compositions/compositions-map.service.ts b/projects/hslayers/src/components/compositions/compositions-map.service.ts index 9a0b566275..bcf233d6d9 100644 --- a/projects/hslayers/src/components/compositions/compositions-map.service.ts +++ b/projects/hslayers/src/components/compositions/compositions-map.service.ts @@ -36,7 +36,7 @@ export class HsCompositionsMapService { this.hsLayoutService.mainpanel$.subscribe((which) => { if (this.extentLayer) { if ( - this.hsLayoutService.mainpanel === 'composition_browser' || + this.hsLayoutService.mainpanel === 'compositions' || this.hsLayoutService.mainpanel === 'composition' ) { this.extentLayer.setVisible(true); @@ -44,7 +44,7 @@ export class HsCompositionsMapService { this.extentLayer.setVisible(false); } } - if (which === 'composition' || which === 'composition_browser') { + if (which === 'composition' || which === 'compositions') { this.addPointerMoveListener(); } else if (this.pointerMoveListener) { unByKey(this.pointerMoveListener); @@ -54,7 +54,7 @@ export class HsCompositionsMapService { this.extentLayer = this.createNewExtentLayer(); this.hsMapService.loaded().then((map) => { if ( - this.hsLayoutService.mainpanel === 'composition_browser' || + this.hsLayoutService.mainpanel === 'compositions' || this.hsLayoutService.mainpanel === 'composition' ) { this.addPointerMoveListener(); diff --git a/projects/hslayers/src/components/compositions/compositions-parser.service.ts b/projects/hslayers/src/components/compositions/compositions-parser.service.ts index 4d707b7b6e..c5110edf30 100644 --- a/projects/hslayers/src/components/compositions/compositions-parser.service.ts +++ b/projects/hslayers/src/components/compositions/compositions-parser.service.ts @@ -23,7 +23,7 @@ import {HsConfig} from '../../config.service'; import {HsDialogContainerService} from '../layout/dialogs/dialog-container.service'; import {HsEventBusService} from '../core/event-bus.service'; import {HsLanguageService} from '../language/language.service'; -import {HsLayerManagerService} from '../layermanager/layermanager.service'; +import {HsLayerManagerService} from '../layer-manager/layer-manager.service'; import {HsLayoutService} from '../layout/layout.service'; import {HsLogService} from '../../common/log/log.service'; import {HsToastService} from '../layout/toast/toast.service'; @@ -471,7 +471,7 @@ export class HsCompositionsParserService { !this.loadingOptions.suspendPanelChange ) { this.loadingOptions.suspendPanelChange = false; - this.hsLayoutService.setMainPanel('layermanager'); + this.hsLayoutService.setMainPanel('layerManager'); } this.composition_edited = false; this.hsEventBusService.compositionLoads.next(responseData); diff --git a/projects/hslayers/src/components/compositions/compositions.component.html b/projects/hslayers/src/components/compositions/compositions.component.html index bd9b9ec050..e1b5a87de5 100644 --- a/projects/hslayers/src/components/compositions/compositions.component.html +++ b/projects/hslayers/src/components/compositions/compositions.component.html @@ -1,7 +1,7 @@
- +
- + - + -
+ \ No newline at end of file diff --git a/projects/hslayers/src/components/layermanager/logical-list/layermanager-layerlist.component.ts b/projects/hslayers/src/components/layer-manager/logical-list/layer-manager-layerlist.component.ts similarity index 91% rename from projects/hslayers/src/components/layermanager/logical-list/layermanager-layerlist.component.ts rename to projects/hslayers/src/components/layer-manager/logical-list/layer-manager-layerlist.component.ts index 95f92779fc..dac1bf46a5 100644 --- a/projects/hslayers/src/components/layermanager/logical-list/layermanager-layerlist.component.ts +++ b/projects/hslayers/src/components/layer-manager/logical-list/layer-manager-layerlist.component.ts @@ -5,8 +5,8 @@ import {HsConfig} from '../../../config.service'; import {HsDimensionTimeService} from '../../../common/get-capabilities/dimension-time.service'; import {HsEventBusService} from '../../core/event-bus.service'; import {HsLayerDescriptor} from '../layer-descriptor.interface'; -import {HsLayerListService} from './layermanager-layerlist.service'; -import {HsLayerManagerService} from '../layermanager.service'; +import {HsLayerListService} from './layer-manager-layerlist.service'; +import {HsLayerManagerService} from '../layer-manager.service'; import {HsLayerUtilsService} from '../../utils/layer-utils.service'; import { getDimension, @@ -15,8 +15,8 @@ import { } from '../../../common/layer-extensions'; @Component({ - selector: 'hs-layermanager-layer-list', - templateUrl: './layermanager-layerlist.component.html', + selector: 'hs-layer-manager-layer-list', + templateUrl: './layer-manager-layerlist.component.html', }) export class HsLayerListComponent implements OnInit, OnDestroy { @Input() folder: any; diff --git a/projects/hslayers/src/components/layermanager/logical-list/layermanager-layerlist.service.mock.ts b/projects/hslayers/src/components/layer-manager/logical-list/layer-manager-layerlist.service.mock.ts similarity index 100% rename from projects/hslayers/src/components/layermanager/logical-list/layermanager-layerlist.service.mock.ts rename to projects/hslayers/src/components/layer-manager/logical-list/layer-manager-layerlist.service.mock.ts diff --git a/projects/hslayers/src/components/layermanager/logical-list/layermanager-layerlist.service.ts b/projects/hslayers/src/components/layer-manager/logical-list/layer-manager-layerlist.service.ts similarity index 97% rename from projects/hslayers/src/components/layermanager/logical-list/layermanager-layerlist.service.ts rename to projects/hslayers/src/components/layer-manager/logical-list/layer-manager-layerlist.service.ts index e8bdc60e9e..c2697db2ab 100644 --- a/projects/hslayers/src/components/layermanager/logical-list/layermanager-layerlist.service.ts +++ b/projects/hslayers/src/components/layer-manager/logical-list/layer-manager-layerlist.service.ts @@ -2,7 +2,7 @@ import {Injectable} from '@angular/core'; import {HsLayerDescriptor} from '../layer-descriptor.interface'; import {HsLayerEditorSublayerService} from '../editor/layer-editor-sub-layer.service'; -import {HsLayerManagerService} from '../layermanager.service'; +import {HsLayerManagerService} from '../layer-manager.service'; import {HsLayerUtilsService} from '../../utils/layer-utils.service'; import {getPath} from '../../../common/layer-extensions'; diff --git a/projects/hslayers/src/components/layermanager/logical-list/layerlist.component.scss b/projects/hslayers/src/components/layer-manager/logical-list/layerlist.component.scss similarity index 100% rename from projects/hslayers/src/components/layermanager/logical-list/layerlist.component.scss rename to projects/hslayers/src/components/layer-manager/logical-list/layerlist.component.scss diff --git a/projects/hslayers/src/components/layermanager/physical-list/physical-layerlist.component.html b/projects/hslayers/src/components/layer-manager/physical-list/physical-layerlist.component.html similarity index 100% rename from projects/hslayers/src/components/layermanager/physical-list/physical-layerlist.component.html rename to projects/hslayers/src/components/layer-manager/physical-list/physical-layerlist.component.html diff --git a/projects/hslayers/src/components/layermanager/physical-list/physical-layerlist.component.scss b/projects/hslayers/src/components/layer-manager/physical-list/physical-layerlist.component.scss similarity index 100% rename from projects/hslayers/src/components/layermanager/physical-list/physical-layerlist.component.scss rename to projects/hslayers/src/components/layer-manager/physical-list/physical-layerlist.component.scss diff --git a/projects/hslayers/src/components/layermanager/physical-list/physical-layerlist.component.ts b/projects/hslayers/src/components/layer-manager/physical-list/physical-layerlist.component.ts similarity index 100% rename from projects/hslayers/src/components/layermanager/physical-list/physical-layerlist.component.ts rename to projects/hslayers/src/components/layer-manager/physical-list/physical-layerlist.component.ts diff --git a/projects/hslayers/src/components/layermanager/public-api.ts b/projects/hslayers/src/components/layer-manager/public-api.ts similarity index 70% rename from projects/hslayers/src/components/layermanager/public-api.ts rename to projects/hslayers/src/components/layer-manager/public-api.ts index 192b6a7926..7a541927ed 100644 --- a/projects/hslayers/src/components/layermanager/public-api.ts +++ b/projects/hslayers/src/components/layer-manager/public-api.ts @@ -1,5 +1,5 @@ export * from './dimensions/layer-editor-dimensions.component'; -export * from './dimensions/layermanager-time-editor.component'; +export * from './dimensions/layer-manager-time-editor.component'; export * from './base-layer-descriptor.interface'; export * from './layer-descriptor.interface'; export * from './editor/layer-editor-vector-layer.service'; @@ -8,15 +8,15 @@ export * from './editor/layer-editor.service'; export * from './editor/layer-editor-sub-layer-checkboxes.component'; export * from './editor/layer-editor-sub-layer.service'; export * from './editor/layer-selector.service'; -export * from './logical-list/layermanager-folder.component'; -export * from './logical-list/layermanager-layerlist.service'; -export * from './gallery/layermanager-gallery.component'; -export * from './logical-list/layermanager-layerlist.component'; -export * from './layermanager-metadata.service'; +export * from './logical-list/layer-manager-folder.component'; +export * from './logical-list/layer-manager-layerlist.service'; +export * from './gallery/layer-manager-gallery.component'; +export * from './logical-list/layer-manager-layerlist.component'; +export * from './layer-manager-metadata.service'; export * from './physical-list/physical-layerlist.component'; -export * from './layermanager.component'; -export * from './layermanager.module'; -export * from './layermanager.service'; +export * from './layer-manager.component'; +export * from './layer-manager.module'; +export * from './layer-manager.service'; export * from './dialogs/remove-all-dialog.component'; export * from './dialogs/remove-layer-dialog.component'; export * from './dialogs/copy-layer-dialog.component'; diff --git a/projects/hslayers/src/components/layermanager/widgets/cluster-widget.component.html b/projects/hslayers/src/components/layer-manager/widgets/cluster-widget.component.html similarity index 100% rename from projects/hslayers/src/components/layermanager/widgets/cluster-widget.component.html rename to projects/hslayers/src/components/layer-manager/widgets/cluster-widget.component.html diff --git a/projects/hslayers/src/components/layermanager/widgets/cluster-widget.component.ts b/projects/hslayers/src/components/layer-manager/widgets/cluster-widget.component.ts similarity index 100% rename from projects/hslayers/src/components/layermanager/widgets/cluster-widget.component.ts rename to projects/hslayers/src/components/layer-manager/widgets/cluster-widget.component.ts diff --git a/projects/hslayers/src/components/layermanager/widgets/extent-widget/extent-widget.component.html b/projects/hslayers/src/components/layer-manager/widgets/extent-widget/extent-widget.component.html similarity index 100% rename from projects/hslayers/src/components/layermanager/widgets/extent-widget/extent-widget.component.html rename to projects/hslayers/src/components/layer-manager/widgets/extent-widget/extent-widget.component.html diff --git a/projects/hslayers/src/components/layermanager/widgets/extent-widget/extent-widget.component.ts b/projects/hslayers/src/components/layer-manager/widgets/extent-widget/extent-widget.component.ts similarity index 100% rename from projects/hslayers/src/components/layermanager/widgets/extent-widget/extent-widget.component.ts rename to projects/hslayers/src/components/layer-manager/widgets/extent-widget/extent-widget.component.ts diff --git a/projects/hslayers/src/components/layermanager/widgets/idw-widget.component.html b/projects/hslayers/src/components/layer-manager/widgets/idw-widget.component.html similarity index 100% rename from projects/hslayers/src/components/layermanager/widgets/idw-widget.component.html rename to projects/hslayers/src/components/layer-manager/widgets/idw-widget.component.html diff --git a/projects/hslayers/src/components/layermanager/widgets/idw-widget.component.ts b/projects/hslayers/src/components/layer-manager/widgets/idw-widget.component.ts similarity index 100% rename from projects/hslayers/src/components/layermanager/widgets/idw-widget.component.ts rename to projects/hslayers/src/components/layer-manager/widgets/idw-widget.component.ts diff --git a/projects/hslayers/src/components/layermanager/widgets/layer-editor-widget-base.component.ts b/projects/hslayers/src/components/layer-manager/widgets/layer-editor-widget-base.component.ts similarity index 100% rename from projects/hslayers/src/components/layermanager/widgets/layer-editor-widget-base.component.ts rename to projects/hslayers/src/components/layer-manager/widgets/layer-editor-widget-base.component.ts diff --git a/projects/hslayers/src/components/layermanager/widgets/layer-editor-widget-container.service.ts b/projects/hslayers/src/components/layer-manager/widgets/layer-editor-widget-container.service.ts similarity index 99% rename from projects/hslayers/src/components/layermanager/widgets/layer-editor-widget-container.service.ts rename to projects/hslayers/src/components/layer-manager/widgets/layer-editor-widget-container.service.ts index d722d0ee4e..ca99537cc1 100644 --- a/projects/hslayers/src/components/layermanager/widgets/layer-editor-widget-container.service.ts +++ b/projects/hslayers/src/components/layer-manager/widgets/layer-editor-widget-container.service.ts @@ -1,6 +1,5 @@ -import {Injectable} from '@angular/core'; - import {HsPanelContainerService} from '../../layout/panels/panel-container.service'; +import {Injectable} from '@angular/core'; @Injectable({ providedIn: 'root', diff --git a/projects/hslayers/src/components/layermanager/widgets/legend-widget.component.html b/projects/hslayers/src/components/layer-manager/widgets/legend-widget.component.html similarity index 100% rename from projects/hslayers/src/components/layermanager/widgets/legend-widget.component.html rename to projects/hslayers/src/components/layer-manager/widgets/legend-widget.component.html diff --git a/projects/hslayers/src/components/layermanager/widgets/legend-widget.component.ts b/projects/hslayers/src/components/layer-manager/widgets/legend-widget.component.ts similarity index 100% rename from projects/hslayers/src/components/layermanager/widgets/legend-widget.component.ts rename to projects/hslayers/src/components/layer-manager/widgets/legend-widget.component.ts diff --git a/projects/hslayers/src/components/layermanager/widgets/metadata-widget.component.html b/projects/hslayers/src/components/layer-manager/widgets/metadata-widget.component.html similarity index 100% rename from projects/hslayers/src/components/layermanager/widgets/metadata-widget.component.html rename to projects/hslayers/src/components/layer-manager/widgets/metadata-widget.component.html diff --git a/projects/hslayers/src/components/layermanager/widgets/metadata-widget.component.ts b/projects/hslayers/src/components/layer-manager/widgets/metadata-widget.component.ts similarity index 91% rename from projects/hslayers/src/components/layermanager/widgets/metadata-widget.component.ts rename to projects/hslayers/src/components/layer-manager/widgets/metadata-widget.component.ts index b2d4a6621b..42551a2571 100644 --- a/projects/hslayers/src/components/layermanager/widgets/metadata-widget.component.ts +++ b/projects/hslayers/src/components/layer-manager/widgets/metadata-widget.component.ts @@ -3,8 +3,8 @@ import {Component} from '@angular/core'; import {HsLanguageService} from '../../language/language.service'; import {HsLayerDescriptor} from './../layer-descriptor.interface'; import {HsLayerEditorWidgetBaseComponent} from './layer-editor-widget-base.component'; -import {HsLayerManagerMetadataService} from './../layermanager-metadata.service'; -import {HsLayerManagerService} from '../layermanager.service'; +import {HsLayerManagerMetadataService} from './../layer-manager-metadata.service'; +import {HsLayerManagerService} from '../layer-manager.service'; import {HsLayerSelectorService} from '../editor/layer-selector.service'; import {getAbstract, setAbstract} from '../../../common/layer-extensions'; import {getAttribution} from '../../../common/layer-extensions'; diff --git a/projects/hslayers/src/components/layermanager/widgets/opacity-widget.component.html b/projects/hslayers/src/components/layer-manager/widgets/opacity-widget.component.html similarity index 100% rename from projects/hslayers/src/components/layermanager/widgets/opacity-widget.component.html rename to projects/hslayers/src/components/layer-manager/widgets/opacity-widget.component.html diff --git a/projects/hslayers/src/components/layermanager/widgets/opacity-widget.component.ts b/projects/hslayers/src/components/layer-manager/widgets/opacity-widget.component.ts similarity index 100% rename from projects/hslayers/src/components/layermanager/widgets/opacity-widget.component.ts rename to projects/hslayers/src/components/layer-manager/widgets/opacity-widget.component.ts diff --git a/projects/hslayers/src/components/layermanager/widgets/scale-widget.component.html b/projects/hslayers/src/components/layer-manager/widgets/scale-widget.component.html similarity index 100% rename from projects/hslayers/src/components/layermanager/widgets/scale-widget.component.html rename to projects/hslayers/src/components/layer-manager/widgets/scale-widget.component.html diff --git a/projects/hslayers/src/components/layermanager/widgets/scale-widget.component.ts b/projects/hslayers/src/components/layer-manager/widgets/scale-widget.component.ts similarity index 100% rename from projects/hslayers/src/components/layermanager/widgets/scale-widget.component.ts rename to projects/hslayers/src/components/layer-manager/widgets/scale-widget.component.ts diff --git a/projects/hslayers/src/components/layermanager/widgets/type-widget.component.html b/projects/hslayers/src/components/layer-manager/widgets/type-widget.component.html similarity index 100% rename from projects/hslayers/src/components/layermanager/widgets/type-widget.component.html rename to projects/hslayers/src/components/layer-manager/widgets/type-widget.component.html diff --git a/projects/hslayers/src/components/layermanager/widgets/type-widget.component.ts b/projects/hslayers/src/components/layer-manager/widgets/type-widget.component.ts similarity index 100% rename from projects/hslayers/src/components/layermanager/widgets/type-widget.component.ts rename to projects/hslayers/src/components/layer-manager/widgets/type-widget.component.ts diff --git a/projects/hslayers/src/components/layermanager/widgets/wms-source-widget/wms-source-widget.component.html b/projects/hslayers/src/components/layer-manager/widgets/wms-source-widget/wms-source-widget.component.html similarity index 100% rename from projects/hslayers/src/components/layermanager/widgets/wms-source-widget/wms-source-widget.component.html rename to projects/hslayers/src/components/layer-manager/widgets/wms-source-widget/wms-source-widget.component.html diff --git a/projects/hslayers/src/components/layermanager/widgets/wms-source-widget/wms-source-widget.component.ts b/projects/hslayers/src/components/layer-manager/widgets/wms-source-widget/wms-source-widget.component.ts similarity index 100% rename from projects/hslayers/src/components/layermanager/widgets/wms-source-widget/wms-source-widget.component.ts rename to projects/hslayers/src/components/layer-manager/widgets/wms-source-widget/wms-source-widget.component.ts diff --git a/projects/hslayers/src/components/layout/layout.component.ts b/projects/hslayers/src/components/layout/layout.component.ts index d22adbd46f..44e5ed6567 100644 --- a/projects/hslayers/src/components/layout/layout.component.ts +++ b/projects/hslayers/src/components/layout/layout.component.ts @@ -16,7 +16,7 @@ import {HsLogService} from '../../common/log/log.service'; import {HsMapHostDirective} from './map-host.directive'; import {HsOverlayPanelContainerService} from './overlay-panel-container.service'; import {HsPanelContainerService} from './panels/panel-container.service'; -import {HsShareUrlService} from '../permalink/share-url.service'; +import {HsShareUrlService} from '../share/share-url.service'; import {HsUtilsService} from '../utils/utils.service'; @Component({ diff --git a/projects/hslayers/src/components/layout/layout.module.ts b/projects/hslayers/src/components/layout/layout.module.ts index 7c37a07b4e..3e0397b5f2 100644 --- a/projects/hslayers/src/components/layout/layout.module.ts +++ b/projects/hslayers/src/components/layout/layout.module.ts @@ -9,7 +9,6 @@ import {HsLayoutHostDirective} from './layout.directive'; import {HsMapHostDirective} from './map-host.directive'; import {HsMapModule} from '../map/map.module'; import {HsPanelHelpersModule} from './panels/panel-helpers.module'; -import {HsPrintComponent} from '../print/print.component'; import {HsSidebarModule} from '../sidebar/sidebar.module'; import {HsToastModule} from './toast/toast.module'; @@ -29,7 +28,6 @@ import {HsToastModule} from './toast/toast.module'; HsSidebarModule, HsPanelHelpersModule, HsToastModule, - HsPrintComponent, ], exports: [HsDialogContainerComponent, HsLayoutComponent], }) diff --git a/projects/hslayers/src/components/layout/overlay-panel-container.service.ts b/projects/hslayers/src/components/layout/overlay-panel-container.service.ts index a9006a098c..6d2bb64021 100644 --- a/projects/hslayers/src/components/layout/overlay-panel-container.service.ts +++ b/projects/hslayers/src/components/layout/overlay-panel-container.service.ts @@ -1,6 +1,5 @@ -import {Injectable} from '@angular/core'; - import {HsPanelContainerService} from './panels/panel-container.service'; +import {Injectable} from '@angular/core'; @Injectable({ providedIn: 'root', diff --git a/projects/hslayers/src/components/layout/public-api.ts b/projects/hslayers/src/components/layout/public-api.ts index 36d68847ca..9fa59b643a 100644 --- a/projects/hslayers/src/components/layout/public-api.ts +++ b/projects/hslayers/src/components/layout/public-api.ts @@ -10,6 +10,7 @@ export * from './panels/gui-overlay-base.component'; export * from './panels/panel-container.component'; export * from './panels/panel-container.service.interface'; export * from './panels/panel-container.service'; +export * from './panels/panel-constructor.service'; export * from './panels/panel-helpers.module'; export * from './panels/panel-host.directive'; export * from './panels/panel-item'; diff --git a/projects/hslayers/src/components/legend/legend.service.ts b/projects/hslayers/src/components/legend/legend.service.ts index b36870b66b..ea867b011e 100644 --- a/projects/hslayers/src/components/legend/legend.service.ts +++ b/projects/hslayers/src/components/legend/legend.service.ts @@ -15,7 +15,7 @@ import { } from 'ol/source'; import {Style} from 'ol/style'; -import {HsLayerSelectorService} from '../layermanager/editor/layer-selector.service'; +import {HsLayerSelectorService} from '../layer-manager/editor/layer-selector.service'; import {HsLayerUtilsService} from '../utils/layer-utils.service'; import {HsLegendDescriptor} from './legend-descriptor.interface'; import {HsStylerService} from '../styles/styler.service'; diff --git a/projects/hslayers/src/components/map-swipe/map-swipe.service.spec.ts b/projects/hslayers/src/components/map-swipe/map-swipe.service.spec.ts index f1ee5bd2ea..2696ab3be3 100644 --- a/projects/hslayers/src/components/map-swipe/map-swipe.service.spec.ts +++ b/projects/hslayers/src/components/map-swipe/map-swipe.service.spec.ts @@ -5,13 +5,13 @@ import {HsConfig} from '../../config.service'; import {HsConfigMock} from '../../config.service.mock'; import {HsEventBusService} from '../core/event-bus.service'; import {HsEventBusServiceMock} from '../core/event-bus.service.mock'; -import {HsLayerEditorService} from '../layermanager/editor/layer-editor.service'; -import {HsLayerManagerService} from '../layermanager/layermanager.service'; +import {HsLayerEditorService} from '../layer-manager/editor/layer-editor.service'; +import {HsLayerManagerService} from '../layer-manager/layer-manager.service'; import {HsLayerShiftingService} from '../../common/layer-shifting/layer-shifting.service'; import {HsMapService} from '../map/map.service'; import {HsMapServiceMock} from '../map/map.service.mock'; import {HsMapSwipeService} from './map-swipe.service'; -import {HsShareUrlService} from '../permalink/share-url.service'; +import {HsShareUrlService} from '../share/share-url.service'; import {HsToastService} from '../layout/toast/toast.service'; import {mockHsLayerShiftingService} from '../../common/layer-shifting/layer-shifting.service.mock'; diff --git a/projects/hslayers/src/components/map-swipe/map-swipe.service.ts b/projects/hslayers/src/components/map-swipe/map-swipe.service.ts index 643c4128ec..c2d0ad54ec 100644 --- a/projects/hslayers/src/components/map-swipe/map-swipe.service.ts +++ b/projects/hslayers/src/components/map-swipe/map-swipe.service.ts @@ -7,13 +7,13 @@ import {Source} from 'ol/source'; import {HsConfig} from '../../config.service'; import {HsEventBusService} from '../core/event-bus.service'; -import {HsLayerEditorService} from '../layermanager/editor/layer-editor.service'; -import {HsLayerManagerService} from '../layermanager/layermanager.service'; +import {HsLayerEditorService} from '../layer-manager/editor/layer-editor.service'; +import {HsLayerManagerService} from '../layer-manager/layer-manager.service'; import {HsLayerShiftingService} from '../../common/layer-shifting/layer-shifting.service'; import {HsLayoutService} from '../layout/layout.service'; import {HsLogService} from '../../common/log/log.service'; import {HsMapService} from '../map/map.service'; -import {HsShareUrlService} from '../permalink/share-url.service'; +import {HsShareUrlService} from '../share/share-url.service'; import {HsToastService} from '../layout/toast/toast.service'; import {LayerListItem} from './../../common/layer-shifting/layer-shifting.service'; import {SwipeControl} from './swipe-control/swipe.control'; diff --git a/projects/hslayers/src/components/map/map.component.ts b/projects/hslayers/src/components/map/map.component.ts index 0ad5c596ad..6d859aabda 100644 --- a/projects/hslayers/src/components/map/map.component.ts +++ b/projects/hslayers/src/components/map/map.component.ts @@ -10,12 +10,12 @@ import { import {Subscription} from 'rxjs'; import {transform} from 'ol/proj'; -import {HS_PRMS} from '../permalink/get-params'; +import {HS_PRMS} from '../share/get-params'; import {HsConfig} from '../../config.service'; import {HsCoreService} from '../core/core.service'; import {HsEventBusService} from '../core/event-bus.service'; import {HsMapService} from './map.service'; -import {HsShareUrlService} from '../permalink/share-url.service'; +import {HsShareUrlService} from '../share/share-url.service'; @Component({ selector: 'hs-map', diff --git a/projects/hslayers/src/components/map/map.spec.ts b/projects/hslayers/src/components/map/map.spec.ts index 575d6baff7..5b7096d647 100644 --- a/projects/hslayers/src/components/map/map.spec.ts +++ b/projects/hslayers/src/components/map/map.spec.ts @@ -22,8 +22,8 @@ import {HsLayoutServiceMock} from '../layout/layout.service.mock'; import {HsMapComponent} from './map.component'; import {HsMapDirective} from './map.directive'; import {HsMapService} from './map.service'; -import {HsShareUrlService} from '../permalink/share-url.service'; -import {HsShareUrlServiceMock} from '../permalink/share-url.service.mock'; +import {HsShareUrlService} from '../share/share-url.service'; +import {HsShareUrlServiceMock} from '../share/share-url.service.mock'; import {HsUtilsService} from '../utils/utils.service'; import {HsUtilsServiceMock} from '../utils/utils.service.mock'; import {mockLanguageService} from '../language/language.service.mock'; diff --git a/projects/hslayers/src/components/print/index.ts b/projects/hslayers/src/components/print/index.ts new file mode 100644 index 0000000000..7e1a213e3e --- /dev/null +++ b/projects/hslayers/src/components/print/index.ts @@ -0,0 +1 @@ +export * from './public-api'; diff --git a/projects/hslayers/src/components/print/print-imprint.service.ts b/projects/hslayers/src/components/print/print-imprint.service.ts index 45368c7db7..35897b2811 100644 --- a/projects/hslayers/src/components/print/print-imprint.service.ts +++ b/projects/hslayers/src/components/print/print-imprint.service.ts @@ -1,7 +1,7 @@ import {Injectable} from '@angular/core'; import {HsPrintLegendService} from './print-legend.service'; -import {HsShareThumbnailService} from '../permalink/share-thumbnail.service'; +import {HsShareThumbnailService} from '../share/share-thumbnail.service'; import {ImprintObj} from './types/imprint-object.type'; import {TextStyle} from './types/text-style.type'; diff --git a/projects/hslayers/src/components/print/print-legend.service.ts b/projects/hslayers/src/components/print/print-legend.service.ts index f776df7f51..c5f152529a 100644 --- a/projects/hslayers/src/components/print/print-legend.service.ts +++ b/projects/hslayers/src/components/print/print-legend.service.ts @@ -9,7 +9,7 @@ import {HsLegendDescriptor} from '../legend/legend-descriptor.interface'; import {HsLegendLayerStaticService} from '../legend/legend-layer-static/legend-layer-static.service'; import {HsLegendService} from '../legend/legend.service'; import {HsMapService} from '../map/map.service'; -import {HsShareThumbnailService} from '../permalink/share-thumbnail.service'; +import {HsShareThumbnailService} from '../share/share-thumbnail.service'; import {LegendObj} from './types/legend-object.type'; import {SparqlJson} from '../../common/layers/hs.source.SparqlJson'; diff --git a/projects/hslayers/src/components/print/print.service.ts b/projects/hslayers/src/components/print/print.service.ts index 0d34ceefcd..4f8194395e 100644 --- a/projects/hslayers/src/components/print/print.service.ts +++ b/projects/hslayers/src/components/print/print.service.ts @@ -7,7 +7,7 @@ import {HsPrintImprintService} from './print-imprint.service'; import {HsPrintLegendService} from './print-legend.service'; import {HsPrintScaleService} from './print-scale.service'; import {HsPrintTitleService} from './print-title.service'; -import {HsShareThumbnailService} from '../permalink/share-thumbnail.service'; +import {HsShareThumbnailService} from '../share/share-thumbnail.service'; import {PrintModel} from './types/print-object.type'; import {xPos, yPos} from './types/xy-positions.type'; diff --git a/projects/hslayers/src/components/print/public-api.ts b/projects/hslayers/src/components/print/public-api.ts index 0b3a7bddf3..69dc09ca6b 100644 --- a/projects/hslayers/src/components/print/public-api.ts +++ b/projects/hslayers/src/components/print/public-api.ts @@ -1,22 +1,22 @@ -export * from './print.component'; -export * from './print.service'; -export * from './constants/text-styling-options'; -export * from './constants/position-options'; -export * from './types/xy-positions.type'; -export * from './types/print-object.type'; -export * from './types/imprint-object.type'; -export * from './types/title-object.type'; -export * from './types/text-style.type'; -export * from './types/scale-object.type'; -export * from './types/legend-object.type'; -export * from './text-styler/text-styler.component'; -export * from './scale-styler/scale-styler.component'; -export * from './legend-styler/legend-styler.component'; -export * from './types/styler.type'; -export * from './constants/scale-svg-classes'; -export * from './constants/scale-styling-options'; -export * from './print-legend.service'; -export * from './print-title.service'; -export * from './print-scale.service'; -export * from './print-imprint.service'; -export * from './imprint-styler/imprint-styler.component'; +export {HsPrintComponent} from './print.component'; +export {HsPrintService} from './print.service'; +// export * from './constants/text-styling-options'; +// export * from './constants/position-options'; +// export * from './types/xy-positions.type'; +// export * from './types/print-object.type'; +// export * from './types/imprint-object.type'; +// export * from './types/title-object.type'; +// export * from './types/text-style.type'; +// export * from './types/scale-object.type'; +// export * from './types/legend-object.type'; +// export * from './text-styler/text-styler.component'; +// export * from './scale-styler/scale-styler.component'; +// export * from './legend-styler/legend-styler.component'; +// export * from './types/styler.type'; +// export * from './constants/scale-svg-classes'; +// export * from './constants/scale-styling-options'; +// export * from './print-legend.service'; +// export * from './print-title.service'; +// export * from './print-scale.service'; +// export * from './print-imprint.service'; +// export * from './imprint-styler/imprint-styler.component'; diff --git a/projects/hslayers/src/components/query/query-base.service.ts b/projects/hslayers/src/components/query/query-base.service.ts index c8d12e11fb..be702bc0f3 100644 --- a/projects/hslayers/src/components/query/query-base.service.ts +++ b/projects/hslayers/src/components/query/query-base.service.ts @@ -45,7 +45,7 @@ export class HsQueryBaseService { popupClassname = ''; nonQueryablePanels = [ 'measure', - 'composition_browser', + 'compositions', 'analysis', 'sensors', // 'draw', diff --git a/projects/hslayers/src/components/query/query-wms.service.ts b/projects/hslayers/src/components/query/query-wms.service.ts index 6c4eccf298..5ea992084b 100644 --- a/projects/hslayers/src/components/query/query-wms.service.ts +++ b/projects/hslayers/src/components/query/query-wms.service.ts @@ -31,7 +31,6 @@ import {jsonGetFeatureInfo} from '../../common/get-feature-info/json-get-feature export class HsQueryWmsService { infoCounter = 0; constructor( - private hsQueryBaseService: HsQueryBaseService, private hsMapService: HsMapService, private hsLayerUtilsService: HsLayerUtilsService, private hsLanguageService: HsLanguageService, @@ -39,6 +38,7 @@ export class HsQueryWmsService { private httpClient: HttpClient, private hsLogService: HsLogService, private hsQueryWmtsService: HsQueryWmtsService, + private hsQueryBaseService: HsQueryBaseService, ) { this.hsQueryBaseService.getFeatureInfoStarted.subscribe((evt) => { this.infoCounter = 0; diff --git a/projects/hslayers/src/components/query/widgets/dynamic-text.component.ts b/projects/hslayers/src/components/query/widgets/dynamic-text.component.ts index eb969543a0..84c6b2bf45 100644 --- a/projects/hslayers/src/components/query/widgets/dynamic-text.component.ts +++ b/projects/hslayers/src/components/query/widgets/dynamic-text.component.ts @@ -4,7 +4,7 @@ import {DomSanitizer, SafeHtml} from '@angular/platform-browser'; import {Feature} from 'ol'; import {Geometry} from 'ol/geom'; -import {HsLayerDescriptor} from '../../layermanager/layer-descriptor.interface'; +import {HsLayerDescriptor} from '../../layer-manager/layer-descriptor.interface'; import {HsQueryPopupWidgetBaseComponent} from '../query-popup-widget-base.component'; import {getPopUp} from '../../../common/layer-extensions'; diff --git a/projects/hslayers/src/components/query/widgets/feature-info.component.ts b/projects/hslayers/src/components/query/widgets/feature-info.component.ts index 535ab51349..5743c303b6 100644 --- a/projects/hslayers/src/components/query/widgets/feature-info.component.ts +++ b/projects/hslayers/src/components/query/widgets/feature-info.component.ts @@ -6,7 +6,7 @@ import {Geometry} from 'ol/geom'; import {HsConfirmDialogComponent} from '../../../common/confirm/confirm-dialog.component'; import {HsDialogContainerService} from '../../layout/dialogs/dialog-container.service'; import {HsLanguageService} from '../../language/language.service'; -import {HsLayerDescriptor} from '../../layermanager/layer-descriptor.interface'; +import {HsLayerDescriptor} from '../../layer-manager/layer-descriptor.interface'; import {HsQueryPopupServiceModel} from '../query-popup.service.model'; import {HsQueryPopupWidgetBaseComponent} from '../query-popup-widget-base.component'; import {HsQueryVectorService} from '../query-vector.service'; diff --git a/projects/hslayers/src/components/query/widgets/layer-name.component.ts b/projects/hslayers/src/components/query/widgets/layer-name.component.ts index c5c4af3a00..2ad27de0a5 100644 --- a/projects/hslayers/src/components/query/widgets/layer-name.component.ts +++ b/projects/hslayers/src/components/query/widgets/layer-name.component.ts @@ -1,6 +1,6 @@ import {ChangeDetectionStrategy, Component, Input, OnInit} from '@angular/core'; -import {HsLayerDescriptor} from '../../layermanager/layer-descriptor.interface'; +import {HsLayerDescriptor} from '../../layer-manager/layer-descriptor.interface'; import {HsLayerUtilsService} from '../../utils/layer-utils.service'; import {HsQueryPopupWidgetBaseComponent} from '../query-popup-widget-base.component'; diff --git a/projects/hslayers/src/components/save-map/save-map-manager.service.ts b/projects/hslayers/src/components/save-map/save-map-manager.service.ts index 27836458b4..220dc714dd 100644 --- a/projects/hslayers/src/components/save-map/save-map-manager.service.ts +++ b/projects/hslayers/src/components/save-map/save-map-manager.service.ts @@ -14,7 +14,7 @@ import {HsLogService} from './../../common/log/log.service'; import {HsMapService} from '../map/map.service'; import {HsSaveMapService} from './save-map.service'; import {HsSaverService} from './interfaces/saver-service.interface'; -import {HsShareService} from '../permalink/share.service'; +import {HsShareService} from '../share/share.service'; import {HsUtilsService} from '../utils/utils.service'; import {LaymanCompositionDescriptor} from '../compositions/models/composition-descriptor.model'; import {MapComposition} from './types/map-composition.type'; @@ -180,8 +180,8 @@ export class HsSaveMapManagerService extends HsSaveMapManagerParams { filtered.length === 0 ? 'private' : filtered.length === 1 && filtered[0] === 'EVERYONE' - ? filtered[0] - : access.join(','); + ? filtered[0] + : access.join(','); } /** @@ -376,7 +376,7 @@ export class HsSaveMapManagerService extends HsSaveMapManagerParams { this.statusData.error = error; } else { this.statusData.resultCode = 'success'; - this.hsLayoutService.setMainPanel('layermanager', true); + this.hsLayoutService.setMainPanel('layerManager', true); } this.saveMapResulted.next(this.statusData); } diff --git a/projects/hslayers/src/components/save-map/save-map.service.ts b/projects/hslayers/src/components/save-map/save-map.service.ts index 7de006891b..14737fddb9 100644 --- a/projects/hslayers/src/components/save-map/save-map.service.ts +++ b/projects/hslayers/src/components/save-map/save-map.service.ts @@ -26,7 +26,7 @@ import {CompoData} from './types/compo-data.type'; import {HsLayerUtilsService} from '../utils/layer-utils.service'; import {HsLogService} from '../../common/log/log.service'; import {HsMapService} from '../map/map.service'; -import {HsShareThumbnailService} from '../permalink/share-thumbnail.service'; +import {HsShareThumbnailService} from '../share/share-thumbnail.service'; import {HsUtilsService} from '../utils/utils.service'; import {LayerJSON} from './types/layer-json.type'; import {MapComposition} from './types/map-composition.type'; diff --git a/projects/hslayers/src/components/search/search-input.component.ts b/projects/hslayers/src/components/search/search-input.component.ts index 2119d80039..8ed6583769 100644 --- a/projects/hslayers/src/components/search/search-input.component.ts +++ b/projects/hslayers/src/components/search/search-input.component.ts @@ -2,11 +2,11 @@ import {Component, OnDestroy, OnInit} from '@angular/core'; import {Subscription} from 'rxjs'; -import {HS_PRMS} from '../permalink/get-params'; +import {HS_PRMS} from '../share/get-params'; import {HsConfig} from '../../config.service'; import {HsEventBusService} from '../core/event-bus.service'; import {HsSearchService} from './search.service'; -import {HsShareUrlService} from '../permalink/share-url.service'; +import {HsShareUrlService} from '../share/share-url.service'; /** * Add search input template to page diff --git a/projects/hslayers/src/components/permalink/get-params.ts b/projects/hslayers/src/components/share/get-params.ts similarity index 100% rename from projects/hslayers/src/components/permalink/get-params.ts rename to projects/hslayers/src/components/share/get-params.ts diff --git a/projects/hslayers/src/components/permalink/public-api.ts b/projects/hslayers/src/components/share/public-api.ts similarity index 100% rename from projects/hslayers/src/components/permalink/public-api.ts rename to projects/hslayers/src/components/share/public-api.ts diff --git a/projects/hslayers/src/components/permalink/share-thumbnail.service.ts b/projects/hslayers/src/components/share/share-thumbnail.service.ts similarity index 100% rename from projects/hslayers/src/components/permalink/share-thumbnail.service.ts rename to projects/hslayers/src/components/share/share-thumbnail.service.ts diff --git a/projects/hslayers/src/components/permalink/share-url.service.mock.ts b/projects/hslayers/src/components/share/share-url.service.mock.ts similarity index 100% rename from projects/hslayers/src/components/permalink/share-url.service.mock.ts rename to projects/hslayers/src/components/share/share-url.service.mock.ts diff --git a/projects/hslayers/src/components/permalink/share-url.service.ts b/projects/hslayers/src/components/share/share-url.service.ts similarity index 98% rename from projects/hslayers/src/components/permalink/share-url.service.ts rename to projects/hslayers/src/components/share/share-url.service.ts index 8f9f2680a8..1f189cc7a0 100644 --- a/projects/hslayers/src/components/permalink/share-url.service.ts +++ b/projects/hslayers/src/components/share/share-url.service.ts @@ -62,7 +62,7 @@ export class HsShareUrlService { this.HsUtilsService.debounce( ({map, event, extent}) => { this.zone.run(() => { - if (this.HsLayoutService.mainpanel == 'permalink') { + if (this.HsLayoutService.mainpanel == 'share') { this.updatePermalinkComposition(); } else { this.updateViewParamsInUrl(true); @@ -191,7 +191,7 @@ export class HsShareUrlService { const addedLayersJson = this.HsSaveMapService.layers2json(addedLayers); const pnlMain = this.HsLayoutService.mainpanel; - this.push(HS_PRMS.panel, pnlMain == 'permalink' ? 'layermanager' : pnlMain); + this.push(HS_PRMS.panel, pnlMain == 'share' ? 'layerManager' : pnlMain); if (this.HsLanguageService.language) { this.push(HS_PRMS.lang, this.HsLanguageService.language); diff --git a/projects/hslayers/src/components/permalink/share.component.html b/projects/hslayers/src/components/share/share.component.html similarity index 100% rename from projects/hslayers/src/components/permalink/share.component.html rename to projects/hslayers/src/components/share/share.component.html diff --git a/projects/hslayers/src/components/permalink/share.component.ts b/projects/hslayers/src/components/share/share.component.ts similarity index 98% rename from projects/hslayers/src/components/permalink/share.component.ts rename to projects/hslayers/src/components/share/share.component.ts index ea2d1ae2ce..3c6bc3fa54 100644 --- a/projects/hslayers/src/components/permalink/share.component.ts +++ b/projects/hslayers/src/components/share/share.component.ts @@ -15,7 +15,7 @@ import {HsSidebarService} from '../sidebar/sidebar.service'; }) export class HsShareComponent extends HsPanelBaseComponent implements OnInit { new_share = false; - name = 'permalink'; + name = 'share'; app: string; constructor( public HsShareService: HsShareService, diff --git a/projects/hslayers/src/components/permalink/share.module.ts b/projects/hslayers/src/components/share/share.module.ts similarity index 89% rename from projects/hslayers/src/components/permalink/share.module.ts rename to projects/hslayers/src/components/share/share.module.ts index c909d3fed2..9fdc22ced9 100644 --- a/projects/hslayers/src/components/permalink/share.module.ts +++ b/projects/hslayers/src/components/share/share.module.ts @@ -7,7 +7,7 @@ import { import {CUSTOM_ELEMENTS_SCHEMA, NgModule} from '@angular/core'; import {FormsModule} from '@angular/forms'; -import {HsPanelHeaderComponent} from '../layout//panels/panel-header/panel-header.component'; +import {HsPanelHeaderComponent} from '../layout/panels/panel-header/panel-header.component'; import {HsPanelHelpersModule} from '../layout/panels/panel-helpers.module'; import {HsShareComponent} from './share.component'; import {TranslateCustomPipe} from '../language/translate-custom.pipe'; diff --git a/projects/hslayers/src/components/permalink/share.service.ts b/projects/hslayers/src/components/share/share.service.ts similarity index 98% rename from projects/hslayers/src/components/permalink/share.service.ts rename to projects/hslayers/src/components/share/share.service.ts index 8c9e5fd82b..9a0f98dc3d 100644 --- a/projects/hslayers/src/components/permalink/share.service.ts +++ b/projects/hslayers/src/components/share/share.service.ts @@ -61,7 +61,7 @@ export class HsShareService { }); this.HsLayoutService.mainpanel$.subscribe(async (which) => { - if (this.HsLayoutService.mainpanel == 'permalink') { + if (this.HsLayoutService.mainpanel == 'share') { this.generateThumbnail( this.HsLayoutService.contentWrapper.querySelector( '.hs-permalink-thumbnail', @@ -97,7 +97,7 @@ export class HsShareService { this.HsShareUrlService.browserUrlUpdated.subscribe(async (url) => { if ( - this.HsLayoutService.mainpanel == 'permalink' || + this.HsLayoutService.mainpanel == 'share' || this.HsLayoutService.mainpanel == 'shareMap' ) { this.shareUrlValid = false; @@ -122,7 +122,7 @@ export class HsShareService { 'postcompose', this.HsUtilsService.debounce( () => { - if (this.HsLayoutService.mainpanel == 'permalink') { + if (this.HsLayoutService.mainpanel == 'share') { this.generateThumbnail( this.HsLayoutService.contentWrapper.querySelector( '.hs-permalink-thumbnail', diff --git a/projects/hslayers/src/components/styles/add-colormap.component.ts b/projects/hslayers/src/components/styles/add-colormap.component.ts index fa72a99b71..6c65e0d93f 100644 --- a/projects/hslayers/src/components/styles/add-colormap.component.ts +++ b/projects/hslayers/src/components/styles/add-colormap.component.ts @@ -5,7 +5,7 @@ import {Vector as VectorSource} from 'ol/source'; import {HsLanguageService} from '../language/language.service'; import {HsStylerService} from './styler.service'; -import {listNumericAttributes} from '../layermanager/widgets/idw-widget.component'; +import {listNumericAttributes} from '../layer-manager/widgets/idw-widget.component'; @Component({ selector: 'hs-add-colormap', diff --git a/projects/hslayers/src/components/styles/filters/comparison-filter.component.ts b/projects/hslayers/src/components/styles/filters/comparison-filter.component.ts index 6e1d7a9e3f..9d32ea1111 100644 --- a/projects/hslayers/src/components/styles/filters/comparison-filter.component.ts +++ b/projects/hslayers/src/components/styles/filters/comparison-filter.component.ts @@ -1,9 +1,9 @@ import {Component, Input} from '@angular/core'; import {Vector as VectorSource} from 'ol/source'; -import {HsLayerSelectorService} from '../../layermanager/editor/layer-selector.service'; +import {HsLayerSelectorService} from '../../layer-manager/editor/layer-selector.service'; import {HsStylerPartBaseComponent} from '../style-part-base.component'; -import {listNumericAttributes} from '../../layermanager/widgets/idw-widget.component'; +import {listNumericAttributes} from '../../layer-manager/widgets/idw-widget.component'; @Component({ selector: 'hs-comparison-filter', diff --git a/projects/hslayers/src/components/styles/styler.component.ts b/projects/hslayers/src/components/styles/styler.component.ts index 467b3d2776..09cc29022f 100644 --- a/projects/hslayers/src/components/styles/styler.component.ts +++ b/projects/hslayers/src/components/styles/styler.component.ts @@ -80,7 +80,7 @@ export class HsStylerComponent this.hsStylerService.setSldQml(); } } - this.hsLayoutService.setMainPanel('layermanager'); + this.hsLayoutService.setMainPanel('layerManager'); } uploadSld(): void { diff --git a/projects/hslayers/src/components/trip-planner/trip-planner.service.ts b/projects/hslayers/src/components/trip-planner/trip-planner.service.ts index a7d04f24be..a39fb1d0d5 100644 --- a/projects/hslayers/src/components/trip-planner/trip-planner.service.ts +++ b/projects/hslayers/src/components/trip-planner/trip-planner.service.ts @@ -17,7 +17,7 @@ import {HsLanguageService} from '../language/language.service'; import {HsLayerUtilsService} from '../utils/layer-utils.service'; import {HsLayoutService} from '../layout/layout.service'; import {HsMapService} from '../map/map.service'; -import {HsShareUrlService} from '../permalink/share-url.service'; +import {HsShareUrlService} from '../share/share-url.service'; import {HsToastService} from '../layout/toast/toast.service'; import {HsUtilsService} from '../utils/utils.service'; import {getHighlighted} from '../../common/feature-extensions'; diff --git a/projects/hslayers/src/components/utils/layer-utils.service.ts b/projects/hslayers/src/components/utils/layer-utils.service.ts index a7fd68ea93..cb2cafc089 100644 --- a/projects/hslayers/src/components/utils/layer-utils.service.ts +++ b/projects/hslayers/src/components/utils/layer-utils.service.ts @@ -22,7 +22,7 @@ import {Tile as TileLayer} from 'ol/layer'; import {isEmpty} from 'ol/extent'; import {HsLanguageService} from '../language/language.service'; -import {HsLayerDescriptor} from '../layermanager/layer-descriptor.interface'; +import {HsLayerDescriptor} from '../layer-manager/layer-descriptor.interface'; import {HsMapService} from '../map/map.service'; import {HsUtilsService} from './utils.service'; import {HsWmsLayer} from '../../common/get-capabilities/wms-get-capabilities-response.interface'; diff --git a/projects/hslayers/src/components/utils/utils.service.ts b/projects/hslayers/src/components/utils/utils.service.ts index 4e04d00bf9..9714afc170 100644 --- a/projects/hslayers/src/components/utils/utils.service.ts +++ b/projects/hslayers/src/components/utils/utils.service.ts @@ -226,6 +226,7 @@ export class HsUtilsService { * @returns Returns function which is debounced */ debounce(func, wait: number, immediate: boolean, context) { + // eslint-disable-next-line @typescript-eslint/no-this-alias context ??= this; return function (...args) { const later = function () { @@ -431,6 +432,13 @@ export class HsUtilsService { return target.charAt(0).toUpperCase() + target.slice(1); } + /** + * Transforms string from camelCase to kebab-case + */ + camelToKebab(str) { + return str.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase(); + } + undefineEmptyString(str: string): any { if (str === undefined) { return undefined; diff --git a/projects/hslayers/src/config.service.mock.ts b/projects/hslayers/src/config.service.mock.ts index 095483dd44..b8eacea5d0 100644 --- a/projects/hslayers/src/config.service.mock.ts +++ b/projects/hslayers/src/config.service.mock.ts @@ -8,16 +8,15 @@ export class HsConfigMock { legend: false, measure: false, info: false, - composition_browser: false, + compositions: false, toolbar: false, draw: false, - datasource_selector: false, layermanager: false, feature_crossfilter: false, print: false, saveMap: false, language: false, - permalink: false, + share: false, compositionLoadingProgress: false, sensors: false, filter: false, diff --git a/projects/hslayers/src/config.service.ts b/projects/hslayers/src/config.service.ts index 8fafeb39ca..06eac5d04c 100644 --- a/projects/hslayers/src/config.service.ts +++ b/projects/hslayers/src/config.service.ts @@ -59,16 +59,15 @@ export class HsConfigObject { legend?: boolean; measure?: boolean; query?: boolean; - composition_browser?: boolean; + compositions?: boolean; draw?: boolean; - datasource_selector?: boolean; - layermanager?: boolean; - feature_table?: boolean; + layerManager?: boolean; + featureTable?: boolean; feature_crossfilter?: boolean; print?: boolean; saveMap?: boolean; language?: boolean; - permalink?: boolean; + share?: boolean; sensors?: boolean; filter?: boolean; search?: boolean; @@ -166,14 +165,14 @@ export class HsConfigObject { this.pathExclusivity = false; this.panelsEnabled = { legend: true, - composition_browser: true, + compositions: true, measure: true, draw: true, - layermanager: true, + layerManager: true, print: true, saveMap: true, language: true, - permalink: true, + share: true, query: true, sensors: false, /** @@ -204,7 +203,7 @@ export class HsConfigObject { this.panelWidths = { default: 425, ows: 700, - composition_browser: 550, + compositions: 550, addData: 700, mapSwipe: 550, }; diff --git a/projects/hslayers/src/css/hslayers-bootstrap.scss b/projects/hslayers/src/css/hslayers-bootstrap.scss index 04bd9f27c5..889a857aa9 100644 --- a/projects/hslayers/src/css/hslayers-bootstrap.scss +++ b/projects/hslayers/src/css/hslayers-bootstrap.scss @@ -981,9 +981,9 @@ $list-group-item-padding-x: 1.25rem; } @import "../components/layout/layout.component.scss"; - @import "../components/layermanager/layermanager.component.scss"; - @import "../components/layermanager/logical-list/layerlist.component.scss"; - @import "../components/layermanager/gallery/layermanager-gallery.component.scss"; + @import "../components/layer-manager/layer-manager.component.scss"; + @import "../components/layer-manager/logical-list/layerlist.component.scss"; + @import "../components/layer-manager/gallery/layer-manager-gallery.component.scss"; @import "../components/sidebar/sidebar.component.scss"; @import "../components/geolocation/geolocation.component.scss"; @import "../components/sidebar/impressum.component.scss"; @@ -1205,4 +1205,4 @@ $list-group-item-padding-x: 1.25rem; .sketch-picker { margin: 7px; } -} \ No newline at end of file +} diff --git a/projects/hslayers/src/css/hslayers-wo-bootstrap.scss b/projects/hslayers/src/css/hslayers-wo-bootstrap.scss index ed3cf7d936..beb47d4cee 100644 --- a/projects/hslayers/src/css/hslayers-wo-bootstrap.scss +++ b/projects/hslayers/src/css/hslayers-wo-bootstrap.scss @@ -740,9 +740,9 @@ $list-group-item-padding-x: 1.25rem; } @import "../components/layout/layout.component.scss"; - @import "../components/layermanager/layermanager.component.scss"; - @import "../components/layermanager/logical-list/layerlist.component.scss"; - @import "../components/layermanager/gallery/layermanager-gallery.component.scss"; + @import "../components/layer-manager/layer-manager.component.scss"; + @import "../components/layer-manager/logical-list/layerlist.component.scss"; + @import "../components/layer-manager/gallery/layer-manager-gallery.component.scss"; @import "../components/sidebar/sidebar.component.scss"; @import "../components/geolocation/geolocation.component.scss"; @import "../components/sidebar/impressum.component.scss"; @@ -939,4 +939,4 @@ $list-group-item-padding-x: 1.25rem; .sketch-picker { margin: 7px; } -} \ No newline at end of file +} diff --git a/projects/hslayers/src/hslayers.component.ts b/projects/hslayers/src/hslayers.component.ts index 0eb41a63fc..4226ec692e 100644 --- a/projects/hslayers/src/hslayers.component.ts +++ b/projects/hslayers/src/hslayers.component.ts @@ -8,7 +8,7 @@ import {HsExternalService} from './components/external/external.service'; import {HsGeolocationComponent} from './components/geolocation/geolocation.component'; import {HsInfoComponent} from './components/info/info.component'; -import {HsLayerManagerGalleryComponent} from './components/layer-manager/gallery/layermanager-gallery.component'; +import {HsLayerManagerGalleryComponent} from './components/layer-manager/gallery/layer-manager-gallery.component'; import {HsLayoutComponent} from './components/layout/layout.component'; import {HsMapSwipeService} from './components/map-swipe/map-swipe.service'; diff --git a/projects/hslayers/src/public-api.ts b/projects/hslayers/src/public-api.ts index 82d286e732..3fc5692af9 100644 --- a/projects/hslayers/src/public-api.ts +++ b/projects/hslayers/src/public-api.ts @@ -38,12 +38,12 @@ export * from './components/feature-table/public-api'; export * from './components/geolocation/public-api'; export * from './components/info/public-api'; export * from './components/language/public-api'; -export * from './components/layermanager/public-api'; +export * from './components/layer-manager/public-api'; export * from './components/layout/public-api'; export * from './components/legend/public-api'; export * from './components/map/public-api'; export * from './components/measure/public-api'; -export * from './components/permalink/public-api'; +export * from './components/share/public-api'; export * from './components/print/public-api'; export * from './components/query/public-api'; export * from './components/save-map/public-api'; diff --git a/projects/hslayers/tsconfig.lib.prod.json b/projects/hslayers/tsconfig.lib.prod.json index f7d0c7e146..8c73a356eb 100644 --- a/projects/hslayers/tsconfig.lib.prod.json +++ b/projects/hslayers/tsconfig.lib.prod.json @@ -4,7 +4,6 @@ "declarationMap": false }, "angularCompilerOptions": { - "compilationMode": "partial" - , + "compilationMode": "full" } }