diff --git a/DataExtractionOSM/src/net/osmand/render/RenderingRuleSearchRequest.java b/DataExtractionOSM/src/net/osmand/render/RenderingRuleSearchRequest.java
index 2f95fec1c2..4124cb2372 100644
--- a/DataExtractionOSM/src/net/osmand/render/RenderingRuleSearchRequest.java
+++ b/DataExtractionOSM/src/net/osmand/render/RenderingRuleSearchRequest.java
@@ -30,6 +30,7 @@ public class RenderingRuleSearchRequest {
}
}
fvalues = new float[props.length];
+ setBooleanFilter(storage.PROPS.R_TEST, true);
saveState();
}
diff --git a/DataExtractionOSM/src/net/osmand/render/RenderingRuleStorageProperties.java b/DataExtractionOSM/src/net/osmand/render/RenderingRuleStorageProperties.java
index db0679f40f..2a2578e3a6 100644
--- a/DataExtractionOSM/src/net/osmand/render/RenderingRuleStorageProperties.java
+++ b/DataExtractionOSM/src/net/osmand/render/RenderingRuleStorageProperties.java
@@ -13,6 +13,7 @@ public class RenderingRuleStorageProperties {
public static final String ATTR_BOOL_VALUE = "attrBoolValue";
public static final String ATTR_COLOR_VALUE = "attrColorValue";
public static final String ATTR_STRING_VALUE = "attrStringValue";
+ public static final String TEST = "test";
public static final String TEXT_LENGTH = "textLength";
public static final String NAME_TAG = "nameTag";
@@ -65,6 +66,7 @@ public class RenderingRuleStorageProperties {
public static final String SHADOW_LEVEL = "shadowLevel";
+ public RenderingRuleProperty R_TEST;
public RenderingRuleProperty R_ATTR_INT_VALUE;
public RenderingRuleProperty R_ATTR_BOOL_VALUE;
public RenderingRuleProperty R_ATTR_COLOR_VALUE;
@@ -139,6 +141,7 @@ public class RenderingRuleStorageProperties {
}
public void createDefaultRenderingRuleProperties() {
+ R_TEST = registerRuleInternal(RenderingRuleProperty.createInputBooleanProperty(TEST));
R_TAG = registerRuleInternal(RenderingRuleProperty.createInputStringProperty(TAG));
R_VALUE = registerRuleInternal(RenderingRuleProperty.createInputStringProperty(VALUE));
R_ADDITIONAL = registerRuleInternal(RenderingRuleProperty.createAdditionalStringProperty(ADDITIONAL));
diff --git a/DataExtractionOSM/src/net/osmand/render/default.render.xml b/DataExtractionOSM/src/net/osmand/render/default.render.xml
index d82ef1755b..cfc53c968b 100644
--- a/DataExtractionOSM/src/net/osmand/render/default.render.xml
+++ b/DataExtractionOSM/src/net/osmand/render/default.render.xml
@@ -10,10 +10,6 @@
-->
-
-
-
-
-
-
-
@@ -78,11 +69,15 @@
-
+
+
+
+
+
@@ -917,7 +912,7 @@
-
+
@@ -1026,11 +1021,11 @@
-
+
-
+
@@ -1132,8 +1127,8 @@
-
-
+
+
@@ -1175,8 +1170,8 @@
-
-
+
+
@@ -1205,11 +1200,11 @@
-
-
+
+
-
+
@@ -1218,7 +1213,7 @@
-
+
@@ -1238,9 +1233,9 @@
-
+
-
+
@@ -1248,7 +1243,7 @@
-
+
@@ -1264,10 +1259,10 @@
-
+
-
-
+
+
@@ -1281,19 +1276,19 @@
-
+
-
-
+
+
-
+
-
-
+
+
@@ -1310,32 +1305,32 @@
-
-
-
+
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -1604,5 +1599,4 @@
-
-
+
\ No newline at end of file
diff --git a/Osmand-kernel/osmand/src/renderRules.cpp b/Osmand-kernel/osmand/src/renderRules.cpp
index 8a45f174dd..1922e1529d 100644
--- a/Osmand-kernel/osmand/src/renderRules.cpp
+++ b/Osmand-kernel/osmand/src/renderRules.cpp
@@ -456,6 +456,7 @@ RenderingRuleSearchRequest::RenderingRuleSearchRequest(RenderingRulesStorage* st
values[it->second->id] = -1;
}
}
+ setBooleanFilter(PROPS->R_TEST, true);
saveState();
}
diff --git a/Osmand-kernel/osmand/src/renderRules.h b/Osmand-kernel/osmand/src/renderRules.h
index fb353939a9..6ee423b3c7 100644
--- a/Osmand-kernel/osmand/src/renderRules.h
+++ b/Osmand-kernel/osmand/src/renderRules.h
@@ -178,6 +178,7 @@ public:
class RenderingRulesStorageProperties
{
public:
+ RenderingRuleProperty* R_TEST;
RenderingRuleProperty* R_TEXT_LENGTH;
RenderingRuleProperty* R_REF;
RenderingRuleProperty* R_TEXT_SHIELD;
@@ -294,6 +295,7 @@ public:
}
void createDefaultProperties() {
+ R_TEST = registerRuleInternal(RenderingRuleProperty::createInputBooleanProperty("test"));
R_TAG = registerRuleInternal(RenderingRuleProperty::createInputStringProperty("tag"));
R_VALUE = registerRuleInternal(RenderingRuleProperty::createInputStringProperty("value"));
R_ADDITIONAL = registerRuleInternal(RenderingRuleProperty::createInputStringProperty("additional"));