fix date going up one day && SHOWLOGO options

Author: Carlos-Benedetti

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@ciag/sentinel-hub",
   "private": false,
-  "version": "0.0.1-beta.23",
+  "version": "0.0.3",
   "description": "a API to create the sentinel ogs requests, and tools to apply on the data",
   "main": "dist/index.js",
   "scripts": {

package.json

@@ -4,7 +4,7 @@ import { TYPENAMES } from './GetFeatures/TYPENAMES';
 import { GetFeaturesRequest } from './GetFeatures/GetFeaturesRequest';
 import { GetFeaturesRequestOptions, RawGetFeatureRequestOptions } from './GetFeatures/GetFeaturesRequestOptions';
 import { defer, from, Observable } from 'rxjs';
-import { _SafeFetch,_ArgumentTypes } from '..';
+import { _SafeFetch, _ArgumentTypes } from '..';
 import { GetFeatureReturn } from './GetFeatures/GetFeatureReturn';
 
 export namespace SentinelHubWfs {
@@ -97,13 +97,14 @@ export namespace SentinelHubWfs {
      * @description Used to fetch avaliable dates for sattelite data
      *
      *  it can be created with a proxy URL
-     * @param {GetFeaturesRequestOptions} options for each option effect and more details: https://www.sentinel-hub.com/develop/api/ogc/standard-parameters/wfs/
+     * @param {GetFeaturesRequestOptions} dateOptions for each option effect and more details: https://www.sentinel-hub.com/develop/api/ogc/standard-parameters/wfs/
      */
-    export async function getAvaliableDates(polygonList: FeatureCollection<Polygon> | Feature<Polygon>, uuid: string, options: { from: Date, to: Date, proxy?: RequestInfo, requestOption?: RequestInit }): Promise<Date[]> {
-        const requestOptions = Object.assign({}, defaultGetDateOptions)
-        requestOptions.DATE_START = options.from
-        requestOptions.DATE_END = options.to
-        const dates: GetFeatureReturn = await GetFeature(polygonList, uuid, requestOptions, options.proxy, options.requestOption).then(r => r.json())
+    export async function getAvaliableDates(polygonList: FeatureCollection<Polygon> | Feature<Polygon>, uuid: string, dateOptions: { from: Date, to: Date, proxy?: RequestInfo, requestOption?: RequestInit }, options: GetFeaturesRequestOptions = defaultGetDateOptions): Promise<Date[]> {
+        let requestOptions = {...defaultGetDateOptions,...options}
+        
+        requestOptions.DATE_START = dateOptions.from
+        requestOptions.DATE_END = dateOptions.to
+        const dates: GetFeatureReturn = await GetFeature(polygonList, uuid, requestOptions, dateOptions.proxy, dateOptions.requestOption).then(r => r.json())
         return dates.features.map(i => new Date(i.properties.date))
     }
 
@@ -114,7 +115,7 @@ export namespace SentinelHubWfs {
      *  it can be created with a proxy URL
      * @param {GetFeaturesRequestOptions} options for each option effect and more details: https://www.sentinel-hub.com/develop/api/ogc/standard-parameters/wfs/
      */
-    export const getAvaliableDatesAsync = (...args:_ArgumentTypes< typeof getAvaliableDates>)=>defer(() => from(getAvaliableDates(...args)))
+    export const getAvaliableDatesAsync = (...args: _ArgumentTypes<typeof getAvaliableDates>) => defer(() => from(getAvaliableDates(...args)))
 
 
 }

src/WFS/index.ts

@@ -53,7 +53,7 @@ export class GetMap {
 
     public proxyOptions: RequestInit = {}
 
-    constructor(UUID: string, params: { DATE: Date, BBOX: BBox, CRS?: string, SRS?: string, FORMAT: GetMapParameters.Format, WIDTH?: number, HEIGHT?: number, RESX?: string, RESY?: string, BGCOLOR?: GetMapParameters.BgColor, TRANSPARENT?: boolean, LAYERS?: GetMapParameters.Sentinel_2[], EXCEPTIONS?: GetMapParameters.Exceptions,SHOWLOGO?:Boolean }) {
+    constructor(UUID: string, params: { DATE: Date, BBOX: BBox, CRS?: string, SRS?: string, FORMAT: GetMapParameters.Format, WIDTH?: number, HEIGHT?: number, RESX?: string, RESY?: string, BGCOLOR?: GetMapParameters.BgColor, TRANSPARENT?: boolean, LAYERS?: GetMapParameters.Sentinel_2[], EXCEPTIONS?: GetMapParameters.Exceptions, SHOWLOGO?: boolean }) {
         this.DATE = params.DATE ? params.DATE : this.DATE;
         this.UUID = UUID;
         this.BBOX = new BoxCords(params.BBOX);
@@ -79,6 +79,7 @@ export class GetMap {
         this.TRANSPARENT = params.TRANSPARENT ? params.TRANSPARENT : this.TRANSPARENT;
         this.LAYERS = params.LAYERS ? params.LAYERS : this.LAYERS;
         this.EXCEPTIONS = params.EXCEPTIONS;
+        this.SHOWLOGO = params.SHOWLOGO || false
     }
     public async request() {
         try {
@@ -115,7 +116,7 @@ export class GetMap {
         if (this.TRANSPARENT) { link.addParameter("TRANSPARENT", this.TRANSPARENT); }
         if (this.LAYERS) { link.addParameter("LAYERS", this.LAYERS); }
         if (this.EXCEPTIONS) { link.addParameter("EXCEPTIONS", this.EXCEPTIONS); }
-        if (this.SHOWLOGO) { link.addParameter("SHOWLOGO", this.SHOWLOGO); }
+        if (this.SHOWLOGO !== undefined) { link.addParameter("SHOWLOGO", this.SHOWLOGO); }
         link.setTimeFrom(this.DATE);
         if (this.proxy) { return link.getProxy() }
         else { return link.getLink() };

src/WMS/GetMap/GetMap.ts

@@ -1,24 +1,24 @@
-export enum SentinelWMSRequests{
-    GET_MAP="REQUEST=GetMap",
-    GET_FEATURE_INFO="REQUEST=GetFeatureInfo"
+export enum SentinelWMSRequests {
+    GET_MAP = "REQUEST=GetMap",
+    GET_FEATURE_INFO = "REQUEST=GetFeatureInfo"
 }
 export class SentinelHubURL {
     public parameters = [];
     public link: string;
     public UUID: string;
     public timeFrom = null;
     public timeTo = null;
-    constructor(public preset:RequestInfo = "https://services.sentinel-hub.com/ogc/wms/",public request:SentinelWMSRequests|string = SentinelWMSRequests.GET_MAP) {
+    constructor(public preset: RequestInfo = "https://services.sentinel-hub.com/ogc/wms/", public request: SentinelWMSRequests | string = SentinelWMSRequests.GET_MAP) {
     }
     public addUUID(uuid: string) { this.UUID = uuid; }
     public addParameter(name: string, value: any) {
         this.parameters.push(name + "=" + value);
     }
     public setTimeFrom(date: Date) {
-        this.timeFrom = "TIME=" + date.toISOString().split("T")[0];
+        this.timeFrom = "TIME=" + this.formatSentinelUrlDate(date);
     }
     public setTimeTo(date: Date) {
-        this.timeTo = "/" + date.toISOString().split("T")[0] + "/P1D";
+        this.timeTo = "/" + this.formatSentinelUrlDate(date);
     }
     public clearTime() {
         this.timeFrom = null;
@@ -36,4 +36,7 @@ export class SentinelHubURL {
         return this.timeFrom ? (this.timeFrom + (this.timeTo ? this.timeTo : "")
             + "&") : "";
     }
+    private formatSentinelUrlDate(date: Date) {
+        return `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`
+    }
 }