Merge pull request #892 from valeria-foco/FixExportShape

fix export Shaper per geometrie poligonali e lineari (cambio versione…

frontend/assets/puntiScaricoIndustriale.json

@@ -265,7 +265,7 @@
            "valueId":"toponimo",
            "valueLabel":"toponimo",
            "dependson":{
-              "field": "decsiraogc_stabilimenti:desProvincia",
+              "field": "decsiraogc_scarichi:desProvincia",
               "from": "sigla",
               "to": "sigla_provincia"
            }

frontend/js/utils/ExporterUtils.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 const FileSaver = require('file-saver');
-const shpwrite = require('shp-write');
+const shpwrite = require('fixed-shp-write');
 const JSZip = require('jszip');
 const GeoJSON = require('ol/format/GeoJSON').default;
 const ProWKTDef = require('./ProjWKTDef');
@@ -51,6 +51,11 @@ const ExporterUtils = {
         const olFeatures = format.readFeatures(featureCollection);
         olFeatures.map((f) => f.getGeometry().transform('EPSG:4326', outputSrs));
         const geoObject = format.writeFeaturesObject(olFeatures);
+        geoObject.features.map((ft) => {
+            if (ft.geometry.type === "LineString") {
+                ft.geometry.coordinates = [ft.geometry.coordinates];
+            }
+        });
         const shpString = shpwrite.zip({
             type: 'FeatureCollection',
             features: geoObject.features
@@ -141,7 +146,7 @@ const ExporterUtils = {
                 res.push({
                     type: ft.type,
                     id: ft.id,
-                    geometry: ft. geometry,
+                    geometry: ft.geometry,
                     properties: cols.reduce((obj, col) => {
                         obj[col.header] = ft.properties[col.id];
                         return obj;

frontend/package.json

@@ -128,6 +128,7 @@
     "es6-promise": "2.3.0",
     "eventlistener": "0.0.1",
     "file-saver": "1.3.3",
+    "fixed-shp-write": "^0.3.3",
     "fs-extra": "3.0.1",
     "geostyler-geocss-parser": "https://github.com/allyoucanmap/geostyler-geocss-parser/tarball/build",
     "geostyler-openlayers-parser": "1.1.4",
@@ -240,7 +241,6 @@
     "resize-observer-polyfill": "1.5.0",
     "rxjs": "5.1.1",
     "screenfull": "4.0.0",
-    "shp-write": "0.3.0",
     "shpjs": "3.4.2",
     "stickybits": "3.6.6",
     "swipe-js-iso": "2.0.3",
@@ -255,8 +255,8 @@
     "uuid": "3.0.1",
     "vis": "4.21.0",
     "w3c-schemas": "1.3.1",
-    "wellknown": "0.5.0",
     "webfontloader": "1.6.28",
+    "wellknown": "0.5.0",
     "xml2js": "0.4.17",
     "xmldom": "0.3.0",
     "xpath": "0.0.27"