@kalisio/kdk 1.6.0 → 1.7.0

package/lib/core/client/mixins/mixin.base-collection.js

@@ -57,7 +57,17 @@ const baseCollectionMixin = {
           // We keep order from the updated list as depending on the sorting criteria a new item might have to be pushed on top of current items
           const sortQuery = _lodash2.default.get(this.getCollectionBaseQuery(), '$sort');
           if (sortQuery) {
-            this.items = _lodash2.default.orderBy(this.items, _lodash2.default.keys(sortQuery), _lodash2.default.map(_lodash2.default.values(sortQuery), value => {
+            // By default orderBy is case sensitive while using collation we want to perform case insensitive sort
+            this.items = _lodash2.default.orderBy(this.items,
+            // Sort function for each sort property
+            _lodash2.default.map(_lodash2.default.keys(sortQuery), property => {
+              return item => {
+                const value = _lodash2.default.get(item, property);
+                return typeof value === 'string' ? value.toLowerCase() : value;
+              };
+            }),
+            // Sort order for each sort property
+            _lodash2.default.map(_lodash2.default.values(sortQuery), value => {
               return value > 0 ? 'asc' : 'desc';
             }));
           }

package/lib/core/client/mixins/mixin.base-collection.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../core/client/mixins/mixin.base-collection.js"],"names":["baseCollectionMixin","props","nbItemsPerPage","type","Number","default","appendItems","Boolean","refreshThrottle","computed","nbPages","Math","ceil","nbTotalItems","data","items","currentPage","methods","subscribe","query","unsubscribe","itemListener","getService","watch","listStrategy","find","response","features","_","unionBy","sortQuery","get","getCollectionBaseQuery","orderBy","keys","map","values","value","total","$emit","error","$events","getCollectionFilterQuery","getCollectionPaginationQuery","$limit","$skip","resetCollection","refreshCollection","onPageChanged","onItemToggled","item","toggled","onItemSelected","section","onItemsSelected","onItemsUpdated","updatedItems","Array","isArray","intersectionWith","item1","item2","_id","toString","length","created","fullQuery","Object","assign","$locale","throttle","leading","service","on","beforeDestroy","off"],"mappings":"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","file":"mixin.base-collection.js","sourcesContent":["import _ from 'lodash'\r\nimport { getLocale } from '../utils'\r\n\r\nconst baseCollectionMixin = {\r\n  props: {\r\n    // This value can be overriden in activities if they want to manage pagination by themselves\r\n    // nbItemsPerPage = 0 means that the client does not handle pagination and server defaults will be used\r\n    nbItemsPerPage: {\r\n      type: Number,\r\n      default: 12\r\n    },\r\n    // This value indicate if items of each page replace or are appended to previous ones\r\n    appendItems: {\r\n      type: Boolean,\r\n      default: false\r\n    },\r\n    // Only invoke refresh at most once per every refreshThrottle milliseconds\r\n    refreshThrottle: {\r\n      type: Number,\r\n      default: 500\r\n    }\r\n  },\r\n  computed: {\r\n    nbPages () {\r\n      return (this.nbItemsPerPage > 0 ? Math.ceil(this.nbTotalItems / this.nbItemsPerPage) : 1)\r\n    }\r\n  },\r\n  data () {\r\n    return {\r\n      items: [],\r\n      nbTotalItems: 0,\r\n      currentPage: 1\r\n    }\r\n  },\r\n  methods: {\r\n    subscribe (query) {\r\n      // Remove previous listener if any\r\n      this.unsubscribe()\r\n      this.itemListener = this.getService().watch({ listStrategy: this.listStrategy || 'always' })\r\n        .find({ query })\r\n        .subscribe(response => {\r\n          // Manage GeoJson features collection as well\r\n          if (response.type === 'FeatureCollection') {\r\n            this.items = response.features\r\n          } else if (this.appendItems) {\r\n            // Append the response ensuring there is no duplicates\r\n            this.items = _.unionBy(response.data, this.items, '_id')\r\n            // We keep order from the updated list as depending on the sorting criteria a new item might have to be pushed on top of current items\r\n            const sortQuery = _.get(this.getCollectionBaseQuery(), '$sort')\r\n            if (sortQuery) {\r\n              this.items = _.orderBy(this.items, _.keys(sortQuery), _.map(_.values(sortQuery), value => { return value > 0 ? 'asc' : 'desc' }))\r\n            }\r\n          } else {\r\n            this.items = response.data\r\n          }\r\n          this.nbTotalItems = response.total\r\n          this.$emit('collection-refreshed', this.items)\r\n        }, error => {\r\n          this.$events.$emit('error', error)\r\n        })\r\n    },\r\n    unsubscribe () {\r\n      if (this.itemListener) {\r\n        this.itemListener.unsubscribe()\r\n        this.itemListener = null\r\n      }\r\n    },\r\n    getCollectionBaseQuery () {\r\n      // This method should be overriden in collections\r\n      return {}\r\n    },\r\n    getCollectionFilterQuery () {\r\n      // This method should be overriden in collections\r\n      return {}\r\n    },\r\n    getCollectionPaginationQuery () {\r\n      // This method can be overriden in collections\r\n      if (this.nbItemsPerPage > 0) {\r\n        return {\r\n          $limit: this.nbItemsPerPage,\r\n          $skip: (this.currentPage - 1) * this.nbItemsPerPage\r\n        }\r\n      } else return {}\r\n    },\r\n    resetCollection () {\r\n      // Reset pagination and start again refreshing the collection\r\n      this.items = []\r\n      this.currentPage = 1\r\n      this.refreshCollection()\r\n    },\r\n    onPageChanged () {\r\n      this.refreshCollection()\r\n    },\r\n    onItemToggled (item, toggled) {\r\n      this.$emit('toggle-changed', item, toggled)\r\n    },\r\n    onItemSelected (item, section) {\r\n      this.$emit('selection-changed', item, section)\r\n    },\r\n    onItemsSelected (items) {\r\n      this.$emit('selection-changed', items)\r\n    },\r\n    onItemsUpdated (items) {\r\n      // When we append items some items of the previous pages might have been updated.\r\n      // In this case we need to reset the full collection as Rx only tracks changes on the current page\r\n      let updatedItems = (Array.isArray(items) ? items : [items])\r\n      // We keep order from the updated list as depending on the sorting criteria a new item might have to be pushed on top of current items\r\n      updatedItems = _.intersectionWith(this.items, updatedItems, (item1, item2) => (item1._id.toString() === item2._id.toString()))\r\n      if (updatedItems.length > 0) this.resetCollection()\r\n    }\r\n  },\r\n  created () {\r\n    // Avoid initiating too much request as the same time, this might be the case\r\n    // when async UI components update simultaneously the base/filter query\r\n    // see https://github.com/kalisio/kdk/issues/432\r\n    const refreshCollection = () => {\r\n      // Add locale to perform sorting (i.e. collation) correctly w.r.t. user's language\r\n      const fullQuery = Object.assign({ $locale: getLocale() },\r\n        this.getCollectionBaseQuery(),\r\n        this.getCollectionFilterQuery(),\r\n        this.getCollectionPaginationQuery())\r\n      // Find the desired items\r\n      this.subscribe(fullQuery)\r\n    }\r\n    this.refreshCollection = _.throttle(refreshCollection, this.refreshThrottle, { leading: false })\r\n\r\n    if (this.appendItems) {\r\n      const service = this.getService()\r\n      service.on('patched', this.onItemsUpdated)\r\n      service.on('updated', this.onItemsUpdated)\r\n      service.on('removed', this.onItemsUpdated)\r\n    }\r\n  },\r\n  beforeDestroy () {\r\n    this.unsubscribe()\r\n    if (this.appendItems) {\r\n      const service = this.getService()\r\n      service.off('patched', this.onItemsUpdated)\r\n      service.off('updated', this.onItemsUpdated)\r\n      service.off('removed', this.onItemsUpdated)\r\n    }\r\n  }\r\n}\r\n\r\nexport default baseCollectionMixin\r\n"]}
+{"version":3,"sources":["../../../../core/client/mixins/mixin.base-collection.js"],"names":["baseCollectionMixin","props","nbItemsPerPage","type","Number","default","appendItems","Boolean","refreshThrottle","computed","nbPages","Math","ceil","nbTotalItems","data","items","currentPage","methods","subscribe","query","unsubscribe","itemListener","getService","watch","listStrategy","find","response","features","_","unionBy","sortQuery","get","getCollectionBaseQuery","orderBy","map","keys","property","item","value","toLowerCase","values","total","$emit","error","$events","getCollectionFilterQuery","getCollectionPaginationQuery","$limit","$skip","resetCollection","refreshCollection","onPageChanged","onItemToggled","toggled","onItemSelected","section","onItemsSelected","onItemsUpdated","updatedItems","Array","isArray","intersectionWith","item1","item2","_id","toString","length","created","fullQuery","Object","assign","$locale","throttle","leading","service","on","beforeDestroy","off"],"mappings":"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","file":"mixin.base-collection.js","sourcesContent":["import _ from 'lodash'\r\nimport { getLocale } from '../utils'\r\n\r\nconst baseCollectionMixin = {\r\n  props: {\r\n    // This value can be overriden in activities if they want to manage pagination by themselves\r\n    // nbItemsPerPage = 0 means that the client does not handle pagination and server defaults will be used\r\n    nbItemsPerPage: {\r\n      type: Number,\r\n      default: 12\r\n    },\r\n    // This value indicate if items of each page replace or are appended to previous ones\r\n    appendItems: {\r\n      type: Boolean,\r\n      default: false\r\n    },\r\n    // Only invoke refresh at most once per every refreshThrottle milliseconds\r\n    refreshThrottle: {\r\n      type: Number,\r\n      default: 500\r\n    }\r\n  },\r\n  computed: {\r\n    nbPages () {\r\n      return (this.nbItemsPerPage > 0 ? Math.ceil(this.nbTotalItems / this.nbItemsPerPage) : 1)\r\n    }\r\n  },\r\n  data () {\r\n    return {\r\n      items: [],\r\n      nbTotalItems: 0,\r\n      currentPage: 1\r\n    }\r\n  },\r\n  methods: {\r\n    subscribe (query) {\r\n      // Remove previous listener if any\r\n      this.unsubscribe()\r\n      this.itemListener = this.getService().watch({ listStrategy: this.listStrategy || 'always' })\r\n        .find({ query })\r\n        .subscribe(response => {\r\n          // Manage GeoJson features collection as well\r\n          if (response.type === 'FeatureCollection') {\r\n            this.items = response.features\r\n          } else if (this.appendItems) {\r\n            // Append the response ensuring there is no duplicates\r\n            this.items = _.unionBy(response.data, this.items, '_id')\r\n            // We keep order from the updated list as depending on the sorting criteria a new item might have to be pushed on top of current items\r\n            const sortQuery = _.get(this.getCollectionBaseQuery(), '$sort')\r\n            if (sortQuery) {\r\n              // By default orderBy is case sensitive while using collation we want to perform case insensitive sort\r\n              this.items = _.orderBy(this.items,\r\n                // Sort function for each sort property\r\n                _.map(_.keys(sortQuery), property => {\r\n                  return item => {\r\n                    const value = _.get(item, property)\r\n                    return (typeof value === 'string' ? value.toLowerCase() : value)\r\n                  }\r\n                }),\r\n                // Sort order for each sort property\r\n                _.map(_.values(sortQuery), value => { return value > 0 ? 'asc' : 'desc' }))\r\n            }\r\n          } else {\r\n            this.items = response.data\r\n          }\r\n          this.nbTotalItems = response.total\r\n          this.$emit('collection-refreshed', this.items)\r\n        }, error => {\r\n          this.$events.$emit('error', error)\r\n        })\r\n    },\r\n    unsubscribe () {\r\n      if (this.itemListener) {\r\n        this.itemListener.unsubscribe()\r\n        this.itemListener = null\r\n      }\r\n    },\r\n    getCollectionBaseQuery () {\r\n      // This method should be overriden in collections\r\n      return {}\r\n    },\r\n    getCollectionFilterQuery () {\r\n      // This method should be overriden in collections\r\n      return {}\r\n    },\r\n    getCollectionPaginationQuery () {\r\n      // This method can be overriden in collections\r\n      if (this.nbItemsPerPage > 0) {\r\n        return {\r\n          $limit: this.nbItemsPerPage,\r\n          $skip: (this.currentPage - 1) * this.nbItemsPerPage\r\n        }\r\n      } else return {}\r\n    },\r\n    resetCollection () {\r\n      // Reset pagination and start again refreshing the collection\r\n      this.items = []\r\n      this.currentPage = 1\r\n      this.refreshCollection()\r\n    },\r\n    onPageChanged () {\r\n      this.refreshCollection()\r\n    },\r\n    onItemToggled (item, toggled) {\r\n      this.$emit('toggle-changed', item, toggled)\r\n    },\r\n    onItemSelected (item, section) {\r\n      this.$emit('selection-changed', item, section)\r\n    },\r\n    onItemsSelected (items) {\r\n      this.$emit('selection-changed', items)\r\n    },\r\n    onItemsUpdated (items) {\r\n      // When we append items some items of the previous pages might have been updated.\r\n      // In this case we need to reset the full collection as Rx only tracks changes on the current page\r\n      let updatedItems = (Array.isArray(items) ? items : [items])\r\n      // We keep order from the updated list as depending on the sorting criteria a new item might have to be pushed on top of current items\r\n      updatedItems = _.intersectionWith(this.items, updatedItems, (item1, item2) => (item1._id.toString() === item2._id.toString()))\r\n      if (updatedItems.length > 0) this.resetCollection()\r\n    }\r\n  },\r\n  created () {\r\n    // Avoid initiating too much request as the same time, this might be the case\r\n    // when async UI components update simultaneously the base/filter query\r\n    // see https://github.com/kalisio/kdk/issues/432\r\n    const refreshCollection = () => {\r\n      // Add locale to perform sorting (i.e. collation) correctly w.r.t. user's language\r\n      const fullQuery = Object.assign({ $locale: getLocale() },\r\n        this.getCollectionBaseQuery(),\r\n        this.getCollectionFilterQuery(),\r\n        this.getCollectionPaginationQuery())\r\n      // Find the desired items\r\n      this.subscribe(fullQuery)\r\n    }\r\n    this.refreshCollection = _.throttle(refreshCollection, this.refreshThrottle, { leading: false })\r\n\r\n    if (this.appendItems) {\r\n      const service = this.getService()\r\n      service.on('patched', this.onItemsUpdated)\r\n      service.on('updated', this.onItemsUpdated)\r\n      service.on('removed', this.onItemsUpdated)\r\n    }\r\n  },\r\n  beforeDestroy () {\r\n    this.unsubscribe()\r\n    if (this.appendItems) {\r\n      const service = this.getService()\r\n      service.off('patched', this.onItemsUpdated)\r\n      service.off('updated', this.onItemsUpdated)\r\n      service.off('removed', this.onItemsUpdated)\r\n    }\r\n  }\r\n}\r\n\r\nexport default baseCollectionMixin\r\n"]}

package/lib/core/client/mixins/mixin.base-widget.js

@@ -4,26 +4,38 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 const baseWidgetMixin = {
-  props: {
-    mode: {
-      type: String,
-      default: 'minimized',
-      validator: value => {
-        return ['minimized', 'maximized'].includes(value);
+  computed: {
+    widgetStyle() {
+      const widgetSize = this.window.size;
+      if (widgetSize) {
+        // compute the widget size
+        const widgetWidth = this.window.size[0];
+        let widgetHeight = this.window.size[1];
+        const windowHeaderElement = document.getElementById('window-header');
+        if (windowHeaderElement) {
+          widgetHeight -= parseInt(window.getComputedStyle(windowHeaderElement).getPropertyValue('height'));
+        }
+        const windowFooterElement = document.getElementById('window-footer');
+        if (windowFooterElement) {
+          widgetHeight -= parseInt(window.getComputedStyle(windowFooterElement).getPropertyValue('height'));
+        }
+        // store the widget size
+        this.widgetWidth = widgetWidth;
+        this.widgetHeight = widgetHeight;
+        // return the style
+        return `minWidth: ${widgetWidth}px;
+                maxWidth: ${widgetWidth}px;
+                minHeight: ${widgetHeight}px; 
+                maxHeight: ${widgetHeight}px;`;
       }
     }
   },
   data() {
     return {
+      window: this.$store.get('window'),
+      widgetWidth: 0,
       widgetHeight: 0
     };
-  },
-  computed: {
-    widgetStyle() {
-      const screenHeight = this.$q.screen.height;
-      this.widgetHeight = this.mode === 'maximized' ? screenHeight : screenHeight * 0.3; // 30vh
-      return `height: ${this.widgetHeight}px`;
-    }
   }
 };
 

package/lib/core/client/mixins/mixin.base-widget.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../core/client/mixins/mixin.base-widget.js"],"names":["baseWidgetMixin","props","mode","type","String","default","validator","value","includes","data","widgetHeight","computed","widgetStyle","screenHeight","$q","screen","height"],"mappings":";;;;;AAAA,MAAMA,kBAAkB;AACtBC,SAAO;AACLC,UAAM;AACJC,YAAMC,MADF;AAEJC,eAAS,WAFL;AAGJC,iBAAYC,KAAD,IAAW;AACpB,eAAO,CAAC,WAAD,EAAc,WAAd,EAA2BC,QAA3B,CAAoCD,KAApC,CAAP;AACD;AALG;AADD,GADe;AAUtBE,SAAQ;AACN,WAAO;AACLC,oBAAc;AADT,KAAP;AAGD,GAdqB;AAetBC,YAAU;AACRC,kBAAe;AACb,YAAMC,eAAe,KAAKC,EAAL,CAAQC,MAAR,CAAeC,MAApC;AACA,WAAKN,YAAL,GAAoB,KAAKR,IAAL,KAAc,WAAd,GAA4BW,YAA5B,GAA2CA,eAAe,GAA9E,CAFa,CAEqE;AAClF,aAAQ,WAAU,KAAKH,YAAa,IAApC;AACD;AALO;AAfY,CAAxB;;kBAwBeV,e","file":"mixin.base-widget.js","sourcesContent":["const baseWidgetMixin = {\r\n  props: {\r\n    mode: {\r\n      type: String,\r\n      default: 'minimized',\r\n      validator: (value) => {\r\n        return ['minimized', 'maximized'].includes(value)\r\n      }\r\n    }\r\n  },\r\n  data () {\r\n    return {\r\n      widgetHeight: 0\r\n    }\r\n  },\r\n  computed: {\r\n    widgetStyle () {\r\n      const screenHeight = this.$q.screen.height\r\n      this.widgetHeight = this.mode === 'maximized' ? screenHeight : screenHeight * 0.3 // 30vh\r\n      return `height: ${this.widgetHeight}px`\r\n    }\r\n  }\r\n}\r\n\r\nexport default baseWidgetMixin\r\n"]}
+{"version":3,"sources":["../../../../core/client/mixins/mixin.base-widget.js"],"names":["baseWidgetMixin","computed","widgetStyle","widgetSize","window","size","widgetWidth","widgetHeight","windowHeaderElement","document","getElementById","parseInt","getComputedStyle","getPropertyValue","windowFooterElement","data","$store","get"],"mappings":";;;;;AAAA,MAAMA,kBAAkB;AACtBC,YAAU;AACRC,kBAAe;AACb,YAAMC,aAAa,KAAKC,MAAL,CAAYC,IAA/B;AACA,UAAIF,UAAJ,EAAgB;AACd;AACA,cAAMG,cAAc,KAAKF,MAAL,CAAYC,IAAZ,CAAiB,CAAjB,CAApB;AACA,YAAIE,eAAe,KAAKH,MAAL,CAAYC,IAAZ,CAAiB,CAAjB,CAAnB;AACA,cAAMG,sBAAsBC,SAASC,cAAT,CAAwB,eAAxB,CAA5B;AACA,YAAIF,mBAAJ,EAAyB;AACvBD,0BAAgBI,SAASP,OAAOQ,gBAAP,CAAwBJ,mBAAxB,EAA6CK,gBAA7C,CAA8D,QAA9D,CAAT,CAAhB;AACD;AACD,cAAMC,sBAAsBL,SAASC,cAAT,CAAwB,eAAxB,CAA5B;AACA,YAAII,mBAAJ,EAAyB;AACvBP,0BAAgBI,SAASP,OAAOQ,gBAAP,CAAwBE,mBAAxB,EAA6CD,gBAA7C,CAA8D,QAA9D,CAAT,CAAhB;AACD;AACD;AACA,aAAKP,WAAL,GAAmBA,WAAnB;AACA,aAAKC,YAAL,GAAoBA,YAApB;AACA;AACA,eAAQ,aAAYD,WAAY;4BACZA,WAAY;6BACXC,YAAa;6BACbA,YAAa,KAHlC;AAID;AACF;AAxBO,GADY;AA2BtBQ,SAAQ;AACN,WAAO;AACLX,cAAQ,KAAKY,MAAL,CAAYC,GAAZ,CAAgB,QAAhB,CADH;AAELX,mBAAa,CAFR;AAGLC,oBAAc;AAHT,KAAP;AAKD;AAjCqB,CAAxB;;kBAoCeP,e","file":"mixin.base-widget.js","sourcesContent":["const baseWidgetMixin = {\r\n  computed: {\r\n    widgetStyle () {\r\n      const widgetSize = this.window.size\r\n      if (widgetSize) {\r\n        // compute the widget size\r\n        const widgetWidth = this.window.size[0]\r\n        let widgetHeight = this.window.size[1]\r\n        const windowHeaderElement = document.getElementById('window-header')\r\n        if (windowHeaderElement) {\r\n          widgetHeight -= parseInt(window.getComputedStyle(windowHeaderElement).getPropertyValue('height'))\r\n        }\r\n        const windowFooterElement = document.getElementById('window-footer')\r\n        if (windowFooterElement) {\r\n          widgetHeight -= parseInt(window.getComputedStyle(windowFooterElement).getPropertyValue('height'))\r\n        }\r\n        // store the widget size\r\n        this.widgetWidth = widgetWidth\r\n        this.widgetHeight = widgetHeight\r\n        // return the style\r\n        return `minWidth: ${widgetWidth}px;\r\n                maxWidth: ${widgetWidth}px;\r\n                minHeight: ${widgetHeight}px; \r\n                maxHeight: ${widgetHeight}px;`\r\n      }\r\n    }\r\n  },\r\n  data () {\r\n    return {\r\n      window: this.$store.get('window'),\r\n      widgetWidth: 0,\r\n      widgetHeight: 0\r\n    }\r\n  }\r\n}\r\n\r\nexport default baseWidgetMixin\r\n"]}

package/lib/core/client/services/index.js

@@ -45,7 +45,7 @@ function init() {
       longDate: 'time.format.date.long',
       shortYear: 'time.format.year.short',
       longYear: 'time.format.year.long',
-      utc: 'time.format.utc',
+      timezone: 'time.format.timezone',
       timelineStep: 'time.step',
       timelineInterval: 'time.interval',
       timeseriesSpan: 'timeseries.span',
@@ -53,6 +53,7 @@ function init() {
       restoreView: 'restore.view',
       restoreLayers: 'restore.layers',
       defaultLength: 'units.default.length',
+      defaultAltitude: 'units.default.altitude',
       defaultArea: 'units.default.area',
       defaultVelocity: 'units.default.velocity',
       defaultTemperature: 'units.default.temperature',

package/lib/core/client/services/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../core/client/services/index.js"],"names":["init","LocalSettingsService","api","declareService","context","createService","_","merge","config","settings","service","propertyMapping","shortTime","longTime","shortDate","longDate","shortYear","longYear","utc","timelineStep","timelineInterval","timeseriesSpan","location","restoreView","restoreLayers","defaultLength","defaultArea","defaultVelocity","defaultTemperature","defaultAngle","defaultPrecision"],"mappings":";;;;;;kBAMwBA,I;;AANxB;;;;AACA;;;;AACA;;;;;;QAESC,oB,GAAAA,uB;AAEM,SAASD,IAAT,GAAiB;AAC9B,QAAME,MAAM,IAAZ;;AAEA;AACAA,MAAIC,cAAJ,CAAmB,OAAnB;AACAD,MAAIC,cAAJ,CAAmB,gBAAnB;AACAD,MAAIC,cAAJ,CAAmB,MAAnB,EAA2B,EAAEC,SAAS,IAAX,EAA3B;AACAF,MAAIC,cAAJ,CAAmB,eAAnB;AACAD,MAAIC,cAAJ,CAAmB,SAAnB,EAA8B,EAAEC,SAAS,IAAX,EAA9B;AACAF,MAAIC,cAAJ,CAAmB,QAAnB,EAA6B,EAAEC,SAAS,IAAX,EAA7B;AACAF,MAAIC,cAAJ,CAAmB,SAAnB,EAA8B,EAAEC,SAAS,IAAX,EAA9B;AACAF,MAAIC,cAAJ,CAAmB,SAAnB;AACAD,MAAIC,cAAJ,CAAmB,SAAnB;;AAEA;AACAD,MAAIG,aAAJ,CAAkB,UAAlB,EAA8BC,iBAAEC,KAAF,CAAQC,iBAAOC,QAAP,IAAmB,EAA3B,EAA+B;AAC3DC,aAAST,uBADkD;AAE3DU,qBAAiB;AACfC,iBAAW,wBADI;AAEfC,gBAAU,uBAFK;AAGfC,iBAAW,wBAHI;AAIfC,gBAAU,uBAJK;AAKfC,iBAAW,wBALI;AAMfC,gBAAU,uBANK;AAOfC,WAAK,iBAPU;AAQfC,oBAAc,WARC;AASfC,wBAAkB,eATH;AAUfC,sBAAgB,iBAVD;AAWfC,gBAAU,gBAXK;AAYfC,mBAAa,cAZE;AAafC,qBAAe,gBAbA;AAcfC,qBAAe,sBAdA;AAefC,mBAAa,oBAfE;AAgBfC,uBAAiB,wBAhBF;AAiBfC,0BAAoB,2BAjBL;AAkBfC,oBAAc,qBAlBC;AAmBfC,wBAAkB;AAnBH;AAF0C,GAA/B,CAA9B,EAf8B,CAsC1B;AACL","file":"index.js","sourcesContent":["import _ from 'lodash'\r\nimport LocalSettingsService from './local-settings.service'\r\nimport config from 'config'\r\n\r\nexport { LocalSettingsService }\r\n\r\nexport default function init () {\r\n  const api = this\r\n\r\n  // Declare the built-in services, others are optional\r\n  api.declareService('users')\r\n  api.declareService('authorisations')\r\n  api.declareService('tags', { context: true })\r\n  api.declareService('organisations')\r\n  api.declareService('members', { context: true })\r\n  api.declareService('groups', { context: true })\r\n  api.declareService('storage', { context: true })\r\n  api.declareService('account')\r\n  api.declareService('devices')\r\n\r\n  // Setup service for settings edition\r\n  api.createService('settings', _.merge(config.settings || {}, {\r\n    service: LocalSettingsService,\r\n    propertyMapping: {\r\n      shortTime: 'time.format.time.short',\r\n      longTime: 'time.format.time.long',\r\n      shortDate: 'time.format.date.short',\r\n      longDate: 'time.format.date.long',\r\n      shortYear: 'time.format.year.short',\r\n      longYear: 'time.format.year.long',\r\n      utc: 'time.format.utc',\r\n      timelineStep: 'time.step',\r\n      timelineInterval: 'time.interval',\r\n      timeseriesSpan: 'timeseries.span',\r\n      location: 'locationFormat',\r\n      restoreView: 'restore.view',\r\n      restoreLayers: 'restore.layers',\r\n      defaultLength: 'units.default.length',\r\n      defaultArea: 'units.default.area',\r\n      defaultVelocity: 'units.default.velocity',\r\n      defaultTemperature: 'units.default.temperature',\r\n      defaultAngle: 'units.default.angle',\r\n      defaultPrecision: 'units.default.precision'\r\n    }\r\n  })) // Default options can be overriden from app config\r\n}\r\n"]}
+{"version":3,"sources":["../../../../core/client/services/index.js"],"names":["init","LocalSettingsService","api","declareService","context","createService","_","merge","config","settings","service","propertyMapping","shortTime","longTime","shortDate","longDate","shortYear","longYear","timezone","timelineStep","timelineInterval","timeseriesSpan","location","restoreView","restoreLayers","defaultLength","defaultAltitude","defaultArea","defaultVelocity","defaultTemperature","defaultAngle","defaultPrecision"],"mappings":";;;;;;kBAMwBA,I;;AANxB;;;;AACA;;;;AACA;;;;;;QAESC,oB,GAAAA,uB;AAEM,SAASD,IAAT,GAAiB;AAC9B,QAAME,MAAM,IAAZ;;AAEA;AACAA,MAAIC,cAAJ,CAAmB,OAAnB;AACAD,MAAIC,cAAJ,CAAmB,gBAAnB;AACAD,MAAIC,cAAJ,CAAmB,MAAnB,EAA2B,EAAEC,SAAS,IAAX,EAA3B;AACAF,MAAIC,cAAJ,CAAmB,eAAnB;AACAD,MAAIC,cAAJ,CAAmB,SAAnB,EAA8B,EAAEC,SAAS,IAAX,EAA9B;AACAF,MAAIC,cAAJ,CAAmB,QAAnB,EAA6B,EAAEC,SAAS,IAAX,EAA7B;AACAF,MAAIC,cAAJ,CAAmB,SAAnB,EAA8B,EAAEC,SAAS,IAAX,EAA9B;AACAF,MAAIC,cAAJ,CAAmB,SAAnB;AACAD,MAAIC,cAAJ,CAAmB,SAAnB;;AAEA;AACAD,MAAIG,aAAJ,CAAkB,UAAlB,EAA8BC,iBAAEC,KAAF,CAAQC,iBAAOC,QAAP,IAAmB,EAA3B,EAA+B;AAC3DC,aAAST,uBADkD;AAE3DU,qBAAiB;AACfC,iBAAW,wBADI;AAEfC,gBAAU,uBAFK;AAGfC,iBAAW,wBAHI;AAIfC,gBAAU,uBAJK;AAKfC,iBAAW,wBALI;AAMfC,gBAAU,uBANK;AAOfC,gBAAU,sBAPK;AAQfC,oBAAc,WARC;AASfC,wBAAkB,eATH;AAUfC,sBAAgB,iBAVD;AAWfC,gBAAU,gBAXK;AAYfC,mBAAa,cAZE;AAafC,qBAAe,gBAbA;AAcfC,qBAAe,sBAdA;AAefC,uBAAiB,wBAfF;AAgBfC,mBAAa,oBAhBE;AAiBfC,uBAAiB,wBAjBF;AAkBfC,0BAAoB,2BAlBL;AAmBfC,oBAAc,qBAnBC;AAoBfC,wBAAkB;AApBH;AAF0C,GAA/B,CAA9B,EAf8B,CAuC1B;AACL","file":"index.js","sourcesContent":["import _ from 'lodash'\r\nimport LocalSettingsService from './local-settings.service'\r\nimport config from 'config'\r\n\r\nexport { LocalSettingsService }\r\n\r\nexport default function init () {\r\n  const api = this\r\n\r\n  // Declare the built-in services, others are optional\r\n  api.declareService('users')\r\n  api.declareService('authorisations')\r\n  api.declareService('tags', { context: true })\r\n  api.declareService('organisations')\r\n  api.declareService('members', { context: true })\r\n  api.declareService('groups', { context: true })\r\n  api.declareService('storage', { context: true })\r\n  api.declareService('account')\r\n  api.declareService('devices')\r\n\r\n  // Setup service for settings edition\r\n  api.createService('settings', _.merge(config.settings || {}, {\r\n    service: LocalSettingsService,\r\n    propertyMapping: {\r\n      shortTime: 'time.format.time.short',\r\n      longTime: 'time.format.time.long',\r\n      shortDate: 'time.format.date.short',\r\n      longDate: 'time.format.date.long',\r\n      shortYear: 'time.format.year.short',\r\n      longYear: 'time.format.year.long',\r\n      timezone: 'time.format.timezone',\r\n      timelineStep: 'time.step',\r\n      timelineInterval: 'time.interval',\r\n      timeseriesSpan: 'timeseries.span',\r\n      location: 'locationFormat',\r\n      restoreView: 'restore.view',\r\n      restoreLayers: 'restore.layers',\r\n      defaultLength: 'units.default.length',\r\n      defaultAltitude: 'units.default.altitude',\r\n      defaultArea: 'units.default.area',\r\n      defaultVelocity: 'units.default.velocity',\r\n      defaultTemperature: 'units.default.temperature',\r\n      defaultAngle: 'units.default.angle',\r\n      defaultPrecision: 'units.default.precision'\r\n    }\r\n  })) // Default options can be overriden from app config\r\n}\r\n"]}

package/lib/core/client/services/local-settings.service.js

@@ -58,6 +58,10 @@ exports.default = function (name, api, options) {
       let settings = window.localStorage.getItem(settingsKey);
       if (!settings) return;
       settings = JSON.parse(settings);
+      // Backward compatibility when changed utc mode to timezone setting
+      if (_lodash2.default.get(settings, 'utc') && _lodash2.default.has(mapping, 'timezone') && !_lodash2.default.get(settings, 'timezone')) {
+        _lodash2.default.set(settings, 'timezone', 'UTC');
+      }
       _lodash2.default.forOwn(mapping, (value, key) => {
         if (value && _lodash2.default.has(settings, key)) {
           _store.Store.set(value, _lodash2.default.get(settings, key));

package/lib/core/client/services/local-settings.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../core/client/services/local-settings.service.js"],"names":["name","api","options","mapping","propertyMapping","rootPaths","_","uniq","values","map","path","split","settingsKey","config","appName","toLowerCase","get","id","data","forOwn","value","key","set","Store","patch","previousRootValues","rootPath","forEach","index","eventName","kebabCase","Events","$emit","saveSettings","has","window","localStorage","setItem","JSON","stringify","restoreSettings","settings","getItem","parse","getSettingsMapping"],"mappings":";;;;;;kBAKe,UAAUA,IAAV,EAAgBC,GAAhB,EAAqBC,OAArB,EAA8B;AAC3C,QAAMC,UAAUD,QAAQE,eAAxB;AACA;AACA;AACA,QAAMC,YAAYC,iBAAEC,IAAF,CAAOD,iBAAEE,MAAF,CAASL,OAAT,EAAkBM,GAAlB,CAAsBC,QAAQA,KAAKC,KAAL,CAAW,GAAX,EAAgB,CAAhB,CAA9B,CAAP,CAAlB;AACA,QAAMC,cAAcC,iBAAOC,OAAP,CAAeC,WAAf,KAA+B,GAA/B,IAAsCb,QAAQU,WAAR,IAAuB,UAA7D,CAApB;AACA,SAAO;;AAECI,OAAN,CAAWC,EAAX,EAAe;AAAA;AACb,cAAMC,OAAO,EAAb;AACAZ,yBAAEa,MAAF,CAAShB,OAAT,EAAkB,UAACiB,KAAD,EAAQC,GAAR,EAAgB;AAChC,cAAID,KAAJ,EAAW;AACTd,6BAAEgB,GAAF,CAAMJ,IAAN,EAAYG,GAAZ,EAAiBE,aAAMP,GAAN,CAAUI,KAAV,CAAjB;AACD;AACF,SAJD;AAKA,eAAOF,IAAP;AAPa;AAQd,KAVI;;AAYCM,SAAN,CAAaP,EAAb,EAAiBC,IAAjB,EAAuB;AAAA;;AAAA;AACrB,cAAMO,qBAAqBpB,UAAUI,GAAV,CAAc;AAAA,iBAAYc,aAAMP,GAAN,CAAUU,QAAV,CAAZ;AAAA,SAAd,CAA3B;AACApB,yBAAEa,MAAF,CAASD,IAAT,EAAe,UAACE,KAAD,EAAQC,GAAR,EAAgB;AAC7B,cAAIf,iBAAEU,GAAF,CAAMb,OAAN,EAAekB,GAAf,CAAJ,EAAyB;AACvBE,yBAAMD,GAAN,CAAUnB,QAAQkB,GAAR,CAAV,EAAwBD,KAAxB;AACD;AACF,SAJD;AAKAf,kBAAUsB,OAAV,CAAkB,UAACD,QAAD,EAAWE,KAAX,EAAqB;AACrC,gBAAMC,YAAYvB,iBAAEwB,SAAF,CAAa,GAAEJ,QAAS,UAAxB,CAAlB;AACAK,yBAAOC,KAAP,CAAaH,SAAb,EAAwBN,aAAMP,GAAN,CAAUU,QAAV,CAAxB,EAA6CD,mBAAmBG,KAAnB,CAA7C;AACD,SAHD;AAIA,cAAKK,YAAL;AAXqB;AAYtB,KAxBI;;AA0BLA,mBAAgB;AACd,YAAMf,OAAO,EAAb;AACAZ,uBAAEa,MAAF,CAAShB,OAAT,EAAkB,CAACiB,KAAD,EAAQC,GAAR,KAAgB;AAChC,YAAID,SAASG,aAAMW,GAAN,CAAUd,KAAV,CAAb,EAA+B;AAC7Bd,2BAAEgB,GAAF,CAAMJ,IAAN,EAAYG,GAAZ,EAAiBE,aAAMP,GAAN,CAAUI,KAAV,CAAjB;AACD;AACF,OAJD;AAKAe,aAAOC,YAAP,CAAoBC,OAApB,CAA4BzB,WAA5B,EAAyC0B,KAAKC,SAAL,CAAerB,IAAf,CAAzC;AACD,KAlCI;;AAoCLsB,sBAAmB;AACjB,UAAIC,WAAWN,OAAOC,YAAP,CAAoBM,OAApB,CAA4B9B,WAA5B,CAAf;AACA,UAAI,CAAC6B,QAAL,EAAe;AACfA,iBAAWH,KAAKK,KAAL,CAAWF,QAAX,CAAX;AACAnC,uBAAEa,MAAF,CAAShB,OAAT,EAAkB,CAACiB,KAAD,EAAQC,GAAR,KAAgB;AAChC,YAAID,SAASd,iBAAE4B,GAAF,CAAMO,QAAN,EAAgBpB,GAAhB,CAAb,EAAmC;AACjCE,uBAAMD,GAAN,CAAUF,KAAV,EAAiBd,iBAAEU,GAAF,CAAMyB,QAAN,EAAgBpB,GAAhB,CAAjB;AACD;AACF,OAJD;AAKD,KA7CI;;AA+CLuB,yBAAsB;AACpB,aAAOzC,OAAP;AACD;AAjDI,GAAP;AAmDD,C;;AA9DD;;;;AACA;;;;AACA;;AACA","file":"local-settings.service.js","sourcesContent":["import _ from 'lodash'\r\nimport config from 'config'\r\nimport { Store } from '../store'\r\nimport { Events } from '../events'\r\n\r\nexport default function (name, api, options) {\r\n  const mapping = options.propertyMapping\r\n  // We will emit also an event for all top level properties in case of nested ones\r\n  // This simplifies event management for some listeners instead of listening to all nested properties\r\n  const rootPaths = _.uniq(_.values(mapping).map(path => path.split('.')[0]))\r\n  const settingsKey = config.appName.toLowerCase() + '-' + (options.settingsKey || 'settings')\r\n  return {\r\n\r\n    async get (id) {\r\n      const data = {}\r\n      _.forOwn(mapping, (value, key) => {\r\n        if (value) {\r\n          _.set(data, key, Store.get(value))\r\n        }\r\n      })\r\n      return data\r\n    },\r\n\r\n    async patch (id, data) {\r\n      const previousRootValues = rootPaths.map(rootPath => Store.get(rootPath))\r\n      _.forOwn(data, (value, key) => {\r\n        if (_.get(mapping, key)) {\r\n          Store.set(mapping[key], value)\r\n        }\r\n      })\r\n      rootPaths.forEach((rootPath, index) => {\r\n        const eventName = _.kebabCase(`${rootPath}-changed`)\r\n        Events.$emit(eventName, Store.get(rootPath), previousRootValues[index])\r\n      })\r\n      this.saveSettings()\r\n    },\r\n\r\n    saveSettings () {\r\n      const data = {}\r\n      _.forOwn(mapping, (value, key) => {\r\n        if (value && Store.has(value)) {\r\n          _.set(data, key, Store.get(value))\r\n        }\r\n      })\r\n      window.localStorage.setItem(settingsKey, JSON.stringify(data))\r\n    },\r\n\r\n    restoreSettings () {\r\n      let settings = window.localStorage.getItem(settingsKey)\r\n      if (!settings) return\r\n      settings = JSON.parse(settings)\r\n      _.forOwn(mapping, (value, key) => {\r\n        if (value && _.has(settings, key)) {\r\n          Store.set(value, _.get(settings, key))\r\n        }\r\n      })\r\n    },\r\n\r\n    getSettingsMapping () {\r\n      return mapping\r\n    }\r\n  }\r\n}\r\n"]}
+{"version":3,"sources":["../../../../core/client/services/local-settings.service.js"],"names":["name","api","options","mapping","propertyMapping","rootPaths","_","uniq","values","map","path","split","settingsKey","config","appName","toLowerCase","get","id","data","forOwn","value","key","set","Store","patch","previousRootValues","rootPath","forEach","index","eventName","kebabCase","Events","$emit","saveSettings","has","window","localStorage","setItem","JSON","stringify","restoreSettings","settings","getItem","parse","getSettingsMapping"],"mappings":"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","file":"local-settings.service.js","sourcesContent":["import _ from 'lodash'\r\nimport config from 'config'\r\nimport { Store } from '../store'\r\nimport { Events } from '../events'\r\n\r\nexport default function (name, api, options) {\r\n  const mapping = options.propertyMapping\r\n  // We will emit also an event for all top level properties in case of nested ones\r\n  // This simplifies event management for some listeners instead of listening to all nested properties\r\n  const rootPaths = _.uniq(_.values(mapping).map(path => path.split('.')[0]))\r\n  const settingsKey = config.appName.toLowerCase() + '-' + (options.settingsKey || 'settings')\r\n  return {\r\n\r\n    async get (id) {\r\n      const data = {}\r\n      _.forOwn(mapping, (value, key) => {\r\n        if (value) {\r\n          _.set(data, key, Store.get(value))\r\n        }\r\n      })\r\n      return data\r\n    },\r\n\r\n    async patch (id, data) {\r\n      const previousRootValues = rootPaths.map(rootPath => Store.get(rootPath))\r\n      _.forOwn(data, (value, key) => {\r\n        if (_.get(mapping, key)) {\r\n          Store.set(mapping[key], value)\r\n        }\r\n      })\r\n      rootPaths.forEach((rootPath, index) => {\r\n        const eventName = _.kebabCase(`${rootPath}-changed`)\r\n        Events.$emit(eventName, Store.get(rootPath), previousRootValues[index])\r\n      })\r\n      this.saveSettings()\r\n    },\r\n\r\n    saveSettings () {\r\n      const data = {}\r\n      _.forOwn(mapping, (value, key) => {\r\n        if (value && Store.has(value)) {\r\n          _.set(data, key, Store.get(value))\r\n        }\r\n      })\r\n      window.localStorage.setItem(settingsKey, JSON.stringify(data))\r\n    },\r\n\r\n    restoreSettings () {\r\n      let settings = window.localStorage.getItem(settingsKey)\r\n      if (!settings) return\r\n      settings = JSON.parse(settings)\r\n      // Backward compatibility when changed utc mode to timezone setting\r\n      if (_.get(settings, 'utc') && _.has(mapping, 'timezone') && !_.get(settings, 'timezone')) {\r\n        _.set(settings, 'timezone', 'UTC')\r\n      }\r\n      _.forOwn(mapping, (value, key) => {\r\n        if (value && _.has(settings, key)) {\r\n          Store.set(value, _.get(settings, key))\r\n        }\r\n      })\r\n    },\r\n\r\n    getSettingsMapping () {\r\n      return mapping\r\n    }\r\n  }\r\n}\r\n"]}

package/lib/core/client/time.js

@@ -9,9 +9,13 @@ var _lodash = require('lodash');
 
 var _lodash2 = _interopRequireDefault(_lodash);
 
-var _moment = require('moment');
+var _momentTimezoneWithData10YearRange = require('moment-timezone/builds/moment-timezone-with-data-10-year-range');
 
-var _moment2 = _interopRequireDefault(_moment);
+var _momentTimezoneWithData10YearRange2 = _interopRequireDefault(_momentTimezoneWithData10YearRange);
+
+var _config = require('config');
+
+var _config2 = _interopRequireDefault(_config);
 
 var _events = require('./events');
 
@@ -25,10 +29,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const Time = exports.Time = {
   initialize() {
     // Set locale globally
-    _moment2.default.locale((0, _utils.getLocale)());
+    _momentTimezoneWithData10YearRange2.default.locale((0, _utils.getLocale)());
     // Set the time object within the store
-    const now = _moment2.default.utc();
-    _store.Store.set('time', {
+    const now = _momentTimezoneWithData10YearRange2.default.utc();
+    // Try to guess user timezone
+    const timezone = _momentTimezoneWithData10YearRange2.default.tz.guess() || '';
+    _store.Store.set('time', _lodash2.default.merge(_config2.default.time || {}, {
       range: {
         start: now.clone().subtract(1, 'months').startOf('day'),
         end: now.clone().endOf('day'),
@@ -48,23 +54,24 @@ const Time = exports.Time = {
           short: 'YY',
           long: 'YYYY'
         },
-        utc: false
+        timezone
       },
       currentTime: now,
       step: 60, // 1H
       interval: 60 // 1m
-    });
+    }));
     this.updateTimeRangeQuery();
     // Make filter react to external changes to update the query
     _events.Events.$on('time-range-changed', () => this.updateTimeRangeQuery());
   },
   convertToMoment(datetime) {
-    if (_moment2.default.isMoment(datetime)) {
+    if (_momentTimezoneWithData10YearRange2.default.isMoment(datetime)) {
       // Clone to avoid mutating and force UTC mode
-      return _moment2.default.utc(datetime.valueOf());
+      return _momentTimezoneWithData10YearRange2.default.utc(datetime.valueOf());
     } else {
       // Convert from Date, string or milliseconds (ie EPOCH)
-      return _moment2.default.utc(datetime);
+      // Check for ambiguous input as ISO 8601 consider it as locale and not UTC
+      if (typeof datetime === 'string' && !datetime.endsWith('Z')) return (0, _momentTimezoneWithData10YearRange2.default)(datetime).utc();else return _momentTimezoneWithData10YearRange2.default.utc(datetime);
     }
   },
   get() {
@@ -89,15 +96,18 @@ const Time = exports.Time = {
   getFormat() {
     return this.get().format;
   },
+  getFormatTimezone() {
+    return this.getFormat().timezone;
+  },
   format(datetime, format, options = { year: 'numeric', month: 'numeric', day: 'numeric', hour: '2-digit', minute: '2-digit' }) {
-    let currentTime = this.convertToMoment(datetime);
-    if (!this.getFormat().utc) {
-      // Convert to local time
-      currentTime = (0, _moment2.default)(currentTime.valueOf());
+    const currentTime = this.convertToMoment(datetime);
+    // Convert to local time
+    if (this.getFormatTimezone()) {
+      currentTime.tz(this.getFormatTimezone());
     }
     if (format === 'iso') return currentTime.format();else if (format === 'locale') return currentTime.toDate().toLocaleString((0, _utils.getLocale)(), options);
     // Defaults to long mode if not given
-    else return currentTime.format(_lodash2.default.get(this.getFormat(), format, _lodash2.default.get(this.getFormat(), format + '.long')));
+    else return currentTime.format(_lodash2.default.get(this.getFormat(), format));
   },
   getCurrentTime() {
     return this.get().currentTime;

package/lib/core/client/time.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../core/client/time.js"],"names":["Time","initialize","moment","locale","now","utc","Store","set","range","start","clone","subtract","startOf","end","endOf","field","query","format","time","short","long","date","year","currentTime","step","interval","updateTimeRangeQuery","Events","$on","convertToMoment","datetime","isMoment","valueOf","get","getRange","patchRange","patch","getRangeQuery","$gte","$lte","_","isEqual","getFormat","options","month","day","hour","minute","toDate","toLocaleString","getCurrentTime","setCurrentTime","isSame","getCurrentFormattedTime","iso","getStep"],"mappings":"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","file":"time.js","sourcesContent":["import _ from 'lodash'\r\nimport moment from 'moment'\r\nimport { Events } from './events'\r\nimport { Store } from './store'\r\nimport { getLocale } from './utils'\r\n\r\n// Export singleton\r\nexport const Time = {\r\n  initialize () {\r\n    // Set locale globally\r\n    moment.locale(getLocale())\r\n    // Set the time object within the store\r\n    const now = moment.utc()\r\n    Store.set('time', {\r\n      range: {\r\n        start: now.clone().subtract(1, 'months').startOf('day'),\r\n        end: now.clone().endOf('day'),\r\n        field: 'createdAt',\r\n        query: {}\r\n      },\r\n      format: {\r\n        time: {\r\n          short: 'H[h]',\r\n          long: 'HH:mm'\r\n        },\r\n        date: {\r\n          short: 'DD/MM',\r\n          long: 'dddd D'\r\n        },\r\n        year: {\r\n          short: 'YY',\r\n          long: 'YYYY'\r\n        },\r\n        utc: false\r\n      },\r\n      currentTime: now,\r\n      step: 60, // 1H\r\n      interval: 60 // 1m\r\n    })\r\n    this.updateTimeRangeQuery()\r\n    // Make filter react to external changes to update the query\r\n    Events.$on('time-range-changed', () => this.updateTimeRangeQuery())\r\n  },\r\n  convertToMoment (datetime) {\r\n    if (moment.isMoment(datetime)) {\r\n      // Clone to avoid mutating and force UTC mode\r\n      return moment.utc(datetime.valueOf())\r\n    } else { // Convert from Date, string or milliseconds (ie EPOCH)\r\n      return moment.utc(datetime)\r\n    }\r\n  },\r\n  get () {\r\n    return Store.get('time')\r\n  },\r\n  getRange () {\r\n    return this.get().range\r\n  },\r\n  patchRange (range) {\r\n    Store.patch('time.range', range)\r\n  },\r\n  getRangeQuery () {\r\n    return Store.get('time.range.query')\r\n  },\r\n  // Build sort query\r\n  updateTimeRangeQuery () {\r\n    const query = {}\r\n    query[this.getRange().field] = { $gte: this.getRange().start.format(), $lte: this.getRange().end.format() }\r\n    // Avoid reentrance as we listen to other filter property changes\r\n    if (!_.isEqual(query, this.getRangeQuery())) Store.patch('time.range', { query })\r\n  },\r\n  getFormat () {\r\n    return this.get().format\r\n  },\r\n  format (datetime, format, options = { year: 'numeric', month: 'numeric', day: 'numeric', hour: '2-digit', minute: '2-digit' }) {\r\n    let currentTime = this.convertToMoment(datetime)\r\n    if (!this.getFormat().utc) {\r\n      // Convert to local time\r\n      currentTime = moment(currentTime.valueOf())\r\n    }\r\n    if (format === 'iso') return currentTime.format()\r\n    else if (format === 'locale') return currentTime.toDate().toLocaleString(getLocale(), options)\r\n    // Defaults to long mode if not given\r\n    else return currentTime.format(_.get(this.getFormat(), format, _.get(this.getFormat(), format + '.long')))\r\n  },\r\n  getCurrentTime () {\r\n    return this.get().currentTime\r\n  },\r\n  setCurrentTime (datetime) {\r\n    const now = this.convertToMoment(datetime)\r\n    if (this.getCurrentTime().isSame(now)) return\r\n    Store.patch('time.currentTime', now)\r\n  },\r\n  getCurrentFormattedTime () {\r\n    const currentTime = this.getCurrentTime()\r\n    return {\r\n      time: {\r\n        short: this.format(currentTime, 'time.short'),\r\n        long: this.format(currentTime, 'time.long')\r\n      },\r\n      date: {\r\n        short: this.format(currentTime, 'date.short'),\r\n        long: this.format(currentTime, 'date.long')\r\n      },\r\n      year: {\r\n        short: this.format(currentTime, 'year.short'),\r\n        long: this.format(currentTime, 'year.long')\r\n      },\r\n      iso: this.format(currentTime, 'iso')\r\n    }\r\n  },\r\n  getStep () {\r\n    return this.get().step\r\n  }\r\n}\r\n"]}
+{"version":3,"sources":["../../../core/client/time.js"],"names":["Time","initialize","moment","locale","now","utc","timezone","tz","guess","Store","set","_","merge","config","time","range","start","clone","subtract","startOf","end","endOf","field","query","format","short","long","date","year","currentTime","step","interval","updateTimeRangeQuery","Events","$on","convertToMoment","datetime","isMoment","valueOf","endsWith","get","getRange","patchRange","patch","getRangeQuery","$gte","$lte","isEqual","getFormat","getFormatTimezone","options","month","day","hour","minute","toDate","toLocaleString","getCurrentTime","setCurrentTime","isSame","getCurrentFormattedTime","iso","getStep"],"mappings":"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","file":"time.js","sourcesContent":["import _ from 'lodash'\r\nimport moment from 'moment-timezone/builds/moment-timezone-with-data-10-year-range'\r\nimport config from 'config'\r\nimport { Events } from './events'\r\nimport { Store } from './store'\r\nimport { getLocale } from './utils'\r\n\r\n// Export singleton\r\nexport const Time = {\r\n  initialize () {\r\n    // Set locale globally\r\n    moment.locale(getLocale())\r\n    // Set the time object within the store\r\n    const now = moment.utc()\r\n    // Try to guess user timezone\r\n    const timezone = moment.tz.guess() || ''\r\n    Store.set('time', _.merge(config.time || {}, {\r\n      range: {\r\n        start: now.clone().subtract(1, 'months').startOf('day'),\r\n        end: now.clone().endOf('day'),\r\n        field: 'createdAt',\r\n        query: {}\r\n      },\r\n      format: {\r\n        time: {\r\n          short: 'H[h]',\r\n          long: 'HH:mm'\r\n        },\r\n        date: {\r\n          short: 'DD/MM',\r\n          long: 'dddd D'\r\n        },\r\n        year: {\r\n          short: 'YY',\r\n          long: 'YYYY'\r\n        },\r\n        timezone\r\n      },\r\n      currentTime: now,\r\n      step: 60, // 1H\r\n      interval: 60 // 1m\r\n    }))\r\n    this.updateTimeRangeQuery()\r\n    // Make filter react to external changes to update the query\r\n    Events.$on('time-range-changed', () => this.updateTimeRangeQuery())\r\n  },\r\n  convertToMoment (datetime) {\r\n    if (moment.isMoment(datetime)) {\r\n      // Clone to avoid mutating and force UTC mode\r\n      return moment.utc(datetime.valueOf())\r\n    } else { // Convert from Date, string or milliseconds (ie EPOCH)\r\n      // Check for ambiguous input as ISO 8601 consider it as locale and not UTC\r\n      if ((typeof datetime === 'string') && !datetime.endsWith('Z')) return moment(datetime).utc()\r\n      else return moment.utc(datetime)\r\n    }\r\n  },\r\n  get () {\r\n    return Store.get('time')\r\n  },\r\n  getRange () {\r\n    return this.get().range\r\n  },\r\n  patchRange (range) {\r\n    Store.patch('time.range', range)\r\n  },\r\n  getRangeQuery () {\r\n    return Store.get('time.range.query')\r\n  },\r\n  // Build sort query\r\n  updateTimeRangeQuery () {\r\n    const query = {}\r\n    query[this.getRange().field] = { $gte: this.getRange().start.format(), $lte: this.getRange().end.format() }\r\n    // Avoid reentrance as we listen to other filter property changes\r\n    if (!_.isEqual(query, this.getRangeQuery())) Store.patch('time.range', { query })\r\n  },\r\n  getFormat () {\r\n    return this.get().format\r\n  },\r\n  getFormatTimezone () {\r\n    return this.getFormat().timezone\r\n  },\r\n  format (datetime, format, options = { year: 'numeric', month: 'numeric', day: 'numeric', hour: '2-digit', minute: '2-digit' }) {\r\n    const currentTime = this.convertToMoment(datetime)\r\n    // Convert to local time\r\n    if (this.getFormatTimezone()) {\r\n      currentTime.tz(this.getFormatTimezone())\r\n    }\r\n    if (format === 'iso') return currentTime.format()\r\n    else if (format === 'locale') return currentTime.toDate().toLocaleString(getLocale(), options)\r\n    // Defaults to long mode if not given\r\n    else return currentTime.format(_.get(this.getFormat(), format))\r\n  },\r\n  getCurrentTime () {\r\n    return this.get().currentTime\r\n  },\r\n  setCurrentTime (datetime) {\r\n    const now = this.convertToMoment(datetime)\r\n    if (this.getCurrentTime().isSame(now)) return\r\n    Store.patch('time.currentTime', now)\r\n  },\r\n  getCurrentFormattedTime () {\r\n    const currentTime = this.getCurrentTime()\r\n    return {\r\n      time: {\r\n        short: this.format(currentTime, 'time.short'),\r\n        long: this.format(currentTime, 'time.long')\r\n      },\r\n      date: {\r\n        short: this.format(currentTime, 'date.short'),\r\n        long: this.format(currentTime, 'date.long')\r\n      },\r\n      year: {\r\n        short: this.format(currentTime, 'year.short'),\r\n        long: this.format(currentTime, 'year.long')\r\n      },\r\n      iso: this.format(currentTime, 'iso')\r\n    }\r\n  },\r\n  getStep () {\r\n    return this.get().step\r\n  }\r\n}\r\n"]}

package/lib/core/client/units.js

@@ -44,6 +44,16 @@ const length = {
     definition: '1852 m'
   }
 };
+const altitude = {
+  m: {
+    symbol: 'units.METER_SYMBOL',
+    label: 'units.METER_LABEL'
+  },
+  ft: {
+    symbol: 'units.FEET_SYMBOL',
+    label: 'units.FEET_LABEL'
+  }
+};
 const area = {
   'm^2': {
     symbol: 'units.SQUARED_METER_SYMBOL',
@@ -104,6 +114,7 @@ const angle = {
 
 const quantities = {
   length,
+  altitude,
   area,
   velocity,
   temperature,
@@ -117,6 +128,7 @@ const quantities = {
     _store.Store.set('units', _lodash2.default.merge(_config2.default.units || {}, quantities, {
       default: {
         length: 'm',
+        altitude: 'm',
         area: 'm^2',
         velocity: 'm/s',
         temperature: 'degC',

package/lib/core/client/units.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../core/client/units.js"],"names":["math","length","m","symbol","label","mi","NM","definition","area","acre","hectare","velocity","kt","temperature","degC","degF","K","angle","deg","rad","quantities","Units","initialize","Store","set","_","merge","config","units","default","precision","getQuantities","forEach","quantity","getUnits","unit","createUnit","name","omit","get","getDefaultPrecision","keys","values","mapValues","value","key","Object","assign","concat","getUnit","find","getUnitSymbol","i18next","t","getDefaultUnit","quantityOrUnit","defaultUnit","baseUnit","convert","sourceUnit","targetUnit","n","toNumber","format","options","output","toFixed"],"mappings":"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","file":"units.js","sourcesContent":["import _ from 'lodash'\r\nimport i18next from 'i18next'\r\nimport * as math from 'mathjs'\r\nimport config from 'config'\r\nimport { Store } from './store'\r\n\r\n// Default units organised by physical quantity\r\n// Each key is the internal mathjs \"identifier\" of the unit\r\nconst length = {\r\n  m: {\r\n    symbol: 'units.METER_SYMBOL',\r\n    label: 'units.METER_LABEL'\r\n  },\r\n  mi: {\r\n    symbol: 'units.MILE_SYMBOL',\r\n    label: 'units.MILE_LABEL'\r\n  },\r\n  NM: {\r\n    symbol: 'units.NAUTICAL_MILE_SYMBOL',\r\n    label: 'units.NAUTICAL_MILE_LABEL',\r\n    definition: '1852 m'\r\n  }\r\n}\r\nconst area = {\r\n  'm^2': {\r\n    symbol: 'units.SQUARED_METER_SYMBOL',\r\n    label: 'units.SQUARED_METER_LABEL'\r\n  },\r\n  'km^2': {\r\n    symbol: 'units.SQUARED_KILOMETER_SYMBOL',\r\n    label: 'units.SQUARED_KILOMETER_LABEL'\r\n  },\r\n  acre: {\r\n    symbol: 'units.ACRE_SYMBOL',\r\n    label: 'units.ACRE_LABEL'\r\n  },\r\n  hectare: {\r\n    symbol: 'units.HECTARE_SYMBOL',\r\n    label: 'units.HECTARE_LABEL'\r\n  }\r\n}\r\nconst velocity = {\r\n  'm/s': {\r\n    symbol: 'units.METER_PER_SECOND_SYMBOL',\r\n    label: 'units.METER_PER_SECOND_LABEL'\r\n  },\r\n  'km/h': {\r\n    symbol: 'units.KILOMETER_PER_HOUR_SYMBOL',\r\n    label: 'units.KILOMETER_PER_HOUR_LABEL'\r\n  },\r\n  kt: {\r\n    symbol: 'units.KNOT_SYMBOL',\r\n    label: 'units.KNOT_LABEL',\r\n    definition: '0.514444 m/s'\r\n  }\r\n}\r\nconst temperature = {\r\n  degC: {\r\n    symbol: 'units.CELSIUS_SYMBOL',\r\n    label: 'units.CELSIUS_LABEL'\r\n  },\r\n  degF: {\r\n    symbol: 'units.FAHRENHEIT_SYMBOL',\r\n    label: 'units.FAHRENHEIT_LABEL'\r\n  },\r\n  K: {\r\n    symbol: 'units.KELVIN_SYMBOL',\r\n    label: 'units.KELVIN_LABEL'\r\n  }\r\n}\r\nconst angle = {\r\n  deg: {\r\n    symbol: 'units.DEGREE_SYMBOL',\r\n    label: 'units.DEGREE_LABEL'\r\n  },\r\n  rad: {\r\n    symbol: 'units.RADIAN_SYMBOL',\r\n    label: 'units.RADIAN_LABEL'\r\n  }\r\n}\r\n\r\nconst quantities = {\r\n  length,\r\n  area,\r\n  velocity,\r\n  temperature,\r\n  angle\r\n}\r\n\r\n// Export singleton\r\nexport const Units = {\r\n\r\n  initialize () {\r\n    // Set the units object within the store\r\n    Store.set('units', _.merge(config.units || {},\r\n      quantities, {\r\n        default: {\r\n          length: 'm',\r\n          area: 'm^2',\r\n          velocity: 'm/s',\r\n          temperature: 'degC',\r\n          angle: 'deg',\r\n          precision: 1\r\n        }\r\n      }))\r\n    // Create units not defined by default in mathjs\r\n    this.getQuantities().forEach(quantity => {\r\n      const units = this.getUnits(quantity)\r\n      units.forEach(unit => {\r\n        if (unit.definition) math.createUnit(unit.name, _.omit(unit, ['label']))\r\n      })\r\n    })\r\n  },\r\n  get () {\r\n    return Store.get('units')\r\n  },\r\n  getDefaultPrecision () {\r\n    return Store.get('units.default.precision', 1)\r\n  },\r\n  getQuantities () {\r\n    return _.keys(_.omit(this.get(), ['default']))\r\n  },\r\n  getUnits (quantity) {\r\n    // Get units for a given quantity\r\n    if (quantity) {\r\n      const units = Store.get(`units.${quantity}`, {})\r\n      return _.values(_.mapValues(units, (value, key) => Object.assign({ name: key, quantity }, value)))\r\n    } else { // Or all units\r\n      let units = []\r\n      this.getQuantities().forEach(quantity => {\r\n        units = units.concat(this.getUnits(quantity))\r\n      })\r\n      return units\r\n    }\r\n  },\r\n  getUnit (unit) {\r\n    return _.find(this.getUnits(), { name: unit })\r\n  },\r\n  getUnitSymbol (unit) {\r\n    const definition = this.getUnit(unit)\r\n    return (definition ? i18next.t(definition.symbol) : unit)\r\n  },\r\n  getDefaultUnit (quantityOrUnit) {\r\n    // Check for quantity first\r\n    let defaultUnit = Store.get(`units.default.${quantityOrUnit}`)\r\n    // If not check by matching quantity based on given unit\r\n    if (!defaultUnit) {\r\n      const baseUnit = Units.getUnit(quantityOrUnit)\r\n      // Get default unit for this quantity instead\r\n      if (baseUnit) defaultUnit = Units.getDefaultUnit(baseUnit.quantity)\r\n    }\r\n    return defaultUnit\r\n  },\r\n  convert (value, sourceUnit, targetUnit) {\r\n    if (sourceUnit === targetUnit) return value\r\n    let n = math.unit(value, sourceUnit)\r\n    n = n.toNumber(targetUnit)\r\n    // Remap from [-180,+180[ to [0,360[ for angles\r\n    n = (targetUnit === 'deg' ? (n < 0.0 ? n + 360.0 : n) : n)\r\n    return n\r\n  },\r\n  format (value, sourceUnit, targetUnit, options = { symbol: true }) {\r\n    // If target unit is not given use default one\r\n    if (!targetUnit) targetUnit = this.getDefaultUnit(sourceUnit)\r\n    const n = (targetUnit ? this.convert(value, sourceUnit, targetUnit) : value)\r\n    let output = n.toFixed(options.precision || this.getDefaultPrecision())\r\n    if (options.symbol) {\r\n      output += ` ${targetUnit ? this.getUnitSymbol(targetUnit) : this.getUnitSymbol(sourceUnit)}`\r\n    }\r\n    return output\r\n  }\r\n}\r\n"]}
+{"version":3,"sources":["../../../core/client/units.js"],"names":["math","length","m","symbol","label","mi","NM","definition","altitude","ft","area","acre","hectare","velocity","kt","temperature","degC","degF","K","angle","deg","rad","quantities","Units","initialize","Store","set","_","merge","config","units","default","precision","getQuantities","forEach","quantity","getUnits","unit","createUnit","name","omit","get","getDefaultPrecision","keys","values","mapValues","value","key","Object","assign","concat","getUnit","find","getUnitSymbol","i18next","t","getDefaultUnit","quantityOrUnit","defaultUnit","baseUnit","convert","sourceUnit","targetUnit","n","toNumber","format","options","output","toFixed"],"mappings":"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","file":"units.js","sourcesContent":["import _ from 'lodash'\r\nimport i18next from 'i18next'\r\nimport * as math from 'mathjs'\r\nimport config from 'config'\r\nimport { Store } from './store'\r\n\r\n// Default units organised by physical quantity\r\n// Each key is the internal mathjs \"identifier\" of the unit\r\nconst length = {\r\n  m: {\r\n    symbol: 'units.METER_SYMBOL',\r\n    label: 'units.METER_LABEL'\r\n  },\r\n  mi: {\r\n    symbol: 'units.MILE_SYMBOL',\r\n    label: 'units.MILE_LABEL'\r\n  },\r\n  NM: {\r\n    symbol: 'units.NAUTICAL_MILE_SYMBOL',\r\n    label: 'units.NAUTICAL_MILE_LABEL',\r\n    definition: '1852 m'\r\n  }\r\n}\r\nconst altitude = {\r\n  m: {\r\n    symbol: 'units.METER_SYMBOL',\r\n    label: 'units.METER_LABEL'\r\n  },\r\n  ft: {\r\n    symbol: 'units.FEET_SYMBOL',\r\n    label: 'units.FEET_LABEL'\r\n  }\r\n}\r\nconst area = {\r\n  'm^2': {\r\n    symbol: 'units.SQUARED_METER_SYMBOL',\r\n    label: 'units.SQUARED_METER_LABEL'\r\n  },\r\n  'km^2': {\r\n    symbol: 'units.SQUARED_KILOMETER_SYMBOL',\r\n    label: 'units.SQUARED_KILOMETER_LABEL'\r\n  },\r\n  acre: {\r\n    symbol: 'units.ACRE_SYMBOL',\r\n    label: 'units.ACRE_LABEL'\r\n  },\r\n  hectare: {\r\n    symbol: 'units.HECTARE_SYMBOL',\r\n    label: 'units.HECTARE_LABEL'\r\n  }\r\n}\r\nconst velocity = {\r\n  'm/s': {\r\n    symbol: 'units.METER_PER_SECOND_SYMBOL',\r\n    label: 'units.METER_PER_SECOND_LABEL'\r\n  },\r\n  'km/h': {\r\n    symbol: 'units.KILOMETER_PER_HOUR_SYMBOL',\r\n    label: 'units.KILOMETER_PER_HOUR_LABEL'\r\n  },\r\n  kt: {\r\n    symbol: 'units.KNOT_SYMBOL',\r\n    label: 'units.KNOT_LABEL',\r\n    definition: '0.514444 m/s'\r\n  }\r\n}\r\nconst temperature = {\r\n  degC: {\r\n    symbol: 'units.CELSIUS_SYMBOL',\r\n    label: 'units.CELSIUS_LABEL'\r\n  },\r\n  degF: {\r\n    symbol: 'units.FAHRENHEIT_SYMBOL',\r\n    label: 'units.FAHRENHEIT_LABEL'\r\n  },\r\n  K: {\r\n    symbol: 'units.KELVIN_SYMBOL',\r\n    label: 'units.KELVIN_LABEL'\r\n  }\r\n}\r\nconst angle = {\r\n  deg: {\r\n    symbol: 'units.DEGREE_SYMBOL',\r\n    label: 'units.DEGREE_LABEL'\r\n  },\r\n  rad: {\r\n    symbol: 'units.RADIAN_SYMBOL',\r\n    label: 'units.RADIAN_LABEL'\r\n  }\r\n}\r\n\r\nconst quantities = {\r\n  length,\r\n  altitude,\r\n  area,\r\n  velocity,\r\n  temperature,\r\n  angle\r\n}\r\n\r\n// Export singleton\r\nexport const Units = {\r\n\r\n  initialize () {\r\n    // Set the units object within the store\r\n    Store.set('units', _.merge(config.units || {},\r\n      quantities, {\r\n        default: {\r\n          length: 'm',\r\n          altitude: 'm',\r\n          area: 'm^2',\r\n          velocity: 'm/s',\r\n          temperature: 'degC',\r\n          angle: 'deg',\r\n          precision: 1\r\n        }\r\n      }))\r\n    // Create units not defined by default in mathjs\r\n    this.getQuantities().forEach(quantity => {\r\n      const units = this.getUnits(quantity)\r\n      units.forEach(unit => {\r\n        if (unit.definition) math.createUnit(unit.name, _.omit(unit, ['label']))\r\n      })\r\n    })\r\n  },\r\n  get () {\r\n    return Store.get('units')\r\n  },\r\n  getDefaultPrecision () {\r\n    return Store.get('units.default.precision', 1)\r\n  },\r\n  getQuantities () {\r\n    return _.keys(_.omit(this.get(), ['default']))\r\n  },\r\n  getUnits (quantity) {\r\n    // Get units for a given quantity\r\n    if (quantity) {\r\n      const units = Store.get(`units.${quantity}`, {})\r\n      return _.values(_.mapValues(units, (value, key) => Object.assign({ name: key, quantity }, value)))\r\n    } else { // Or all units\r\n      let units = []\r\n      this.getQuantities().forEach(quantity => {\r\n        units = units.concat(this.getUnits(quantity))\r\n      })\r\n      return units\r\n    }\r\n  },\r\n  getUnit (unit) {\r\n    return _.find(this.getUnits(), { name: unit })\r\n  },\r\n  getUnitSymbol (unit) {\r\n    const definition = this.getUnit(unit)\r\n    return (definition ? i18next.t(definition.symbol) : unit)\r\n  },\r\n  getDefaultUnit (quantityOrUnit) {\r\n    // Check for quantity first\r\n    let defaultUnit = Store.get(`units.default.${quantityOrUnit}`)\r\n    // If not check by matching quantity based on given unit\r\n    if (!defaultUnit) {\r\n      const baseUnit = Units.getUnit(quantityOrUnit)\r\n      // Get default unit for this quantity instead\r\n      if (baseUnit) defaultUnit = Units.getDefaultUnit(baseUnit.quantity)\r\n    }\r\n    return defaultUnit\r\n  },\r\n  convert (value, sourceUnit, targetUnit) {\r\n    if (sourceUnit === targetUnit) return value\r\n    let n = math.unit(value, sourceUnit)\r\n    n = n.toNumber(targetUnit)\r\n    // Remap from [-180,+180[ to [0,360[ for angles\r\n    n = (targetUnit === 'deg' ? (n < 0.0 ? n + 360.0 : n) : n)\r\n    return n\r\n  },\r\n  format (value, sourceUnit, targetUnit, options = { symbol: true }) {\r\n    // If target unit is not given use default one\r\n    if (!targetUnit) targetUnit = this.getDefaultUnit(sourceUnit)\r\n    const n = (targetUnit ? this.convert(value, sourceUnit, targetUnit) : value)\r\n    let output = n.toFixed(options.precision || this.getDefaultPrecision())\r\n    if (options.symbol) {\r\n      output += ` ${targetUnit ? this.getUnitSymbol(targetUnit) : this.getUnitSymbol(sourceUnit)}`\r\n    }\r\n    return output\r\n  }\r\n}\r\n"]}

package/lib/core/client/utils.js

@@ -41,11 +41,16 @@ exports.getIconName = getIconName;
 exports.processIcon = processIcon;
 exports.dotify = dotify;
 exports.isObjectID = isObjectID;
+exports.getTimezoneLabel = getTimezoneLabel;
 
 var _lodash = require('lodash');
 
 var _lodash2 = _interopRequireDefault(_lodash);
 
+var _moment = require('moment');
+
+var _moment2 = _interopRequireDefault(_moment);
+
 var _emailValidator = require('email-validator');
 
 var _emailValidator2 = _interopRequireDefault(_emailValidator);
@@ -251,4 +256,10 @@ var checkForHexRegExp = new RegExp('^[0-9a-fA-F]{24}$');
 function isObjectID(id) {
   return id.length === 24 && checkForHexRegExp.test(id);
 }
+
+// Add UTC offset to timezone name
+function getTimezoneLabel(timezone) {
+  const offset = (0, _moment2.default)().tz(timezone).format('Z');
+  return `${timezone} (${offset})`;
+}
 //# sourceMappingURL=utils.js.map

package/lib/core/client/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../core/client/utils.js"],"names":["options","Promise","resolve","reject","Dialog","create","onOk","data","ok","onCancel","cancel","onDismiss","dismiss","dialog","createQuerablePromise","getPaletteFromColor","getColorFromPalette","getLocale","getAppLocale","getInitials","isEmailValid","createThumbnail","downloadAsBlob","toast","getIconName","processIcon","dotify","isObjectID","Notify","setDefaults","position","timeout","textColor","actions","icon","color","Loading","spinnerColor","spinnerSize","messageColor","customClass","promiseOrExecutor","promise","isResolved","isPending","isRejected","isFulfilled","result","then","value","error","Colors","dark","red","pink","purple","indigo","blue","cyan","teal","green","lime","yellow","amber","orange","brown","grey","_","findKey","item","locale","navigator","language","languages","browserLanguage","userLanguage","systemLanguage","languageCodes","split","length","localeConfig","config","localeBrowser","default","name","initials","toUpperCase","match","join","email","emailValidator","validate","imageDataUri","width","height","quality","callback","image","document","createElement","onload","canvas","ctx","getContext","drawImage","toDataURL","src","filename","mimeType","blob","Blob","type","Platform","is","cordova","window","requestFileSystem","LocalFileSystem","PERSISTENT","fs","root","getFile","exclusive","fileEntry","createWriter","fileWriter","write","plugins","fileOpener2","open","nativeURL","Object","assign","omit","object","path","get","startsWith","set","dotifiedObject","recurse","current","forOwn","key","newKey","checkForHexRegExp","RegExp","id","test"],"mappings":"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","file":"utils.js","sourcesContent":["import _ from 'lodash'\r\nimport emailValidator from 'email-validator'\r\nimport config from 'config'\r\nimport { Platform, Notify, Dialog, Loading, exportFile } from 'quasar'\r\n\r\nNotify.setDefaults({\r\n  position: 'bottom-left',\r\n  timeout: 5000,\r\n  textColor: 'white',\r\n  actions: [{ icon: 'las la-times', color: 'white' }]\r\n})\r\n\r\nLoading.setDefaults({\r\n  spinnerColor: 'primary',\r\n  spinnerSize: 140,\r\n  messageColor: 'white',\r\n  customClass: 'full-width'\r\n})\r\n\r\n/**\r\n * This function allow you to modify a JS Promise by adding some status properties.\r\n * Based on: http://stackoverflow.com/questions/21485545/is-there-a-way-to-tell-if-an-es6-promise-is-fulfilled-rejected-resolved\r\n * But modified according to the specs of promises : https://promisesaplus.com/\r\n */\r\nexport function createQuerablePromise (promiseOrExecutor) {\r\n  let promise = promiseOrExecutor\r\n  if (typeof promiseOrExecutor === 'function') {\r\n    promise = new Promise(promiseOrExecutor)\r\n  }\r\n  // Don't modify any promise that has been already modified.\r\n  if (promise.isResolved) return promise\r\n\r\n  // Set initial state\r\n  let isPending = true\r\n  let isRejected = false\r\n  let isFulfilled = false\r\n\r\n  // Observe the promise, saving the fulfillment in a closure scope.\r\n  const result = promise.then(\r\n    (value) => {\r\n      isFulfilled = true\r\n      isPending = false\r\n      return value\r\n    },\r\n    (error) => {\r\n      isRejected = true\r\n      isPending = false\r\n      throw error\r\n    }\r\n  )\r\n\r\n  result.isFulfilled = () => { return isFulfilled }\r\n  result.isPending = () => { return isPending }\r\n  result.isRejected = () => { return isRejected }\r\n\r\n  return result\r\n}\r\n\r\nexport const Colors = {\r\n  dark: '#333',\r\n  red: '#f44336',\r\n  pink: '#e91e63',\r\n  purple: '#9c27b0',\r\n  'deep-purple': '#673ab7',\r\n  indigo: '#3f51b5',\r\n  blue: '#2196f3',\r\n  'light-blue': '#03a9f4',\r\n  cyan: '#00bcd4',\r\n  teal: '#009688',\r\n  green: '#4caf50',\r\n  'light-green': '#8bc34a',\r\n  lime: '#cddc39',\r\n  yellow: '#ffeb3b',\r\n  amber: '#ffc107',\r\n  orange: '#ff9800',\r\n  'deep-orange': '#ff5722',\r\n  brown: '#795548',\r\n  grey: '#9e9e9e',\r\n  'blue-grey': '#607d8b'\r\n}\r\n\r\nexport function getPaletteFromColor (color) {\r\n  return _.findKey(Colors, item => item === color)\r\n}\r\n\r\nexport function getColorFromPalette (color) {\r\n  return Colors[color]\r\n}\r\n\r\nexport function getLocale () {\r\n  const locale =\r\n    navigator.language ||\r\n    navigator.languages[0] ||\r\n    navigator.browserLanguage ||\r\n    navigator.userLanguage ||\r\n    navigator.systemLanguage\r\n\r\n  if (locale) {\r\n    // see https://www.ietf.org/rfc/bcp/bcp47.txt\r\n    const languageCodes = _.split(locale, '-')\r\n    if (languageCodes.length > 0) return languageCodes[0]\r\n  }\r\n  // return undefined by default\r\n}\r\n\r\nexport function getAppLocale () {\r\n  const localeConfig = config.locale || {}\r\n  const localeBrowser = getLocale()\r\n  return localeConfig.default || localeBrowser\r\n}\r\n\r\nexport function getInitials (name) {\r\n  const initials = name.toUpperCase().match(/\\b\\w/g) || []\r\n  return initials.join('')\r\n}\r\n\r\nexport function isEmailValid (email) {\r\n  return emailValidator.validate(email)\r\n}\r\n\r\nexport function createThumbnail (imageDataUri, width, height, quality, callback) {\r\n  const image = document.createElement('img')\r\n  image.onload = function () {\r\n    const canvas = document.createElement('canvas')\r\n    const ctx = canvas.getContext('2d')\r\n    // set its dimension to target size\r\n    canvas.width = width\r\n    canvas.height = height\r\n    ctx.drawImage(this, 0, 0, width, height)\r\n    callback(canvas.toDataURL('image/jpeg', quality))\r\n  }\r\n  image.src = imageDataUri\r\n}\r\n\r\nexport function downloadAsBlob (data, filename, mimeType) {\r\n  const blob = new Blob([data], { type: mimeType })\r\n  if (Platform.is.cordova) {\r\n    window.requestFileSystem(LocalFileSystem.PERSISTENT, 0, (fs) => {\r\n      fs.root.getFile(filename, { create: true, exclusive: false }, (fileEntry) => {\r\n        fileEntry.createWriter((fileWriter) => {\r\n          fileWriter.write(blob)\r\n          cordova.plugins.fileOpener2.open(fileEntry.nativeURL, mimeType)\r\n        })\r\n      })\r\n    })\r\n  } else {\r\n    exportFile(filename, blob)\r\n  }\r\n}\r\n\r\nexport function toast (options) {\r\n  // We deduce the color from the type as it was not initially supported by Quasar.\r\n  // The built-in type property appeared with Quasar 1.9 so that we should not need this function anymore.\r\n  // However, we have prefered to keep this function for backward compatibility.\r\n  const type = options.type || 'negative'\r\n  // Notify.create returns a function that, when invoked, hides the notification\r\n  return Notify.create(Object.assign({\r\n    color: (type === 'negative' ? 'red' : (type === 'warning' ? 'orange' : 'green'))\r\n  }, _.omit(options, ['type'])))\r\n}\r\n\r\n// Simplify Quasar dialog plugin usage with async/await\r\nexport async function dialog (options) {\r\n  return new Promise((resolve, reject) => {\r\n    Dialog.create(options)\r\n      .onOk((data) => resolve({ ok: true, data }))\r\n      .onCancel(() => resolve({ cancel: true }))\r\n      .onDismiss(() => resolve({ dismiss: true }))\r\n  })\r\n}\r\n\r\n// Extract icon name from a given icon property on a given target object\r\nexport function getIconName (object, path = 'icon.name') {\r\n  // Make function work in a generic way, sometimes the provided input is directly the icon name\r\n  const icon = (typeof object === 'object' ? _.get(object, path, '') : object)\r\n  // Check whether the returned icon is an object (can be true in some cases)\r\n  if (typeof icon === 'object') return ''\r\n  // Name icons to ensure backward compatibility with font awesome 4\r\n  return (icon.startsWith('fa-') ? `fas ${icon}` : icon)\r\n}\r\n\r\nexport function processIcon (object, path = 'icon.name') {\r\n  // Process icons for backward compatibility with font awesome 4\r\n  _.set(object, path, getIconName(object, path))\r\n}\r\n\r\n// Transform nested object to dot notation\r\nexport function dotify (object) {\r\n  var dotifiedObject = {}\r\n  function recurse (object, current) {\r\n    _.forOwn(object, (value, key) => {\r\n      var newKey = (current ? current + '.' + key : key) // joined key with dot\r\n      if (value && typeof value === 'object') {\r\n        recurse(value, newKey) // it's a nested object, so do it again\r\n      } else {\r\n        dotifiedObject[newKey] = value // it's not an object, so set the property\r\n      }\r\n    })\r\n  }\r\n\r\n  recurse(object)\r\n  return dotifiedObject\r\n}\r\n\r\n// Regular expression that checks for hex value\r\nvar checkForHexRegExp = new RegExp('^[0-9a-fA-F]{24}$')\r\n\r\n// Check if a string is a valid MongoDB Object ID\r\nexport function isObjectID (id) {\r\n  return (id.length === 24 && checkForHexRegExp.test(id))\r\n}\r\n"]}
+{"version":3,"sources":["../../../core/client/utils.js"],"names":["options","Promise","resolve","reject","Dialog","create","onOk","data","ok","onCancel","cancel","onDismiss","dismiss","dialog","createQuerablePromise","getPaletteFromColor","getColorFromPalette","getLocale","getAppLocale","getInitials","isEmailValid","createThumbnail","downloadAsBlob","toast","getIconName","processIcon","dotify","isObjectID","getTimezoneLabel","Notify","setDefaults","position","timeout","textColor","actions","icon","color","Loading","spinnerColor","spinnerSize","messageColor","customClass","promiseOrExecutor","promise","isResolved","isPending","isRejected","isFulfilled","result","then","value","error","Colors","dark","red","pink","purple","indigo","blue","cyan","teal","green","lime","yellow","amber","orange","brown","grey","_","findKey","item","locale","navigator","language","languages","browserLanguage","userLanguage","systemLanguage","languageCodes","split","length","localeConfig","config","localeBrowser","default","name","initials","toUpperCase","match","join","email","emailValidator","validate","imageDataUri","width","height","quality","callback","image","document","createElement","onload","canvas","ctx","getContext","drawImage","toDataURL","src","filename","mimeType","blob","Blob","type","Platform","is","cordova","window","requestFileSystem","LocalFileSystem","PERSISTENT","fs","root","getFile","exclusive","fileEntry","createWriter","fileWriter","write","plugins","fileOpener2","open","nativeURL","Object","assign","omit","object","path","get","startsWith","set","dotifiedObject","recurse","current","forOwn","key","newKey","checkForHexRegExp","RegExp","id","test","timezone","offset","tz","format"],"mappings":"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","file":"utils.js","sourcesContent":["import _ from 'lodash'\r\nimport moment from 'moment'\r\nimport emailValidator from 'email-validator'\r\nimport config from 'config'\r\nimport { Platform, Notify, Dialog, Loading, exportFile } from 'quasar'\r\n\r\nNotify.setDefaults({\r\n  position: 'bottom-left',\r\n  timeout: 5000,\r\n  textColor: 'white',\r\n  actions: [{ icon: 'las la-times', color: 'white' }]\r\n})\r\n\r\nLoading.setDefaults({\r\n  spinnerColor: 'primary',\r\n  spinnerSize: 140,\r\n  messageColor: 'white',\r\n  customClass: 'full-width'\r\n})\r\n\r\n/**\r\n * This function allow you to modify a JS Promise by adding some status properties.\r\n * Based on: http://stackoverflow.com/questions/21485545/is-there-a-way-to-tell-if-an-es6-promise-is-fulfilled-rejected-resolved\r\n * But modified according to the specs of promises : https://promisesaplus.com/\r\n */\r\nexport function createQuerablePromise (promiseOrExecutor) {\r\n  let promise = promiseOrExecutor\r\n  if (typeof promiseOrExecutor === 'function') {\r\n    promise = new Promise(promiseOrExecutor)\r\n  }\r\n  // Don't modify any promise that has been already modified.\r\n  if (promise.isResolved) return promise\r\n\r\n  // Set initial state\r\n  let isPending = true\r\n  let isRejected = false\r\n  let isFulfilled = false\r\n\r\n  // Observe the promise, saving the fulfillment in a closure scope.\r\n  const result = promise.then(\r\n    (value) => {\r\n      isFulfilled = true\r\n      isPending = false\r\n      return value\r\n    },\r\n    (error) => {\r\n      isRejected = true\r\n      isPending = false\r\n      throw error\r\n    }\r\n  )\r\n\r\n  result.isFulfilled = () => { return isFulfilled }\r\n  result.isPending = () => { return isPending }\r\n  result.isRejected = () => { return isRejected }\r\n\r\n  return result\r\n}\r\n\r\nexport const Colors = {\r\n  dark: '#333',\r\n  red: '#f44336',\r\n  pink: '#e91e63',\r\n  purple: '#9c27b0',\r\n  'deep-purple': '#673ab7',\r\n  indigo: '#3f51b5',\r\n  blue: '#2196f3',\r\n  'light-blue': '#03a9f4',\r\n  cyan: '#00bcd4',\r\n  teal: '#009688',\r\n  green: '#4caf50',\r\n  'light-green': '#8bc34a',\r\n  lime: '#cddc39',\r\n  yellow: '#ffeb3b',\r\n  amber: '#ffc107',\r\n  orange: '#ff9800',\r\n  'deep-orange': '#ff5722',\r\n  brown: '#795548',\r\n  grey: '#9e9e9e',\r\n  'blue-grey': '#607d8b'\r\n}\r\n\r\nexport function getPaletteFromColor (color) {\r\n  return _.findKey(Colors, item => item === color)\r\n}\r\n\r\nexport function getColorFromPalette (color) {\r\n  return Colors[color]\r\n}\r\n\r\nexport function getLocale () {\r\n  const locale =\r\n    navigator.language ||\r\n    navigator.languages[0] ||\r\n    navigator.browserLanguage ||\r\n    navigator.userLanguage ||\r\n    navigator.systemLanguage\r\n\r\n  if (locale) {\r\n    // see https://www.ietf.org/rfc/bcp/bcp47.txt\r\n    const languageCodes = _.split(locale, '-')\r\n    if (languageCodes.length > 0) return languageCodes[0]\r\n  }\r\n  // return undefined by default\r\n}\r\n\r\nexport function getAppLocale () {\r\n  const localeConfig = config.locale || {}\r\n  const localeBrowser = getLocale()\r\n  return localeConfig.default || localeBrowser\r\n}\r\n\r\nexport function getInitials (name) {\r\n  const initials = name.toUpperCase().match(/\\b\\w/g) || []\r\n  return initials.join('')\r\n}\r\n\r\nexport function isEmailValid (email) {\r\n  return emailValidator.validate(email)\r\n}\r\n\r\nexport function createThumbnail (imageDataUri, width, height, quality, callback) {\r\n  const image = document.createElement('img')\r\n  image.onload = function () {\r\n    const canvas = document.createElement('canvas')\r\n    const ctx = canvas.getContext('2d')\r\n    // set its dimension to target size\r\n    canvas.width = width\r\n    canvas.height = height\r\n    ctx.drawImage(this, 0, 0, width, height)\r\n    callback(canvas.toDataURL('image/jpeg', quality))\r\n  }\r\n  image.src = imageDataUri\r\n}\r\n\r\nexport function downloadAsBlob (data, filename, mimeType) {\r\n  const blob = new Blob([data], { type: mimeType })\r\n  if (Platform.is.cordova) {\r\n    window.requestFileSystem(LocalFileSystem.PERSISTENT, 0, (fs) => {\r\n      fs.root.getFile(filename, { create: true, exclusive: false }, (fileEntry) => {\r\n        fileEntry.createWriter((fileWriter) => {\r\n          fileWriter.write(blob)\r\n          cordova.plugins.fileOpener2.open(fileEntry.nativeURL, mimeType)\r\n        })\r\n      })\r\n    })\r\n  } else {\r\n    exportFile(filename, blob)\r\n  }\r\n}\r\n\r\nexport function toast (options) {\r\n  // We deduce the color from the type as it was not initially supported by Quasar.\r\n  // The built-in type property appeared with Quasar 1.9 so that we should not need this function anymore.\r\n  // However, we have prefered to keep this function for backward compatibility.\r\n  const type = options.type || 'negative'\r\n  // Notify.create returns a function that, when invoked, hides the notification\r\n  return Notify.create(Object.assign({\r\n    color: (type === 'negative' ? 'red' : (type === 'warning' ? 'orange' : 'green'))\r\n  }, _.omit(options, ['type'])))\r\n}\r\n\r\n// Simplify Quasar dialog plugin usage with async/await\r\nexport async function dialog (options) {\r\n  return new Promise((resolve, reject) => {\r\n    Dialog.create(options)\r\n      .onOk((data) => resolve({ ok: true, data }))\r\n      .onCancel(() => resolve({ cancel: true }))\r\n      .onDismiss(() => resolve({ dismiss: true }))\r\n  })\r\n}\r\n\r\n// Extract icon name from a given icon property on a given target object\r\nexport function getIconName (object, path = 'icon.name') {\r\n  // Make function work in a generic way, sometimes the provided input is directly the icon name\r\n  const icon = (typeof object === 'object' ? _.get(object, path, '') : object)\r\n  // Check whether the returned icon is an object (can be true in some cases)\r\n  if (typeof icon === 'object') return ''\r\n  // Name icons to ensure backward compatibility with font awesome 4\r\n  return (icon.startsWith('fa-') ? `fas ${icon}` : icon)\r\n}\r\n\r\nexport function processIcon (object, path = 'icon.name') {\r\n  // Process icons for backward compatibility with font awesome 4\r\n  _.set(object, path, getIconName(object, path))\r\n}\r\n\r\n// Transform nested object to dot notation\r\nexport function dotify (object) {\r\n  var dotifiedObject = {}\r\n  function recurse (object, current) {\r\n    _.forOwn(object, (value, key) => {\r\n      var newKey = (current ? current + '.' + key : key) // joined key with dot\r\n      if (value && typeof value === 'object') {\r\n        recurse(value, newKey) // it's a nested object, so do it again\r\n      } else {\r\n        dotifiedObject[newKey] = value // it's not an object, so set the property\r\n      }\r\n    })\r\n  }\r\n\r\n  recurse(object)\r\n  return dotifiedObject\r\n}\r\n\r\n// Regular expression that checks for hex value\r\nvar checkForHexRegExp = new RegExp('^[0-9a-fA-F]{24}$')\r\n\r\n// Check if a string is a valid MongoDB Object ID\r\nexport function isObjectID (id) {\r\n  return (id.length === 24 && checkForHexRegExp.test(id))\r\n}\r\n\r\n// Add UTC offset to timezone name\r\nexport function getTimezoneLabel (timezone) {\r\n  const offset = moment().tz(timezone).format('Z')\r\n  return `${timezone} (${offset})`\r\n}\r\n"]}

package/lib/core/common/schemas/settings.update.json

@@ -59,12 +59,12 @@
         "helper": "schemas.TIME_FORMAT_LONG_YEAR_FIELD_HELPER"
       }
     },
-    "utc": {
-      "type": "boolean",
+    "timezone": {
+      "type": "string",
       "group": "schemas.TIME_FORMAT_SETTINGS",
       "field": {
-        "component": "form/KToggleField",
-        "label": "schemas.TIME_FORMAT_UTC_FIELD_LABEL"
+        "component": "form/KTimezoneField",
+        "label": "schemas.TIME_FORMAT_TIMEZONE_FIELD_LABEL"
       }
     },
     "timelineStep": {
@@ -152,6 +152,15 @@
         "quantity": "length"
       }
     },
+    "defaultAltitude": {
+      "type": "string",
+      "group": "schemas.UNITS_SETTINGS",
+      "field": {
+        "component": "form/KUnitField",
+        "label": "schemas.ALTITUDE_FIELD_LABEL",
+        "quantity": "altitude"
+      }
+    },
     "defaultArea": {
       "type": "string",
       "group": "schemas.UNITS_SETTINGS",
@@ -206,6 +215,7 @@
     "longDate",
     "shortYear",
     "longYear",
+    "timezone",
     "location"
   ]
 }