various fixes

MV88 · MV88 · commit ad4ada066ff2 · 2018-08-02T15:01:44.000+02:00
diff --git a/web/client/components/map/openlayers/VectorStyle.js b/web/client/components/map/openlayers/VectorStyle.js
@@ -1,7 +1,7 @@
 var markerIcon = require('./img/marker-icon.png');
 var markerShadow = require('./img/marker-shadow.png');
 var ol = require('openlayers');
-const {last, head} = require('lodash');
+const {last, head, isArray} = require('lodash');
 const blue = [0, 153, 255, 1];
 const assign = require('object-assign');
 const {trim, isString} = require('lodash');
@@ -480,8 +480,13 @@ function getStyle(options, isDrawing = false, textValues = []) {
                             }));
                         }
                         let gStyle = getValidStyle(type, options, isDrawing, textValues);
+                        if (isArray(gStyle)) {
+                            gStyle.forEach(s => {s.setGeometry(c); });
+                            return p.concat(gStyle);
+                        }
                         gStyle.setGeometry(c);
                         return p.concat([gStyle]);
+
                     }, []);
                     return styles;
                 }
diff --git a/web/client/components/mapcontrols/annotations/Annotations.jsx b/web/client/components/mapcontrols/annotations/Annotations.jsx
@@ -171,7 +171,7 @@ class Annotations extends React.Component {
         }
         if (featureType === "GeometryCollection" || featureType === "FeatureCollection") {
             return (<span className={"mapstore-annotations-panel-card"}>
-            {(!!(geometry.geometries || geometry.features).filter(f => f.type !== "MultiPoint").length || (properties.textValues && properties.textValues.length)) && (<MultiGeomThumb styleMultiGeom={style} geometry={geometry} properties={properties}/>)}
+            {(!!(geometry.geometries || geometry.features || []).filter(f => f.type !== "MultiPoint").length || (properties.textValues && properties.textValues.length)) && (<MultiGeomThumb styleMultiGeom={style} geometry={geometry} properties={properties}/>)}
             {markerStyle ? (<span className={"mapstore-annotations-panel-card"}>
                 <div className={"mapstore-annotations-panel-card-thumbnail-" + marker.name} style={{...marker.thumbnailStyle, margin: 'auto', textAlign: 'center', color: '#ffffff', marginLeft: 7}}>
                     <span className={"mapstore-annotations-panel-card-thumbnail " + this.getConfig().getGlyphClassName(markerStyle)} style={{marginTop: 0, marginLeft: -7}}/>

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ class Annotations extends React.Component {`
`171`	`171`	`}`
`172`	`172`	`if (featureType === "GeometryCollection" \|\| featureType === "FeatureCollection") {`
`173`	`173`	`return (<span className={"mapstore-annotations-panel-card"}>`
`174`		`- {(!!(geometry.geometries \|\| geometry.features).filter(f => f.type !== "MultiPoint").length \|\| (properties.textValues && properties.textValues.length)) && (<MultiGeomThumb styleMultiGeom={style} geometry={geometry} properties={properties}/>)}`
	`174`	`+ {(!!(geometry.geometries \|\| geometry.features \|\| []).filter(f => f.type !== "MultiPoint").length \|\| (properties.textValues && properties.textValues.length)) && (<MultiGeomThumb styleMultiGeom={style} geometry={geometry} properties={properties}/>)}`
`175`	`175`	`{markerStyle ? (<span className={"mapstore-annotations-panel-card"}>`
`176`	`176`	`<div className={"mapstore-annotations-panel-card-thumbnail-" + marker.name} style={{...marker.thumbnailStyle, margin: 'auto', textAlign: 'center', color: '#ffffff', marginLeft: 7}}>`
`177`	`177`	`<span className={"mapstore-annotations-panel-card-thumbnail " + this.getConfig().getGlyphClassName(markerStyle)} style={{marginTop: 0, marginLeft: -7}}/>`