@dronedeploy/rocos-js-sdk 3.0.1-alpha.33 → 3.0.1-alpha.35

package/cjs/models/target/Target.d.ts

@@ -9,24 +9,17 @@ export interface Target extends TargetBase {
     translation?: Vector3;
     rotation?: Quaternion;
     media?: TargetMedia[];
-    /**
-     * Media associated with the target (images)
-     */
+    position?: TargetWgs84 | Vector3;
     frame?: string;
 }
 export interface TargetMedia {
     id: string;
     data: Record<string, string>;
 }
-export interface CreateTargetPositionWgs84 {
+export interface TargetWgs84 {
     lat: number;
     lon: number;
     alt?: number;
 }
-export interface CreateTarget extends TargetBase {
-    data?: Record<string, string>;
-    position?: CreateTargetPositionWgs84 | Vector3;
-    frame?: string;
-}
+export declare const isTargetWgs84: (position: TargetWgs84 | Vector3) => position is TargetWgs84;
 export type Asset = Target;
-export type CreateAsset = CreateTarget;

package/cjs/models/target/Target.js

@@ -1,2 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isTargetWgs84 = void 0;
+const isTargetWgs84 = (position) => {
+    return 'lat' in position && 'lon' in position;
+};
+exports.isTargetWgs84 = isTargetWgs84;

package/cjs/services/TargetService.d.ts

@@ -1,4 +1,4 @@
-import { Asset, CreateAsset, CreateTarget, IBaseService, IRocosSDKConfig, RocosError, Target, TargetMedia } from '../models';
+import { Asset, IBaseService, IRocosSDKConfig, RocosError, Target, TargetMedia } from '../models';
 import { BaseServiceAbstract } from './BaseServiceAbstract';
 /**
  * Service for managing targets (such as assets, PoI's, or FLOCS) on DroneDeploy
@@ -8,9 +8,9 @@ export declare class TargetService extends BaseServiceAbstract implements IBaseS
     constructor(config: IRocosSDKConfig);
     getStatus(): boolean;
     protected getError(e: Error): RocosError;
-    createTargets(projectId: string, targets: CreateTarget[]): Promise<void>;
+    createTargets(projectId: string, targets: Target[]): Promise<void>;
     listTargets(projectId: string, frameID?: string): Promise<Target[]>;
-    createAssets(projectId: string, assets: CreateAsset[]): Promise<void>;
+    createAssets(projectId: string, assets: Asset[]): Promise<void>;
     listAssets(projectId: string, frameID?: string): Promise<Asset[]>;
     addMedia(projectId: string, targetId: string, media: TargetMedia): Promise<void>;
 }

package/cjs/services/TargetService.js

@@ -22,10 +22,10 @@ class TargetService extends BaseServiceAbstract_1.BaseServiceAbstract {
         return new models_1.RocosError(e, models_1.errorCodes.TARGET_SERVICE_ERROR);
     }
     async createTargets(projectId, targets) {
-        await this.callPut((0, formatServiceUrl_1.formatServiceUrl)(api_1.API_TARGET_UPLOAD_URL, {
+        return this.callPut((0, formatServiceUrl_1.formatServiceUrl)(api_1.API_TARGET_UPLOAD_URL, {
             url: this.config.url,
             projectId,
-        }, this.config.insecure), targets, 'Failed to upload assets');
+        }, this.config.insecure), targets, `Failed to upload targets for ${projectId}`);
     }
     async listTargets(projectId, frameID = 'seed') {
         const resp = await this.callGet((0, formatServiceUrl_1.formatServiceUrl)(api_1.API_TARGETS_URL, {
@@ -35,10 +35,10 @@ class TargetService extends BaseServiceAbstract_1.BaseServiceAbstract {
         return resp;
     }
     async createAssets(projectId, assets) {
-        await this.callPut((0, formatServiceUrl_1.formatServiceUrl)(api_1.API_ASSETS_UPLOAD_URL, {
+        return this.callPut((0, formatServiceUrl_1.formatServiceUrl)(api_1.API_ASSETS_UPLOAD_URL, {
             url: this.config.url,
             projectId,
-        }, this.config.insecure), assets, 'Failed to upload assets');
+        }, this.config.insecure), assets, `Failed to upload assets for ${projectId}`);
     }
     async listAssets(projectId, frameID = 'seed') {
         const resp = await this.callGet((0, formatServiceUrl_1.formatServiceUrl)(api_1.API_ASSETS_URL, {

package/esm/models/target/Target.d.ts

@@ -9,24 +9,17 @@ export interface Target extends TargetBase {
     translation?: Vector3;
     rotation?: Quaternion;
     media?: TargetMedia[];
-    /**
-     * Media associated with the target (images)
-     */
+    position?: TargetWgs84 | Vector3;
     frame?: string;
 }
 export interface TargetMedia {
     id: string;
     data: Record<string, string>;
 }
-export interface CreateTargetPositionWgs84 {
+export interface TargetWgs84 {
     lat: number;
     lon: number;
     alt?: number;
 }
-export interface CreateTarget extends TargetBase {
-    data?: Record<string, string>;
-    position?: CreateTargetPositionWgs84 | Vector3;
-    frame?: string;
-}
+export declare const isTargetWgs84: (position: TargetWgs84 | Vector3) => position is TargetWgs84;
 export type Asset = Target;
-export type CreateAsset = CreateTarget;

package/esm/models/target/Target.js

@@ -1 +1,3 @@
-export {};
+export const isTargetWgs84 = (position) => {
+    return 'lat' in position && 'lon' in position;
+};

package/esm/services/TargetService.d.ts

@@ -1,4 +1,4 @@
-import { Asset, CreateAsset, CreateTarget, IBaseService, IRocosSDKConfig, RocosError, Target, TargetMedia } from '../models';
+import { Asset, IBaseService, IRocosSDKConfig, RocosError, Target, TargetMedia } from '../models';
 import { BaseServiceAbstract } from './BaseServiceAbstract';
 /**
  * Service for managing targets (such as assets, PoI's, or FLOCS) on DroneDeploy
@@ -8,9 +8,9 @@ export declare class TargetService extends BaseServiceAbstract implements IBaseS
     constructor(config: IRocosSDKConfig);
     getStatus(): boolean;
     protected getError(e: Error): RocosError;
-    createTargets(projectId: string, targets: CreateTarget[]): Promise<void>;
+    createTargets(projectId: string, targets: Target[]): Promise<void>;
     listTargets(projectId: string, frameID?: string): Promise<Target[]>;
-    createAssets(projectId: string, assets: CreateAsset[]): Promise<void>;
+    createAssets(projectId: string, assets: Asset[]): Promise<void>;
     listAssets(projectId: string, frameID?: string): Promise<Asset[]>;
     addMedia(projectId: string, targetId: string, media: TargetMedia): Promise<void>;
 }

package/esm/services/TargetService.js

@@ -1,5 +1,5 @@
 import { API_ASSETS_UPLOAD_URL, API_ASSETS_URL, API_TARGETS_URL, API_TARGET_UPLOAD_URL } from '../constants/api';
-import { RocosError, errorCodes, } from '../models';
+import { RocosError, errorCodes } from '../models';
 import { BaseServiceAbstract } from './BaseServiceAbstract';
 import { RocosLogger } from '../logger/RocosLogger';
 import { formatServiceUrl } from '../helpers/formatServiceUrl';
@@ -19,10 +19,10 @@ export class TargetService extends BaseServiceAbstract {
         return new RocosError(e, errorCodes.TARGET_SERVICE_ERROR);
     }
     async createTargets(projectId, targets) {
-        await this.callPut(formatServiceUrl(API_TARGET_UPLOAD_URL, {
+        return this.callPut(formatServiceUrl(API_TARGET_UPLOAD_URL, {
             url: this.config.url,
             projectId,
-        }, this.config.insecure), targets, 'Failed to upload assets');
+        }, this.config.insecure), targets, `Failed to upload targets for ${projectId}`);
     }
     async listTargets(projectId, frameID = 'seed') {
         const resp = await this.callGet(formatServiceUrl(API_TARGETS_URL, {
@@ -32,10 +32,10 @@ export class TargetService extends BaseServiceAbstract {
         return resp;
     }
     async createAssets(projectId, assets) {
-        await this.callPut(formatServiceUrl(API_ASSETS_UPLOAD_URL, {
+        return this.callPut(formatServiceUrl(API_ASSETS_UPLOAD_URL, {
             url: this.config.url,
             projectId,
-        }, this.config.insecure), assets, 'Failed to upload assets');
+        }, this.config.insecure), assets, `Failed to upload assets for ${projectId}`);
     }
     async listAssets(projectId, frameID = 'seed') {
         const resp = await this.callGet(formatServiceUrl(API_ASSETS_URL, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dronedeploy/rocos-js-sdk",
-  "version": "3.0.1-alpha.33",
+  "version": "3.0.1-alpha.35",
   "description": "Javascript SDK for rocos",
   "main": "cjs/index.js",
   "module": "esm/index.js",