MapLibre GL JS first stub
This commit is contained in:
+78
-2
@@ -1,10 +1,23 @@
|
||||
package eu.konggdev.strikemaps.map.renderer.implementation;
|
||||
|
||||
import android.annotation.SuppressLint;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.webkit.WebChromeClient;
|
||||
import android.webkit.WebSettings;
|
||||
import android.webkit.WebView;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.fasterxml.jackson.databind.node.ArrayNode;
|
||||
import com.fasterxml.jackson.databind.node.ObjectNode;
|
||||
import eu.konggdev.strikemaps.app.AppController;
|
||||
import eu.konggdev.strikemaps.map.MapComponent;
|
||||
import eu.konggdev.strikemaps.map.layer.SourcedMapLayer;
|
||||
import eu.konggdev.strikemaps.map.overlay.MapOverlay;
|
||||
import eu.konggdev.strikemaps.map.renderer.MapRenderer;
|
||||
import eu.konggdev.strikemaps.map.style.MapStyle;
|
||||
import org.maplibre.android.geometry.LatLng;
|
||||
import org.maplibre.android.maps.Style;
|
||||
import org.maplibre.geojson.Feature;
|
||||
|
||||
import java.util.Collections;
|
||||
@@ -12,14 +25,55 @@ import java.util.List;
|
||||
|
||||
//Stub for now
|
||||
public class MapLibreGLJSRenderer implements MapRenderer {
|
||||
|
||||
AppController app;
|
||||
|
||||
MapComponent controller;
|
||||
|
||||
final WebView webView;
|
||||
|
||||
@Override
|
||||
public void reload() {
|
||||
ObjectMapper mapper = new ObjectMapper();
|
||||
mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
|
||||
MapStyle style = controller.style;
|
||||
try {
|
||||
/* Take metadata from MapStyle
|
||||
everything outside sources, layers */
|
||||
ObjectNode root = style.metadata.deepCopy();
|
||||
|
||||
//Sources
|
||||
ObjectNode sources = mapper.createObjectNode();
|
||||
style.sources.forEach((k, v) -> sources.set(k, mapper.valueToTree(v)));
|
||||
|
||||
//Layers
|
||||
ArrayNode layers = mapper.createArrayNode();
|
||||
layers.addAll((ArrayNode) style.layerDefinitions);
|
||||
|
||||
//Overlays
|
||||
for (MapOverlay overlay : controller.overlays.values()) {
|
||||
SourcedMapLayer overlayLayer = overlay.makeLayer();
|
||||
sources.set(overlayLayer.key, mapper.valueToTree(overlayLayer.source));
|
||||
layers.addAll((ArrayNode) overlayLayer.layer);
|
||||
}
|
||||
|
||||
//Set all to root
|
||||
root.set("sources", sources);
|
||||
root.set("layers", layers);
|
||||
|
||||
webView.evaluateJavascript(
|
||||
"",
|
||||
null
|
||||
);
|
||||
} catch (Exception e) {
|
||||
app.logcat("Failed to reload Map");
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public View getView() {
|
||||
return null;
|
||||
return webView;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -27,5 +81,27 @@ public class MapLibreGLJSRenderer implements MapRenderer {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
public MapLibreGLJSRenderer(AppController app, MapComponent controller) { }
|
||||
@SuppressLint({"JavascriptInterface", "SetJavaScriptEnabled"})
|
||||
public MapLibreGLJSRenderer(AppController app, MapComponent controller) {
|
||||
webView = new WebView(app.getActivity());
|
||||
webView.setLayoutParams(
|
||||
new ViewGroup.LayoutParams(
|
||||
ViewGroup.LayoutParams.MATCH_PARENT,
|
||||
ViewGroup.LayoutParams.MATCH_PARENT
|
||||
)
|
||||
);
|
||||
|
||||
WebSettings settings = webView.getSettings();
|
||||
settings.setJavaScriptEnabled(true);
|
||||
settings.setDomStorageEnabled(true);
|
||||
settings.setAllowFileAccess(true);
|
||||
|
||||
webView.setWebChromeClient(new WebChromeClient());
|
||||
|
||||
webView.addJavascriptInterface(new Bridge(), "AndroidBridge");
|
||||
|
||||
webView.loadUrl("file:///android_asset/maplibre/gl-js/index.html");
|
||||
}
|
||||
|
||||
class Bridge { }
|
||||
}
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package eu.konggdev.strikemaps.ui.factory;
|
||||
|
||||
import android.app.AlertDialog;
|
||||
import android.content.Intent;
|
||||
import android.graphics.Color;
|
||||
import android.graphics.drawable.ColorDrawable;
|
||||
import android.view.View;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.ScrollView;
|
||||
import android.widget.Toast;
|
||||
import eu.konggdev.strikemaps.app.AppController;
|
||||
import eu.konggdev.strikemaps.ui.element.item.PreviewItem;
|
||||
import org.maplibre.geojson.Feature;
|
||||
@@ -45,4 +47,27 @@ public final class AlertDialogFactory {
|
||||
.setPositiveButton("OK", null)
|
||||
.create();
|
||||
}
|
||||
|
||||
public static AlertDialog restartDialog(AppController app) {
|
||||
return new AlertDialog.Builder(app.getActivity())
|
||||
.setTitle("Restart required")
|
||||
.setMessage("Restart the app to apply changes.")
|
||||
.setCancelable(false)
|
||||
.setNegativeButton("Cancel", (d, w) -> {
|
||||
Toast.makeText(app.getActivity(),
|
||||
"Changes will be applied on next restart",
|
||||
Toast.LENGTH_SHORT).show();
|
||||
d.dismiss();
|
||||
})
|
||||
.setPositiveButton("Restart", (d, w) -> {
|
||||
Intent i = app.getActivity().getPackageManager()
|
||||
.getLaunchIntentForPackage(app.getActivity().getPackageName());
|
||||
if (i != null) {
|
||||
i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
app.getActivity().startActivity(i);
|
||||
}
|
||||
Runtime.getRuntime().exit(0);
|
||||
})
|
||||
.create();
|
||||
}
|
||||
}
|
||||
|
||||
+9
@@ -14,6 +14,8 @@ import com.google.android.material.appbar.MaterialToolbar;
|
||||
import eu.konggdev.strikemaps.R;
|
||||
import eu.konggdev.strikemaps.data.helper.UserPrefsHelper;
|
||||
import eu.konggdev.strikemaps.app.AppController;
|
||||
import eu.konggdev.strikemaps.map.MapComponent;
|
||||
import eu.konggdev.strikemaps.ui.factory.AlertDialogFactory;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
@@ -42,11 +44,18 @@ public class FragmentLayoutContentSettings extends Fragment implements MainConte
|
||||
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
|
||||
mapRendererSelector.setAdapter(adapter);
|
||||
mapRendererSelector.setSelection(UserPrefsHelper.mapRenderer(app.getPrefs()));
|
||||
final boolean[] ignoreFirst = {true};
|
||||
mapRendererSelector.setOnItemSelectedListener(
|
||||
new AdapterView.OnItemSelectedListener() {
|
||||
@Override
|
||||
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
|
||||
if (ignoreFirst[0]) {
|
||||
ignoreFirst[0] = false;
|
||||
return;
|
||||
}
|
||||
|
||||
UserPrefsHelper.mapRenderer(app.getPrefs(), position);
|
||||
app.getUi().alert(AlertDialogFactory.restartDialog(app));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user