npm - @lbdudc/gp-gis-dsl - Versions diffs - 0.3.3 → 0.3.4 - Mend

@lbdudc/gp-gis-dsl 0.3.3 → 0.3.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (25) hide show

package/grammar/.antlr/GISGrammar.interp +3 -1
package/grammar/.antlr/GISGrammar.tokens +49 -48
package/grammar/.antlr/GISGrammarLexer.interp +4 -1
package/grammar/.antlr/GISGrammarLexer.java +532 -523
package/grammar/.antlr/GISGrammarLexer.tokens +49 -48
package/grammar/.antlr/GISGrammarParser.java +428 -383
package/grammar/GISGrammar.g4 +4 -2
package/package.json +1 -1
package/src/GISVisitor.js +440 -436
package/src/lib/GISGrammar.interp +3 -1
package/src/lib/GISGrammar.tokens +49 -48
package/src/lib/GISGrammarLexer.interp +4 -1
package/src/lib/GISGrammarLexer.js +323 -315
package/src/lib/GISGrammarLexer.tokens +49 -48
package/src/lib/GISGrammarParser.js +405 -368
package/src/spl/WMSStyleCustom.js +24 -22
package/test-output/agriculture.json +2 -1
package/test-output/basic.json +88 -130
package/test-output/complete.json +2 -1
package/test-output/emergency.json +4 -2
package/test-output/environmental.json +6 -3
package/test-output/gis.json +54 -54
package/test-output/tourism.json +6 -3
package/test-output/transportation.json +2 -1
package/test-output/utilities.json +6 -3

package/src/spl/WMSStyleCustom.js CHANGED Viewed

@@ -1,22 +1,24 @@
-export default class WMSStyleCustom {
-  constructor(
-    id,
-    geometryType,
-    fillColor,
-    strokeColor,
-    fillOpacity,
-    strokeOpacity,
-  ) {
-    this.name = id;
-    this.type = "WMSLayerStyle";
-    this.geometryType = geometryType;
-    this.fillColor = fillColor;
-    this.strokeColor = strokeColor;
-    this.fillOpacity = fillOpacity;
-    this.strokeOpacity = strokeOpacity;
-  }
-  getId() {
-    return this.name;
-  }
-}
+export default class WMSStyleCustom {
+  constructor(
+    id,
+    geometryType,
+    fillColor,
+    strokeColor,
+    fillOpacity,
+    strokeOpacity,
+    strokeWidth,
+  ) {
+    this.name = id;
+    this.type = "WMSLayerStyle";
+    this.geometryType = geometryType;
+    this.fillColor = fillColor;
+    this.strokeColor = strokeColor;
+    this.fillOpacity = fillOpacity;
+    this.strokeOpacity = strokeOpacity;
+    this.strokeWidth = strokeWidth;
+  }
+  getId() {
+    return this.name;
+  }
+}

package/test-output/agriculture.json CHANGED Viewed

@@ -398,7 +398,8 @@
         "fillColor": "#90EE90",
         "strokeColor": "#228B22",
         "fillOpacity": 0.6,
-        "strokeOpacity": 1
+        "strokeOpacity": 1,
+        "strokeWidth": null
       },
       {
         "name": "parcelLayerStyle",

package/test-output/basic.json CHANGED Viewed

@@ -54,13 +54,13 @@
     "D_C_Nginx"
   ],
   "basicData": {
-    "name": "city_example"
+    "name": "water_supply_marine"
   },
   "data": {
     "dataModel": {
       "entities": [
         {
-          "name": "City",
+          "name": "River",
           "properties": [
             {
               "name": "id",
@@ -71,33 +71,28 @@
             },
             {
               "name": "name",
-              "class": "String"
+              "class": "String",
+              "required": true
             },
             {
-              "name": "extension",
-              "class": "MultiPolygon"
+              "name": "river_code",
+              "class": "String",
+              "required": true,
+              "unique": true
             },
             {
-              "name": "points",
-              "class": "PointOfInterest",
-              "owner": false,
-              "bidirectional": "city",
-              "multiple": true,
-              "required": false
+              "name": "length",
+              "class": "Double"
             },
             {
-              "name": "streets",
-              "class": "Street",
-              "owner": false,
-              "bidirectional": "city",
-              "multiple": true,
-              "required": false
+              "name": "geometry",
+              "class": "LineString"
             }
           ],
-          "displayString": "$name"
+          "displayString": "$id"
         },
         {
-          "name": "Street",
+          "name": "Sea",
           "properties": [
             {
               "name": "id",
@@ -108,29 +103,26 @@
             },
             {
               "name": "name",
-              "class": "String"
+              "class": "String",
+              "required": true
             },
             {
-              "name": "type",
+              "name": "water_type",
               "class": "String"
             },
             {
-              "name": "path",
-              "class": "MultiLineString"
+              "name": "area",
+              "class": "Double"
             },
             {
-              "name": "city",
-              "class": "City",
-              "owner": true,
-              "bidirectional": "streets",
-              "multiple": false,
-              "required": true
+              "name": "geometry",
+              "class": "Polygon"
             }
           ],
-          "displayString": "$name"
+          "displayString": "$id"
         },
         {
-          "name": "PointOfInterest",
+          "name": "MaritimeBuoy",
           "properties": [
             {
               "name": "id",
@@ -140,56 +132,29 @@
               "unique": true
             },
             {
-              "name": "name",
-              "class": "String"
-            },
-            {
-              "name": "location",
-              "class": "Point"
+              "name": "buoy_id",
+              "class": "String",
+              "required": true,
+              "unique": true
             },
             {
-              "name": "city",
-              "class": "City",
-              "owner": true,
-              "bidirectional": "points",
-              "multiple": false,
-              "required": true
+              "name": "name",
+              "class": "String"
             },
             {
-              "name": "type",
-              "class": "PoiType",
-              "owner": true,
-              "bidirectional": "pointofinterests",
-              "multiple": false,
-              "required": true
-            }
-          ],
-          "displayString": "$name"
-        },
-        {
-          "name": "PoiType",
-          "properties": [
-            {
-              "name": "id",
-              "class": "Long (autoinc)",
-              "pk": true,
-              "required": true,
-              "unique": true
+              "name": "buoy_type",
+              "class": "String"
             },
             {
-              "name": "name",
+              "name": "status",
               "class": "String"
             },
             {
-              "name": "pointofinterests",
-              "class": "PointOfInterest",
-              "owner": false,
-              "bidirectional": "type",
-              "multiple": true,
-              "required": false
+              "name": "geometry",
+              "class": "Point"
             }
           ],
-          "displayString": "$name"
+          "displayString": "$id"
         }
       ],
       "enums": []
@@ -198,117 +163,110 @@
   "mapViewer": {
     "maps": [
       {
-        "name": "streets",
-        "label": "Streets",
+        "name": "main",
+        "label": "Water Supply Marine Map",
         "sortable": false,
         "layers": [
           {
-            "name": "base",
+            "name": "osm",
             "baseLayer": true,
             "selected": true
           },
           {
-            "name": "streetLayer",
+            "name": "river_layer",
             "baseLayer": false,
             "selected": true
           },
           {
-            "name": "cityLayer",
+            "name": "sea_layer",
             "baseLayer": false,
-            "selected": false
-          }
-        ]
-      },
-      {
-        "name": "points",
-        "label": "Points of Interest",
-        "sortable": false,
-        "layers": [
-          {
-            "name": "base",
-            "baseLayer": true,
             "selected": true
           },
           {
-            "name": "pointsOfInterestLayer",
+            "name": "buoy_layer",
             "baseLayer": false,
             "selected": true
-          },
-          {
-            "name": "cityLayer",
-            "baseLayer": false,
-            "selected": false
           }
         ]
       }
     ],
     "layers": [
       {
-        "name": "base",
+        "name": "osm",
         "type": "tilelayer",
         "label": "OpenStreetMap",
         "url": "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
       },
       {
-        "name": "streetLayer",
+        "name": "river_layer",
         "type": "wms",
-        "label": "Streets",
-        "list": "Street",
+        "label": "Rivers",
+        "list": "River",
         "layers": [
-          "Street"
+          "River"
         ],
         "availableStyles": [
-          "streetLayerStyle"
+          "river_style"
         ],
-        "defaultStyles": "streetLayerStyle"
+        "defaultStyles": "river_style"
       },
       {
-        "name": "pointsOfInterestLayer",
-        "type": "geojson",
-        "label": "Points of Interest",
-        "entityName": "PointOfInterest",
-        "editable": true,
-        "defaultStyle": "pointsOfInterestLayerStyle",
+        "name": "sea_layer",
+        "type": "wms",
+        "label": "Seas",
+        "list": "Sea",
+        "layers": [
+          "Sea"
+        ],
         "availableStyles": [
-          "pointsOfInterestLayerStyle"
-        ]
+          "sea_style"
+        ],
+        "defaultStyles": "sea_style"
       },
       {
-        "name": "cityLayer",
+        "name": "buoy_layer",
         "type": "wms",
-        "label": "City",
-        "list": "City",
+        "label": "Maritime Buoys",
+        "list": "MaritimeBuoy",
         "layers": [
-          "City"
+          "MaritimeBuoy"
         ],
         "availableStyles": [
-          "cityLayerStyle"
+          "buoy_style"
         ],
-        "defaultStyles": "cityLayerStyle"
+        "defaultStyles": "buoy_style"
       }
     ],
     "styles": [
       {
-        "name": "streetLayerStyle",
-        "type": "WMSLayerSLDStyle",
-        "cached": true,
-        "sldPath": "/home/acortinas/sld/streets-sld.xml",
-        "sld": "@include:/home/acortinas/sld/streets-sld.xml"
+        "name": "river_style",
+        "type": "WMSLayerStyle",
+        "geometryType": "LINESTRING",
+        "fillColor": null,
+        "strokeColor": "#0066cc",
+        "fillOpacity": null,
+        "strokeOpacity": 1,
+        "strokeWidth": 2
       },
       {
-        "name": "pointsOfInterestLayerStyle",
-        "type": "GeoJSONLayerStyle",
-        "fillColor": "#243452",
-        "strokeColor": "#eeeee3",
-        "fillOpacity": "0.8",
-        "strokeOpacity": "0.9"
+        "name": "sea_style",
+        "type": "WMSLayerStyle",
+        "geometryType": "POLYGON",
+        "fillColor": "#3399ff",
+        "strokeColor": "#0066cc",
+        "fillOpacity": 0.4,
+        "strokeOpacity": 0.8,
+        "strokeWidth": null
       },
       {
-        "name": "cityLayerStyle",
-        "type": "WMSLayerSLDStyle",
-        "cached": true,
-        "sldPath": "/home/acortinas/sld/city-sld.xml",
-        "sld": "@include:/home/acortinas/sld/city-sld.xml"
+        "name": "buoy_style",
+        "type": "WMSLayerStyle",
+        "geometryType": "POINT",
+        "fillColor": "#ff6600",
+        "strokeColor": "#cc3300",
+        "fillOpacity": 0.9,
+        "strokeOpacity": 1,
+        "strokeWidth": null
       }
     ]
   }

package/test-output/complete.json CHANGED Viewed

@@ -1166,7 +1166,8 @@
         "fillColor": "#243452",
         "strokeColor": "#eeeee3",
         "fillOpacity": 0.8,
-        "strokeOpacity": 0.9
+        "strokeOpacity": 0.9,
+        "strokeWidth": null
       },
       {
         "name": "populationEntityLayerStyle",

package/test-output/emergency.json CHANGED Viewed

@@ -691,7 +691,8 @@
         "fillColor": "#00FF00",
         "strokeColor": "#008000",
         "fillOpacity": 0.8,
-        "strokeOpacity": 1
+        "strokeOpacity": 1,
+        "strokeWidth": null
       },
       {
         "name": "hazardZoneStyle",
@@ -700,7 +701,8 @@
         "fillColor": "#FF0000",
         "strokeColor": "#8B0000",
         "fillOpacity": 0.3,
-        "strokeOpacity": 0.8
+        "strokeOpacity": 0.8,
+        "strokeWidth": null
       },
       {
         "name": "fireStationLayerStyle",

package/test-output/environmental.json CHANGED Viewed

@@ -542,7 +542,8 @@
         "fillColor": "#228B22",
         "strokeColor": "#006400",
         "fillOpacity": 0.4,
-        "strokeOpacity": 0.9
+        "strokeOpacity": 0.9,
+        "strokeWidth": null
       },
       {
         "name": "waterBodyStyle",
@@ -551,7 +552,8 @@
         "fillColor": "#1E90FF",
         "strokeColor": "#00008B",
         "fillOpacity": 0.5,
-        "strokeOpacity": 0.8
+        "strokeOpacity": 0.8,
+        "strokeWidth": null
       },
       {
         "name": "forestStyle",
@@ -560,7 +562,8 @@
         "fillColor": "#2E8B57",
         "strokeColor": "#1B4D2E",
         "fillOpacity": 0.6,
-        "strokeOpacity": 0.9
+        "strokeOpacity": 0.9,
+        "strokeWidth": null
       },
       {
         "name": "monitoringStationLayerStyle",

package/test-output/gis.json CHANGED Viewed

@@ -54,18 +54,13 @@
     "D_C_Nginx"
   ],
   "basicData": {
-    "name": "maritime_coruña",
-    "extra": {
-      "geoserver_user": "admin",
-      "geoserver_password": "geoserver",
-      "geoserver_url_wms": "http://localhost:8080/geoserver"
-    }
+    "name": "water_supply"
   },
   "data": {
     "dataModel": {
       "entities": [
         {
-          "name": "Buoy",
+          "name": "River",
           "properties": [
             {
               "name": "id",
@@ -75,24 +70,23 @@
               "unique": true
             },
             {
-              "name": "buoy_id",
+              "name": "name",
               "class": "String",
-              "required": true,
-              "unique": true
+              "required": true
             },
             {
-              "name": "name",
-              "class": "String"
+              "name": "length",
+              "class": "Long"
             },
             {
               "name": "geometry",
-              "class": "Point"
+              "class": "MultiLineString"
             }
           ],
           "displayString": "$id"
         },
         {
-          "name": "River",
+          "name": "Sea",
           "properties": [
             {
               "name": "id",
@@ -107,18 +101,18 @@
               "required": true
             },
             {
-              "name": "length",
-              "class": "Double"
+              "name": "area",
+              "class": "Long"
             },
             {
               "name": "geometry",
-              "class": "LineString"
+              "class": "MultiPolygon"
             }
           ],
           "displayString": "$id"
         },
         {
-          "name": "Municipality",
+          "name": "MaritimeBuoy",
           "properties": [
             {
               "name": "id",
@@ -133,12 +127,12 @@
               "required": true
             },
             {
-              "name": "population",
-              "class": "Long"
+              "name": "location",
+              "class": "String"
             },
             {
               "name": "geometry",
-              "class": "MultiPolygon"
+              "class": "Point"
             }
           ],
           "displayString": "$id"
@@ -150,8 +144,8 @@
   "mapViewer": {
     "maps": [
       {
-        "name": "maritime_view",
-        "label": "Maritime Map of Coruña",
+        "name": "main",
+        "label": "Water Supply Map",
         "sortable": false,
         "layers": [
           {
@@ -160,17 +154,17 @@
             "selected": true
           },
           {
-            "name": "rivers",
+            "name": "river_layer",
             "baseLayer": false,
             "selected": true
           },
           {
-            "name": "municipalities",
+            "name": "sea_layer",
             "baseLayer": false,
             "selected": true
           },
           {
-            "name": "buoys",
+            "name": "buoy_layer",
             "baseLayer": false,
             "selected": true
           }
@@ -185,7 +179,7 @@
         "url": "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
       },
       {
-        "name": "rivers",
+        "name": "river_layer",
         "type": "wms",
         "label": "Rivers",
         "list": "River",
@@ -198,28 +192,30 @@
         "defaultStyles": "river_style"
       },
       {
-        "name": "municipalities",
+        "name": "sea_layer",
         "type": "wms",
-        "label": "Municipalities",
-        "list": "Municipality",
+        "label": "Seas",
+        "list": "Sea",
         "layers": [
-          "Municipality"
+          "Sea"
         ],
         "availableStyles": [
-          "municipality_style"
+          "sea_style"
         ],
-        "defaultStyles": "municipality_style"
+        "defaultStyles": "sea_style"
       },
       {
-        "name": "buoys",
-        "type": "geojson",
-        "label": "Buoy Locations",
-        "entityName": "Buoy",
-        "editable": true,
-        "defaultStyle": "buoysStyle",
+        "name": "buoy_layer",
+        "type": "wms",
+        "label": "Maritime Buoys",
+        "list": "MaritimeBuoy",
+        "layers": [
+          "MaritimeBuoy"
+        ],
         "availableStyles": [
-          "buoysStyle"
-        ]
+          "buoy_style"
+        ],
+        "defaultStyles": "buoy_style"
       }
     ],
     "styles": [
@@ -228,26 +224,30 @@
         "type": "WMSLayerStyle",
         "geometryType": "LINESTRING",
         "fillColor": null,
-        "strokeColor": "#0000FF",
+        "strokeColor": "#0066cc",
         "fillOpacity": null,
-        "strokeOpacity": null
+        "strokeOpacity": null,
+        "strokeWidth": null
       },
       {
-        "name": "municipality_style",
+        "name": "sea_style",
         "type": "WMSLayerStyle",
         "geometryType": "POLYGON",
-        "fillColor": "#CCFFCC",
-        "strokeColor": "#669966",
-        "fillOpacity": 0.3,
-        "strokeOpacity": null
+        "fillColor": "#0099ff",
+        "strokeColor": "#0066cc",
+        "fillOpacity": 0.5,
+        "strokeOpacity": 1,
+        "strokeWidth": null
       },
       {
-        "name": "buoysStyle",
-        "type": "GeoJSONLayerStyle",
-        "fillColor": "#0000FF",
-        "strokeColor": "#0000FF",
-        "fillOpacity": "1.0",
-        "strokeOpacity": "0.5"
+        "name": "buoy_style",
+        "type": "WMSLayerStyle",
+        "geometryType": "POINT",
+        "fillColor": "#ff0000",
+        "strokeColor": "#ff0000",
+        "fillOpacity": 1,
+        "strokeOpacity": 1,
+        "strokeWidth": null
       }
     ]
   }