tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

skip jni layers generation

Browse Source
This commit is contained in:
Łukasz Paczos
2019-11-13 14:21:39 +01:00
parent dfdbaf5493
commit c396113785
5 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillExtrusionLayerTest.java
View File

@@ -244,7 +244,7 @@ public class FillExtrusionLayerTest extends BaseLayerTest {
assertNull(layer.getFillExtrusionPattern().getExpression());
// Set and Get
Expression expression = string(Expression.get("undefined"));
Expression expression = image(string(Expression.get("undefined")));
layer.setProperties(fillExtrusionPattern(expression));
assertEquals(layer.getFillExtrusionPattern().getExpression(), expression);
}

2
MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java
View File

@@ -319,7 +319,7 @@ public class FillLayerTest extends BaseLayerTest {
assertNull(layer.getFillPattern().getExpression());
// Set and Get
Expression expression = string(Expression.get("undefined"));
Expression expression = image(string(Expression.get("undefined")));
layer.setProperties(fillPattern(expression));
assertEquals(layer.getFillPattern().getExpression(), expression);
}

2
MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java
View File

@@ -486,7 +486,7 @@ public class LineLayerTest extends BaseLayerTest {
assertNull(layer.getLinePattern().getExpression());
// Set and Get
Expression expression = string(Expression.get("undefined"));
Expression expression = image(string(Expression.get("undefined")));
layer.setProperties(linePattern(expression));
assertEquals(layer.getLinePattern().getExpression(), expression);
}

4
MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java
View File

@@ -296,7 +296,7 @@ public class SymbolLayerTest extends BaseLayerTest {
assertEquals(layer.getIconImage().getValue(), propertyValue);
layer.setProperties(iconImage("{token}"));
assertEquals(layer.getIconImage().getExpression(), Expression.toString(Expression.get("token")));
assertEquals(layer.getIconImage().getExpression(), image(Expression.toString(Expression.get("token"))));
}
@Test
@@ -307,7 +307,7 @@ public class SymbolLayerTest extends BaseLayerTest {
assertNull(layer.getIconImage().getExpression());
// Set and Get
Expression expression = string(Expression.get("undefined"));
Expression expression = image(string(Expression.get("undefined")));
layer.setProperties(iconImage(expression));
assertEquals(layer.getIconImage().getExpression(), expression);
}

6
scripts/generate-style-code.js
View File

@@ -374,15 +374,11 @@ const lightJavaUnitTests = ejs.compile(fs.readFileSync('MapboxGLAndroidSDKTestAp
writeIfModified(`MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java`, lightJava({properties: lightProperties}));
writeIfModified(`MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java`, lightJavaUnitTests({properties: lightProperties}));
// Java + JNI Layers (Peer model)
const layerHpp = ejs.compile(fs.readFileSync('src/style/layers/layer.hpp.ejs', 'utf8'), {strict: true});
const layerCpp = ejs.compile(fs.readFileSync('src/style/layers/layer.cpp.ejs', 'utf8'), {strict: true});
// Java
const layerJava = ejs.compile(fs.readFileSync('MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs', 'utf8'), {strict: true});
const layerJavaUnitTests = ejs.compile(fs.readFileSync('MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs', 'utf8'), {strict: true});
for (const layer of layers) {
writeIfModified(`src/style/layers/${layer.type.replace('-', '_')}_layer.hpp`, layerHpp(layer));
writeIfModified(`src/style/layers/${layer.type.replace('-', '_')}_layer.cpp`, layerCpp(layer));
writeIfModified(`MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/${camelize(layer.type)}Layer.java`, layerJava(layer));
writeIfModified(`MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/${camelize(layer.type)}LayerTest.java`, layerJavaUnitTests(layer));
}