openlayers-style-editor 1.1.0 → 1.1.1

package/dist/index.cjs

@@ -551,6 +551,8 @@
 			"fill-color": fillColorArray,
 			"_rules": filters.map((f) => ({
 				expression: getFriendlyExpression(f),
+				name: f.name,
+				json: f.filterJson,
 				render: f.symbol
 			}))
 		};
@@ -2782,9 +2784,11 @@
 		function deconstructRule(rule) {
 			const parsedRule = JSON.parse(rule);
 			const isAll = parsedRule.hasOwnProperty("and");
+			let conditions = parsedRule[isAll ? "and" : "or"];
+			if (!conditions) conditions = [parsedRule];
 			return {
 				isAll,
-				conditions: parsedRule[isAll ? "and" : "or"].map((condition) => {
+				conditions: conditions.map((condition) => {
 					const operator = Object.keys(condition)[0];
 					const value = condition[operator];
 					if (operator === "==" && value[0].hasOwnProperty("substr")) {
@@ -3034,7 +3038,19 @@
 	//#region src/components/basedOnRules.tsx
 	function BasedOnRules(props) {
 		const { setVisible, applyRenderer, layerCurrentRenderer, features, idFieldName } = props;
-		const [rules, setRules] = (0, react.useState)(layerCurrentRenderer.type == RenderType.ByRules ? layerCurrentRenderer.filters ? layerCurrentRenderer.filters : [] : []);
+		const [rules, setRules] = (0, react.useState)(() => {
+			if (layerCurrentRenderer.type == RenderType.ByRules) {
+				if (layerCurrentRenderer.filters && layerCurrentRenderer.filters.length > 0) return layerCurrentRenderer.filters;
+				else if (layerCurrentRenderer.rendererOL._rules) return layerCurrentRenderer.rendererOL._rules.map((r, index) => ({
+					name: r.name || r.expression,
+					filterJson: r.json,
+					isElse: index === layerCurrentRenderer.rendererOL._rules.length - 1,
+					symbol: r.render,
+					isAll: false
+				}));
+			}
+			return [];
+		});
 		const [selectedRule, setSelectedRule] = (0, react.useState)();
 		const [showDialog, setShowDialog] = (0, react.useState)(false);
 		const [isAdding, setIsAdding] = (0, react.useState)(false);

package/dist/index.js

@@ -519,6 +519,8 @@ function getByRulesStyle(filters, idFieldName, features, elseFilter) {
 		"fill-color": fillColorArray,
 		"_rules": filters.map((f) => ({
 			expression: getFriendlyExpression(f),
+			name: f.name,
+			json: f.filterJson,
 			render: f.symbol
 		}))
 	};
@@ -2750,9 +2752,11 @@ var FilterWidget = (props) => {
 	function deconstructRule(rule) {
 		const parsedRule = JSON.parse(rule);
 		const isAll = parsedRule.hasOwnProperty("and");
+		let conditions = parsedRule[isAll ? "and" : "or"];
+		if (!conditions) conditions = [parsedRule];
 		return {
 			isAll,
-			conditions: parsedRule[isAll ? "and" : "or"].map((condition) => {
+			conditions: conditions.map((condition) => {
 				const operator = Object.keys(condition)[0];
 				const value = condition[operator];
 				if (operator === "==" && value[0].hasOwnProperty("substr")) {
@@ -3002,7 +3006,19 @@ var FilterWidget = (props) => {
 //#region src/components/basedOnRules.tsx
 function BasedOnRules(props) {
 	const { setVisible, applyRenderer, layerCurrentRenderer, features, idFieldName } = props;
-	const [rules, setRules] = useState(layerCurrentRenderer.type == RenderType.ByRules ? layerCurrentRenderer.filters ? layerCurrentRenderer.filters : [] : []);
+	const [rules, setRules] = useState(() => {
+		if (layerCurrentRenderer.type == RenderType.ByRules) {
+			if (layerCurrentRenderer.filters && layerCurrentRenderer.filters.length > 0) return layerCurrentRenderer.filters;
+			else if (layerCurrentRenderer.rendererOL._rules) return layerCurrentRenderer.rendererOL._rules.map((r, index) => ({
+				name: r.name || r.expression,
+				filterJson: r.json,
+				isElse: index === layerCurrentRenderer.rendererOL._rules.length - 1,
+				symbol: r.render,
+				isAll: false
+			}));
+		}
+		return [];
+	});
 	const [selectedRule, setSelectedRule] = useState();
 	const [showDialog, setShowDialog] = useState(false);
 	const [isAdding, setIsAdding] = useState(false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openlayers-style-editor",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "type": "module",
   "description": "A style editor extension for OpenLayers currently working with WebGL Vector Layers",
   "homepage": "https://land-it.github.io/openlayers-style-editor/",