diff --git a/opensrp-eusm/src/main/assets/map-download-style.json b/opensrp-eusm/src/main/assets/map-download-style.json index 3b5d71c..1f42e1e 100644 --- a/opensrp-eusm/src/main/assets/map-download-style.json +++ b/opensrp-eusm/src/main/assets/map-download-style.json @@ -23,14 +23,18 @@ "data": { "type": "FeatureCollection", "features": [] - } + }, + "cluster": true, + "clusterMaxZoom": 13, + "clusterRadius": 50 + }, + "mapbox-streets": { + "url": "mapbox://mapbox.mapbox-streets-v8", + "type": "vector" }, - "diimagery": { + "mapbox-satellite": { + "url": "mapbox://mapbox.satellite", "type": "raster", - "scheme": "tms", - "tiles": [ - "https://access.maxar.com/earthservice/tmsaccess/tms/1.0.0/DigitalGlobe:ImageryTileService@EPSG:3857@png/{z}/{x}/{y}.png?connectId=DIGITAL_GLOBE_ID" - ], "tileSize": 256 }, "select-data": { @@ -71,19 +75,15 @@ "zoom" ], 7.0, - 17, + 13, 13.0, - 30, - 15.0, - 35, - 17.79, - 45 + 15 ], "circle-color": [ "match", [ "get", - "taskStatus" + "taskStatusType" ], [ "in_progress" @@ -93,7 +93,11 @@ "completed" ], "hsl(101.6,66.8%,44.9%)", - "hsl(0, 0%, 64%)" + [ + "not_started" + ], + "hsl(0, 0%, 64%)", + "hsl(100, 100%, 100%)" ], "circle-stroke-width": 2, "circle-opacity": 1 @@ -119,13 +123,9 @@ "zoom" ], 7.0, - 17, + 13, 13.0, - 30, - 15.0, - 35, - 17.79, - 45 + 15 ], "circle-stroke-width": 2, "circle-stroke-color": "hsl(0, 0%, 0%)" diff --git a/opensrp-eusm/src/main/assets/reveal-streets-satellite.json b/opensrp-eusm/src/main/assets/reveal-streets-satellite.json index 158c056..4dc259b 100644 --- a/opensrp-eusm/src/main/assets/reveal-streets-satellite.json +++ b/opensrp-eusm/src/main/assets/reveal-streets-satellite.json @@ -65,8 +65,10 @@ [ "zoom" ], - 7.0, 13, - 13.0, 15 + 7.0, + 13, + 13.0, + 15 ], "circle-color": [ "match", diff --git a/opensrp-eusm/src/main/java/org/smartregister/eusm/config/AppTaskingLibraryConfiguration.java b/opensrp-eusm/src/main/java/org/smartregister/eusm/config/AppTaskingLibraryConfiguration.java index a828126..531e543 100644 --- a/opensrp-eusm/src/main/java/org/smartregister/eusm/config/AppTaskingLibraryConfiguration.java +++ b/opensrp-eusm/src/main/java/org/smartregister/eusm/config/AppTaskingLibraryConfiguration.java @@ -533,7 +533,6 @@ public Pair getMinMaxZoomMapDownloadPair() { @Override public List getBaseLayers() { return Arrays.asList( - BaseLayerSwitchModel.builder().baseLayer(new DigitalGlobeLayer()).build(), BaseLayerSwitchModel.builder().baseLayer(new MapBoxLayer()).build(), BaseLayerSwitchModel.builder().baseLayer(new StreetsBaseLayer(EusmApplication.getInstance().getBaseContext())).build(), BaseLayerSwitchModel.builder().baseLayer(new SatelliteStreetsLayer(EusmApplication.getInstance().getBaseContext())).isDefault(true).build() diff --git a/opensrp-eusm/src/main/java/org/smartregister/eusm/layer/SatelliteStreetsLayer.java b/opensrp-eusm/src/main/java/org/smartregister/eusm/layer/SatelliteStreetsLayer.java index 59e526e..33bd54e 100644 --- a/opensrp-eusm/src/main/java/org/smartregister/eusm/layer/SatelliteStreetsLayer.java +++ b/opensrp-eusm/src/main/java/org/smartregister/eusm/layer/SatelliteStreetsLayer.java @@ -40,7 +40,7 @@ public SatelliteStreetsLayer(@NonNull Context context) { protected void createLayersAndSources(@NonNull Context context) { RasterSource rasterSource = new RasterSource(satelliteSourceId, satelliteSourceId, 256); - VectorSource streetSource = new VectorSource(streetSourceId, "mapbox://mapbox.mapbox-streets-v8,mapbox.mapbox-terrain-v2"); + VectorSource streetSource = new VectorSource(streetSourceId, "mapbox://mapbox.mapbox-streets-v8"); sourcesList.add(streetSource); sourcesList.add(rasterSource);