@lbdudc/gp-gis-dsl 0.2.4 → 0.2.6

package/package.json

@@ -1,54 +1,54 @@
-{
-  "name": "@lbdudc/gp-gis-dsl",
-  "version": "0.2.4",
-  "homepage": "https://github.com/lbdudc/gis-dsl#readme",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/lbdudc/gis-dsl.git"
-  },
-  "description": "A library that parses a DSL instance and generates the spec for the web-based GIS SPL.",
-  "bin": {
-    "gis-dsl": "src/cli.js"
-  },
-  "main": "src/index.js",
-  "type": "module",
-  "author": "Álex Cortiñas",
-  "dependencies": {
-    "antlr4": "^4.13.0",
-    "meow": "^12.0.1",
-    "mocha": "^10.2.0"
-  },
-  "devDependencies": {
-    "eslint": "^8.54.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-prettier": "^5.0.1",
-    "husky": "^8.0.3",
-    "lint-staged": "^15.1.0",
-    "npm-run-all": "^4.1.5",
-    "prettier": "^3.1.0",
-    "strip-bom": "^5.0.0"
-  },
-  "keywords": [
-    "gis",
-    "dsl"
-  ],
-  "license": "MIT",
-  "lint-staged": {
-    "*.{json,md,yml}": "prettier --write",
-    "*.{js}": [
-      "eslint --fix",
-      "prettier --write"
-    ]
-  },
-  "scripts": {
-    "build-grammar": "antlr -Dlanguage=JavaScript -lib grammar -o src/lib -visitor -Xexact-output-dir grammar/GISGrammar.g4",
-    "eslint": "eslint --ext js src",
-    "eslint:fix": "eslint --ext js --fix src",
-    "lint": "npm-run-all eslint prettier",
-    "lint:fix": "npm-run-all eslint:fix prettier:fix",
-    "prettier": "prettier --check --ignore-unknown src",
-    "prettier:fix": "prettier --write --ignore-unknown src",
-    "prepare": "husky install",
-    "test": "mocha --ui qunit"
-  }
-}
+{
+  "name": "@lbdudc/gp-gis-dsl",
+  "version": "0.2.6",
+  "homepage": "https://github.com/lbdudc/gis-dsl#readme",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lbdudc/gis-dsl.git"
+  },
+  "description": "A library that parses a DSL instance and generates the spec for the web-based GIS SPL.",
+  "bin": {
+    "gis-dsl": "src/cli.js"
+  },
+  "main": "src/index.js",
+  "type": "module",
+  "author": "Álex Cortiñas",
+  "dependencies": {
+    "antlr4": "^4.13.0",
+    "meow": "^12.0.1",
+    "mocha": "^10.2.0"
+  },
+  "devDependencies": {
+    "eslint": "^8.54.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-prettier": "^5.0.1",
+    "husky": "^8.0.3",
+    "lint-staged": "^15.1.0",
+    "npm-run-all": "^4.1.5",
+    "prettier": "^3.1.0",
+    "strip-bom": "^5.0.0"
+  },
+  "keywords": [
+    "gis",
+    "dsl"
+  ],
+  "license": "MIT",
+  "lint-staged": {
+    "*.{json,md,yml}": "prettier --write",
+    "*.{js}": [
+      "eslint --fix",
+      "prettier --write"
+    ]
+  },
+  "scripts": {
+    "build-grammar": "antlr -Dlanguage=JavaScript -lib grammar -o src/lib -visitor -Xexact-output-dir grammar/GISGrammar.g4",
+    "eslint": "eslint --ext js src",
+    "eslint:fix": "eslint --ext js --fix src",
+    "lint": "npm-run-all eslint prettier",
+    "lint:fix": "npm-run-all eslint:fix prettier:fix",
+    "prettier": "prettier --check --ignore-unknown src",
+    "prettier:fix": "prettier --write --ignore-unknown src",
+    "prepare": "husky install",
+    "test": "mocha --ui qunit"
+  }
+}

package/src/GISVisitor.js

@@ -276,18 +276,21 @@ class Visitor extends GISGrammarVisitor {
       aux = ctx.getChild(i);
       auxEntityName = aux.getChild(0).getText();
       entity = this.store.getCurrentProduct().getEntity(auxEntityName);
-
-      if (!entity) {
-        throw `ERROR: entity ${auxEntityName} required by layer ${id} does not exists!!`;
-      }
-
       styleName = aux.getChild(1).getText();
       style = this.store.getCurrentProduct().getStyle(styleName);
-      if (!style) {
-        throw `Style ${aux.getChild(1).getText()} does not exist!!!`;
+
+      if (entity) {
+        layer.addSubLayer(entity.name, styleName);
+      } else {
+        // GeoTIFF case: no associated entity exists
+        const normalizedId = id
+          .replace(/Layer$/, "")
+          .replace(/^(\d+)([A-Z][a-z]+)/, "$1_$2")
+          .toLowerCase();
+        layer.addSubLayer(normalizedId, null);
       }
-      layer.addSubLayer(entity.name, styleName);
     }
+
     this.log(`visitCreateWmsLayer ${id} - ${label}`);
 
     this.store.getCurrentProduct().addLayer(layer);

package/src/features.js

@@ -41,6 +41,7 @@ export default [
   "MV_T_InformationMode",
   "MV_T_MeasureControl",
   "MV_T_ZoomWindow",
+  "MV_T_ViewMapAsList",
   "DM_DataInput",
   "DM_DI_DataFeeding",
   "DM_DI_DF_Shapefile",

package/src/spl/WMSLayer.js

@@ -16,8 +16,8 @@ export default class WMSLayer {
   addSubLayer(entityId, style) {
     this.list = entityId;
     this.layers.push(entityId);
+    if (style) this.availableStyles.push(style);
     this.defaultStyles = style;
-    this.availableStyles.push(style);
   }
 
   toString() {