@woosmap/ui 4.98.4 → 4.98.6

package/.idea/jsLinters/eslint.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="EslintConfiguration">
+    <option name="fix-on-save" value="true" />
+  </component>
+</project>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@woosmap/ui",
-  "version": "4.98.4",
+  "version": "4.98.6",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/WebGeoServices/ui.git"

package/src/components/Demo/DistanceDemo.js

@@ -4,6 +4,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import cl from 'classnames';
 import polyline from '@mapbox/polyline';
+import Datetime from 'react-datetime';
 import Demo from './SkeletonDemo';
 import Input from '../Input/Input';
 import Constants from '../../Constants';
@@ -19,7 +20,7 @@ import { createWoosmapMap } from '../Map/drawOnMap';
 
 const languages = [
     { value: 'fr', label: 'French' },
-    { value: 'gb', label: 'English' },
+    { value: 'en', label: 'English' },
     { value: 'es', label: 'Spanish' },
     { value: 'it', label: 'Italian' },
     { value: 'de', label: 'German' },
@@ -64,6 +65,8 @@ export default class DistanceDemo extends Component {
             error: null,
             originLocation: this.defaultOrigin.location,
             destinationLocation: this.defaultDestination.location,
+            departureTime: null,
+            arrivalTime: null,
             unit: units[0],
             method: methods[0],
             travelMode: travelModes[0],
@@ -96,7 +99,9 @@ export default class DistanceDemo extends Component {
             const { originLocation, destinationLocation, routes } = this.state;
 
             if (!this.directionsRenderer) {
-                this.directionsRenderer = new window.woosmap.map.DirectionsRenderer({ preserveViewport: true });
+                this.directionsRenderer = new window.woosmap.map.DirectionsRenderer({
+                    preserveViewport: true,
+                });
                 this.directionsRenderer.setMap(this.map);
             }
 
@@ -172,9 +177,19 @@ export default class DistanceDemo extends Component {
     };
 
     getRequestparams = () => {
-        const { language, originLocation, destinationLocation, unit, method, travelMode, alternatives } = this.state;
+        const {
+            language,
+            originLocation,
+            destinationLocation,
+            unit,
+            method,
+            travelMode,
+            alternatives,
+            arrivalTime,
+            departureTime,
+        } = this.state;
 
-        return {
+        const params = {
             key: Constants.woosmapKey,
             origin: `${originLocation.lat},${originLocation.lng}`,
             destination: `${destinationLocation.lat},${destinationLocation.lng}`,
@@ -184,6 +199,12 @@ export default class DistanceDemo extends Component {
             mode: travelMode.value,
             alternatives,
         };
+        if (departureTime) {
+            params.departure_time = departureTime.unix();
+        } else if (arrivalTime) {
+            params.arrival_time = arrivalTime.unix();
+        }
+        return params;
     };
 
     renderRoutesSummary = () => {
@@ -269,7 +290,35 @@ export default class DistanceDemo extends Component {
             ),
         };
 
-        return [originInputs, destinationInputs];
+        const departureTimeInput = {
+            label: tr('Departure Time'),
+            component: (
+                <>
+                    <Datetime
+                        key="dt_departure"
+                        className="datetime"
+                        inputProps={{ className: 'input__item' }}
+                        onChange={(dt) => this.setState({ departureTime: dt, arrivalTime: null }, this.requestDistance)}
+                    />
+                </>
+            ),
+        };
+
+        const arrivalTimeInput = {
+            label: tr('Arrival Time'),
+            component: (
+                <>
+                    <Datetime
+                        key="dt_arrival"
+                        className="datetime"
+                        inputProps={{ className: 'input__item' }}
+                        onChange={(dt) => this.setState({ arrivalTime: dt, departureTime: null }, this.requestDistance)}
+                    />
+                </>
+            ),
+        };
+
+        return [originInputs, destinationInputs, departureTimeInput, arrivalTimeInput];
     };
 
     renderFooterFilters = () => {

package/src/components/Demo/DistanceDemo.test.js

@@ -43,7 +43,7 @@ it('test method button', () => {
 
 it('test language button', () => {
     render(<DistanceDemo />);
-    expect(screen.getByText('language=gb&\\')).toBeVisible();
+    expect(screen.getByText('language=en&\\')).toBeVisible();
     fireEvent.click(screen.getByTitle('Italian'));
     expect(screen.getByText('language=it&\\')).toBeVisible();
 });

package/src/styles/commons/flags.styl

@@ -900,6 +900,7 @@
 
 
 .flag-gb
+.flag-en
 .flag-uk
 	background-position 0 92.561983%