jmapcloud-ng-core-types 2.0.20-qa.4 → 2.0.20-qa.6

package/index.d.ts

@@ -92,8 +92,8 @@ export interface JUIService {
 }
 
 export interface JSimpleSearchService {
-  getSelectedLayerIds(): JId[]
-  setSelectedLayerIds(layerIds: JId[]): void
+  getSelectedLayerIds(): string[]
+  setSelectedLayerIds(layerIds: string[]): void
   setQueryString(queryString: string): void
   search(queryString: string, options?: JSimpleSearchOptions): Promise<JSimpleSearchResult[]>
 }
@@ -113,26 +113,26 @@ export interface JMapContextService {
   startCreation(): void
   cancelCreation(): void
   getAll(): JMapContext[]
-  getById(contextId: JId): JMapContext
-  existsById(contextId: JId): boolean
+  getById(contextId: string): JMapContext
+  existsById(contextId: string): boolean
   getUrlByUUID(contextUUID: string): string
-  applyContextById(contextId: JId): Promise<void>
-  deleteContextById(contextId: JId | JId[]): Promise<void>
+  applyContextById(contextId: string): Promise<void>
+  deleteContextById(contextId: string | string[]): Promise<void>
   create(params?: JMapContextMetaData): Promise<JMapContext>
-  update(contextId: JId, params?: JMapContextMetaData): Promise<JMapContext>
-  updateMetaData(contextId: JId, params: JMapContextMetaData): Promise<void>
+  update(contextId: string, params?: JMapContextMetaData): Promise<JMapContext>
+  updateMetaData(contextId: string, params: JMapContextMetaData): Promise<void>
   setCreateTitle(newTitle: string): void
   setCreateDescription(newDescription: string): void
   setCreateTitleError(hasError: boolean): void
-  getContextTitle(contextId: JId): string
-  setContextTitle(contextId: JId, title: string): Promise<void>
-  getContextDescription(contextId: JId): string
-  setContextDescription(contextId: JId, description: string): Promise<void>
-  isLinkShared(contextId: JId): boolean
-  setLinkShare(contextId: JId, isShared: boolean): Promise<void>
+  getContextTitle(contextId: string): string
+  setContextTitle(contextId: string, title: string): Promise<void>
+  getContextDescription(contextId: string): string
+  setContextDescription(contextId: string, description: string): Promise<void>
+  isLinkShared(contextId: string): boolean
+  setLinkShare(contextId: string, isShared: boolean): Promise<void>
   getDefaultContext(): JMapContext | undefined
-  isDefaultContext(contextId: JId): boolean
-  setDefaultContext(contextId?: JId): Promise<void>
+  isDefaultContext(contextId: string): boolean
+  setDefaultContext(contextId?: string): Promise<void>
   sortListBy(sortBy: JMAP_CONTEXT_SORT_BY_OPTIONS): void
   getListSortBy(): JMAP_CONTEXT_SORT_BY_OPTIONS
   getAllListSortBy(): JMAP_CONTEXT_SORT_BY_OPTIONS[]
@@ -178,7 +178,9 @@ export interface JUtilService {
   loadJSFile(fileUrl: string): Promise<void>
   isJMapId(id: any, allowStringNumber?: boolean): boolean
   checkJmapId(id: any, message?: string): void
-  getJmapIdAsIntegerIfPossible(id: any): JId
+  getFeatureId(feature: GeoJSON.Feature): number
+  /** @deprecated Entity ids are strings and feature ids are numbers; use {@link getFeatureId} for a feature. */
+  getJmapIdAsIntegerIfPossible(id: any): number | string
   asyncProcess(callback: () => any, timeoutsInMilliseconds: number[]): () => void
 }
 
@@ -199,16 +201,16 @@ export interface JLocalStorageService {
 }
 
 export interface JFeatureService {
-  getById(layerId: JId, featureId: JId, includeAllAttributes?: boolean): Promise<GeoJSON.Feature>
-  getByIds(layerId: JId, featureIds: JId[]): Promise<GeoJSON.Feature[]>
-  getByLayerId(layerId: JId, bbox: JBoundaryBox): Promise<GeoJSON.Feature[]>
+  getById(layerId: string, featureId: number, includeAllAttributes?: boolean): Promise<GeoJSON.Feature>
+  getByIds(layerId: string, featureIds: number[]): Promise<GeoJSON.Feature[]>
+  getByLayerId(layerId: string, bbox: JBoundaryBox): Promise<GeoJSON.Feature[]>
   geometryUpdateById(params: JFeatureGeometryUpdateParams): Promise<GeoJSON.Feature>
   propertiesUpdateById(params: JFeaturePropertiesUpdateParams): Promise<GeoJSON.Feature>
-  deleteById(layerId: JId, featureId: JId): Promise<JId>
-  // deleteByIds(layerId: JId, featureIds: JId[]): Promise<JFeatureDeleteByIdsResult>
+  deleteById(layerId: string, featureId: number): Promise<number>
+  // deleteByIds(layerId: string, featureIds: number[]): Promise<JFeatureDeleteByIdsResult>
   // TODO: see if the future endpoint will return detail about individual deleted features success or failure
   // https://k2geospatial.atlassian.net/browse/JMAP8-1589
-  deleteByIds(layerId: JId, featureIds: JId[]): Promise<JId[]>
+  deleteByIds(layerId: string, featureIds: number[]): Promise<number[]>
   geometryCreate(params: JFeatureGeometryCreateParams): Promise<GeoJSON.Feature>
 }
 
@@ -274,7 +276,7 @@ export interface JEventListener {
 
 export type JEventSimpleListenerFunction = (listenerId: string, fn: JEventFunction) => void
 
-export type JEventResourceListenerFunction = (listenerId: string, resourceId: JId, fn: JEventFunction) => void
+export type JEventResourceListenerFunction = (listenerId: string, resourceId: string, fn: JEventFunction) => void
 
 export type JEventListenerFunction = JEventSimpleListenerFunction | JEventResourceListenerFunction
 
@@ -359,9 +361,9 @@ export interface JMapEventModule extends JEventModule {
     move(listenerId: string, fn: (params: JMapEventParams) => void): void
     moveEnd(listenerId: string, fn: (params: JMapEventParams) => void): void
     mouseMove(listenerId: string, fn: (params: JMapEventLayerParams) => void): void
-    mouseMoveOnLayer(listenerId: string, layerId: JId, fn: (params: JMapEventFeaturesParams) => void): void
-    mouseEnterOnLayer(listenerId: string, layerId: JId, fn: (params: JMapEventFeaturesParams) => void): void
-    mouseLeaveOnLayer(listenerId: string, layerId: JId, fn: (params: JMapEventLayerParams) => void): void
+    mouseMoveOnLayer(listenerId: string, layerId: string, fn: (params: JMapEventFeaturesParams) => void): void
+    mouseEnterOnLayer(listenerId: string, layerId: string, fn: (params: JMapEventFeaturesParams) => void): void
+    mouseLeaveOnLayer(listenerId: string, layerId: string, fn: (params: JMapEventLayerParams) => void): void
     click(listenerId: string, fn: (params: JMapEventLocationParams) => void): void
     zoomStart(listenerId: string, fn: (params: JMapEventZoomParams) => void): void
     zoom(listenerId: string, fn: (params: JMapEventZoomParams) => void): void
@@ -418,13 +420,13 @@ export interface JFormService {
 }
 
 export interface JAttachmentService {
-  getByItemId(dataSourceId: JId, dataSourceOrganizationId: string, itemId: JId): Promise<JAttachment[]>
+  getByItemId(dataSourceId: string, dataSourceOrganizationId: string, itemId: number): Promise<JAttachment[]>
   create(dataSourceId: string, dataSourceOrganizationId: string, params: JCreateAttachmentParams): Promise<string>
   remove(dataSourceId: string, dataSourceOrganizationId: string, attachmentId: string): Promise<string>
   update(dataSourceId: string, dataSourceOrganizationId: string, attachmentId: string, params: JUpdateAttachmentParams): Promise<string>
   download(dataSourceId: string, dataSourceOrganizationId: string, attachmentId: string): Promise<{ data: Blob; headers: any }>
   downloadToDevice(attachment: JAttachmentFile, dataSourceId: string, dataSourceOrganizationId: string): Promise<void>
-  previewAttachments(attachmentId: string, dataSourceId: string, dataSourceOrganizationId: string, itemId: JId): void
+  previewAttachments(attachmentId: string, dataSourceId: string, dataSourceOrganizationId: string, itemId: number): void
 }
 
 export interface JHistoryService {
@@ -468,7 +470,7 @@ export interface JGeometryService {
   getFeatureCollection(features: Feature[] | JLocation[] | JPoint[]): FeatureCollection
   getCircleFeature(center: JPoint | JLocation, radius: number): Feature<Polygon> // radius in km
   getPolygonFeature(coordinates: JPoint[], closeCoordinates?: boolean): Feature<Polygon>
-  isGeometryTypeValidForLayer(layerId: JId, geometryType: GeoJSON.GeoJsonGeometryTypes): boolean
+  isGeometryTypeValidForLayer(layerId: string, geometryType: GeoJSON.GeoJsonGeometryTypes): boolean
   getRotatedFeature(feature: GeoJSON.Feature, angle: number): GeoJSON.Feature
   convertLength(length: number, toUnit: JMAP_DISTANCE_UNITS, fromUnit?: JMAP_DISTANCE_UNITS): number // fromUnit is km by default
   convertArea(area: number, toUnit: JMAP_DISTANCE_UNITS, fromUnit?: JMAP_DISTANCE_UNITS): number // fromUnit is km by default
@@ -493,14 +495,14 @@ export interface JMapService {
   getExtent(): JBoundaryBox
   getCenter(): { x: number; y: number }
   getZoom(): number
-  getMaplibreSourceIdByJMapLayerId(layerId: JId): string
+  getMaplibreSourceIdByJMapLayerId(layerId: string): string
   isScaleControlVisible(): boolean
   isTerrainAvailable(): boolean
   isTerrainActive(): boolean
   setTerrainActive(active: boolean): void
   isTerrainControlVisible(): boolean
-  setSelectionStyle(layerId: JId, style: JLayerSetStyleParams): void
-  resetSelectionStyle(layerId: JId): void
+  setSelectionStyle(layerId: string, style: JLayerSetStyleParams): void
+  resetSelectionStyle(layerId: string): void
   setScaleControlVisibility(isVisible: boolean, position?: JMAP_POSITIONS): void
   setScaleControlUnits(units: "imperial" | "metric" | "nautical"): void
   setScaleControlPosition(position: JMAP_POSITIONS): void
@@ -517,13 +519,13 @@ export interface JMapService {
   isInitialExtentControlVisible(): boolean
   setInitialExtentControlVisibility(isVisible: boolean): void
   zoomToProjectInitialExtent(): Promise<void>
-  getMaplibreSupportedJMapLayerIds(): JId[]
-  getMaplibreSupportedJMapLayerIdBefore(layerId: JId): JId | undefined
-  getMaplibreSupportedJMapLayerIdAfter(layerId: JId): JId | undefined
-  refreshLayerById(layerId: JId): void
-  getRenderedFeatures(layerId: JId, params?: JLocation | JBoundaryBox | JCircle | JGetRenderedFeaturesParams): Feature[]
-  getSourceFeatures(layerId: JId, params?: JGetSourceFeaturesParams): Feature[]
-  getRenderedFeaturesAttributeValues(layerId: JId, filter?: JLocation | JBoundaryBox | JCircle): JMapFeatureAttributeValues[]
+  getMaplibreSupportedJMapLayerIds(): string[]
+  getMaplibreSupportedJMapLayerIdBefore(layerId: string): string | undefined
+  getMaplibreSupportedJMapLayerIdAfter(layerId: string): string | undefined
+  refreshLayerById(layerId: string): void
+  getRenderedFeatures(layerId: string, params?: JLocation | JBoundaryBox | JCircle | JGetRenderedFeaturesParams): Feature[]
+  getSourceFeatures(layerId: string, params?: JGetSourceFeaturesParams): Feature[]
+  getRenderedFeaturesAttributeValues(layerId: string, filter?: JLocation | JBoundaryBox | JCircle): JMapFeatureAttributeValues[]
   getPitch(): number
   getRotation(): number
   getBearing(): number
@@ -542,7 +544,7 @@ export interface JMapService {
   flashLocation(location: JLocation, options?: JMapFlashLocationParams): void
   flashLocations(locations: JLocation[], options?: JMapFlashLocationParams): void
   clearFlashingLocations(): void
-  displayLayerExtent(layerId: JId, params?: JDisplayExtentParams): Promise<boolean>
+  displayLayerExtent(layerId: string, params?: JDisplayExtentParams): Promise<boolean>
   displayExtent(extent: JBoundaryBox, params?: JDisplayExtentParams): void
   getResolution(params?: JLatitudeAndZoom): number
   getScale(params?: JLatitudeAndZoom): string
@@ -555,17 +557,17 @@ export interface JMapService {
   openModificationPopupForScale(): void
   closeModificationPopup(): void
   /** @deprecated Use JMap.Map.getLayerTransparency to read overridden transparency. For non-overridden layers, use JMap.Map.getRasterLayerInitialTransparency. */
-  getRasterLayerTransparency(layerId: JId): number
+  getRasterLayerTransparency(layerId: string): number
   /** @deprecated This method is unreliable when style opacity is expression-based and will be removed in a future version. */
-  getRasterLayerInitialTransparency(layerId: JId): number
+  getRasterLayerInitialTransparency(layerId: string): number
   /** @deprecated Use JMap.Map.resetLayerTransparency instead. It manages all supported map layer types (vector and raster), not only raster layers. */
-  resetRasterLayerTransparency(layerId: JId): number
+  resetRasterLayerTransparency(layerId: string): number
   /** @deprecated Use JMap.Map.setLayerTransparency instead. It manages all supported map layer types (vector and raster), not only raster layers. */
-  setRasterLayerTransparency(layerId: JId, transparency: number): void
-  getLayerTransparency(layerId: JId): number | undefined
-  isLayerTransparencyOverridden(layerId: JId): boolean
-  setLayerTransparency(layerId: JId, transparency: number): void
-  resetLayerTransparency(layerId: JId): void
+  setRasterLayerTransparency(layerId: string, transparency: number): void
+  getLayerTransparency(layerId: string): number | undefined
+  isLayerTransparencyOverridden(layerId: string): boolean
+  setLayerTransparency(layerId: string, transparency: number): void
+  resetLayerTransparency(layerId: string): void
   setPixelRatio(pixelRatio: number): boolean
   getPixelRatio(): number
 }
@@ -601,42 +603,42 @@ export interface JMapInteractionService {
 
 export interface JMapSelectionService {
   isEmpty(): boolean
-  isEmptyByLayerId(layerId: JId): boolean
+  isEmptyByLayerId(layerId: string): boolean
   getSelectionCentroid(selection: JMapSelection): JLocation
   getSelectedFeatures(): JMapSelection
-  getSelectedFeaturesForLayer(layerId: JId): Feature[]
-  getSelectedFeatureIdsForLayer(layerId: JId): string[]
-  selectOnOneLayerAtLocation(layerId: JId, location: JLocation, params?: JMapSelectionParams | undefined): Feature[]
-  selectOnOneLayerFromCircle(layerId: JId, circle: JCircle, params?: JMapSelectionParams | undefined): Feature[]
-  selectOnOneLayerFromLine(layerId: JId, line: JLine, params?: JMapSelectionParams | undefined): Feature[]
-  selectOnOneLayerFromPolygon(layerId: JId, polygon: JPolygon, params?: JMapSelectionParams | undefined): Feature[]
+  getSelectedFeaturesForLayer(layerId: string): Feature[]
+  getSelectedFeatureIdsForLayer(layerId: string): number[]
+  selectOnOneLayerAtLocation(layerId: string, location: JLocation, params?: JMapSelectionParams | undefined): Feature[]
+  selectOnOneLayerFromCircle(layerId: string, circle: JCircle, params?: JMapSelectionParams | undefined): Feature[]
+  selectOnOneLayerFromLine(layerId: string, line: JLine, params?: JMapSelectionParams | undefined): Feature[]
+  selectOnOneLayerFromPolygon(layerId: string, polygon: JPolygon, params?: JMapSelectionParams | undefined): Feature[]
   selectOnAllLayersAtLocation(location: JLocation, params?: JMapSelectionParams | undefined): JMapSelection
   selectOnAllLayersFromCircle(circle: JCircle, params?: JMapSelectionParams | undefined): JMapSelection
   selectOnAllLayersFromLine(line: JLine, params?: JMapSelectionParams | undefined): JMapSelection
   selectOnAllLayersFromPolygon(polygon: JPolygon, params?: JMapSelectionParams | undefined): JMapSelection
-  setLayerSelection(layerId: JId, features: Feature | Feature[]): void
+  setLayerSelection(layerId: string, features: Feature | Feature[]): void
   setLayersSelection(params: JSelectionSetLayersSelectionParams[]): void
-  addFeaturesToLayerSelection(layerId: JId, features: Feature | Feature[]): void
-  removeFeaturesFromLayerSelection(layerId: JId, featureIds: JId | JId[]): void
-  clearSelection(layerId?: JId): void
-  clearLayersSelection(layerIds: JId[]): void
+  addFeaturesToLayerSelection(layerId: string, features: Feature | Feature[]): void
+  removeFeaturesFromLayerSelection(layerId: string, featureIds: number | number[]): void
+  clearSelection(layerId?: string): void
+  clearLayersSelection(layerIds: string[]): void
 }
 
 export interface JMapFilterService {
-  applyHasAttribute(layerId: JId, attributeId: string): string
-  applyHasNotAttribute(layerId: JId, attributeId: string): string
-  applyAttributeValueEqualTo(layerId: JId, attributeId: string, attributeValue: any): string
-  applyAttributeValueBetween(layerId: JId, attributeId: string, start: any, end: any): string
-  applyAttributeValueNotEqualTo(layerId: JId, attributeId: string, attributeValue: any): string
-  applyAttributeValueGreaterThan(layerId: JId, attributeId: string, attributeValue: any): string
-  applyAttributeValueGreaterOrEqualsTo(layerId: JId, attributeId: string, attributeValue: any): string
-  applyAttributeValueLowerThan(layerId: JId, attributeId: string, attributeValue: any): string
-  applyAttributeValueLowerOrEqualsTo(layerId: JId, attributeId: string, attributeValue: any): string
-  applyAttributeValueIn(layerId: JId, attributeId: string, attributeValues: any[]): string
-  applyAttributeValueNotIn(layerId: JId, attributeId: string, attributeValues: any[]): string
-  applySpatial(layerId: JId, filterGeometry: JPolygon | JCircle): string
+  applyHasAttribute(layerId: string, attributeId: string): string
+  applyHasNotAttribute(layerId: string, attributeId: string): string
+  applyAttributeValueEqualTo(layerId: string, attributeId: string, attributeValue: any): string
+  applyAttributeValueBetween(layerId: string, attributeId: string, start: any, end: any): string
+  applyAttributeValueNotEqualTo(layerId: string, attributeId: string, attributeValue: any): string
+  applyAttributeValueGreaterThan(layerId: string, attributeId: string, attributeValue: any): string
+  applyAttributeValueGreaterOrEqualsTo(layerId: string, attributeId: string, attributeValue: any): string
+  applyAttributeValueLowerThan(layerId: string, attributeId: string, attributeValue: any): string
+  applyAttributeValueLowerOrEqualsTo(layerId: string, attributeId: string, attributeValue: any): string
+  applyAttributeValueIn(layerId: string, attributeId: string, attributeValues: any[]): string
+  applyAttributeValueNotIn(layerId: string, attributeId: string, attributeValues: any[]): string
+  applySpatial(layerId: string, filterGeometry: JPolygon | JCircle): string
   removeByFilterId(filterId: string): void
-  removeAllFilters(layerId: JId): void
+  removeAllFilters(layerId: string): void
 }
 
 export interface JProjectionService {
@@ -647,15 +649,15 @@ export interface JProjectionService {
 export interface JProjectService {
   hasProjectActivated(): boolean
   getActiveProject(): JProject
-  activateById(projectId: JId): JProject
+  activateById(projectId: string): JProject
   activateByName(projectName: string): JProject
   deactivate(): void
   getAllProjects(): Promise<JProject[]>
-  existsById(projectId: JId): boolean
+  existsById(projectId: string): boolean
   existsByName(projectName: string): boolean
-  getById(projectId: JId): JProject
+  getById(projectId: string): JProject
   getByName(projectName: string): JProject
-  getId(): JId
+  getId(): string
   getName(): string
   getDescription(): string | undefined
   getProjection(): JProjection
@@ -680,49 +682,50 @@ export interface JLayerService {
   DynamicFilter: JDynamicFilterService
   getMetadataSchema(): JLayerMetadataSchemaItem[]
   getLayerTree(): JLayerTree
-  getLayerTreeElementsById(): { [key in JId]: JLayerTreeElement }
+  getLayerTreeElementsById(): Record<string, JLayerTreeElement>
   getLayers(): JLayer[]
-  getLayerIds(): JId[]
-  setLayersMapOrder(layerIds: JId[]): void
+  getLayerIds(): string[]
+  setLayersMapOrder(layerIds: string[]): void
   getVectorLayers(): JLayer[]
-  getVectorLayerIds(): JId[]
+  getVectorLayerIds(): string[]
   /** @deprecated Returns legacy views. Use the layer's attributes for the shared model. */
-  getLayerAttributes(layerId: JId): JLayerAttribute[]
+  getLayerAttributes(layerId: string): JLayerAttribute[]
   /** @deprecated Returns a legacy view. Use the layer's attributes for the shared model. */
-  getLayerAttribute(layerId: JId, attributeName: string): JLayerAttribute
-  exists(layerId: JId): boolean
-  attributeExists(layerId: JId, attributeName: string): boolean
-  getById(layerId: JId): JLayerTreeElement
-  getSelfOrChildren(layerId: JId): JLayer[]
-  getName(layerId: JId): string
-  getDescription(layerId: JId): string
-  getEPSG4326Extent(layerId: JId): Promise<JBoundaryBox | null>
-  isVisible(layerId: JId, checkParentVisibility?: boolean): boolean
-  isVectorLayerById(layerId: JId): boolean
-  isSelectableById(layerId: JId): boolean
-  setSelectabilityById(layerId: JId, selectability: boolean, ignoreVisibility?: boolean): void
+  getLayerAttribute(layerId: string, attributeName: string): JLayerAttribute
+  exists(layerId: string): boolean
+  attributeExists(layerId: string, attributeName: string): boolean
+  getById(layerId: string): JLayerTreeElement
+  getSelfOrChildren(layerId: string): JLayer[]
+  getName(layerId: string): string
+  getDescription(layerId: string): string
+  getEPSG4326Extent(layerId: string): Promise<JBoundaryBox | null>
+  isVisible(layerId: string, checkParentVisibility?: boolean): boolean
+  isVectorLayerById(layerId: string): boolean
+  isSelectableById(layerId: string): boolean
+  setSelectabilityById(layerId: string, selectability: boolean, ignoreVisibility?: boolean): void
   setLayersSelectability(params: JLayerSetLayersSelectabilityParams[]): void
-  isAllLayerParentsVisible(layerId: JId): boolean
-  setVisible(layerId: JId, visible: boolean): void
+  isAllLayerParentsVisible(layerId: string): boolean
+  setVisible(layerId: string, visible: boolean): void
   setLayersVisibility(params: JLayerSetLayersVisibilityParams[]): void
-  ensureLayerIsVisible(layerId: JId): void
-  ensureLayersAreVisible(layerIds: JId[]): void
-  setLayerGroupExpansion(layerGroupId: JId, isExpanded: boolean): void
+  ensureLayerIsVisible(layerId: string): void
+  ensureLayersAreVisible(layerIds: string[]): void
+  setLayerGroupExpansion(layerGroupId: string, isExpanded: boolean): void
   setLayerGroupsExpansion(params: JLayerSetLayerGroupsExpansionParams[]): void
-  deleteLayer(layerId: JId): void
-  getDataSourceAttributes(layerId: JId): Promise<DataSourceAttribute[]>
+  deleteLayer(layerId: string): void
+  getDataSourceAttributes(layerId: string): Promise<DataSourceAttribute[]>
+  getData(layerId: string, params?: JLayerDataParams): Promise<JDataSourceData>
 }
 
 export interface JDataSourceService {
-  getAttributes(dataSourceId: JId, dataSourceOrganizationId: string): Promise<DataSourceAttribute[]>
-  getById(dataSourceId: JId, dataSourceOrganizationId: string): Promise<JDataSource>
-  getData(dataSourceId: JId, dataSourceOrganizationId: string, params: JDataSourceDataParams, dataSourceType?: JDataSourceType): Promise<JDataSourceData>
-  getPermissions(dataSourceId: JId, dataSourceOrganizationId: string): Promise<JDataSourcePermissions>
-  createRow(dataSourceId: JId, dataSourceOrganizationId: string, row: { [key: string]: any }): Promise<{ id: JId; links: any[] }>
-  updateRow(dataSourceId: JId, dataSourceOrganizationId: string, rowId: JId, row: { [key: string]: any }): Promise<void>
-  deleteRow(dataSourceId: JId, dataSourceOrganizationId: string, rowId: JId): Promise<void>
-  updateFeatureProperties(dataSourceId: JId, dataSourceOrganizationId: string, featureId: JId, properties: { [key: string]: any }): Promise<GeoJSON.Feature>
-  deleteFeature(dataSourceId: JId, dataSourceOrganizationId: string, featureId: JId): Promise<JId>
+  getAttributes(dataSourceId: string, dataSourceOrganizationId: string): Promise<DataSourceAttribute[]>
+  getById(dataSourceId: string, dataSourceOrganizationId: string): Promise<JDataSource>
+  getData(dataSourceId: string, dataSourceOrganizationId: string, params: JDataSourceDataParams, dataSourceType?: JDataSourceType): Promise<JDataSourceData>
+  getPermissions(dataSourceId: string, dataSourceOrganizationId: string): Promise<JDataSourcePermissions>
+  createRow(dataSourceId: string, dataSourceOrganizationId: string, row: { [key: string]: any }): Promise<{ id: number; links: any[] }>
+  updateRow(dataSourceId: string, dataSourceOrganizationId: string, rowId: number, row: { [key: string]: any }): Promise<void>
+  deleteRow(dataSourceId: string, dataSourceOrganizationId: string, rowId: number): Promise<void>
+  updateFeatureProperties(dataSourceId: string, dataSourceOrganizationId: string, featureId: number, properties: { [key: string]: any }): Promise<GeoJSON.Feature>
+  deleteFeature(dataSourceId: string, dataSourceOrganizationId: string, featureId: number): Promise<number>
   getFeature(dataSourceId: string, dataSourceOrganizationId: string, featureId: number): Promise<GeoJSON.Feature>
   getRow(dataSourceId: string, dataSourceOrganizationId: string, rowId: number): Promise<{ [key: string]: any }>
   getRelationship(dataSourceId: string, dataSourceOrganizationId: string, relationshipId: string): Promise<JRelationship>
@@ -731,14 +734,14 @@ export interface JDataSourceService {
 export interface JTableService {
   DynamicFilter: JDynamicFilterService
   getTables(): JTable[]
-  getTableData(tableId: JId, params: JTableDataParams): Promise<JTableData>
-  getById(tableId: JId): JTable
-  createRow(tableId: JId, row: { [key: string]: any }): Promise<{ id: JId; links: Array<any> }>
-  updateRow(tableId: JId, rowId: number, row: { [key: string]: any }): Promise<void>
-  deleteRow(tableId: JId, rowId: number): Promise<void>
-  getDataSourceAttributes(tableId: JId): Promise<DataSourceAttribute[]>
+  getTableData(tableId: string, params: JTableDataParams): Promise<JTableData>
+  getById(tableId: string): JTable
+  createRow(tableId: string, row: { [key: string]: any }): Promise<{ id: number; links: Array<any> }>
+  updateRow(tableId: string, rowId: number, row: { [key: string]: any }): Promise<void>
+  deleteRow(tableId: string, rowId: number): Promise<void>
+  getDataSourceAttributes(tableId: string): Promise<DataSourceAttribute[]>
   /** @deprecated Use DynamicFilter.setIsActive instead. */
-  setDynamicFilterActive(tableId: JId, filterId: string, isActive: boolean): void
+  setDynamicFilterActive(tableId: string, filterId: string, isActive: boolean): void
 }
 
 export interface JLayerSearchService {
@@ -747,19 +750,19 @@ export interface JLayerSearchService {
 
 export interface JLayerThematicService {
   addThematic(params: JLayerAddThematicParams): Promise<void>
-  deleteThematic(layerId: JId, thematicId: JId): void
-  getAllByLayerId(layerId: JId): JLayerThematic[]
-  getById(layerId: JId, thematicId: JId): JLayerThematic
-  existsById(layerId: JId, thematicId: JId): boolean
-  hasAnyVisibleByLayerId(layerId: JId): boolean
-  getAllVisibleByLayerId(layerId: JId): JLayerThematic[]
-  setVisibilityById(layerId: JId, thematicId: JId, visibility: boolean): void
+  deleteThematic(layerId: string, thematicId: string): void
+  getAllByLayerId(layerId: string): JLayerThematic[]
+  getById(layerId: string, thematicId: string): JLayerThematic
+  existsById(layerId: string, thematicId: string): boolean
+  hasAnyVisibleByLayerId(layerId: string): boolean
+  getAllVisibleByLayerId(layerId: string): JLayerThematic[]
+  setVisibilityById(layerId: string, thematicId: string, visibility: boolean): void
   setThematicsVisibility(params: JLayerThematicSetVisibilityParams[]): void
   setCategoryVisibility(params: JLayerThematicSetCategoryVisibilityParams): void
-  setAllCategoriesVisibility(layerId: JId, thematicId: JId, visibility: boolean): void
+  setAllCategoriesVisibility(layerId: string, thematicId: string, visibility: boolean): void
   setConditionVisibility(params: JLayerThematicSetConditionVisibilityParams): void
-  setAllConditionsVisibility(layerId: JId, thematicId: JId, visibility: boolean): void
-  getFamilyTypeById(layerId: JId, thematicId: JId): JLAYER_THEMATIC_FAMILY_TYPES
+  setAllConditionsVisibility(layerId: string, thematicId: string, visibility: boolean): void
+  getFamilyTypeById(layerId: string, thematicId: string): JLAYER_THEMATIC_FAMILY_TYPES
 }
 
 export interface JUserService {
@@ -838,12 +841,12 @@ export interface JServerService {
 }
 
 export interface JDynamicFilterService {
-  create(resourceId: JId, params: JLocalDynamicFilterCreateParams): string
-  getAll(resourceId: JId): JLocalDynamicFilter[]
-  getById(resourceId: JId, filterId: string): JLocalDynamicFilter
-  update(resourceId: JId, filterId: string, update: JLocalDynamicFilterUpdateParams): void
-  remove(resourceId: JId, filterId: string): void
-  setIsActive(resourceId: JId, filterId: string, isActive: boolean): void
+  create(resourceId: string, params: JLocalDynamicFilterCreateParams): string
+  getAll(resourceId: string): JLocalDynamicFilter[]
+  getById(resourceId: string, filterId: string): JLocalDynamicFilter
+  update(resourceId: string, filterId: string, update: JLocalDynamicFilterUpdateParams): void
+  remove(resourceId: string, filterId: string): void
+  setIsActive(resourceId: string, filterId: string, isActive: boolean): void
 }
 
 // MISC

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmapcloud-ng-core-types",
-  "version": "2.0.20-qa.4",
+  "version": "2.0.20-qa.6",
   "description": "JMap Cloud specific version of JMap Cloud NG Core types and interfaces",
   "main": "index.js",
   "types": "ambient.d.ts",