@lbdudc/gp-gis-dsl 0.2.5 → 0.2.6

package/package.json

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

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

@@ -1,53 +1,53 @@
-export default [
-  "MapViewer",
-  "Tools",
-  "DM_SpatialDatabase",
-  "DM_GenerationType",
-  "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",
-  "MV_T_ViewMapAsList",
-  "DM_DataInput",
-  "DM_DI_DataFeeding",
-  "DM_DI_DF_Shapefile",
-  "T_GIS",
-  "T_EntitiesInformation",
-  "D_C_Postgres",
-  "D_C_Geoserver",
-  "D_C_Nginx",
-];
+export default [
+  "MapViewer",
+  "Tools",
+  "DM_SpatialDatabase",
+  "DM_GenerationType",
+  "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",
+  "MV_T_ViewMapAsList",
+  "DM_DataInput",
+  "DM_DI_DataFeeding",
+  "DM_DI_DF_Shapefile",
+  "T_GIS",
+  "T_EntitiesInformation",
+  "D_C_Postgres",
+  "D_C_Geoserver",
+  "D_C_Nginx",
+];

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() {