Skip to content

Commit

Permalink
refactor!: Rename src to core and move core service out of the services
Browse files Browse the repository at this point in the history
BREAKING CHANGE: src folder has been renamed to core, update your imports accordingly
  • Loading branch information
FilipLeitner authored and jmacura committed Apr 22, 2024
1 parent 3893e90 commit c67b0f8
Show file tree
Hide file tree
Showing 45 changed files with 47 additions and 70 deletions.
2 changes: 1 addition & 1 deletion projects/cesium-test-app/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {BrowserModule} from '@angular/platform-browser';
import {NgModule} from '@angular/core';

import {HsCesiumModule} from 'hslayers-cesium';
import {HslayersModule} from 'hslayers-ng';
import {HslayersModule} from 'hslayers-ng/core';

import {AppComponent} from './app.component';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {HsConfig} from '../../../hslayers/src/config.service';
import {HsConfigMock} from '../../../hslayers/src/config.service.mock';
import {HsConfig} from '../../../hslayers/config/config.service';
import {HsConfigMock} from '../../../hslayers/test/config.service.mock';
import {HslayersAppComponent} from './hslayers-app.component';
import {TestBed, waitForAsync} from '@angular/core/testing';
describe('AppComponent', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {NgModule} from '@angular/core';
} from 'hslayers-ng/public-api'; */
//import {HsMeasureModule} from 'hslayers-ng/components/measure/public-api';
//import {HsDrawModule} from 'hslayers-ng/components/draw/public-api';
import {HslayersModule} from 'hslayers-ng';
import {HslayersModule} from 'hslayers-ng/core';

import {HslayersAppComponent} from './hslayers-app.component';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {HsConfig} from '../../../hslayers/src/config.service';
import {HsConfigMock} from '../../../hslayers/src/config.service.mock';
import {HsConfig} from '../../../hslayers/config/config.service';
import {HsConfigMock} from '../../../hslayers/test/config.service.mock';
import {HslayersAppComponent} from './hslayers-app.component';
import {TestBed, waitForAsync} from '@angular/core/testing';
describe('AppComponent', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {ApplicationRef, DoBootstrap, NgModule} from '@angular/core';
import {BrowserModule} from '@angular/platform-browser';

import {HslayersAppComponent} from './hslayers-app.component';
import {HslayersModule} from 'hslayers-ng';
import {HslayersModule} from 'hslayers-ng/core';

@NgModule({
declarations: [HslayersAppComponent],
Expand Down
2 changes: 1 addition & 1 deletion projects/hslayers-cesium-app/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {BrowserModule} from '@angular/platform-browser';

import {AppComponent} from './app.component';
import {HsCesiumModule} from 'hslayers-cesium';
import {HslayersModule} from 'hslayers-ng';
import {HslayersModule} from 'hslayers-ng/core';

@NgModule({
declarations: [AppComponent],
Expand Down
2 changes: 0 additions & 2 deletions projects/hslayers-cesium/src/hscesium.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import {AfterViewInit, Component, DestroyRef} from '@angular/core';

import {HS_PRMS, HsShareUrlService} from 'hslayers-ng/components/share';
import {HsCoreService} from 'hslayers-ng/services/core';
import {HsEventBusService} from 'hslayers-ng/services/event-bus';
import {HsLayoutService} from 'hslayers-ng/services/layout';
import {HsMapService} from 'hslayers-ng/services/map';
Expand Down Expand Up @@ -35,7 +34,6 @@ export class HslayersCesiumComponent implements AfterViewInit {
constructor(
public HsCesiumService: HsCesiumService,
public HsShareUrlService: HsShareUrlService,
public HsCoreService: HsCoreService,
public HsMapService: HsMapService,
public HsSidebarService: HsSidebarService,
private hsToolbarPanelContainerService: HsToolbarPanelContainerService,
Expand Down
2 changes: 1 addition & 1 deletion projects/hslayers-cesium/src/hscesium.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
} from '@angular/core';
import {CommonModule} from '@angular/common';

import {HslayersModule} from 'hslayers-ng';
import {HslayersModule} from 'hslayers-ng/core';

import {HsCesiumCameraService} from './hscesium-camera.service';
import {HsCesiumConfig} from './hscesium-config.service';
Expand Down
2 changes: 1 addition & 1 deletion projects/hslayers-cesium/src/hscesium.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
} from 'cesium';
import {Subject, takeUntil} from 'rxjs';

import {HsCoreService} from 'hslayers-ng/services/core';
import {HsCoreService} from 'hslayers-ng/core';
import {HsEventBusService} from 'hslayers-ng/services/event-bus';
import {HsLayerManagerService} from 'hslayers-ng/services/layer-manager';
import {HsLayoutService} from 'hslayers-ng/services/layout';
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions projects/hslayers/.compodocrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"output": "../../docs/hslayers",
"name": "HSLayers-NG documentation",
"theme": "material",
"customFavicon": "./src/assets/img/hslayers-ng-favicon_32x32.jpg",
"customLogo": "./src/assets/img/hslayers-ng-logo.png"
}
"customFavicon": ".assets/img/hslayers-ng-favicon_32x32.jpg",
"customLogo": ".assets/img/hslayers-ng-logo.png"
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {HsAddDataCatalogueService} from 'hslayers-ng/services/add-data';
import {HsAddDataLayerDescriptor} from 'hslayers-ng/types';
import {HsCommonLaymanService} from 'hslayers-ng/common/layman';
import {HsConfig} from 'hslayers-ng/config';
import {HsCoreService} from 'hslayers-ng/services/core';
import {HsLanguageService} from 'hslayers-ng/services/language';
import {HsLaymanService} from 'hslayers-ng/services/save-map';
import {HsLayoutService} from 'hslayers-ng/services/layout';
Expand All @@ -32,7 +31,6 @@ export class HsAddDataCatalogueComponent implements OnInit {
constructor(
public hsLanguageService: HsLanguageService,
public hsConfig: HsConfig,
public hsCore: HsCoreService,
public hsAddDataCatalogueService: HsAddDataCatalogueService,
public hsAddDataCatalogueMapService: HsAddDataCatalogueMapService,
public hsLayoutService: HsLayoutService,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {Subject, takeUntil} from 'rxjs';

import {HsCommonLaymanService} from 'hslayers-ng/common/layman';
import {HsConfig} from 'hslayers-ng/config';
import {HsCoreService} from 'hslayers-ng/services/core';
import {HsCoreService} from 'hslayers-ng/core';
import {HsDialogContainerService} from 'hslayers-ng/common/dialogs';
import {HsEventBusService} from 'hslayers-ng/services/event-bus';
import {HsLayerDescriptor} from 'hslayers-ng/types';
Expand Down
13 changes: 0 additions & 13 deletions projects/hslayers/components/map/map.module.ts

This file was deleted.

6 changes: 0 additions & 6 deletions projects/hslayers/components/map/ng-package.json

This file was deleted.

3 changes: 0 additions & 3 deletions projects/hslayers/components/map/public-api.ts

This file was deleted.

2 changes: 1 addition & 1 deletion projects/hslayers/components/share/share-url.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {transformExtent} from 'ol/proj';

import {HS_PRMS, HS_PRMS_BACKWARDS, HS_PRMS_REGENERATED} from './get-params';
import {HsConfig} from 'hslayers-ng/config';
import {HsCoreService} from 'hslayers-ng/services/core';
import {HsCoreService} from 'hslayers-ng/core';
import {HsEventBusService} from 'hslayers-ng/services/event-bus';
import {HsLanguageService} from 'hslayers-ng/services/language';
import {HsLayoutService} from 'hslayers-ng/services/layout';
Expand Down
2 changes: 1 addition & 1 deletion projects/hslayers/components/share/share.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {Component, OnInit} from '@angular/core';

import {HsConfig} from 'hslayers-ng/config';
import {HsCoreService} from 'hslayers-ng/services/core';
import {HsCoreService} from 'hslayers-ng/core';
import {HsLanguageService} from 'hslayers-ng/services/language';
import {HsPanelBaseComponent} from 'hslayers-ng/common/panels';
import {HsShareService} from './share.service';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {Observable, Subject, delay, map, startWith, takeUntil} from 'rxjs';

import {HsButton} from 'hslayers-ng/types';
import {HsConfig} from 'hslayers-ng/config';
import {HsCoreService} from 'hslayers-ng/services/core';
import {HsCoreService} from 'hslayers-ng/core';
import {HsLayoutService} from 'hslayers-ng/services/layout';
import {HsSidebarService} from 'hslayers-ng/services/sidebar';

Expand Down
2 changes: 1 addition & 1 deletion projects/hslayers/components/sidebar/sidebar.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {Subject, Subscription, debounceTime, takeUntil} from 'rxjs';
import {HS_PRMS} from 'hslayers-ng/components/share';
import {HsButton} from 'hslayers-ng/types';
import {HsConfig} from 'hslayers-ng/config';
import {HsCoreService} from 'hslayers-ng/services/core';
import {HsCoreService} from 'hslayers-ng/core';
import {HsEventBusService} from 'hslayers-ng/services/event-bus';
import {HsLayoutService} from 'hslayers-ng/services/layout';
import {HsShareUrlService} from 'hslayers-ng/components/share';
Expand Down
2 changes: 0 additions & 2 deletions projects/hslayers/components/toolbar/toolbar.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import {Component, OnDestroy} from '@angular/core';

import {Subscription} from 'rxjs';

import {HsCoreService} from 'hslayers-ng/services/core';
import {HsEventBusService} from 'hslayers-ng/services/event-bus';
import {HsGuiOverlayBaseComponent} from 'hslayers-ng/common/panels';
import {HsToolbarPanelContainerService} from 'hslayers-ng/services/panels';
Expand All @@ -21,7 +20,6 @@ export class HsToolbarComponent
mapResetsSubscription: Subscription;
constructor(
public HsEventBusService: HsEventBusService,
public HsCoreService: HsCoreService,
public HsToolbarPanelContainerService: HsToolbarPanelContainerService,
) {
super();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import {Component, OnInit} from '@angular/core';

import {Feature} from 'ol';

import {HsConfig} from 'hslayers-ng/config';
import {HsCoreService} from 'hslayers-ng/services/core';
import {HsLanguageService} from 'hslayers-ng/services/language';
import {HsLayerUtilsService} from 'hslayers-ng/services/utils';
import {HsMapService} from 'hslayers-ng/services/map';
Expand All @@ -25,7 +22,6 @@ export class HsTripPlannerComponent

constructor(
public HsMapService: HsMapService,
public HsCoreService: HsCoreService,
public HsTripPlannerService: HsTripPlannerService,
public HsConfig: HsConfig,
public HsUtilsService: HsUtilsService,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import {Injectable} from '@angular/core';

import {HsConfig} from 'hslayers-ng/config';
import {HsEventBusService} from 'hslayers-ng/services/event-bus';
import {HsLayoutService} from 'hslayers-ng/services/layout';
import {HsLogService} from 'hslayers-ng/services/log';
import {HsMapService} from 'hslayers-ng/services/map';
import {HsUtilsService} from 'hslayers-ng/services/utils';
import {Injectable} from '@angular/core';

import {HsLanguageService} from 'hslayers-ng/services/language';

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import {NgModule} from '@angular/core';

import {HsDialogContainerComponent} from 'hslayers-ng/common/dialogs';
import {HsLayoutHostDirective} from './layout.directive';
import {HsMapComponent} from './map/map.component';
import {HsMapHostDirective} from './map-host.directive';
import {HsMapModule} from 'hslayers-ng/components/map';
import {HsPanelHelpersModule} from 'hslayers-ng/common/panels';
import {HsSidebarModule} from 'hslayers-ng/components/sidebar';
import {HsToastModule} from 'hslayers-ng/common/toast';
Expand All @@ -16,7 +16,7 @@ import {HslayersComponent} from './hslayers.component';
imports: [
HttpClientModule,
CommonModule,
HsMapModule,
HsMapComponent,
HsSidebarModule,
HsPanelHelpersModule,
HsToastModule,
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,24 @@ import {
OnDestroy,
ViewChild,
} from '@angular/core';
import {CommonModule} from '@angular/common';

import {Subscription} from 'rxjs';
import {transform} from 'ol/proj';

import {HS_PRMS} from 'hslayers-ng/components/share';
import {HsConfig} from 'hslayers-ng/config';
import {HsCoreService} from 'hslayers-ng/services/core';
import {HsCoreService} from '../core.service';
import {HsEventBusService} from 'hslayers-ng/services/event-bus';
import {HsMapDirective} from './map.directive';
import {HsMapService} from 'hslayers-ng/services/map';
import {HsShareUrlService} from 'hslayers-ng/components/share';

@Component({
selector: 'hs-map',
templateUrl: './map.component.html',
standalone: true,
imports: [CommonModule, HsMapDirective],
})
export class HsMapComponent implements AfterViewInit, OnDestroy {
@ViewChild('map') map: ElementRef;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {Directive, ViewContainerRef} from '@angular/core';

@Directive({
selector: '[map]',
standalone: true,
})
export class HsMapDirective {
constructor(public viewContainerRef: ViewContainerRef) {}
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ export * from './hslayers.component';
export * from './hslayers.module';
export * from './map-host.directive';
export * from './layout.directive';
export * from './core.service';
export * from './map/map.component';
2 changes: 1 addition & 1 deletion projects/hslayers/css/hslayers-bootstrap.scss
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,7 @@ $list-group-item-padding-x: 1.25rem;
}
}

@import "../src/hslayers.component.scss";
@import "../core/hslayers.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";
Expand Down
2 changes: 1 addition & 1 deletion projects/hslayers/css/hslayers-wo-bootstrap.scss
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,7 @@ $list-group-item-padding-x: 1.25rem;
overflow-y: auto;
}

@import "../src/hslayers.component.scss";
@import "../core/hslayers.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";
Expand Down
6 changes: 4 additions & 2 deletions projects/hslayers/public-api.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
//Dummy variable export to 'fool' compiler
export const HSLAYERSNG = 'hslayers-ng';
// public-api.ts is required by ng-packagr and cannot be empty.
const DO_NOT_IMPORT =
'Do not import from hslayers-ng; Submodules must be imported directly.';
export default DO_NOT_IMPORT;
2 changes: 1 addition & 1 deletion projects/hslayers/services/sidebar/sidebar.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {Injectable} from '@angular/core';

import {HsButton} from 'hslayers-ng/types';
import {HsConfig} from 'hslayers-ng/config';
import {HsCoreService} from 'hslayers-ng/services/core';
import {HsCoreService} from 'hslayers-ng/core';
import {HsLanguageService} from 'hslayers-ng/services/language';
import {HsLayoutService} from 'hslayers-ng/services/layout';
import {HsUtilsService} from 'hslayers-ng/services/utils';
Expand Down
1 change: 0 additions & 1 deletion projects/hslayers/src/index.ts

This file was deleted.

2 changes: 1 addition & 1 deletion projects/hslayers/test/hslayers.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {HsLayerUtilsService} from 'hslayers-ng/services/utils';
import {
HsMapHostDirective,
HslayersComponent,
} from 'hslayers-ng/src/public-api';
} from 'hslayers-ng/core/public-api';
import {HsUtilsService} from 'hslayers-ng/services/utils';
import {HsUtilsServiceMock} from './utils.service.mock';
import {TranslateTestingModule} from 'hslayers-ng/components/language';
Expand Down
2 changes: 1 addition & 1 deletion projects/hslayers/test/map.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {Vector as VectorSource} from 'ol/source';
import {HsCommonLaymanService} from 'hslayers-ng/common/layman';
import {HsConfig} from 'hslayers-ng/config';
import {HsConfigMock} from './config.service.mock';
import {HsCoreService} from 'hslayers-ng/services/core';
import {HsCoreService} from 'hslayers-ng/core';
import {HsEventBusService} from 'hslayers-ng/services/event-bus';
import {HsLanguageService} from 'hslayers-ng/services/language';
import {HsLayoutService} from 'hslayers-ng/services/layout';
Expand Down
2 changes: 1 addition & 1 deletion projects/hslayers/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
"strictInjectionParameters": true,
"enableResourceInlining": true
},
"exclude": ["**/*.spec.ts", "**/*.mock.ts", "./src/testing"]
"exclude": ["**/*.spec.ts", "**/*.mock.ts", "./test"]
}
2 changes: 1 addition & 1 deletion projects/test-app/src/hslayers-app/hslayers-app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {BrowserModule} from '@angular/platform-browser';
import {NgModule} from '@angular/core';

import {HslayersAppComponent} from './hslayers-app.component';
import {HslayersModule} from 'hslayers-ng';
import {HslayersModule} from 'hslayers-ng/core';
import {SomeModule} from './some-panel/some-panel.module';

@NgModule({
Expand Down
12 changes: 6 additions & 6 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@
"@angular/*": ["node_modules/@angular/*"],
"rxjs/*": ["node_modules/rxjs/*"],
"ol/*": ["node_modules/ol/*"],
"hslayers-ng": ["projects/hslayers/src/public-api.ts"],
"hslayers-ng": ["projects/hslayers/core/public-api.ts"],
"hslayers-ng/*": ["projects/hslayers/*"],
"@ngx-translate/*": ["node_modules/@ngx-translate/*"],
"hslayers-cesium": ["dist/hslayers-cesium"],
"hslayers-cesium/*": [
"projects/hslayers-cesium/*",
"projects/hslayers-cesium",
"projects/hslayers-cesium"
],
"cesium/*": ["node_modules/cesium/*"],
"cesium/*": ["node_modules/cesium/*"]
},
"useDefineForClassFields": false,
"useDefineForClassFields": false
},
"angularCompilerOptions": {
"enableResourceInlining": true,
"fullTemplateTypeCheck": true,
"strictInjectionParameters": true,
},
"strictInjectionParameters": true
}
}

0 comments on commit c67b0f8

Please sign in to comment.