Skip to content

Commit

Permalink
Merge pull request #40 from opentraffic/duplicate_coords
Browse files Browse the repository at this point in the history 
Change from using MultiLineString to LineString.
  • Loading branch information
@gknisely
gknisely authored Sep 14, 2017
2 parents 05e8acb + 7bd4dce commit 7553da5
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 32 deletions.
48 changes: 40 additions & 8 deletions src/geojson_osmlr.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,15 @@ void output_segment(std::ostringstream& out,
}
first = false;
out << "{\"type\":\"Feature\",\"geometry\":";
out << "{\"type\":\"MultiLineString\",\"coordinates\":[";
out << "[";
out << "{\"type\":\"LineString\",\"coordinates\":[";
bool first_pt = true;
for (const auto pt : shape) {
if (first_pt) { first_pt = false; } else { out << ","; }
out << "[" << pt.lng() << "," << pt.lat() << "]";
}
out << "]";

bool oneway = (edge->reverseaccess() & vb::kVehicularAccess) == 0;
out << "]},\"properties\":{"
<< "\"tile_id\":" << osmlr_id.tileid() << ","
<< "\"level\":" << osmlr_id.level() << ","
<< "\"id\":" << osmlr_id.id() << ","
<< "\"osmlr_id\":" << osmlr_id.value << ","
<< "\"best_frc\":\"" << vb::to_string(edge->classification()) << "\","
Expand Down Expand Up @@ -117,9 +113,17 @@ const vb::DirectedEdge* follow_segment(const vb::TrafficSegment& seg,
if (next_seg.begin_percent_ > 0.0f || next_seg.end_percent_ < 1.0f) {
auto partial_shape = vm::trim_polyline(next_shape.begin(), next_shape.end(),
next_seg.begin_percent_, next_seg.end_percent_);
std::copy(partial_shape.begin(), partial_shape.end(), std::back_inserter(shape));
if (partial_shape.front() == shape.back()) {
std::copy(partial_shape.begin()+1, partial_shape.end(), std::back_inserter(shape));
} else {
std::copy(partial_shape.begin(), partial_shape.end(), std::back_inserter(shape));
}
} else {
std::copy(next_shape.begin(), next_shape.end(), std::back_inserter(shape));
if (next_shape.front() == shape.back()) {
std::copy(next_shape.begin()+1, next_shape.end(), std::back_inserter(shape));
} else {
std::copy(next_shape.begin(), next_shape.end(), std::back_inserter(shape));
}
}

// Matched segment has been found. Return nullptr if this edge ends
Expand Down Expand Up @@ -177,12 +181,24 @@ void create_geojson(std::queue<vb::GraphId>& tilequeue,
std::string date_str = std::string(mbstr);
uint64_t osm_changeset_id = pbf_tile.changeset_id();

// Create a map of valid Ids within this tile - we will record those that
// we find in the traffic-enabled Valhalla tile
uint32_t id = 0;
std::unordered_map<uint32_t, bool> segment_map;
for (const auto& entry : pbf_tile.entries()) {
if (entry.has_segment()) {
segment_map[id] = false;
}
id++;
}

// Create the GeoJSON output stream
std::ostringstream out;
out.precision(9);
out << "{\"type\":\"FeatureCollection\",\"properties\":{"
<< "\"creation_time\":" << creation_date << ","
<< "\"creation_date\":\"" << date_str << "\","
<< "\"description\":\"" << tile_id << "\","
<< "\"changeset_id\":" << osm_changeset_id << "},";
out << "\"features\":[";

Expand All @@ -209,6 +225,7 @@ void create_geojson(std::queue<vb::GraphId>& tilequeue,
seg.ends_segment_ && seg.end_percent_ == 1.0f) {
// Output full segment along this edge
output_segment(out, first, seg.segment_id_, edge, shape);
segment_map[seg.segment_id_.id()] = true;
} else {
if (seg.starts_segment_) {
if (seg.end_percent_ == 1.0f) {
Expand All @@ -218,6 +235,7 @@ void create_geojson(std::queue<vb::GraphId>& tilequeue,
;
}
output_segment(out, first, seg.segment_id_, first_edge, shape);
segment_map[seg.segment_id_.id()] = true;
} else {
// Should not see partial, single edges that are not part of a chunk
LOG_ERROR("Single partial segment starts on this edge but does not use entire edge?");
Expand All @@ -234,6 +252,7 @@ void create_geojson(std::queue<vb::GraphId>& tilequeue,
// edge for this segment
auto partial_shape = vm::trim_polyline(shape.begin(), shape.end(), seg.begin_percent_, seg.end_percent_);
output_segment(out, first, seg.segment_id_, edge, partial_shape);
segment_map[seg.segment_id_.id()] = true;
} else {
// THIS SHOULD NOT OCCUR!
LOG_ERROR("Chunk that does not begin and end a segment");
Expand All @@ -245,6 +264,19 @@ void create_geojson(std::queue<vb::GraphId>& tilequeue,
// Output to file
out << "]}";
writer.write_to(tile_id, out.str());

// Log statistics for this tile
uint32_t found = 0;
for (const auto& seg : segment_map) {
if (seg.second) {
found++;
}
}
if (found != segment_map.size()) {
LOG_INFO("Tile: " + std::to_string(tile_id.level()) + "/" + std::to_string(tile_id.tileid()) +
" Found " + std::to_string(found) + " of " + std::to_string(segment_map.size()) +
" OSMLR segments");
}
}
}

Expand Down Expand Up @@ -361,7 +393,7 @@ int main(int argc, char** argv) {
thread->join();
}
/*
// Check all of the outcomes, to see about maximum density (km/km2)
// Check all of the outcomes
enhancer_stats stats{std::numeric_limits<float>::min(), 0};
for (auto& result : results) {
// If something bad went down this will rethrow it
Expand Down
38 changes: 14 additions & 24 deletions src/output/geojson.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,15 +155,14 @@ void geojson::output_segment(const vb::merge::path &p) {
}

out << "{\"type\":\"Feature\",\"geometry\":";
out << "{\"type\":\"MultiLineString\",\"coordinates\":[";
out << "{\"type\":\"LineString\",\"coordinates\":[";

bool first = true;
bool first_pt = true;
bool oneway = false;
bool drive_on_right = false;
vb::RoadClass best_frc = vb::RoadClass::kServiceOther;
vm::PointLL prev_pt;
for (auto edge_id : p.m_edges) {
if (first) { first = false; } else { out << ","; };

const auto *tile = m_reader.GetGraphTile(edge_id);
const auto* directededge = tile->directededge(edge_id);
oneway = is_oneway(directededge);
Expand All @@ -180,20 +179,19 @@ void geojson::output_segment(const vb::merge::path &p) {
}

// Serialize the shape
out << "[";
bool first_pt = true;
for (const auto& pt : shape) {
if (pt == prev_pt) {
continue;
}
if (first_pt) { first_pt = false; } else { out << ","; }
out << "[" << pt.lng() << "," << pt.lat() << "]";
prev_pt = pt;
}
out << "]";
}

// Add properties for this OSMLR segment
vb::GraphId osmlr_id(tile_id.tileid(), tile_id.level(), tile_path_itr->second);
out << "]},\"properties\":{"
<< "\"tile_id\":" << tile_id.tileid() << ","
<< "\"level\":" << tile_id.level() << ","
<< "\"id\":" << tile_path_itr->second << ","
<< "\"osmlr_id\":" << osmlr_id.value << ","
<< "\"best_frc\":\"" << vb::to_string(best_frc) << "\","
Expand All @@ -219,6 +217,7 @@ void geojson::output_segment(const std::vector<vm::PointLL>& shape,
out << "{\"type\":\"FeatureCollection\",\"properties\":{"
<< "\"creation_time\":" << m_creation_date << ","
<< "\"creation_date\":\"" << m_date_str << "\","
<< "\"description\":\"" << tile_id << "\","
<< "\"changeset_id\":" << m_osm_changeset_id << "},";
out << "\"features\":[";
std::tie(tile_path_itr, std::ignore) = m_tile_path_ids.emplace(tile_id, 0);
Expand All @@ -227,32 +226,23 @@ void geojson::output_segment(const std::vector<vm::PointLL>& shape,
}

out << "{\"type\":\"Feature\",\"geometry\":";
out << "{\"type\":\"MultiLineString\",\"coordinates\":[";
out << "[";
out << "{\"type\":\"LineString\",\"coordinates\":[";

bool first_pt = true;
for (const auto pt : shape) {
if (first_pt) { first_pt = false; } else { out << ","; }
out << "[" << pt.lng() << "," << pt.lat() << "]";
}
out << "]";

vb::GraphId osmlr_id(tile_id.tileid(), tile_id.level(), tile_path_itr->second);
bool first = true;
bool oneway = is_oneway(edge);
bool drive_on_right = edge->drive_on_right();
vb::RoadClass best_frc = edge->classification();
out << "]},\"properties\":{"
<< "\"tile_id\":" << tile_id.tileid() << ","
<< "\"level\":" << tile_id.level() << ","
<< "\"id\":" << tile_path_itr->second << ","
<< "\"osmlr_id\":" << osmlr_id.value << ","
<< "\"best_frc\":\"" << vb::to_string(best_frc) << "\","
<< "\"oneway\":" << oneway << ","
<< "\"drive_on_right\":" << drive_on_right << ","
<< "\"original_edges\":\"";

out << edgeid;
out << "\"}}";
<< "\"best_frc\":\"" << vb::to_string(edge->classification()) << "\","
<< "\"oneway\":" << is_oneway(edge) << ","
<< "\"drive_on_right\":" << edge->drive_on_right();
out << "}}";

m_writer.write_to(tile_id, out.str());
tile_path_itr->second += 1;
Expand Down

0 comments on commit 7553da5

Please sign in to comment.