jmapcloud-ng-types 1.0.1001 → 1.1.0

package/index.ts

@@ -7,7 +7,7 @@ export interface JAppState {
   selection: JAppSelectionState
   layer: JAppLayerState
   ui: JAppUiState
-  query: JAppQueryState
+  map: JAppMapState
   print: JAppPrintState
   project: JAppProjectState
   annotation: JAppAnnotationState
@@ -15,6 +15,12 @@ export interface JAppState {
   user: JAppUserState
   feature: JAppFeatureState
   geometry: JAppGeometryState
+  table: JAppTableState
+}
+
+export interface JAppTableState {
+  displayTable: boolean
+  activeTableDataSourceId: JId | undefined
 }
 
 export interface JAppGeometryState {
@@ -25,6 +31,9 @@ export interface JAppGeometryState {
   isUpdate: boolean
   wizardStep: JAPP_GEOMETRY_WIZARD_STEPS
   draw: JAppDrawState
+  lastSnap: JAppSnap
+  snap: JAppSnap
+  isAttributesEditing: boolean
 }
 
 export interface JAppFeatureState {
@@ -39,12 +48,6 @@ export interface JAppProjectState {
   showProjectList: boolean
 }
 
-export interface JAppQueryState {
-  activeQuery: JQuery | undefined
-  defaultValueById: { [id: string]: any } | undefined
-  displayInDialog: boolean
-}
-
 export interface JAppPanelState {
   active: JAppPanel
   all: JAppPanel[]
@@ -65,8 +68,13 @@ export interface JAppUiState {
   theme: { [key: string]: any }
 }
 
+export interface JAppMapState {
+  simpleSearchControlVisible: boolean
+  geocodingControlVisible: boolean
+}
+
 export interface JAppFormState {
-  expandedSections: { [id: string]: boolean }
+  dialogParams: JFormDialogParams | null
 }
 
 export interface JAppMeasureState {
@@ -75,6 +83,8 @@ export interface JAppMeasureState {
   isSelectionActive: boolean
   isNewElement: boolean
   draw: JAppDrawState
+  lastSnap: JAppSnap
+  snap: JAppSnap
 }
 
 export interface JAppDrawState {
@@ -91,6 +101,13 @@ export interface JAppAnnotationState {
   annotations: JAppAnnotation[]
   draw: JAppDrawState
   presetColors: string[]
+  lastSnap: JAppSnap
+  snap: JAppSnap
+}
+
+export interface JAppSnap {
+  layerId: JId | undefined
+  isEnabled: boolean
 }
 
 export interface JAppPrintState {
@@ -137,7 +154,6 @@ export interface JApplicationService extends JApplicationMainService {
   Layer: JAppLayerService
   Print: JAppPrintService
   UI: JApplicationUIService
-  Query: JAppQueryService
   Event: JAppEventService
   Annotation: JAppAnnotationService
   Extension: JAppExtensionService
@@ -157,6 +173,8 @@ export interface JAppGeometryService {
   finishCreate(): void
   finishUpdate(): Promise<void>
   closePanel(): void
+  setSnapEnabled(isEnabled: boolean): void
+  setSnapLayerId(LayerId: JId): void
 }
 
 export interface JAppFeatureService {
@@ -187,6 +205,8 @@ export interface JAppAnnotationService {
   setDrawMode(drawMode: JAPP_DRAW_MODES): void
   getDrawType(): JAPP_DRAW_TYPES
   setDrawType(drawType: JAPP_DRAW_TYPES): void
+  setSnapEnabled(isEnabled: boolean): void
+  setSnapLayerId(LayerId: JId): void
   existsById(annotationId: string): boolean
   getById(annotationId: string): JAppAnnotation
   getAll(): JAppAnnotation[]
@@ -204,16 +224,6 @@ export interface JAppAnnotationService {
   deletePresetColor(presetColor: string): void
 }
 
-export interface JAppQueryService {
-  activateQuery(groupId: JId, queryId: string): void
-  deactivateQuery(): void
-  setDefaultData(values: any): void
-  getDefaultData(): { [id: string]: any }
-  clearDefaultData(): void
-  displayInDialog(isVisibleInDialog: boolean): void
-  processQuery(values: any): Promise<GeoJSON.Feature[]>
-}
-
 export interface JApplicationUserService {
   addPopupMenuAction(action: JAppUserAction, index?: number): void
   existsPopupMenuActionById(actionId: string): boolean
@@ -255,6 +265,12 @@ export interface JApplicationUIService {
     setDark(isDark: boolean): void
     isDark(): boolean
   }
+  Map: {
+    isGeocodingControlVisible(): boolean
+    setGeocodingControlVisibility(isVisible: boolean): void
+    isSimpleSearchControlVisible(): boolean
+    setSimpleSearchControlVisibility(isVisible: boolean): void
+  }
 }
 
 export interface JAppEventService {
@@ -302,6 +318,8 @@ export interface JAppMeasureService {
   deleteAllCircles(): number
   setMeasurementSystem(measurementSystem: JAPP_MEASUREMENT_SYSTEMS): void
   getMeasurementSystem(): JAPP_MEASUREMENT_SYSTEMS
+  setSnapEnabled(isEnabled: boolean): void
+  setSnapLayerId(LayerId: JId): void
 }
 
 export interface JAppExtensionService {
@@ -340,7 +358,11 @@ export interface JAppPrintService {
   getFileType(): JAPP_PRINT_FILE_TYPES
   setHiResolution(isHiResolution: boolean): void
   getHiResolution(): boolean
-  takeCapture(): void
+  takeCapture(
+    returnAsScreenCaptureResult?: boolean,
+    customRatioWidth?: number,
+    customRatioHeight?: number
+  ): Promise<void | JAppPrintCaptureResult>
 }
 
 export interface JAppLayerService {
@@ -395,8 +417,7 @@ export interface JAppLayerTreeFilterService {
 }
 
 export interface JAppFormService {
-  render(containerId: string, formParams: JFormParams): JFormMetaData
-  destroyByContainerId(containerId: string): void
+  openForm(params: JFormDialogParams): void
 }
 
 export interface JAppAppEventModule extends JEventModule {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmapcloud-ng-types",
-  "version": "1.0.1001",
+  "version": "1.1.0",
   "description": "JMap Cloud specific version of JMap Cloud NG types and interfaces",
   "main": "src/app.ts",
   "scripts": {
@@ -22,10 +22,11 @@
   },
   "homepage": "https://github.com/k2geospatial/jmapcloud-ng-types#readme",
   "devDependencies": {
-    "@types/react": "18.2.21",
-    "jmapcloud-ng-core-types": "1.0.1",
-    "maplibre-gl": "^3.2.1",
-    "react": "^18.2.0",
-    "typedoc": "^0.24.8"
+    "@types/react": "^18.3.2",
+    "@fortawesome/fontawesome-svg-core": "^6.7.2",
+    "jmapcloud-ng-core-types": "../ng-core-types",
+    "maplibre-gl": "^4.7.1",
+    "react": "^18.3.1",
+    "typedoc": "^0.25.13"
   }
 }