Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RestartRelations() to reset relation subscript #548

Merged
merged 1 commit into from
Oct 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/RELATIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ Now that you've accepted the relations, they will be available from `way_functio
print ("Part of route "..way:FindInRelation("ref"))
end

(Should you need to re-read the relations, you can reset the iterator with `way:RestartRelations()`.)


### Writing relation geometries

Expand Down
1 change: 1 addition & 0 deletions include/osm_lua_processing.h
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ class OsmLuaProcessing {

// Relation scan support
kaguya::optional<int> NextRelation();
void RestartRelations();
std::string FindInRelation(const std::string &key);
void Accept();

Expand Down
5 changes: 5 additions & 0 deletions src/osm_lua_processing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ OsmLuaProcessing::OsmLuaProcessing(
.addOverloadedFunctions("ZOrder", &OsmLuaProcessing::ZOrder, &OsmLuaProcessing::ZOrderWithScale)
.addFunction("Accept", &OsmLuaProcessing::Accept)
.addFunction("NextRelation", &OsmLuaProcessing::NextRelation)
.addFunction("RestartRelations", &OsmLuaProcessing::RestartRelations)
.addFunction("FindInRelation", &OsmLuaProcessing::FindInRelation)
);
supportsRemappingShapefiles = !!luaState["attribute_function"];
Expand Down Expand Up @@ -525,6 +526,10 @@ kaguya::optional<int> OsmLuaProcessing::NextRelation() {
return relationList[relationSubscript];
}

void OsmLuaProcessing::RestartRelations() {
relationSubscript = -1;
}

std::string OsmLuaProcessing::FindInRelation(const std::string &key) {
return osmStore.get_relation_tag(relationList[relationSubscript], key);
}
Expand Down
Loading