hide the LocationIndicatorLayer impl

2020-04-14 13:15:24 +02:00
parent 6bb456882a
commit dbaad6312b
56 changed files with 476 additions and 430 deletions
--- a/MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.cpp
+++ b/MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.cpp
@@ -1,4 +1,4 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
+// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.

 #include "background_layer.hpp"

--- a/MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.hpp
+++ b/MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.hpp
@@ -1,4 +1,4 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
+// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.

 #pragma once

--- a/MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.cpp
+++ b/MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.cpp
@@ -1,4 +1,4 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
+// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.

 #include "circle_layer.hpp"

--- a/MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.hpp
+++ b/MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.hpp
@@ -1,4 +1,4 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
+// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.

 #pragma once

--- a/MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.cpp
+++ b/MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.cpp
@@ -1,4 +1,4 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
+// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.

 #include "fill_extrusion_layer.hpp"

--- a/MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.hpp
+++ b/MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.hpp
@@ -1,4 +1,4 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
+// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.

 #pragma once

--- a/MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.cpp
+++ b/MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.cpp
@@ -1,4 +1,4 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
+// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.

 #include "fill_layer.hpp"

--- a/MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.hpp
+++ b/MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.hpp
@@ -1,4 +1,4 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
+// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.

 #pragma once

--- a/MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.cpp
+++ b/MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.cpp
@@ -1,4 +1,4 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
+// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.

 #include "heatmap_layer.hpp"

--- a/MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.hpp
+++ b/MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.hpp
@@ -1,4 +1,4 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
+// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.

 #pragma once

--- a/MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.cpp
+++ b/MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.cpp
@@ -1,4 +1,4 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
+// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.

 #include "hillshade_layer.hpp"

--- a/MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.hpp
+++ b/MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.hpp
@@ -1,4 +1,4 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
+// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.

 #pragma once

--- a/MapboxGLAndroidSDK/src/cpp/style/layers/layer.cpp.ejs
+++ b/MapboxGLAndroidSDK/src/cpp/style/layers/layer.cpp.ejs
@@ -2,7 +2,7 @@
  const type = locals.type;
  const properties = locals.properties;
 -%>
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
+// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.

 #include "<%- type.replace('-', '_') %>_layer.hpp"

--- a/MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp.ejs
+++ b/MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp.ejs
@@ -2,7 +2,7 @@
  const type = locals.type;
  const properties = locals.properties;
 -%>
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
+// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.

 #pragma once

@@ -18,7 +18,11 @@ namespace android {
 class <%- camelize(type) %>Layer : public Layer {
 public:
    using SuperTag = Layer;
+<% if (type === 'location-indicator') { -%>
+    static constexpr auto Name() { return "com/mapbox/mapboxsdk/location/<%- camelize(type) %>Layer"; };
+<% } else { -%>
    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/<%- camelize(type) %>Layer"; };
+<% } -%>

 <% if (type === 'background' || type === 'location-indicator') { -%>
    <%- camelize(type) %>Layer(jni::JNIEnv&, jni::String&);
--- a/MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.cpp
+++ b/MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.cpp
@@ -1,4 +1,4 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
+// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.

 #include "line_layer.hpp"

--- a/MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.hpp
+++ b/MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.hpp
@@ -1,4 +1,4 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
+// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.

 #pragma once

--- a/MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.cpp
+++ b/MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.cpp
@@ -1,4 +1,4 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
+// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.

 #include "location_indicator_layer.hpp"

--- a/MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.hpp
+++ b/MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.hpp
@@ -1,4 +1,4 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
+// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.

 #pragma once

@@ -14,7 +14,7 @@ namespace android {
 class LocationIndicatorLayer : public Layer {
 public:
    using SuperTag = Layer;
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/LocationIndicatorLayer"; };
+    static constexpr auto Name() { return "com/mapbox/mapboxsdk/location/LocationIndicatorLayer"; };

    LocationIndicatorLayer(jni::JNIEnv&, jni::String&);

--- a/MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.cpp
+++ b/MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.cpp
@@ -1,4 +1,4 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
+// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.

 #include "raster_layer.hpp"

--- a/MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.hpp
+++ b/MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.hpp
@@ -1,4 +1,4 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
+// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.

 #pragma once

--- a/MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.cpp
+++ b/MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.cpp
@@ -1,4 +1,4 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
+// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.

 #include "symbol_layer.hpp"

--- a/MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.hpp
+++ b/MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.hpp
@@ -1,4 +1,4 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
+// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.

 #pragma once