Skip to content

Add bit to distinguish between tagged and untagged nodes [libosmium part] #394

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

Add bit to distinguish between tagged and untagged nodes [libosmium part] #394

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 29 additions & 7 deletions include/osmium/osm/location.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,9 @@ namespace osmium {
int32_t m_x; // NOLINT(modernize-use-default-member-init)
int32_t m_y; // NOLINT(modernize-use-default-member-init)

// Use MSB of y-coordinate to store tag information
static constexpr int32_t TAG_BIT = 0x80000000;

constexpr static double precision() noexcept {
return static_cast<double>(detail::coordinate_precision);
}
Expand Down Expand Up @@ -352,8 +355,8 @@ namespace osmium {
constexpr bool valid() const noexcept {
return m_x >= -180 * precision()
&& m_x <= 180 * precision()
&& m_y >= -90 * precision()
&& m_y <= 90 * precision();
&& y() >= -90 * precision()
&& y() <= 90 * precision();
}

/**
Expand All @@ -379,7 +382,7 @@ namespace osmium {
}

constexpr int32_t y() const noexcept {
return m_y;
return m_y & ~TAG_BIT;
}

Location& set_x(const int32_t x) noexcept {
Expand All @@ -388,7 +391,26 @@ namespace osmium {
}

Location& set_y(const int32_t y) noexcept {
m_y = y;
m_y = (m_y & TAG_BIT) | (y & ~TAG_BIT);
return *this;
}

/**
* Check if the node is tagged
*/
bool is_tagged() const noexcept {
return (m_y & TAG_BIT) != 0;
}

/**
* Set the tag status of the node
*/
Location& set_tagged(bool tagged) noexcept {
if (tagged) {
m_y |= TAG_BIT;
} else {
m_y &= ~TAG_BIT;
}
return *this;
}

Expand Down Expand Up @@ -420,14 +442,14 @@ namespace osmium {
if (!valid()) {
throw osmium::invalid_location{"invalid location"};
}
return fix_to_double(m_y);
return fix_to_double(m_y & ~TAG_BIT);
}

/**
* Get latitude without checking the validity.
*/
double lat_without_check() const noexcept {
return fix_to_double(m_y);
return fix_to_double(m_y & ~TAG_BIT);
}

Location& set_lon(double lon) noexcept {
Expand All @@ -436,7 +458,7 @@ namespace osmium {
}

Location& set_lat(double lat) noexcept {
m_y = double_to_fix(lat);
m_y = (m_y & TAG_BIT) | (double_to_fix(lat) & ~TAG_BIT);
return *this;
}

Expand Down