summaryrefslogtreecommitdiff
path: root/src/mbgl/style
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2017-04-04 07:35:26 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2017-04-06 09:22:51 -0700
commit16a2839e23d42d4640ef028d62dc01322a0d2e5a (patch)
treeb8b8ba6e7c9f2e91cc3ec230bb9420e3827f3c27 /src/mbgl/style
parenta261f7ff532584b3bbbe4ddef2d0ff96a1ee65a5 (diff)
downloadqtlocation-mapboxgl-16a2839e23d42d4640ef028d62dc01322a0d2e5a.tar.gz
[all] Make LatLng coordinates read-only
Diffstat (limited to 'src/mbgl/style')
-rw-r--r--src/mbgl/style/layers/custom_layer_impl.cpp4
-rw-r--r--src/mbgl/style/parser.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/style/layers/custom_layer_impl.cpp b/src/mbgl/style/layers/custom_layer_impl.cpp
index 379de25e8f..375c9ee27b 100644
--- a/src/mbgl/style/layers/custom_layer_impl.cpp
+++ b/src/mbgl/style/layers/custom_layer_impl.cpp
@@ -55,8 +55,8 @@ void CustomLayer::Impl::render(const TransformState& state) const {
parameters.width = state.getSize().width;
parameters.height = state.getSize().height;
- parameters.latitude = state.getLatLng().latitude;
- parameters.longitude = state.getLatLng().longitude;
+ parameters.latitude = state.getLatLng().latitude();
+ parameters.longitude = state.getLatLng().longitude();
parameters.zoom = state.getZoom();
parameters.bearing = -state.getAngle() * util::RAD2DEG;
parameters.pitch = state.getPitch();
diff --git a/src/mbgl/style/parser.cpp b/src/mbgl/style/parser.cpp
index d970d8bbc0..19ea8cefee 100644
--- a/src/mbgl/style/parser.cpp
+++ b/src/mbgl/style/parser.cpp
@@ -56,8 +56,8 @@ StyleParseResult Parser::parse(const std::string& json) {
const JSValue& value = document["center"];
if (value.IsArray() && value.Size() >= 2) {
// Style spec uses lon/lat order
- latLng.longitude = value[0].IsNumber() ? value[0].GetDouble() : 0;
- latLng.latitude = value[1].IsNumber() ? value[1].GetDouble() : 0;
+ latLng = LatLng(value[1].IsNumber() ? value[1].GetDouble() : 0,
+ value[0].IsNumber() ? value[0].GetDouble() : 0);
}
}