qwc2 2025.10.16 → 2025.10.24

package/static/translations/tr-TR.json

@@ -24,6 +24,7 @@
         "MapExport3D": "",
         "MapFilter": "Harita Filtresi",
         "MapLight3D": "Tarih Zaman",
+        "ObjectList": "",
         "Print": "Yazdır",
         "Reports": "Raporlar",
         "Settings": "Ayarlar",
@@ -192,6 +193,12 @@
       "takepicture": "Fotoğraf çek",
       "unsavedchanged": "Kaydedilmemiş değişiklikler mevcut. Yine de sayfadan ayrılmak istiyor musunuz?"
     },
+    "featureattributes": {
+      "name": "",
+      "nofeature": "",
+      "value": "",
+      "windowtitle": ""
+    },
     "featureform": {
       "feature": "Obje",
       "noresults": "Sonuç yok",
@@ -244,6 +251,7 @@
     "identify": {
       "aggregatedreport": "Toplu rapor",
       "clipboard": "Panoya kopyala",
+      "compare": "",
       "comparing": "",
       "download": "İndir",
       "export": "Dışarıya aktar",
@@ -345,6 +353,10 @@
         "PERMISSION_DENIED": "Konum: izin verilmedi"
       }
     },
+    "locationrecorder": {
+      "record": "",
+      "stop": ""
+    },
     "map": {
       "loading": "Yükleniyor...",
       "resetrotation": "Dönüklüğü sıfırla"
@@ -481,6 +493,7 @@
       "loading": "Form yükleniyor..."
     },
     "redlining": {
+      "attributes": "",
       "buffer": "Tampon",
       "buffercompute": "Hesapla",
       "bufferdistance": "Mesafe",

package/static/translations/tsconfig.json

@@ -45,6 +45,7 @@
     "appmenu.items.MeasureLineString",
     "appmenu.items.MeasurePolygon",
     "appmenu.items.NewsPopup",
+    "appmenu.items.ObjectList",
     "appmenu.items.Panoramax",
     "appmenu.items.Portal",
     "appmenu.items.PrintScreen3D",
@@ -79,6 +80,7 @@
     "appmenu.items.MapExport3D",
     "appmenu.items.MapFilter",
     "appmenu.items.MapLight3D",
+    "appmenu.items.ObjectList",
     "appmenu.items.Print",
     "appmenu.items.Reports",
     "appmenu.items.Settings",
@@ -195,6 +197,10 @@
     "editing.select",
     "editing.takepicture",
     "editing.unsavedchanged",
+    "featureattributes.name",
+    "featureattributes.nofeature",
+    "featureattributes.value",
+    "featureattributes.windowtitle",
     "featureform.feature",
     "featureform.noresults",
     "featureform.querying",
@@ -234,6 +240,7 @@
     "hideobjects3d.restoreall",
     "identify.aggregatedreport",
     "identify.clipboard",
+    "identify.compare",
     "identify.comparing",
     "identify.download",
     "identify.export",
@@ -312,6 +319,8 @@
     "locate.statustooltip.FOLLOWING",
     "locate.statustooltip.LOCATING",
     "locate.statustooltip.PERMISSION_DENIED",
+    "locationrecorder.record",
+    "locationrecorder.stop",
     "map.loading",
     "map.resetrotation",
     "map3d.lockview",
@@ -413,6 +422,7 @@
     "print.submit",
     "print.wait",
     "qtdesignerform.loading",
+    "redlining.attributes",
     "redlining.buffer",
     "redlining.buffercompute",
     "redlining.bufferdistance",

package/static/translations/uk-UA.json

@@ -24,6 +24,7 @@
         "MapExport3D": "",
         "MapFilter": "",
         "MapLight3D": "",
+        "ObjectList": "",
         "Print": "Друк",
         "Reports": "",
         "Settings": "",
@@ -192,6 +193,12 @@
       "takepicture": "",
       "unsavedchanged": ""
     },
+    "featureattributes": {
+      "name": "",
+      "nofeature": "",
+      "value": "",
+      "windowtitle": ""
+    },
     "featureform": {
       "feature": "",
       "noresults": "",
@@ -244,6 +251,7 @@
     "identify": {
       "aggregatedreport": "",
       "clipboard": "",
+      "compare": "",
       "comparing": "",
       "download": "",
       "export": "Експорт",
@@ -345,6 +353,10 @@
         "PERMISSION_DENIED": "Геолокація: доступ заборонено"
       }
     },
+    "locationrecorder": {
+      "record": "",
+      "stop": ""
+    },
     "map": {
       "loading": "Завантаження...",
       "resetrotation": ""
@@ -481,6 +493,7 @@
       "loading": ""
     },
     "redlining": {
+      "attributes": "",
       "buffer": "",
       "buffercompute": "",
       "bufferdistance": "",

package/utils/EditingInterface.js

@@ -159,11 +159,13 @@ var EditingInterface = {
    * @param callback Callback invoked with the picked features, taking `{features: [...]}` on success and `null` on failure
    * @param filter An optional feature attribute filter expression
    * @param filterGeom An optional filter geometry
+   * @param fields An optional list of fields to query, if unspecified all fields are queried
    */
   getFeatures: function getFeatures(editConfig, mapCrs, callback) {
     var bbox = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
     var filter = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
     var filterGeom = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : null;
+    var fields = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : null;
     var editServiceUrl = ConfigUtils.getConfigProp("editServiceUrl").replace(/\/$/, '');
     var requestUrl = editServiceUrl + '/' + editConfig.editDataset + '/';
     var params = {
@@ -177,7 +179,8 @@ var EditingInterface = {
             name: mapCrs
           }
         }
-      })) : undefined
+      })) : undefined,
+      fields: fields ? fields.join(",") : undefined
     };
     var headers = {
       "Accept-Language": LocaleUtils.lang()

package/utils/EditingUtils.js

@@ -32,6 +32,7 @@ import { v5 as uuidv5 } from 'uuid';
 import StandardApp from '../components/StandardApp';
 import ConfigUtils from './ConfigUtils';
 import LocaleUtils from './LocaleUtils';
+import MiscUtils from './MiscUtils';
 import grammar from './expr_grammar/grammar';
 var UUID_NS = '5ae5531d-8e21-4456-b45d-77e9840a5bb7';
 export var FeatureCache = /*#__PURE__*/_createClass(function FeatureCache() {
@@ -176,6 +177,7 @@ export function parseExpression(expr, feature, editConfig, editIface, mapPrefix,
     representValue: function representValue(attr) {
       return _representValue(attr, editConfig, editIface, promises);
     },
+    formatDate: MiscUtils.formatDate,
     asFilter: asFilter,
     username: ConfigUtils.getConfigProp("username"),
     layer: editConfig.layerName,
@@ -267,7 +269,7 @@ export function getFeatureTemplate(editConfig, feature, editIface, mapPrefix, ma
   }
   // Apply default values
   var defaultFieldExpressions = editConfig.fields.reduce(function (res, field) {
-    if (field.defaultValue) {
+    if (field.defaultValue && !(field.id in feature.properties)) {
       return [].concat(_toConsumableArray(res), [{
         field: field.id,
         expression: field.defaultValue.replace(/^expr:/, '')

package/utils/MiscUtils.js

@@ -1,4 +1,7 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _construct(t, e, r) { if (_isNativeReflectConstruct()) return Reflect.construct.apply(null, arguments); var o = [null]; o.push.apply(o, e); var p = new (t.bind.apply(t, o))(); return r && _setPrototypeOf(p, r.prototype), p; }
+function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
@@ -9,6 +12,10 @@ function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Can
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -200,6 +207,60 @@ var MiscUtils = {
   },
   resolveAssetsPath: function resolveAssetsPath(path) {
     return path && path.startsWith(":/") ? ConfigUtils.getAssetsPath() + path.substr(1) : path;
+  },
+  formatDate: function formatDate(input, pattern) {
+    var locale = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : undefined;
+    // Try to parse the input as a full date-time or as time-only
+    var date;
+    if (/^\d{2}:\d{2}(:\d{2})?$/.test(input)) {
+      var now = new Date();
+      var _input$split$map = input.split(':').map(Number),
+        _input$split$map2 = _slicedToArray(_input$split$map, 3),
+        h = _input$split$map2[0],
+        m = _input$split$map2[1],
+        s = _input$split$map2[2];
+      date = new Date(now.getFullYear(), now.getMonth(), now.getDate(), h, m, s || 0);
+    } else {
+      date = new Date(input);
+    }
+    if (isNaN(date)) throw new Error("Invalid date");
+    var pad = function pad(n) {
+      var len = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
+      return String(n).padStart(len, "0");
+    };
+    var tokens = {
+      yyyy: date.getFullYear(),
+      yy: String(date.getFullYear()).slice(-2),
+      MMMM: date.toLocaleString(locale, {
+        month: "long"
+      }),
+      MMM: date.toLocaleString(locale, {
+        month: "short"
+      }),
+      MM: pad(date.getMonth() + 1),
+      M: date.getMonth() + 1,
+      dd: pad(date.getDate()),
+      d: date.getDate(),
+      dddd: date.toLocaleString(locale, {
+        weekday: "long"
+      }),
+      ddd: date.toLocaleString(locale, {
+        weekday: "short"
+      }),
+      hh: pad((date.getHours() + 11) % 12 + 1),
+      h: (date.getHours() + 11) % 12 + 1,
+      HH: pad(date.getHours()),
+      H: date.getHours(),
+      mm: pad(date.getMinutes()),
+      m: date.getMinutes(),
+      ss: pad(date.getSeconds()),
+      s: date.getSeconds(),
+      AP: date.getHours() < 12 ? "AM" : "PM",
+      ap: date.getHours() < 12 ? "am" : "pm"
+    };
+    return pattern.replace(/(yyyy|yy|MMMM|MMM|MM|M|dddd|ddd|dd|d|hh|h|HH|H|mm|m|ss|s|AP|ap)/g, function (match) {
+      return tokens[match];
+    });
   }
 };
 export var ToggleSet = /*#__PURE__*/_createClass(function ToggleSet() {
@@ -227,6 +288,10 @@ export var ToggleSet = /*#__PURE__*/_createClass(function ToggleSet() {
       return _this;
     }
   });
+  _defineProperty(this, "filtered", function (test) {
+    var newset = _construct(Set, _toConsumableArray(_toConsumableArray(_this._set).filter(test)));
+    return new ToggleSet(newset);
+  });
   _defineProperty(this, "add", function (key) {
     if (!_this._set.has(key)) {
       var newset = new Set(_this._set);

package/utils/expr_grammar/grammar.js

@@ -1652,6 +1652,88 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
       "postprocess": function postprocess(d) {
         return window.qwc2ExpressionParserContext.representValue(d[4]);
       }
+    }, {
+      "name": "N$string$44",
+      "symbols": [{
+        "literal": "f"
+      }, {
+        "literal": "o"
+      }, {
+        "literal": "r"
+      }, {
+        "literal": "m"
+      }, {
+        "literal": "a"
+      }, {
+        "literal": "t"
+      }, {
+        "literal": "_"
+      }, {
+        "literal": "d"
+      }, {
+        "literal": "a"
+      }, {
+        "literal": "t"
+      }, {
+        "literal": "e"
+      }],
+      "postprocess": function joiner(d) {
+        return d.join('');
+      }
+    }, {
+      "name": "N",
+      "symbols": ["N$string$44", "_", {
+        "literal": "("
+      }, "_", "sqstring", "_", {
+        "literal": ","
+      }, "_", "sqstring", "_", {
+        "literal": ")"
+      }],
+      "postprocess": function postprocess(d) {
+        return window.qwc2ExpressionParserContext.formatDate(d[4], d[8]);
+      }
+    }, {
+      "name": "N$string$45",
+      "symbols": [{
+        "literal": "f"
+      }, {
+        "literal": "o"
+      }, {
+        "literal": "r"
+      }, {
+        "literal": "m"
+      }, {
+        "literal": "a"
+      }, {
+        "literal": "t"
+      }, {
+        "literal": "_"
+      }, {
+        "literal": "d"
+      }, {
+        "literal": "a"
+      }, {
+        "literal": "t"
+      }, {
+        "literal": "e"
+      }],
+      "postprocess": function joiner(d) {
+        return d.join('');
+      }
+    }, {
+      "name": "N",
+      "symbols": ["N$string$45", "_", {
+        "literal": "("
+      }, "_", "sqstring", "_", {
+        "literal": ","
+      }, "_", "sqstring", "_", {
+        "literal": ","
+      }, "_", "sqstring", "_", {
+        "literal": ")"
+      }],
+      "postprocess": function postprocess(d) {
+        return window.qwc2ExpressionParserContext.formatDate(d[4], d[8], d[12]);
+      }
     }, {
       "name": "N$subexpression$1",
       "symbols": [/[pP]/, /[iI]/],
@@ -1713,7 +1795,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
         return true;
       }
     }, {
-      "name": "N$string$44",
+      "name": "N$string$46",
       "symbols": [{
         "literal": "@"
       }, {
@@ -1736,12 +1818,12 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
       }
     }, {
       "name": "N",
-      "symbols": ["N$string$44"],
+      "symbols": ["N$string$46"],
       "postprocess": function postprocess(d) {
         return window.qwc2ExpressionParserContext.feature;
       }
     }, {
-      "name": "N$string$45",
+      "name": "N$string$47",
       "symbols": [{
         "literal": "@"
       }, {
@@ -1766,13 +1848,13 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
       }
     }, {
       "name": "N",
-      "symbols": ["N$string$45"],
+      "symbols": ["N$string$47"],
       "postprocess": function postprocess(d) {
         var _window$qwc2Expressio7;
         return (_window$qwc2Expressio7 = window.qwc2ExpressionParserContext.feature) === null || _window$qwc2Expressio7 === void 0 ? void 0 : _window$qwc2Expressio7.geometry;
       }
     }, {
-      "name": "N$string$46",
+      "name": "N$string$48",
       "symbols": [{
         "literal": "@"
       }, {
@@ -1785,13 +1867,13 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
       }
     }, {
       "name": "N",
-      "symbols": ["N$string$46"],
+      "symbols": ["N$string$48"],
       "postprocess": function postprocess(d) {
         var _window$qwc2Expressio8;
         return (_window$qwc2Expressio8 = window.qwc2ExpressionParserContext.feature) === null || _window$qwc2Expressio8 === void 0 ? void 0 : _window$qwc2Expressio8.id;
       }
     }, {
-      "name": "N$string$47",
+      "name": "N$string$49",
       "symbols": [{
         "literal": "@"
       }, {
@@ -1810,12 +1892,12 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
       }
     }, {
       "name": "N",
-      "symbols": ["N$string$47"],
+      "symbols": ["N$string$49"],
       "postprocess": function postprocess(d) {
         return window.qwc2ExpressionParserContext.layer;
       }
     }, {
-      "name": "N$string$48",
+      "name": "N$string$50",
       "symbols": [{
         "literal": "@"
       }, {
@@ -1844,12 +1926,12 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
       }
     }, {
       "name": "N",
-      "symbols": ["N$string$48"],
+      "symbols": ["N$string$50"],
       "postprocess": function postprocess(d) {
         return window.qwc2ExpressionParserContext.layer;
       }
     }, {
-      "name": "N$string$49",
+      "name": "N$string$51",
       "symbols": [{
         "literal": "@"
       }, {
@@ -1876,12 +1958,12 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
       }
     }, {
       "name": "N",
-      "symbols": ["N$string$49"],
+      "symbols": ["N$string$51"],
       "postprocess": function postprocess(d) {
         return window.qwc2ExpressionParserContext.projection;
       }
     }, {
-      "name": "N$string$50",
+      "name": "N$string$52",
       "symbols": [{
         "literal": "@"
       }, {
@@ -1922,12 +2004,12 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
       }
     }, {
       "name": "N",
-      "symbols": ["N$string$50"],
+      "symbols": ["N$string$52"],
       "postprocess": function postprocess(d) {
         return window.qwc2ExpressionParserContext.mapPrefix;
       }
     }, {
-      "name": "N$string$51",
+      "name": "N$string$53",
       "symbols": [{
         "literal": "@"
       }, {
@@ -1958,12 +2040,12 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
       }
     }, {
       "name": "N",
-      "symbols": ["N$string$51"],
+      "symbols": ["N$string$53"],
       "postprocess": function postprocess(d) {
         return window.qwc2ExpressionParserContext.projection;
       }
     }, {
-      "name": "N$string$52",
+      "name": "N$string$54",
       "symbols": [{
         "literal": "@"
       }, {
@@ -1994,12 +2076,12 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
       }
     }, {
       "name": "N",
-      "symbols": ["N$string$52"],
+      "symbols": ["N$string$54"],
       "postprocess": function postprocess(d) {
         return window.qwc2ExpressionParserContext.lang;
       }
     }, {
-      "name": "N$string$53",
+      "name": "N$string$55",
       "symbols": [{
         "literal": "@"
       }, {
@@ -2042,12 +2124,12 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
       }
     }, {
       "name": "N",
-      "symbols": ["N$string$53"],
+      "symbols": ["N$string$55"],
       "postprocess": function postprocess(d) {
         return window.qwc2ExpressionParserContext.username;
       }
     }, {
-      "name": "N$string$54",
+      "name": "N$string$56",
       "symbols": [{
         "literal": "@"
       }, {
@@ -2084,7 +2166,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
       }
     }, {
       "name": "N",
-      "symbols": ["N$string$54"],
+      "symbols": ["N$string$56"],
       "postprocess": function postprocess(d) {
         return window.qwc2ExpressionParserContext.username;
       }

package/utils/expr_grammar/grammar.ne

@@ -121,6 +121,8 @@ N -> float                         {% id %}
     | "get_feature" _ "(" _ P0 _ "," _ P0 _ "," _ P0 _ ")" {% function(d) { return window.qwc2ExpressionParserContext.getFeature(d[4], d[8], d[12]); } %}
     | "get_feature_by_id" _ "(" _ P0 _ "," _ P0 _ ")"      {% function(d) { return window.qwc2ExpressionParserContext.getFeature(d[4], "id", d[8]); } %}
     | "represent_value" _ "(" _ dqstring _ ")"             {% function(d) { return window.qwc2ExpressionParserContext.representValue(d[4]); } %}
+    | "format_date" _ "(" _ sqstring _ "," _ sqstring _ ")" {% function(d) { return window.qwc2ExpressionParserContext.formatDate(d[4], d[8]); } %}
+    | "format_date" _ "(" _ sqstring _ "," _ sqstring _ "," _ sqstring _ ")" {% function(d) { return window.qwc2ExpressionParserContext.formatDate(d[4], d[8], d[12]); } %}
     | "PI"i                        {% function(d) { return Math.PI; } %}
     | "E"i                         {% function(d) { return Math.E; } %}
     | "NULL"i                      {% function(d) { return null; } %}

package/utils/expr_grammar/test.js

@@ -1,14 +1,24 @@
 /* This is just a scratch file for testing the expression grammar */
 
-var nearley = require("nearley");
-var grammar = require("./grammar.js");
+import nearley from "nearley";
+import grammar from "./grammar.js";
+import MiscUtils from '../MiscUtils.js';
 global.qwc2ExpressionParserContext = {
   feature: {
     "type": "Feature",
     "properties": {
       "listnr": 1,
       "grpcode": 2,
-      "numcode": 3
+      "numcode": 3,
+      "label": "My fancy feature",
+      "BerechneteGruenflaeche": 10,
+      "EffektiveGruenflaeche": 8,
+      // "BerechneteBebauungsflaeche" - "EffektiveBebauungsflaeche" - "Abtretung" + "Zuteilung"
+      "BerechneteBebauungsflaeche": 10,
+      "EffektiveBebauungsflaeche": 9,
+      "Abtretung": 8.1,
+      "Zuteilung": 7.3
+      // 10 - 9 - 8 + 7 = 0
     }
   },
   getFeature: function getFeature(layerName, attr, value) {
@@ -52,6 +62,7 @@ global.qwc2ExpressionParserContext = {
       4: 'Four'
     }[value]) !== null && _$2$3$4$value !== void 0 ? _$2$3$4$value : value;
   },
+  formatDate: MiscUtils.formatDate,
   asFilter: false,
   username: "testuser",
   layer: "layername"
@@ -74,5 +85,11 @@ var parser = new nearley.Parser(nearley.Grammar.fromCompiled(grammar));
 // parser.feed("nullif('a', 'b')")
 // parser.feed("@user_account_name")
 // parser.feed("'Hello' || ' ' || 'World'");
-parser.feed('represent_value("numcode")');
+// parser.feed('represent_value("numcode")');
+// parser.feed('"BerechneteGruenflaeche" - "EffektiveGruenflaeche"');
+// parser.feed('"BerechneteBebauungsflaeche" - "EffektiveBebauungsflaeche" - "Abtretung" + "Zuteilung"');
+// parser.feed('randf(0.5,0.6)');
+// parser.feed('round(\r "Abtretung" \r+ "Zuteilung")')
+// parser.feed("format_date('2012-05-15','d MMMM yyyy','fr')")
+
 console.log(JSON.stringify(parser.results));