From 3b8b50a68cead752c2cd858f3840b0d8a17217a9 Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Wed, 27 Jul 2016 15:36:24 +0300 Subject: [PATCH] Logging min altitude while mwm generation. --- generator/altitude_generator.cpp | 7 ++++++- routing/nearest_edge_finder.cpp | 11 +++++++---- tools/unix/generate_mwm.sh | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/generator/altitude_generator.cpp b/generator/altitude_generator.cpp index e3feee18ed..4b3d0e7088 100644 --- a/generator/altitude_generator.cpp +++ b/generator/altitude_generator.cpp @@ -220,7 +220,12 @@ void BuildRoadAltitudes(string const & mwmPath, AltitudeGetter & altitudeGetter) w.Seek(startOffset); header.Serialize(w); w.Seek(endOffset); - LOG(LINFO, (ALTITUDES_FILE_TAG, "section is ready. The size is", endOffset - startOffset)); + LOG(LINFO, (ALTITUDES_FILE_TAG, "section is ready. The size is", endOffset - startOffset, + "min altitude is", processor.GetMinAltitude())); + if (processor.HasAltitudeInfo()) + LOG(LINFO, ("Min altitude is", processor.GetMinAltitude())); + else + LOG(LINFO, ("Min altitude isn't defined.")); } catch (RootException const & e) { diff --git a/routing/nearest_edge_finder.cpp b/routing/nearest_edge_finder.cpp index fc6ebd0090..fc70555492 100644 --- a/routing/nearest_edge_finder.cpp +++ b/routing/nearest_edge_finder.cpp @@ -41,12 +41,15 @@ void NearestEdgeFinder::AddInformationSource(FeatureID const & featureId, IRoadG feature::TAltitude projPointAlt = feature::kDefaultAltitudeMeters; if (segLenM == 0.0) { - ASSERT(false, (featureId)); + LOG(LWARNING, ("Length of segment", i, " of feature", featureId, "is zero.")); projPointAlt = startAlt; } - double const distFromStartM = MercatorBounds::DistanceOnEarth(segStart.GetPoint(), pt); - ASSERT_LESS_OR_EQUAL(distFromStartM, segLenM, (featureId)); - projPointAlt = startAlt + static_cast((endAlt - startAlt) * distFromStartM / segLenM); + else + { + double const distFromStartM = MercatorBounds::DistanceOnEarth(segStart.GetPoint(), pt); + ASSERT_LESS_OR_EQUAL(distFromStartM, segLenM, (featureId)); + projPointAlt = startAlt + static_cast((endAlt - startAlt) * distFromStartM / segLenM); + } res.m_dist = d; res.m_fid = featureId; diff --git a/tools/unix/generate_mwm.sh b/tools/unix/generate_mwm.sh index b0939000a6..cededb574e 100755 --- a/tools/unix/generate_mwm.sh +++ b/tools/unix/generate_mwm.sh @@ -103,7 +103,7 @@ if [ "$SOURCE_TYPE" == "pbf" -o "$SOURCE_TYPE" == "bz2" -o "$SOURCE_TYPE" == "os fi if [ "$SOURCE_TYPE" == "o5m" ]; then $GENERATOR_TOOL $INTDIR_FLAG --osm_file_type=o5m --osm_file_name="$SOURCE_FILE" --preprocess=true || fail "Preprocessing failed" - $GENERATOR_TOOL $INTDIR_FLAG --osm_file_type=o5m --osm_file_name="$SOURCE_FILE" --data_path="$TARGET" --user_resource_path="$DATA_PATH" $GENERATE_EVERYTHING --output="$BASE_NAME" --srtm_path="./../../maps/srtm/2000.02.11/" + $GENERATOR_TOOL $INTDIR_FLAG --osm_file_type=o5m --osm_file_name="$SOURCE_FILE" --data_path="$TARGET" --user_resource_path="$DATA_PATH" $GENERATE_EVERYTHING --output="$BASE_NAME" else fail "Unsupported source type: $SOURCE_TYPE" fi