Search for dynamic object properties

src/core/map.cpp

@@ -1114,6 +1114,10 @@ void Map::ensureVisibilityOfSelectedObjects(SelectionVisibility visibility)
 					widget->ensureVisibilityOfRect(rect, MapWidget::DiscreteZoom);
 				break;
 
+			case CenterFullVisibility:
+				widget->ensureVisibilityOfRect(rect, MapWidget::DiscreteZoom, true);
+				break;
+
 			case IgnoreVisibilty:
 				break; // Do nothing
 

src/core/map.h

@@ -121,6 +121,7 @@ friend class XMLFileExporter;
 	{
 		FullVisibility,
 		PartialVisibility,
+		CenterFullVisibility,
 		IgnoreVisibilty
 	};
 

src/core/objects/object.cpp

@@ -65,6 +65,7 @@ class QRectF;
 
 namespace literal
 {
+	// map file
 	static const QLatin1String object("object");
 	static const QLatin1String symbol("symbol");
 	static const QLatin1String type("type");
@@ -76,12 +77,45 @@ namespace literal
 	static const QLatin1String rotation("rotation");
 	static const QLatin1String size("size");
 	static const QLatin1String tags("tags");
+
+	// object properties
+	// boolean operations
+	static const QLatin1String UndefinedSymbol(".UndefinedSymbol");
+	static const QLatin1String AreaTooSmall(".AreaTooSmall");
+	static const QLatin1String LineTooShort(".LineTooShort");
+	// comparisons
+	static const QLatin1String PaperArea(".PaperArea");
+	static const QLatin1String RealArea(".RealArea");
+	static const QLatin1String PaperLength(".PaperLength");
+	static const QLatin1String RealLength(".RealLength");
 }
 
 
-
 namespace OpenOrienteering {
 
+static const std::vector<QLatin1String> object_properties = {literal::UndefinedSymbol, literal::AreaTooSmall, literal::LineTooShort, 
+                                                             literal::PaperArea, literal::RealArea, literal::PaperLength, literal::RealLength};
+
+bool Object::isObjectProperty(const QString& property)
+{
+	return std::find(object_properties.begin(), object_properties.end(), property) != object_properties.end();
+}
+
+bool Object::isBooleanObjectProperty(const QString& property)
+{
+	return std::find(object_properties.begin(), object_properties.begin() + 3, property) != object_properties.begin() + 3;
+}
+
+bool Object::isComparisonObjectProperty(const QString& property)
+{
+	return std::find(object_properties.begin() + 3, object_properties.end(), property) != object_properties.end();
+}
+
+const std::vector<QLatin1String>& Object::getObjectProperties()
+{
+	return object_properties;
+}
+
 // ### Object implementation ###
 
 Object::Object(Object::Type type, const Symbol* symbol)
@@ -755,6 +789,17 @@ void Object::includeControlPointsRect(QRectF& rect) const
 }
 
 
+QVariant Object::getObjectProperty(const QString& property) const
+{
+	if (property == literal::UndefinedSymbol)
+	{
+		if (map && symbol)
+			return QVariant(map->findSymbolIndex(symbol) < 0);
+	}
+
+	return QVariant();
+}
+
 
 // ### PathPart ###
 
@@ -3220,6 +3265,32 @@ bool PathObject::isLineTooShort() const
 }
 
 
+// override
+QVariant PathObject::getObjectProperty(const QString& property) const
+{
+	if (property == literal::AreaTooSmall)
+		return QVariant(isAreaTooSmall());
+
+	if (property == literal::LineTooShort)
+		return QVariant(isLineTooShort());
+
+	if (property == literal::PaperArea)
+		return QVariant(calculatePaperArea());
+
+	if (property == literal::RealArea)
+		return QVariant(calculateRealArea());
+
+	if (property == literal::PaperLength)
+		return QVariant(getPaperLength());
+
+	if (property == literal::RealLength)
+		return QVariant(getRealLength());
+
+	return Object::getObjectProperty(property);	// pass to base class function
+}
+
+
+
 // ### PointObject ###
 
 PointObject::PointObject(const Symbol* symbol)

src/core/objects/object.h

@@ -96,6 +96,7 @@ friend class XMLImportExport;
 	/** Creates an empty object with the given type, symbol, coords and (optional) map. */
 	explicit Object(Type type, const Symbol* symbol, MapCoordVector coords, Map* map = nullptr);
 
+
 protected:
 	/**
 	 * Constructs an Object, initialized from the given prototype.
@@ -317,6 +318,26 @@ friend class XMLImportExport;
 	 */
 	void includeControlPointsRect(QRectF& rect) const;
 
+
+	/**
+	 * Returns dynamic object properties that are common for all objects.
+	 * Derived object classes (i.e., PathObject) override this function to return class specific object properties.
+	 * If derived object classes don't provide a requested property, they invoke the base class function.
+	 */
+	virtual QVariant getObjectProperty(const QString& property) const;
+
+	/** Returns true if property is a dynamic object property. */
+	static bool isObjectProperty(const QString& property);
+
+	/** Returns true if property is a dynamic object property that returns a boolean value. */
+	static bool isBooleanObjectProperty(const QString& property);
+
+	/** Returns true if property is a dynamic object property that returns a value for comparison. */
+	static bool isComparisonObjectProperty(const QString& property);
+
+	/** Returns keywords of the available dynamic object properties. */
+	static const std::vector<QLatin1String>& getObjectProperties();
+
 protected:
 	virtual void updateEvent() const;
 
@@ -925,6 +946,14 @@ class PathObject : public Object  // clazy:exclude=copyable-polymorphic
 	bool isLineTooShort() const;
 
 
+	/**
+	 * Returns dynamic object properties that are specific for the PathObject class.
+	 * Note: Overrides the base class function that returns dynamic object properties that are common for all objects.
+	 * If a requested property is not provided by PathObject, the base class function is invoked.
+	 */
+	QVariant getObjectProperty(const QString& property) const override;
+
+
 protected:
 	/**
 	 * Adjusts the end index of the given part and the start/end indexes of the following parts.
@@ -1135,7 +1164,6 @@ struct ObjectPathCoord : public PathCoord
 };
 
 
-
 //### Object inline code ###
 
 inline