Mult-layer MVT style support

Author: simonpoole

src/main/java/de/blau/android/Map.java

@@ -223,7 +223,8 @@ public void setUpLayers(@NonNull Context ctx) {
                             TileLayerSource backgroundSource = TileLayerSource.get(ctx, contentId, true);
                             if (backgroundSource != null) {
                                 if (backgroundSource.getTileType() == TileType.MVT) {
-                                    layer = new de.blau.android.layer.mvt.MapOverlay(this, new VectorTileRenderer());
+                                    layer = new de.blau.android.layer.mvt.MapOverlay(this, new VectorTileRenderer(), false);
+                                    ((MapTilesOverlayLayer<?>) layer).setRendererInfo(backgroundSource);
                                 } else {
                                     layer = new MapTilesLayer<Bitmap>(this, backgroundSource, null, new MapTilesLayer.BitmapTileRenderer());
                                 }
@@ -233,13 +234,16 @@ public void setUpLayers(@NonNull Context ctx) {
                             TileLayerSource overlaySource = TileLayerSource.get(ctx, contentId, true);
                             if (overlaySource != null) {
                                 if (overlaySource.getTileType() == TileType.MVT) {
-                                    layer = new de.blau.android.layer.mvt.MapOverlay(this, new VectorTileRenderer());
+                                    layer = new de.blau.android.layer.mvt.MapOverlay(this, new VectorTileRenderer(), true);
                                 } else {
                                     layer = new MapTilesOverlayLayer<Bitmap>(this, new MapTilesLayer.BitmapTileRenderer());
                                 }
                                 ((MapTilesOverlayLayer<?>) layer).setRendererInfo(overlaySource);
                             }
                             break;
+                        case MVT:
+                            // unused for now
+                            break;
                         case PHOTO:
                             layer = new de.blau.android.layer.photos.MapOverlay(this);
                             break;
@@ -390,7 +394,7 @@ public MapViewLayer getLayer(int index) {
     /**
      * Get the top visible imagery layer for a type
      * 
-     * @param type the type (typically LayerType.Imagery or OVERLAYIMAGERY)
+     * @param type the type (typically LayerType.BACKGROUNDIMAGERY or OVERLAYIMAGERY)
      * @return the layer or null
      */
     @Nullable
@@ -1191,7 +1195,7 @@ public List<String> getImageryNames() {
         for (MapViewLayer osmvo : imageryLayers) {
             if (osmvo instanceof MapTilesLayer && osmvo.isVisible()) {
                 result.add(((MapTilesLayer<?>) osmvo).getTileLayerConfiguration().getName());
-                if (!(osmvo instanceof MapTilesOverlayLayer)) {
+                if (osmvo.getType() != LayerType.OVERLAYIMAGERY) {
                     // not an overlay -> not transparent so nothing below it is visible
                     break;
                 }

src/main/java/de/blau/android/contract/MimeTypes.java

@@ -17,6 +17,7 @@ public final class MimeTypes {
     public static final String WMS_EXCEPTION_XML_SUBTYPE = "vnd.ogc.se_xml";
     public static final String TEXT_TYPE                 = "text";
     public static final String MVT_SUBTYPE               = "vnd.mapbox-vector-tile";
+    public static final String X_PROTOBUF_SUBTYPE        = "x-protobuf";
 
     /**
      * Private constructor

src/main/java/de/blau/android/dialogs/ImageryListAdapter.java

@@ -44,7 +44,7 @@ public ImageryViewHolder(@NonNull View v) {
      *
      * @param names an array with imagery names
      * @param currentId an array with imagery ids
-     * @param isOverlay the current imagery id
+     * @param isOverlay true if overlay should be displayed
      * @param buttonLayoutParams layout params for the RadioButtons
      * @param groupChangeListener a listener to call when a RadioButton has been selected
      */