@lbdudc/gp-gis-dsl 0.2.6 → 0.3.1

package/grammar/GISGrammar.g4

@@ -58,7 +58,66 @@ createWmsLayer: WMS_SYMBOL LAYER_SYMBOL identifier (AS_SYMBOL text)? OPAR_SYMBOL
     wmsSubLayer (COMMA_SYMBOL wmsSubLayer)*
   CPAR_SYMBOL SCOL_SYMBOL;
 
-wmsSubLayer: identifier identifier;
+wmsSubLayer:
+      identifier identifier              
+    | (wmsUrl wmsLayerName wmsFormatName? wmsCrs? wmsStyles? wmsQueryable? wmsAttribution? wmsBboxGroup? wmsVersion?)
+;
+
+wmsUrl: 
+  URL_WMS_SYMBOL text
+;
+
+wmsLayerName: 
+  COMMA_SYMBOL LAYERNAME_SYMBOL text
+;
+
+wmsFormatName:
+  COMMA_SYMBOL FORMAT_SYMBOL text
+;
+
+wmsCrs:
+  COMMA_SYMBOL CRS_SYMBOL text
+;
+
+wmsBboxCrs:
+  COMMA_SYMBOL BBOX_CRS_SYMBOL text
+;
+
+wmsMinX:
+  COMMA_SYMBOL MINX_SYMBOL floatNumber
+;
+
+wmsMinY:
+  COMMA_SYMBOL MINY_SYMBOL floatNumber
+;
+
+wmsMaxX:
+  COMMA_SYMBOL MAXX_SYMBOL floatNumber
+;
+
+wmsMaxY:
+  COMMA_SYMBOL MAXY_SYMBOL floatNumber
+;
+
+wmsBboxGroup:
+  wmsBboxCrs wmsMinX wmsMinY wmsMaxX wmsMaxY
+;
+
+wmsStyles:
+  COMMA_SYMBOL STYLE_SYMBOL text
+;
+
+wmsQueryable:
+  COMMA_SYMBOL QUERYABLE_SYMBOL text
+;
+
+wmsAttribution:
+  COMMA_SYMBOL ATTRIBUTION_SYMBOL text
+;
+
+wmsVersion:
+  COMMA_SYMBOL VERSION_SYMBOL text
+;
 
 createSortableMap: SORTABLE_SYMBOL createMap;
 
@@ -159,6 +218,7 @@ fragment LETTER_WITHOUT_FLOAT_PART: [a-df-zA-DF-Z_$\u0080-\uffff];
 
 fragment UNDERLINE_SYMBOL: '_';
 fragment QUOTE_SYMBOL: '"';
+fragment MINUS_SYMBOL: '-';
 
 CREATE_SYMBOL: C R E A T E;
 GIS_SYMBOL: G I S;
@@ -194,6 +254,19 @@ MAP_SYMBOL: M A P;
 SET_SYMBOL: S E T;
 DEPLOYMENT_SYMBOL: D E P L O Y M E N T;
 
+URL_WMS_SYMBOL: U R L W M S;
+LAYERNAME_SYMBOL: L A Y E R N A M E;
+FORMAT_SYMBOL: F O R M A T;
+CRS_SYMBOL: C R S;
+BBOX_CRS_SYMBOL: B B O X C R S;
+MINX_SYMBOL: M I N X;
+MINY_SYMBOL: M I N Y;
+MAXX_SYMBOL: M A X X;
+MAXY_SYMBOL: M A X Y;
+QUERYABLE_SYMBOL: Q U E R Y A B L E;
+ATTRIBUTION_SYMBOL: A T T R I B U T I O N;
+VERSION_SYMBOL: V E R S I O N;
+
 ZERO_ONE_SYMBOL: '0..1';
 ONE_ONE_SYMBOL: '1..1';
 ZERO_MANY_SYMBOL: '0..*';
@@ -224,7 +297,7 @@ SCOL_SYMBOL  : ';';
 
 HEX_COLOR: POUND_SYMBOL HEXDIGIT HEXDIGIT HEXDIGIT HEXDIGIT HEXDIGIT HEXDIGIT;
 INT_NUMBER: DIGITS;
-FLOAT_NUMBER: (DIGITS? DOT_SYMBOL)? DIGITS;
+FLOAT_NUMBER: MINUS_SYMBOL? (DIGITS? DOT_SYMBOL)? DIGITS;
 
 COMMENT: '//' ~[\r\n]* -> skip;
 //SPACE: [ \t]+ -> skip;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lbdudc/gp-gis-dsl",
-  "version": "0.2.6",
+  "version": "0.3.1",
   "homepage": "https://github.com/lbdudc/gis-dsl#readme",
   "repository": {
     "type": "git",

package/src/GISVisitor.js

@@ -8,6 +8,7 @@ import {
   Map,
   GeoJSONLayerStyle,
   WMSStyleCustom,
+  WMSServiceLayer,
 } from "./spl/Map.js";
 import { transformation, getPropertyParams } from "./GISVisitorHelper.js";
 // import { generateProduct } from "./project-generator.js";
@@ -256,8 +257,75 @@ class Visitor extends GISGrammarVisitor {
 
   visitCreateWmsLayer(ctx) {
     const id = ctx.getChild(2).getText();
-    let label = id,
-      from = 4,
+    let label = id;
+
+    const isWmsService = ctx
+      .getChild(6)
+      .getText()
+      .toLowerCase()
+      .startsWith("urlwms");
+
+    const layer = isWmsService
+      ? this._createWmsServiceLayer(ctx, id, label)
+      : this._createStandardLayer(ctx, id, label);
+
+    this.log(`visitCreateWmsLayer ${id} - ${label}`);
+
+    this.store.getCurrentProduct().addLayer(layer);
+  }
+
+  _getCleanText = (node) => node?.text()?.getText().replace(/"/g, "") || null;
+
+  _createWmsServiceLayer(ctx, id, label) {
+    const sub = ctx.wmsSubLayer(0);
+    const clean = this._getCleanText;
+
+    const url = clean(sub.wmsUrl());
+    const layerName = clean(sub.wmsLayerName());
+    const format = clean(sub.wmsFormatName());
+    const crs = clean(sub.wmsCrs());
+    const version = clean(sub.wmsVersion());
+    const attribution = clean(sub.wmsAttribution());
+
+    const styles = sub.wmsStyles()
+      ? clean(sub.wmsStyles())
+          .split(",")
+          .map((s) => s.trim())
+      : [];
+
+    const queryable = sub.wmsQueryable()
+      ? clean(sub.wmsQueryable()).toLowerCase() === "true"
+      : false;
+
+    let bbox = null;
+    const bboxNode = sub.wmsBboxGroup();
+    if (bboxNode) {
+      bbox = {
+        crs: clean(bboxNode.wmsBboxCrs()),
+        minx: parseFloat(bboxNode.wmsMinX().floatNumber().getText()),
+        miny: parseFloat(bboxNode.wmsMinY().floatNumber().getText()),
+        maxx: parseFloat(bboxNode.wmsMaxX().floatNumber().getText()),
+        maxy: parseFloat(bboxNode.wmsMaxY().floatNumber().getText()),
+      };
+    }
+
+    return new WMSServiceLayer({
+      id,
+      label,
+      url,
+      layerName,
+      format,
+      crs,
+      bbox,
+      styles,
+      queryable,
+      attribution,
+      version,
+    });
+  }
+
+  _createStandardLayer(ctx, id, label) {
+    let from = 4,
       i,
       aux,
       entity,
@@ -269,10 +337,9 @@ class Visitor extends GISGrammarVisitor {
       label = ctx.getChild(4).getText().slice(1, -1);
       from = 6;
     }
-
     const layer = new WMSLayer(id, label);
 
-    for (i = from; i < ctx.getChildCount() - 2; i = i + 2) {
+    for (i = from; i < ctx.getChildCount() - 2; i += 2) {
       aux = ctx.getChild(i);
       auxEntityName = aux.getChild(0).getText();
       entity = this.store.getCurrentProduct().getEntity(auxEntityName);
@@ -282,7 +349,7 @@ class Visitor extends GISGrammarVisitor {
       if (entity) {
         layer.addSubLayer(entity.name, styleName);
       } else {
-        // GeoTIFF case: no associated entity exists
+        // GeoTIFF: no entity
         const normalizedId = id
           .replace(/Layer$/, "")
           .replace(/^(\d+)([A-Z][a-z]+)/, "$1_$2")
@@ -291,9 +358,7 @@ class Visitor extends GISGrammarVisitor {
       }
     }
 
-    this.log(`visitCreateWmsLayer ${id} - ${label}`);
-
-    this.store.getCurrentProduct().addLayer(layer);
+    return layer;
   }
 
   visitCreateMap(ctx, sortable) {

package/src/GISVisitorHelper.js

@@ -1,93 +1,93 @@
-import features from "./features.js";
-
-function transformation(spec) {
-  _relationships(spec);
-  const newSpec = {
-    features: features,
-    basicData: {
-      name: spec.name,
-    },
-    data: {
-      dataModel: {
-        entities: spec.entities,
-        enums: [],
-      },
-    },
-    mapViewer: {
-      maps: spec.maps,
-      layers: spec.layers,
-      styles: spec.styles,
-    },
-  };
-
-  if (spec.extra) {
-    newSpec.basicData.extra = spec.extra;
-  }
-
-  return newSpec;
-}
-
-function _relationships(spec) {
-  let source, target;
-
-  spec.relationships.forEach((r) => {
-    source = spec.getEntity(r.source);
-    target = spec.getEntity(r.target);
-    let sourceOwner = false;
-    let targetOwner = false;
-    let sourceMultiple = _multiple(r.sourceOpts.multiplicity);
-    let targetMultiple = _multiple(r.targetOpts.multiplicity);
-    if (sourceMultiple && !targetMultiple) {
-      targetOwner = true;
-    } else {
-      sourceOwner = true;
-    }
-
-    source.properties.push({
-      name: r.sourceOpts.label,
-      class: target.name,
-      owner: sourceOwner,
-      bidirectional: r.targetOpts.label,
-      multiple: sourceMultiple,
-      required: _required(r.sourceOpts.multiplicity),
-    });
-
-    target.properties.push({
-      name: r.targetOpts.label,
-      class: source.name,
-      owner: targetOwner,
-      bidirectional: r.sourceOpts.label,
-      multiple: targetMultiple,
-      required: _required(r.targetOpts.multiplicity),
-    });
-  });
-}
-
-function _multiple(multiplicity) {
-  return ["1..1", "0..1"].find((a) => a == multiplicity) == null;
-}
-
-function _required(multiplicity) {
-  return ["1..1", "1..*"].find((a) => a == multiplicity) != null;
-}
-
-function getPropertyParams(symbols) {
-  if (!symbols.length) return null;
-
-  const ret = {};
-  if (symbols.includes("identifier")) {
-    ret.pk = true;
-  }
-  if (symbols.includes("required")) {
-    ret.required = true;
-  }
-  if (symbols.includes("unique")) {
-    ret.unique = true;
-  }
-  if (symbols.includes("display_string")) {
-    ret.displayString = true;
-  }
-  return ret;
-}
-
-export { transformation, getPropertyParams };
+import features from "./features.js";
+
+function transformation(spec) {
+  _relationships(spec);
+  const newSpec = {
+    features: features,
+    basicData: {
+      name: spec.name,
+    },
+    data: {
+      dataModel: {
+        entities: spec.entities,
+        enums: [],
+      },
+    },
+    mapViewer: {
+      maps: spec.maps,
+      layers: spec.layers,
+      styles: spec.styles,
+    },
+  };
+
+  if (spec.extra) {
+    newSpec.basicData.extra = spec.extra;
+  }
+
+  return newSpec;
+}
+
+function _relationships(spec) {
+  let source, target;
+
+  spec.relationships.forEach((r) => {
+    source = spec.getEntity(r.source);
+    target = spec.getEntity(r.target);
+    let sourceOwner = false;
+    let targetOwner = false;
+    let sourceMultiple = _multiple(r.sourceOpts.multiplicity);
+    let targetMultiple = _multiple(r.targetOpts.multiplicity);
+    if (sourceMultiple && !targetMultiple) {
+      targetOwner = true;
+    } else {
+      sourceOwner = true;
+    }
+
+    source.properties.push({
+      name: r.sourceOpts.label,
+      class: target.name,
+      owner: sourceOwner,
+      bidirectional: r.targetOpts.label,
+      multiple: sourceMultiple,
+      required: _required(r.sourceOpts.multiplicity),
+    });
+
+    target.properties.push({
+      name: r.targetOpts.label,
+      class: source.name,
+      owner: targetOwner,
+      bidirectional: r.sourceOpts.label,
+      multiple: targetMultiple,
+      required: _required(r.targetOpts.multiplicity),
+    });
+  });
+}
+
+function _multiple(multiplicity) {
+  return ["1..1", "0..1"].find((a) => a == multiplicity) == null;
+}
+
+function _required(multiplicity) {
+  return ["1..1", "1..*"].find((a) => a == multiplicity) != null;
+}
+
+function getPropertyParams(symbols) {
+  if (!symbols.length) return null;
+
+  const ret = {};
+  if (symbols.includes("identifier")) {
+    ret.pk = true;
+  }
+  if (symbols.includes("required")) {
+    ret.required = true;
+  }
+  if (symbols.includes("unique")) {
+    ret.unique = true;
+  }
+  if (symbols.includes("display_string")) {
+    ret.displayString = true;
+  }
+  return ret;
+}
+
+export { transformation, getPropertyParams };

package/src/cli.js

@@ -1,34 +1,34 @@
-#!/usr/bin/env node
-
-import meow from "meow";
-import fs from "fs";
-import gisdslParser from "./index.js";
-import path from "path";
-
-const usage = "Usage: gisdsl input output";
-
-const cli = meow(usage, {
-  importMeta: import.meta,
-  flags: {
-    debug: {
-      type: "boolean",
-      default: false,
-    },
-  },
-});
-
-if (cli.input.length < 2) {
-  cli.showHelp();
-}
-
-const inputPath = path.resolve(process.cwd(), cli.input.at(0));
-const input = fs.readFileSync(inputPath, {
-  encoding: "utf-8",
-});
-
-const spec = gisdslParser(input, cli.flags.debug);
-
-const outputPath = path.resolve(process.cwd(), cli.input.at(1));
-fs.writeFileSync(outputPath, JSON.stringify(spec, null, 2), "utf8");
-
-console.log(`File ${cli.input.at(1)} generated`);
+#!/usr/bin/env node
+
+import meow from "meow";
+import fs from "fs";
+import gisdslParser from "./index.js";
+import path from "path";
+
+const usage = "Usage: gisdsl input output";
+
+const cli = meow(usage, {
+  importMeta: import.meta,
+  flags: {
+    debug: {
+      type: "boolean",
+      default: false,
+    },
+  },
+});
+
+if (cli.input.length < 2) {
+  cli.showHelp();
+}
+
+const inputPath = path.resolve(process.cwd(), cli.input.at(0));
+const input = fs.readFileSync(inputPath, {
+  encoding: "utf-8",
+});
+
+const spec = gisdslParser(input, cli.flags.debug);
+
+const outputPath = path.resolve(process.cwd(), cli.input.at(1));
+fs.writeFileSync(outputPath, JSON.stringify(spec, null, 2), "utf8");
+
+console.log(`File ${cli.input.at(1)} generated`);

package/src/error/ErrorListener.js

@@ -1,26 +1,26 @@
-import antlr4 from "antlr4";
-
-import SyntaxGenericError from "./SyntaxGenericError.js";
-
-/**
- * Custom Error Listener
- *
- * @returns {object}
- */
-class ErrorListener extends antlr4.error.ErrorListener {
-  /**
-   * Checks syntax error
-   *
-   * @param {object} recognizer The parsing support code essentially. Most of it is error recovery stuff
-   * @param {object} symbol Offending symbol
-   * @param {int} line Line of offending symbol
-   * @param {int} column Position in line of offending symbol
-   * @param {string} message Error message
-   * @param {string} payload Stack trace
-   */
-  syntaxError(recognizer, symbol, line, column, message) {
-    throw new SyntaxGenericError({ line, column, message });
-  }
-}
-
-export default ErrorListener;
+import antlr4 from "antlr4";
+
+import SyntaxGenericError from "./SyntaxGenericError.js";
+
+/**
+ * Custom Error Listener
+ *
+ * @returns {object}
+ */
+class ErrorListener extends antlr4.error.ErrorListener {
+  /**
+   * Checks syntax error
+   *
+   * @param {object} recognizer The parsing support code essentially. Most of it is error recovery stuff
+   * @param {object} symbol Offending symbol
+   * @param {int} line Line of offending symbol
+   * @param {int} column Position in line of offending symbol
+   * @param {string} message Error message
+   * @param {string} payload Stack trace
+   */
+  syntaxError(recognizer, symbol, line, column, message) {
+    throw new SyntaxGenericError({ line, column, message });
+  }
+}
+
+export default ErrorListener;

package/src/error/SyntaxGenericError.js

@@ -1,18 +1,18 @@
-export default class SyntaxGenericError extends Error {
-  constructor(payload) {
-    super(payload);
-
-    this.code = "E_SYNTAX_GENERIC";
-    this.message = "Something went wrong";
-
-    if (typeof payload !== "undefined") {
-      this.message = payload.message || this.message;
-      this.payload = payload;
-    }
-
-    console.error(
-      `line ${this.payload.line}, col ${this.payload.column}: ${this.payload.message}`,
-    );
-    Error.captureStackTrace(this, SyntaxGenericError);
-  }
-}
+export default class SyntaxGenericError extends Error {
+  constructor(payload) {
+    super(payload);
+
+    this.code = "E_SYNTAX_GENERIC";
+    this.message = "Something went wrong";
+
+    if (typeof payload !== "undefined") {
+      this.message = payload.message || this.message;
+      this.payload = payload;
+    }
+
+    console.error(
+      `line ${this.payload.line}, col ${this.payload.column}: ${this.payload.message}`,
+    );
+    Error.captureStackTrace(this, SyntaxGenericError);
+  }
+}

package/src/features.js

@@ -1,5 +1,6 @@
 export default [
   "MapViewer",
+  "ChartViewer",
   "Tools",
   "DM_SpatialDatabase",
   "DM_GenerationType",

package/src/index.js

@@ -1,26 +1,26 @@
-import antlr4 from "antlr4";
-import GISGrammarLexer from "./lib/GISGrammarLexer.js";
-import GISGrammarParser from "./lib/GISGrammarParser.js";
-import ErrorListener from "./error/ErrorListener.js";
-import GISVisitor from "./GISVisitor.js";
-import store from "./store.js";
-
-export default function parse(inputStr, debug = false) {
-  const chars = new antlr4.InputStream(inputStr);
-  const lexer = new GISGrammarLexer(chars);
-  lexer.strictMode = false; // do not use js strictMode
-
-  const tokens = new antlr4.CommonTokenStream(lexer);
-  const parser = new GISGrammarParser(tokens);
-
-  const errorListener = new ErrorListener();
-  // Do this after creating the parser and before running it
-  parser.removeErrorListeners(); // Remove default ConsoleErrorListener
-  parser.addErrorListener(errorListener); // Add custom error listener
-
-  const visitor = new GISVisitor(store, debug);
-  const tree = parser.parse();
-  visitor.start(tree);
-
-  return store.getLastGeneratedProduct();
-}
+import antlr4 from "antlr4";
+import GISGrammarLexer from "./lib/GISGrammarLexer.js";
+import GISGrammarParser from "./lib/GISGrammarParser.js";
+import ErrorListener from "./error/ErrorListener.js";
+import GISVisitor from "./GISVisitor.js";
+import store from "./store.js";
+
+export default function parse(inputStr, debug = false) {
+  const chars = new antlr4.InputStream(inputStr);
+  const lexer = new GISGrammarLexer(chars);
+  lexer.strictMode = false; // do not use js strictMode
+
+  const tokens = new antlr4.CommonTokenStream(lexer);
+  const parser = new GISGrammarParser(tokens);
+
+  const errorListener = new ErrorListener();
+  // Do this after creating the parser and before running it
+  parser.removeErrorListeners(); // Remove default ConsoleErrorListener
+  parser.addErrorListener(errorListener); // Add custom error listener
+
+  const visitor = new GISVisitor(store, debug);
+  const tree = parser.parse();
+  visitor.start(tree);
+
+  return store.getLastGeneratedProduct();
+}