@lbdudc/gp-gis-dsl 0.2.1 → 0.2.3

package/grammar/GISGrammar.g4

@@ -43,8 +43,15 @@ createGeoJSONLayer: GEOJSON_SYMBOL LAYER_SYMBOL identifier (AS_SYMBOL text)? OPA
     STROKE_OPACITY_SYMBOL floatNumber
   CPAR_SYMBOL SCOL_SYMBOL;
 
+sldCustomBody: GEOMETRY_TYPE_SYMBOL TYPE COMMA_SYMBOL
+    FILL_COLOR_SYMBOL? hexColor? COMMA_SYMBOL?
+    STROKE_COLOR_SYMBOL? hexColor? COMMA_SYMBOL?
+    FILL_OPACITY_SYMBOL? (floatNumber | intNumber)? COMMA_SYMBOL?
+    STROKE_OPACITY_SYMBOL? (floatNumber | intNumber)?;
+
 createWmsStyle: WMS_SYMBOL STYLE_SYMBOL identifier OPAR_SYMBOL
-    SLD_SYMBOL text
+    (SLD_SYMBOL text)? COMMA_SYMBOL?
+    sldCustomBody?
   CPAR_SYMBOL SCOL_SYMBOL;
 
 createWmsLayer: WMS_SYMBOL LAYER_SYMBOL identifier (AS_SYMBOL text)? OPAR_SYMBOL
@@ -106,6 +113,7 @@ text: QUOTED_TEXT;
 
 hexColor: HEX_COLOR;
 floatNumber: FLOAT_NUMBER;
+intNumber: INT_NUMBER;
 
 
 //-----------------------------------------------------------------------
@@ -168,6 +176,7 @@ MAPPEDBY_SYMBOL: M A P P E D UNDERLINE_SYMBOL B Y;
 LAYER_SYMBOL: L A Y E R;
 TILE_SYMBOL: T I L E;
 GEOJSON_SYMBOL: G E O J S O N;
+GEOMETRY_TYPE_SYMBOL: G E O M E T R Y T Y P E;
 AS_SYMBOL: A S;
 URL_SYMBOL: U R L;
 SLD_SYMBOL: S T Y L E L A Y E R D E S C R I P T O R;
@@ -198,6 +207,7 @@ TYPE
   | L O C A L D A T E
   | S T R I N G
   | L I N E S T R I N G
+  | L I N E
   | M U L T I L I N E S T R I N G
   | P O L Y G O N
   | M U L T I P O L Y G O N

package/package.json

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

package/src/GISVisitor.js

@@ -7,6 +7,7 @@ import {
   WMSLayer,
   Map,
   GeoJSONLayerStyle,
+  WMSStyleCustom,
 } from "./spl/Map.js";
 import { transformation, getPropertyParams } from "./GISVisitorHelper.js";
 // import { generateProduct } from "./project-generator.js";
@@ -198,10 +199,59 @@ class Visitor extends GISGrammarVisitor {
   }
 
   visitCreateWmsStyle(ctx) {
-    const id = ctx.getChild(2).getText();
-    const sld = ctx.getChild(5).getText().slice(1, -1);
-    this.log(`visitCreateWmsStyle ${id} with ${sld}`);
-    this.store.getCurrentProduct().addStyle(new WMSStyle(id, sld));
+    const descriptor = ctx
+      .getChild(4)
+      .getText()
+      .startsWith("styleLayerDescriptor");
+    if (descriptor) {
+      const id = ctx.getChild(2).getText();
+      const sld = ctx.getChild(5).getText().slice(1, -1);
+      this.log(`visitCreateWmsStyle ${id} with ${sld}`);
+      this.store.getCurrentProduct().addStyle(new WMSStyle(id, sld));
+    } else {
+      let style = {
+        geometryType: null,
+        fillColor: null,
+        strokeColor: null,
+        fillOpacity: null,
+        strokeOpacity: null,
+      };
+      const id = ctx.getChild(2).getText();
+      const props = ctx.getChild(4).getText();
+
+      props.split(",").forEach((field) => {
+        if (field.startsWith("geometryType")) {
+          style.geometryType = field.split("geometryType")[1];
+        } else if (field.startsWith("fillColor")) {
+          if (field.split("fillColor")[1] == "null") style.fillColor = null;
+          else style.fillColor = field.split("fillColor")[1]; // Remove the '#' symbol
+        } else if (field.startsWith("strokeColor")) {
+          if (field.split("strokeColor")[1] == "null") style.strokeColor = null;
+          else style.strokeColor = field.split("strokeColor")[1]; // Remove the '#' symbol
+        } else if (field.startsWith("fillOpacity")) {
+          style.fillOpacity = parseFloat(field.split("fillOpacity")[1]);
+        } else if (field.startsWith("strokeOpacity")) {
+          style.strokeOpacity = parseFloat(field.split("strokeOpacity")[1]);
+        }
+      });
+
+      this.log(
+        `visitCreateWmsStyle ${id} - ${style.geometryType}, ${style.fillColor}, ${style.strokeColor}, ${style.fillOpacity}, ${style.strokeOpacity}`,
+      );
+
+      this.store
+        .getCurrentProduct()
+        .addStyle(
+          new WMSStyleCustom(
+            id,
+            style.geometryType,
+            style.fillColor,
+            style.strokeColor,
+            style.fillOpacity,
+            style.strokeOpacity,
+          ),
+        );
+    }
   }
 
   visitCreateWmsLayer(ctx) {

package/src/GISVisitorHelper.js

@@ -1,162 +1,93 @@
-function transformation(spec) {
-  _relationships(spec);
-  const newSpec = {
-    features: [
-      "GEMA_SPL",
-      "DataManagement",
-      "GraphicalUserInterface",
-      "MapViewer",
-      "Tools",
-      "DM_SpatialDatabase",
-      "DM_GenerationType",
-      "DM_DataServer",
-      "MV_MapServer",
-      "MV_Tools",
-      "MV_MapManagement",
-      "DM_SD_PostGIS",
-      "MV_T_Pan",
-      "MV_T_Zoom",
-      "DM_GT_Sequence",
-      "MV_MM_MultipleMapViewer",
-      "MV_MM_MMV_MapSelectorInMapViewer",
-      "MV_MM_MMV_MapSelectorInMenuElement",
-      "MV_MS_GeoServer",
-      "GUI_Forms",
-      "GUI_F_Editable",
-      "GUI_F_Creatable",
-      "GUI_F_Removable",
-      "GUI_F_R_ConfirmationAlert",
-      "GUI_Lists",
-      "GUI_L_FormLink",
-      "GUI_L_F_BasicSearch",
-      "GUI_L_Filterable",
-      "GUI_L_Sortable",
-      "GUI_L_LocateInMap",
-      "GUI_L_ViewListAsMap",
-      "GUI_L_Export",
-      "GUI_StaticPages",
-      "MV_ContextInformation",
-      "MV_CI_Scale",
-      "MV_CI_Map",
-      "MV_CI_CenterCoordinates",
-      "MV_CI_Dimensions",
-      "MV_DetailOnClick",
-      "MV_LayerManagement",
-      "MV_LM_CenterViewOnLayer",
-      "MV_LM_Order",
-      "MV_LM_Opacity",
-      "MV_LM_HideLayer",
-      "MV_LM_Style",
-      "MV_LM_ExternalLayer",
-      "MV_LM_StylePreview",
-      "MV_T_Export",
-      "MV_T_E_Type",
-      "MV_T_E_F_URL",
-      "MV_T_E_F_PDF",
-      "MV_T_E_SetScale",
-      "MV_T_E_ShowLegend",
-      "MV_T_InformationMode",
-      "MV_T_MeasureControl",
-      "MV_T_M_Distance",
-      "MV_T_M_Line",
-      "MV_T_M_Polygon",
-      "MV_T_ZoomWindow",
-      "GUI_Menu",
-      "GUI_M_Position",
-      "GUI_M_Top",
-      "DM_DataInput",
-      "DM_DI_DataFeeding",
-      "DM_DI_DF_Shapefile",
-      "T_GIS",
-      "T_EntitiesInformation",
-      "D_C_Postgres",
-      "D_C_Geoserver",
-      "D_C_Nginx",
-    ],
-    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/features.js

@@ -0,0 +1,53 @@
+export default [
+  "MapViewer",
+  "Tools",
+  "DM_SpatialDatabase",
+  "DM_GenerationType",
+  "DM_DataServer",
+  "MV_MapServer",
+  "MV_Tools",
+  "MV_MapManagement",
+  "DM_SD_PostGIS",
+  "DM_GT_Sequence",
+  "MV_MM_MultipleMapViewer",
+  "MV_MM_MMV_MapSelectorInMapViewer",
+  "MV_MM_MMV_MapSelectorInMenuElement",
+  "MV_MS_GeoServer",
+  "GUI_Lists",
+  "GUI_L_FormLink",
+  "GUI_L_F_BasicSearch",
+  "GUI_L_Filterable",
+  "GUI_L_Sortable",
+  "GUI_L_LocateInMap",
+  "GUI_L_ViewListAsMap",
+  "MV_ContextInformation",
+  "MV_CI_Scale",
+  "MV_CI_Map",
+  "MV_CI_CenterCoordinates",
+  "MV_CI_Dimensions",
+  "MV_DetailOnClick",
+  "MV_LayerManagement",
+  "MV_LM_CenterViewOnLayer",
+  "MV_LM_Order",
+  "MV_LM_Opacity",
+  "MV_LM_HideLayer",
+  "MV_LM_Style",
+  "MV_LM_ExternalLayer",
+  "MV_LM_StylePreview",
+  "MV_T_E_Type",
+  "MV_T_E_F_URL",
+  "MV_T_E_F_PDF",
+  "MV_T_E_SetScale",
+  "MV_T_E_ShowLegend",
+  "MV_T_InformationMode",
+  "MV_T_MeasureControl",
+  "MV_T_ZoomWindow",
+  "DM_DataInput",
+  "DM_DI_DataFeeding",
+  "DM_DI_DF_Shapefile",
+  "T_GIS",
+  "T_EntitiesInformation",
+  "D_C_Postgres",
+  "D_C_Geoserver",
+  "D_C_Nginx",
+];

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();
+}