Fix indexing nodes when basezoom>14 (#728)

systemed · web-flow · commit eab08d189ad9 · 2024-06-09T12:52:38.000+01:00
diff --git a/include/tile_data.h b/include/tile_data.h
@@ -453,6 +453,7 @@ class TileDataSource {
 
 	virtual void populateMultiPolygon(MultiPolygon& dst, NodeID objectID);
 
+	unsigned int getIndexZoom() const { return indexZoom; }
 	inline size_t getId(NodeID id) const {
 		return id & (~(~0ull << (TILE_DATA_ID_SIZE - shardBits)));
 	}
diff --git a/src/osm_lua_processing.cpp b/src/osm_lua_processing.cpp
@@ -972,7 +972,7 @@ bool OsmLuaProcessing::setNode(NodeID id, LatpLon node, const TagMap& tags) {
 	}
 
 	if (!this->empty()) {
-		TileCoordinates index = latpLon2index(node, this->config.baseZoom);
+		TileCoordinates index = latpLon2index(node, osmMemTiles.getIndexZoom());
 
 		for (auto &output : finalizeOutputs()) {
 			osmMemTiles.addObjectToSmallIndex(index, output, originalOsmID);

Original file line number	Diff line number	Diff line change
`@@ -453,6 +453,7 @@ class TileDataSource {`
`453`	`453`
`454`	`454`	`virtual void populateMultiPolygon(MultiPolygon& dst, NodeID objectID);`
`455`	`455`
	`456`	`+ unsigned int getIndexZoom() const { return indexZoom; }`
`456`	`457`	`inline size_t getId(NodeID id) const {`
`457`	`458`	`return id & (~(~0ull << (TILE_DATA_ID_SIZE - shardBits)));`
`458`	`459`	`}`
Original file line number	Diff line number	Diff line change
`@@ -972,7 +972,7 @@ bool OsmLuaProcessing::setNode(NodeID id, LatpLon node, const TagMap& tags) {`
`972`	`972`	`}`
`973`	`973`
`974`	`974`	`if (!this->empty()) {`
`975`		`- TileCoordinates index = latpLon2index(node, this->config.baseZoom);`
	`975`	`+ TileCoordinates index = latpLon2index(node, osmMemTiles.getIndexZoom());`
`976`	`976`
`977`	`977`	`for (auto &output : finalizeOutputs()) {`
`978`	`978`	`osmMemTiles.addObjectToSmallIndex(index, output, originalOsmID);`