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

Merge pull request #11025 from cc-engineering/generator.geojson-lon-lat

Browse source 
[generator] Fix jsonl generation: GeoJSON lat-lon format
This commit is contained in:
Sergey Yershov 2019-06-13 12:51:03 +03:00 • committed by GitHub
commit 679549a9dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
generator/geo_objects/geo_objects.cpp
View file

@ -57,8 +57,8 @@ void UpdateCoordinates(m2::PointD const & point, base::JSONPtr & json)
if (json_array_size(coordinates) == 2)
{
auto const latLon = MercatorBounds::ToLatLon(point);
json_array_set_new(coordinates, 0, ToJSON(latLon.m_lat).release());
json_array_set_new(coordinates, 1, ToJSON(latLon.m_lon).release());
json_array_set_new(coordinates, 0, ToJSON(latLon.m_lon).release());
json_array_set_new(coordinates, 1, ToJSON(latLon.m_lat).release());
}
}

2
generator/regions/to_string_policy.cpp
View file

@ -21,8 +21,8 @@ std::string JsonPolicy::ToString(NodePath const & path) const
auto coordinates = base::NewJSONArray();
auto const tmpCenter = main.GetCenter();
auto const center = MercatorBounds::ToLatLon({tmpCenter.get<0>(), tmpCenter.get<1>()});
ToJSONArray(*coordinates, center.m_lat);
ToJSONArray(*coordinates, center.m_lon);
ToJSONArray(*coordinates, center.m_lat);
ToJSONObject(*geometry, "coordinates", coordinates);
auto localeEn = base::NewJSONObject();

4
generator/streets/streets_builder.cpp
View file

@ -172,11 +172,11 @@ std::unique_ptr<char, JSONFreeDeleter> StreetsBuilder::MakeStreetValue(
auto const & leftBottom = MercatorBounds::ToLatLon(bbox.LeftBottom());
auto const & rightTop = MercatorBounds::ToLatLon(bbox.RightTop());
auto const & bboxArray = std::vector<double>{
leftBottom.m_lat, leftBottom.m_lon, rightTop.m_lat, rightTop.m_lon};
leftBottom.m_lon, leftBottom.m_lat, rightTop.m_lon, rightTop.m_lat};
ToJSONObject(*streetObject, "bbox", std::move(bboxArray));
auto const & pinLatLon = MercatorBounds::ToLatLon(pinPoint);
auto const & pinArray = std::vector<double>{pinLatLon.m_lat, pinLatLon.m_lon};
auto const & pinArray = std::vector<double>{pinLatLon.m_lon, pinLatLon.m_lat};
ToJSONObject(*streetObject, "pin", std::move(pinArray));
auto const value = json_dumps(streetObject.get(), JSON_COMPACT);

4
generator/streets/streets_builder.hpp
View file

@ -32,8 +32,8 @@ public:
void AssembleStreets(std::string const & pathInStreetsTmpMwm);
void AssembleBindings(std::string const & pathInGeoObjectsTmpMwm);
// Save built streets in the jsonl format with the members: "properties", "bbox" (array: left bottom
// latitude, left bottom longitude, right top latitude, right top longitude), "pin" (array: latitude,
// longitude).
// longitude, left bottom latitude, right top longitude, right top latitude), "pin" (array: longitude,
// latitude).
void SaveStreetsKv(std::ostream & streamStreetsKv);
static bool IsStreet(OsmElement const & element);