AttributeStore memory tweaks

include/osm_lua_processing.h

@@ -206,6 +206,7 @@ class OsmLuaProcessing {
 		multiPolygonInited = false;
 		relationAccepted = false;
 		relationSubscript = -1;
+		lastStoredGeometryId = 0;
 	}
 
 	const inline Point getPoint() {
@@ -243,6 +244,9 @@ class OsmLuaProcessing {
 	MultiPolygon multiPolygonCache;
 	bool multiPolygonInited;
 
+	NodeID lastStoredGeometryId;
+	OutputGeometryType lastStoredGeometryType;
+
 	const class Config &config;
 	class LayerDefinition &layers;
 

include/output_object.h

@@ -29,14 +29,13 @@ std::ostream& operator<<(std::ostream& os, OutputGeometryType geomType);
 #pragma pack(push, 4)
 class OutputObject {
 
-protected:	
+public:
 	OutputObject(OutputGeometryType type, uint_least8_t l, NodeID id, AttributeIndex attributes, uint mz) 
 		: objectID(id), geomType(type), layer(l), z_order(0),
 		  minZoom(mz), attributes(attributes)
 	{ }
 
 
-public:
 	NodeID objectID 			: 36;					// id of point/linestring/polygon
 	unsigned minZoom 			: 4;					// minimum zoom level in which object is written
 	AttributeIndex attributes   : 30;					// index in attribute storage
@@ -79,54 +78,10 @@ class OutputObject {
 	 * (we can't easily use find() because of the different value-type encoding - 
 	 *	should be possible to improve this though)
 	 */
-	int findValue(std::vector<vector_tile::Tile_Value> *valueList, vector_tile::Tile_Value const &value) const;
+	int findValue(const std::vector<vector_tile::Tile_Value>* valueList, const AttributePair& value) const;
 };
 #pragma pack(pop)
 
-/**
- * \brief An OutputObject derived class that contains data originally from OsmMemTiles
-*/
-class OutputObjectPoint : public OutputObject
-{
-public:
-	OutputObjectPoint(OutputGeometryType type, uint_least8_t l, NodeID id, AttributeIndex attributes, uint minzoom)
-		: OutputObject(type, l, id, attributes, minzoom)
-	{ 
-		assert(type == POINT_);
-	}
-}; 
-
-class OutputObjectLinestring : public OutputObject
-{
-public:
-	OutputObjectLinestring(OutputGeometryType type, uint_least8_t l, NodeID id, AttributeIndex attributes, uint minzoom)
-		: OutputObject(type, l, id, attributes, minzoom)
-	{ 
-		assert(type == LINESTRING_);
-	}
-};
-
-class OutputObjectMultiLinestring : public OutputObject
-{
-public:
-	OutputObjectMultiLinestring(OutputGeometryType type, uint_least8_t l, NodeID id, AttributeIndex attributes, uint minzoom)
-		: OutputObject(type, l, id, attributes, minzoom)
-	{ 
-		assert(type == MULTILINESTRING_);
-	}
-};
-
-
-class OutputObjectMultiPolygon : public OutputObject
-{
-public:
-	OutputObjectMultiPolygon(OutputGeometryType type, uint_least8_t l, NodeID id, AttributeIndex attributes, uint minzoom)
-		: OutputObject(type, l, id, attributes, minzoom)
-	{ 
-		assert(type == POLYGON_);
-	}
-};
-
 class OutputObjectRef
 {
 	OutputObject *oo;

include/tile_data.h

@@ -20,7 +20,7 @@ class TileDataSource {
 protected:	
 	std::mutex mutex;
 	TileIndex tileIndex;
-	std::deque<OutputObject> objects;
+	std::deque<std::deque<OutputObject>> objects;
 
 	// rtree index of large objects
 	using oo_rtree_param_type = boost::geometry::index::quadratic<128>;
@@ -55,7 +55,7 @@ class TileDataSource {
 
 public:
 	TileDataSource(unsigned int baseZoom) 
-		: baseZoom(baseZoom) 
+		: baseZoom(baseZoom)
 	{ }
 
 	///This must be thread safe!
@@ -70,12 +70,7 @@ class TileDataSource {
 		MergeSingleTileDataAtZoom(dstIndex, zoom, baseZoom, tileIndex, dstTile);
 	}
 
-	OutputObjectRef CreateObject(OutputObject const &oo) {
-		std::lock_guard<std::mutex> lock(mutex);
-		objects.push_back(oo);
-		return &objects.back();
-	}
-
+	OutputObjectRef CreateObject(OutputObject const &oo);
 	void AddGeometryToIndex(Linestring const &geom, std::vector<OutputObjectRef> const &outputs);
 	void AddGeometryToIndex(MultiLinestring const &geom, std::vector<OutputObjectRef> const &outputs);
 	void AddGeometryToIndex(MultiPolygon const &geom, std::vector<OutputObjectRef> const &outputs);
@@ -103,6 +98,13 @@ class TileDataSource {
 		linestring_store = std::make_unique<linestring_store_t>();
 		multi_polygon_store = std::make_unique<multi_polygon_store_t>();
 		multi_linestring_store = std::make_unique<multi_linestring_store_t>();
+
+		// Put something at index 0 of all stores so that 0 can be used
+		// as a sentinel.
+		point_store->push_back(Point(0,0));
+		linestring_store->push_back(linestring_t());
+		multi_polygon_store->push_back(multi_polygon_t());
+		multi_linestring_store->push_back(multi_linestring_t());
 	}
 	void reportSize() const;