pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[build] CMake build fix.

Browse source
This commit is contained in:
Yuri Gorshenin 2017-02-13 14:04:56 +03:00 • committed by Sergey Yershov
parent 5f43e2cd31
commit 4e072c2183
4 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
indexer/CMakeLists.txt
View file

@ -6,7 +6,6 @@ set(
SRC
altitude_loader.cpp
altitude_loader.hpp
banners.cpp
banners.hpp
categories_holder_loader.cpp
categories_holder.cpp

1
indexer/indexer_tests/CMakeLists.txt
View file

@ -2,7 +2,6 @@ project(indexer_tests)
set(
SRC
banners_test.cpp
categories_test.cpp
cell_coverer_test.cpp
cell_id_test.cpp

20
indexer/road_shields_parser.cpp
View file

@ -16,18 +16,16 @@ using ftypes::RoadShieldType;
uint32_t constexpr kMaxRoadShieldBytesSize = 8;
std::array<std::string, 63> const kStatesCode {
"US", "SR", "FSR", "AL", "AK", "AZ", "AR", "CA", "CO", "CT", "DE", "DC", "FL", "GA",
"HI", "ID", "IL", "IN", "IA", "KS", "KY", "LA", "ME", "MD", "MA", "MI", "MN", "MS",
"MO", "MT", "NE", "NV", "NH", "NJ", "NM", "NY", "NC", "ND", "OH", "OK", "OR", "PA",
"RI", "SC", "SD", "TN", "TX", "UT", "VT", "VA", "WA", "WV", "WI", "WY", "AS", "GU",
"MP", "PR", "VI", "UM", "FM", "MH", "PW",
};
std::array<std::string, 63> const kStatesCode = {{
"US", "SR", "FSR", "AL", "AK", "AZ", "AR", "CA", "CO", "CT", "DE", "DC", "FL", "GA", "HI", "ID",
"IL", "IN", "IA", "KS", "KY", "LA", "ME", "MD", "MA", "MI", "MN", "MS", "MO", "MT", "NE", "NV",
"NH", "NJ", "NM", "NY", "NC", "ND", "OH", "OK", "OR", "PA", "RI", "SC", "SD", "TN", "TX", "UT",
"VT", "VA", "WA", "WV", "WI", "WY", "AS", "GU", "MP", "PR", "VI", "UM", "FM", "MH", "PW",
}};
std::array<std::string, 13> const kModifiers {
"alt", "alternate", "bus", "business", "bypass", "historic", "connector", "loop",
"scenic", "spur", "temporary", "toll", "truck"
};
std::array<std::string, 13> const kModifiers = {{
"alt", "alternate", "bus", "business", "bypass", "historic", "connector",
"loop", "scenic", "spur", "temporary", "toll", "truck"}};
class RoadShieldParser
{

1
qt/CMakeLists.txt
View file

@ -124,7 +124,6 @@ copy_resources(
cuisine-strings
eula.html
banners.txt
categories.txt
classificator.txt
colors.txt