@lbdudc/gp-gis-dsl 0.2.3 → 0.2.4

package/package.json

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

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/features.js

@@ -3,7 +3,6 @@ export default [
   "Tools",
   "DM_SpatialDatabase",
   "DM_GenerationType",
-  "DM_DataServer",
   "MV_MapServer",
   "MV_Tools",
   "MV_MapManagement",

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

package/src/spl/GIS.js

@@ -1,234 +1,234 @@
-class GIS {
-  constructor(name, srid) {
-    this.name = name;
-    this.srid = parseInt(srid);
-    if (srid != 4326) {
-      console.warn("Only SRID 4326 supported!");
-    }
-    this.entities = [];
-    this.relationships = [];
-    this.enums = [];
-    this.layers = [];
-    this.styles = [];
-    this.maps = [];
-  }
-
-  addEntity(name) {
-    if (this.getEntity(name)) {
-      throw `Entity ${name} already exists!!!`;
-    }
-    this.entities.push(new Entity(name));
-  }
-
-  getEntity(name) {
-    return this.entities.find((e) => e.name == name);
-  }
-
-  addRelationship(source, target, sourceOpts, targetOpts) {
-    const existingRelationship = this.getRelationship(
-      source,
-      target,
-      sourceOpts.label,
-    );
-    if (existingRelationship) {
-      existingRelationship.update(sourceOpts, targetOpts);
-    } else {
-      this.relationships.push(
-        new Relationship(source, target, sourceOpts, targetOpts),
-      );
-    }
-  }
-
-  getRelationship(source, target, sourceLabel) {
-    return this.relationships.find(
-      (e) =>
-        e.source == source &&
-        e.target == target &&
-        e.sourceOpts.label == sourceLabel,
-    );
-  }
-
-  _entityExists(name) {
-    return this.getEntity(name) != null;
-  }
-
-  /**
-   * Only for things that cannot be validated earlier
-   */
-  validate() {
-    this.relationships.forEach((r) => {
-      if (!this._entityExists(r.source)) {
-        throw `ERROR: entity ${r.source} required by relationship does not exists!!`;
-      }
-      if (!this._entityExists(r.target)) {
-        throw `ERROR: entity ${r.target} required by relationship does not exists!!`;
-      }
-    });
-
-    this.layers.forEach((layer) => {
-      if (layer.type == "GeoJSONLayer") {
-        if (!this._entityExists(layer.entityId)) {
-          throw `ERROR: entity ${layer.entityId} required by layer ${layer.id} does not exists!!`;
-        }
-      }
-    });
-  }
-
-  getMaps() {
-    return this.maps;
-  }
-
-  getLayer(id) {
-    return this.layers.find((l) => l.getId() == id);
-  }
-
-  addLayer(layer) {
-    this.layers.push(layer);
-  }
-
-  getStyle(id) {
-    return this.styles.find((s) => s.getId() == id);
-  }
-
-  addStyle(style) {
-    this.styles.push(style);
-  }
-
-  getMap(id) {
-    return this.maps.find((m) => m.id == id);
-  }
-
-  addMap(id, map) {
-    this.maps.push(map);
-  }
-
-  addDeploymentProperty(key, value) {
-    if (!this.extra) {
-      this.extra = {};
-    }
-    this.extra[key] = value;
-  }
-
-  toString() {
-    return (
-      `\nGIS(${this.name} in ${this.srid}) - ${this.entities.length} entities, ${this.relationships.length} relationships:\n\t` +
-      `${this.entities.map((e) => e.toString()).join("\n\t")}\n\n\t` +
-      `${this.relationships.map((r) => r.toString()).join("\n\t")}` +
-      `${this.getMaps()
-        .map((m) => m.toString())
-        .join("\n\t")}`
-    );
-  }
-}
-
-class Entity {
-  constructor(name) {
-    this.name = name;
-    this.properties = [];
-  }
-
-  addProperty(name, type, params) {
-    if (this.getProperty(name)) {
-      throw `Property ${name} already exists in entity ${this.name}!!!`;
-    }
-    this.properties.push(new Property(name, type, params));
-  }
-
-  getProperty(name) {
-    return this.properties.find((p) => p.name == name);
-  }
-
-  validate() {
-    let pk = false;
-    let displayString = false;
-    this.properties.forEach((prop) => {
-      if (prop.pk) {
-        if (pk) throw "ERROR: already has a primary key";
-        pk = true;
-      }
-      if (prop.displayString) {
-        if (displayString) throw "ERROR: already has a displayString";
-        this.displayString = "$" + prop.name;
-        delete prop.displayString;
-        displayString = true;
-      }
-    });
-  }
-
-  toString() {
-    return `Entity ${this.name}: ${this.properties
-      .map((e) => e.toString())
-      .join(", ")}`;
-  }
-}
-
-class Property {
-  constructor(name, type, params) {
-    this.name = name;
-    this.class = type;
-    if (params) {
-      if (params.pk) {
-        this.pk = true;
-        this.required = true;
-        this.unique = true;
-        if (this.class == "Long") {
-          this.class = "Long (autoinc)";
-        }
-      }
-      if (params.required) {
-        this.required = true;
-      }
-      if (params.unique) {
-        this.unique = true;
-      }
-      if (params.displayString) {
-        this.displayString = true;
-      }
-    }
-  }
-
-  toString() {
-    return (
-      this.name +
-      ":" +
-      this.class +
-      (this.params ? "(" + Object.keys(this.params).join(", ") + ")" : "")
-    );
-  }
-}
-
-class Relationship {
-  constructor(source, target, sourceOpts, targetOpts) {
-    this.source = source;
-    this.target = target;
-    this.sourceOpts = sourceOpts;
-    this.targetOpts = targetOpts;
-    if (!this.targetOpts.label) {
-      this.targetOpts.label = this.source.toLowerCase();
-      if (this.targetOpts.multiplicity.indexOf("*") != -1) {
-        this.targetOpts.label += "s";
-      }
-    }
-  }
-
-  update(sourceOpts, targetOpts) {
-    if (targetOpts.label) {
-      this.targetOpts.label = targetOpts.label;
-    }
-    if (targetOpts.multiplicity) {
-      this.targetOpts.multiplicity = targetOpts.multiplicity;
-    }
-    if (sourceOpts.multiplicity) {
-      this.sourceOpts.multiplicity = sourceOpts.multiplicity;
-    }
-  }
-
-  toString() {
-    return (
-      `${this.source}.${this.sourceOpts.label}(${this.sourceOpts.multiplicity})` +
-      ` -> ${this.target}.${this.targetOpts.label}(${this.targetOpts.multiplicity})`
-    );
-  }
-}
-
-export default GIS;
+class GIS {
+  constructor(name, srid) {
+    this.name = name;
+    this.srid = parseInt(srid);
+    if (srid != 4326) {
+      console.warn("Only SRID 4326 supported!");
+    }
+    this.entities = [];
+    this.relationships = [];
+    this.enums = [];
+    this.layers = [];
+    this.styles = [];
+    this.maps = [];
+  }
+
+  addEntity(name) {
+    if (this.getEntity(name)) {
+      throw `Entity ${name} already exists!!!`;
+    }
+    this.entities.push(new Entity(name));
+  }
+
+  getEntity(name) {
+    return this.entities.find((e) => e.name == name);
+  }
+
+  addRelationship(source, target, sourceOpts, targetOpts) {
+    const existingRelationship = this.getRelationship(
+      source,
+      target,
+      sourceOpts.label,
+    );
+    if (existingRelationship) {
+      existingRelationship.update(sourceOpts, targetOpts);
+    } else {
+      this.relationships.push(
+        new Relationship(source, target, sourceOpts, targetOpts),
+      );
+    }
+  }
+
+  getRelationship(source, target, sourceLabel) {
+    return this.relationships.find(
+      (e) =>
+        e.source == source &&
+        e.target == target &&
+        e.sourceOpts.label == sourceLabel,
+    );
+  }
+
+  _entityExists(name) {
+    return this.getEntity(name) != null;
+  }
+
+  /**
+   * Only for things that cannot be validated earlier
+   */
+  validate() {
+    this.relationships.forEach((r) => {
+      if (!this._entityExists(r.source)) {
+        throw `ERROR: entity ${r.source} required by relationship does not exists!!`;
+      }
+      if (!this._entityExists(r.target)) {
+        throw `ERROR: entity ${r.target} required by relationship does not exists!!`;
+      }
+    });
+
+    this.layers.forEach((layer) => {
+      if (layer.type == "GeoJSONLayer") {
+        if (!this._entityExists(layer.entityId)) {
+          throw `ERROR: entity ${layer.entityId} required by layer ${layer.id} does not exists!!`;
+        }
+      }
+    });
+  }
+
+  getMaps() {
+    return this.maps;
+  }
+
+  getLayer(id) {
+    return this.layers.find((l) => l.getId() == id);
+  }
+
+  addLayer(layer) {
+    this.layers.push(layer);
+  }
+
+  getStyle(id) {
+    return this.styles.find((s) => s.getId() == id);
+  }
+
+  addStyle(style) {
+    this.styles.push(style);
+  }
+
+  getMap(id) {
+    return this.maps.find((m) => m.id == id);
+  }
+
+  addMap(id, map) {
+    this.maps.push(map);
+  }
+
+  addDeploymentProperty(key, value) {
+    if (!this.extra) {
+      this.extra = {};
+    }
+    this.extra[key] = value;
+  }
+
+  toString() {
+    return (
+      `\nGIS(${this.name} in ${this.srid}) - ${this.entities.length} entities, ${this.relationships.length} relationships:\n\t` +
+      `${this.entities.map((e) => e.toString()).join("\n\t")}\n\n\t` +
+      `${this.relationships.map((r) => r.toString()).join("\n\t")}` +
+      `${this.getMaps()
+        .map((m) => m.toString())
+        .join("\n\t")}`
+    );
+  }
+}
+
+class Entity {
+  constructor(name) {
+    this.name = name;
+    this.properties = [];
+  }
+
+  addProperty(name, type, params) {
+    if (this.getProperty(name)) {
+      throw `Property ${name} already exists in entity ${this.name}!!!`;
+    }
+    this.properties.push(new Property(name, type, params));
+  }
+
+  getProperty(name) {
+    return this.properties.find((p) => p.name == name);
+  }
+
+  validate() {
+    let pk = false;
+    let displayString = false;
+    this.properties.forEach((prop) => {
+      if (prop.pk) {
+        if (pk) throw "ERROR: already has a primary key";
+        pk = true;
+      }
+      if (prop.displayString) {
+        if (displayString) throw "ERROR: already has a displayString";
+        this.displayString = "$" + prop.name;
+        delete prop.displayString;
+        displayString = true;
+      }
+    });
+  }
+
+  toString() {
+    return `Entity ${this.name}: ${this.properties
+      .map((e) => e.toString())
+      .join(", ")}`;
+  }
+}
+
+class Property {
+  constructor(name, type, params) {
+    this.name = name;
+    this.class = type;
+    if (params) {
+      if (params.pk) {
+        this.pk = true;
+        this.required = true;
+        this.unique = true;
+        if (this.class == "Long") {
+          this.class = "Long (autoinc)";
+        }
+      }
+      if (params.required) {
+        this.required = true;
+      }
+      if (params.unique) {
+        this.unique = true;
+      }
+      if (params.displayString) {
+        this.displayString = true;
+      }
+    }
+  }
+
+  toString() {
+    return (
+      this.name +
+      ":" +
+      this.class +
+      (this.params ? "(" + Object.keys(this.params).join(", ") + ")" : "")
+    );
+  }
+}
+
+class Relationship {
+  constructor(source, target, sourceOpts, targetOpts) {
+    this.source = source;
+    this.target = target;
+    this.sourceOpts = sourceOpts;
+    this.targetOpts = targetOpts;
+    if (!this.targetOpts.label) {
+      this.targetOpts.label = this.source.toLowerCase();
+      if (this.targetOpts.multiplicity.indexOf("*") != -1) {
+        this.targetOpts.label += "s";
+      }
+    }
+  }
+
+  update(sourceOpts, targetOpts) {
+    if (targetOpts.label) {
+      this.targetOpts.label = targetOpts.label;
+    }
+    if (targetOpts.multiplicity) {
+      this.targetOpts.multiplicity = targetOpts.multiplicity;
+    }
+    if (sourceOpts.multiplicity) {
+      this.sourceOpts.multiplicity = sourceOpts.multiplicity;
+    }
+  }
+
+  toString() {
+    return (
+      `${this.source}.${this.sourceOpts.label}(${this.sourceOpts.multiplicity})` +
+      ` -> ${this.target}.${this.targetOpts.label}(${this.targetOpts.multiplicity})`
+    );
+  }
+}
+
+export default GIS;

package/src/spl/GeoJSONLayer.js

@@ -1,21 +1,21 @@
-export default class GeoJSONLayer {
-  constructor(id, label, entityId, editable, style) {
-    this.name = id;
-    this.type = "geojson";
-    this.label = label;
-    this.entityName = entityId;
-    this.editable = editable;
-    this.defaultStyle = style;
-    this.availableStyles = [style];
-  }
-
-  getId() {
-    return this.name;
-  }
-
-  toString() {
-    return `GeoJSONLayer(${this.name} as ${this.label}) for entity ${
-      this.entityName
-    } ${this.editable ? "(editable)" : ""}`;
-  }
-}
+export default class GeoJSONLayer {
+  constructor(id, label, entityId, editable, style) {
+    this.name = id;
+    this.type = "geojson";
+    this.label = label;
+    this.entityName = entityId;
+    this.editable = editable;
+    this.defaultStyle = style;
+    this.availableStyles = [style];
+  }
+
+  getId() {
+    return this.name;
+  }
+
+  toString() {
+    return `GeoJSONLayer(${this.name} as ${this.label}) for entity ${
+      this.entityName
+    } ${this.editable ? "(editable)" : ""}`;
+  }
+}

package/src/spl/GeoJSONLayerStyle.js

@@ -1,14 +1,14 @@
-export default class GeoJSONLayerStyle {
-  constructor(id, fillColor, strokeColor, fillOpacity, strokeOpacity) {
-    this.name = id;
-    this.type = "GeoJSONLayerStyle";
-    this.fillColor = fillColor;
-    this.strokeColor = strokeColor;
-    this.fillOpacity = fillOpacity;
-    this.strokeOpacity = strokeOpacity;
-  }
-
-  getId() {
-    return this.name;
-  }
-}
+export default class GeoJSONLayerStyle {
+  constructor(id, fillColor, strokeColor, fillOpacity, strokeOpacity) {
+    this.name = id;
+    this.type = "GeoJSONLayerStyle";
+    this.fillColor = fillColor;
+    this.strokeColor = strokeColor;
+    this.fillOpacity = fillOpacity;
+    this.strokeOpacity = strokeOpacity;
+  }
+
+  getId() {
+    return this.name;
+  }
+}

package/src/spl/TileLayer.js

@@ -1,16 +1,16 @@
-export default class TileLayer {
-  constructor(id, label, url) {
-    this.name = id;
-    this.type = "tilelayer";
-    this.label = label;
-    this.url = url;
-  }
-
-  getId() {
-    return this.name;
-  }
-
-  toString() {
-    return `TileLayer(${this.name} as ${this.label}) with url ${this.url}`;
-  }
-}
+export default class TileLayer {
+  constructor(id, label, url) {
+    this.name = id;
+    this.type = "tilelayer";
+    this.label = label;
+    this.url = url;
+  }
+
+  getId() {
+    return this.name;
+  }
+
+  toString() {
+    return `TileLayer(${this.name} as ${this.label}) with url ${this.url}`;
+  }
+}

package/src/spl/WMSLayer.js

@@ -1,30 +1,30 @@
-export default class WMSLayer {
-  constructor(id, label) {
-    this.name = id;
-    this.type = "wms";
-    this.label = label;
-    this.list = null;
-    this.layers = [];
-    this.availableStyles = [];
-    this.defaultStyles = [];
-  }
-
-  getId() {
-    return this.name;
-  }
-
-  addSubLayer(entityId, style) {
-    this.list = entityId;
-    this.layers.push(entityId);
-    this.defaultStyles = style;
-    this.availableStyles.push(style);
-  }
-
-  toString() {
-    return `WMSLayer(${this.name} as ${this.label}) - ${
-      this.layers.length
-    } sublayers for entities ${this.layers
-      .map((sl) => sl.entityId)
-      .join(", ")}`;
-  }
-}
+export default class WMSLayer {
+  constructor(id, label) {
+    this.name = id;
+    this.type = "wms";
+    this.label = label;
+    this.list = null;
+    this.layers = [];
+    this.availableStyles = [];
+    this.defaultStyles = [];
+  }
+
+  getId() {
+    return this.name;
+  }
+
+  addSubLayer(entityId, style) {
+    this.list = entityId;
+    this.layers.push(entityId);
+    this.defaultStyles = style;
+    this.availableStyles.push(style);
+  }
+
+  toString() {
+    return `WMSLayer(${this.name} as ${this.label}) - ${
+      this.layers.length
+    } sublayers for entities ${this.layers
+      .map((sl) => sl.entityId)
+      .join(", ")}`;
+  }
+}

package/src/spl/WMSStyle.js

@@ -1,13 +1,13 @@
-export default class WMSStyle {
-  constructor(id, sldPath) {
-    this.name = id;
-    this.type = "WMSLayerSLDStyle";
-    this.cached = true;
-    this.sldPath = sldPath;
-    this.sld = `@include:${sldPath}`;
-  }
-
-  getId() {
-    return this.name;
-  }
-}
+export default class WMSStyle {
+  constructor(id, sldPath) {
+    this.name = id;
+    this.type = "WMSLayerSLDStyle";
+    this.cached = true;
+    this.sldPath = sldPath;
+    this.sld = `@include:${sldPath}`;
+  }
+
+  getId() {
+    return this.name;
+  }
+}

package/src/store.js

@@ -1,74 +1,74 @@
-const store = {
-  products: [],
-  currentProduct: null,
-  currentEntity: null,
-  lastGeneratedProduct: null,
-};
-
-function getProducts() {
-  return store.products;
-}
-
-function getCurrentProduct() {
-  return store.currentProduct;
-}
-
-function setCurrentProduct(productName) {
-  if (!productName) {
-    store.currentProduct = null;
-  } else {
-    store.currentProduct = getProduct(productName);
-    if (!store.currentProduct) {
-      throw `GIS ${productName} does not exist!!!`;
-    }
-  }
-}
-
-function getCurrentEntity() {
-  return store.currentEntity;
-}
-
-function setCurrentEntity(entityName) {
-  if (!entityName) {
-    store.currentEntity = null;
-  } else {
-    store.currentEntity = getCurrentProduct().getEntity(entityName);
-    if (!store.currentEntity) {
-      throw `Entity ${entityName} does not exist in current product!!!`;
-    }
-  }
-}
-
-function getProduct(name) {
-  return store.products.find((e) => e.name == name);
-}
-
-function addProduct(id, product) {
-  store.products.push(product);
-}
-
-function getLastGeneratedProduct() {
-  return store.lastGeneratedProduct;
-}
-
-function setLastGeneratedProduct(generatedProduct) {
-  store.lastGeneratedProduct = generatedProduct;
-}
-
-function reset() {
-  store.products.splice(0, store.products.length);
-  store.lastGeneratedProduct = null;
-}
-
-export default {
-  getCurrentProduct,
-  setCurrentProduct,
-  getCurrentEntity,
-  setCurrentEntity,
-  getProducts,
-  getProduct,
-  addProduct,
-  getLastGeneratedProduct,
-  setLastGeneratedProduct,
-  reset,
-};
+const store = {
+  products: [],
+  currentProduct: null,
+  currentEntity: null,
+  lastGeneratedProduct: null,
+};
+
+function getProducts() {
+  return store.products;
+}
+
+function getCurrentProduct() {
+  return store.currentProduct;
+}
+
+function setCurrentProduct(productName) {
+  if (!productName) {
+    store.currentProduct = null;
+  } else {
+    store.currentProduct = getProduct(productName);
+    if (!store.currentProduct) {
+      throw `GIS ${productName} does not exist!!!`;
+    }
+  }
+}
+
+function getCurrentEntity() {
+  return store.currentEntity;
+}
+
+function setCurrentEntity(entityName) {
+  if (!entityName) {
+    store.currentEntity = null;
+  } else {
+    store.currentEntity = getCurrentProduct().getEntity(entityName);
+    if (!store.currentEntity) {
+      throw `Entity ${entityName} does not exist in current product!!!`;
+    }
+  }
+}
+
+function getProduct(name) {
+  return store.products.find((e) => e.name == name);
+}
+
+function addProduct(id, product) {
+  store.products.push(product);
+}
+
+function getLastGeneratedProduct() {
+  return store.lastGeneratedProduct;
+}
+
+function setLastGeneratedProduct(generatedProduct) {
+  store.lastGeneratedProduct = generatedProduct;
+}
+
+function reset() {
+  store.products.splice(0, store.products.length);
+  store.lastGeneratedProduct = null;
+}
+
+export default {
+  getCurrentProduct,
+  setCurrentProduct,
+  getCurrentEntity,
+  setCurrentEntity,
+  getProducts,
+  getProduct,
+  addProduct,
+  getLastGeneratedProduct,
+  setLastGeneratedProduct,
+  reset,
+};