Skip to content

Redraw GeoJSON features after style changes #1732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dkhawk merged 2 commits into from
Aug 5, 2026
Merged

Redraw GeoJSON features after style changes #1732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75f82bd
Redraw GeoJSON features after style changes
arpitagarwal1301 Jul 23, 2026
b718352
refactor: use imported aliases instead of FQDNs in GeoJsonLayer
dkhawk Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
143 changes: 98 additions & 45 deletions data/src/main/java/com/google/maps/android/data/geojson/GeoJsonLayer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,51 @@ import com.google.maps.android.collections.PolygonManager
import com.google.maps.android.collections.PolylineManager
import com.google.maps.android.data.Geometry
import com.google.maps.android.data.Layer
import com.google.maps.android.data.MultiGeometry
import com.google.maps.android.data.parser.geojson.GeoJsonFeature as ParserGeoJsonFeature
import com.google.maps.android.data.parser.geojson.GeoJsonFeatureCollection as ParserGeoJsonFeatureCollection
import com.google.maps.android.data.parser.geojson.GeoJsonGeometry as ParserGeoJsonGeometry
import com.google.maps.android.data.parser.geojson.GeoJsonGeometryCollection as ParserGeoJsonGeometryCollection
import com.google.maps.android.data.parser.geojson.GeoJsonLineString as ParserGeoJsonLineString
import com.google.maps.android.data.parser.geojson.GeoJsonMultiLineString as ParserGeoJsonMultiLineString
import com.google.maps.android.data.parser.geojson.GeoJsonMultiPoint as ParserGeoJsonMultiPoint
import com.google.maps.android.data.parser.geojson.GeoJsonMultiPolygon as ParserGeoJsonMultiPolygon
import com.google.maps.android.data.parser.geojson.GeoJsonParser
import com.google.maps.android.data.parser.geojson.GeoJsonPoint as ParserGeoJsonPoint
import com.google.maps.android.data.parser.geojson.GeoJsonPolygon as ParserGeoJsonPolygon
import com.google.maps.android.data.renderer.UrlIconProvider
import com.google.maps.android.data.renderer.mapview.MapViewRenderer
import com.google.maps.android.data.renderer.model.Feature as ModelFeature
import com.google.maps.android.data.renderer.model.Geometry as ModelGeometry
import com.google.maps.android.data.renderer.model.LineString as ModelLineString
import com.google.maps.android.data.renderer.model.LineStyle as ModelLineStyle
import com.google.maps.android.data.renderer.model.MultiGeometry as ModelMultiGeometry
import com.google.maps.android.data.renderer.model.Point as ModelPoint
import com.google.maps.android.data.renderer.model.PointGeometry as ModelPointGeometry
import com.google.maps.android.data.renderer.model.PointStyle as ModelPointStyle
import com.google.maps.android.data.renderer.model.Polygon as ModelPolygon
import com.google.maps.android.data.renderer.model.PolygonStyle as ModelPolygonStyle
import org.json.JSONException
import org.json.JSONObject
import java.io.IOException
import java.io.InputStream
import java.util.IdentityHashMap
import java.util.Observer


@Deprecated("Use the new platform-agnostic data layer and renderer instead.")
public class GeoJsonLayer : Layer {
private val mFeatures = mutableListOf<GeoJsonFeature>()
private var mBoundingBox: LatLngBounds? = null
private var mRenderer: MapViewRenderer? = null
private var mIsLayerOnMap = false
private val mFeatureMap = HashMap<GeoJsonFeature, com.google.maps.android.data.renderer.model.Feature>()
private val mModelToLegacyFeatures = HashMap<com.google.maps.android.data.renderer.model.Feature, GeoJsonFeature>()
private val mFeatureMap = HashMap<GeoJsonFeature, ModelFeature>()
private val mModelToLegacyFeatures = IdentityHashMap<ModelFeature, GeoJsonFeature>()

private var mFeatureClickListener: OnFeatureClickListener? = null
private val mFeatureObserver = Observer { observable, _ ->
if (observable is GeoJsonFeature) onFeatureChanged(observable)
}

public interface GeoJsonOnFeatureClickListener : OnFeatureClickListener

Expand Down Expand Up @@ -84,7 +112,7 @@ public class GeoJsonLayer : Layer {

// Map parsed object to our legacy GeoJsonFeature instances
when (parsed) {
is com.google.maps.android.data.parser.geojson.GeoJsonFeatureCollection -> {
is ParserGeoJsonFeatureCollection -> {
parsed.features.forEach { feature ->
val legacyGeometry = feature.geometry?.let { toLegacyGeometry(it) }
val legacyProps = feature.properties?.filterValues { it != null }?.mapValues { it.value as String }
Expand All @@ -99,7 +127,7 @@ public class GeoJsonLayer : Layer {
}
}

is com.google.maps.android.data.parser.geojson.GeoJsonFeature -> {
is ParserGeoJsonFeature -> {
val legacyGeometry = parsed.geometry?.let { toLegacyGeometry(it) }
val legacyProps = parsed.properties?.filterValues { it != null }?.mapValues { it.value as String }
val legacyFeature = GeoJsonFeature(legacyGeometry, parsed.id, legacyProps, null)
Expand All @@ -111,7 +139,7 @@ public class GeoJsonLayer : Layer {
mFeatures.add(legacyFeature)
}

is com.google.maps.android.data.parser.geojson.GeoJsonGeometry -> {
is ParserGeoJsonGeometry -> {
val legacyGeometry = toLegacyGeometry(parsed)
val legacyFeature = GeoJsonFeature(legacyGeometry, null, null, null)

Expand All @@ -123,6 +151,7 @@ public class GeoJsonLayer : Layer {
}
}

mFeatures.forEach { it.addObserver(mFeatureObserver) }
// Calculate bounding box
calculateBoundingBox()
}
Expand All @@ -131,37 +160,38 @@ public class GeoJsonLayer : Layer {
mRenderer = map?.let { MapViewRenderer(it, UrlIconProvider()) }
}

private fun toLegacyGeometry(geometry: com.google.maps.android.data.parser.geojson.GeoJsonGeometry): Geometry =
private fun toLegacyGeometry(geometry: ParserGeoJsonGeometry): Geometry =
when (geometry) {
is com.google.maps.android.data.parser.geojson.GeoJsonPoint -> {
is ParserGeoJsonPoint -> {
GeoJsonPoint(LatLng(geometry.coordinates.lat, geometry.coordinates.lng), geometry.coordinates.alt)
}

is com.google.maps.android.data.parser.geojson.GeoJsonLineString -> {
is ParserGeoJsonLineString -> {
GeoJsonLineString(geometry.coordinates.map { LatLng(it.lat, it.lng) }, geometry.coordinates.mapNotNull { it.alt })
}

is com.google.maps.android.data.parser.geojson.GeoJsonPolygon -> {
is ParserGeoJsonPolygon -> {
GeoJsonPolygon(geometry.coordinates.map { ring -> ring.map { LatLng(it.lat, it.lng) } })
}

is com.google.maps.android.data.parser.geojson.GeoJsonMultiPoint -> {
is ParserGeoJsonMultiPoint -> {
GeoJsonMultiPoint(geometry.coordinates.map { GeoJsonPoint(LatLng(it.lat, it.lng), it.alt) })
}

is com.google.maps.android.data.parser.geojson.GeoJsonMultiLineString -> {
is ParserGeoJsonMultiLineString -> {
GeoJsonMultiLineString(geometry.coordinates.map { GeoJsonLineString(it.map { c -> LatLng(c.lat, c.lng) }) })
}

is com.google.maps.android.data.parser.geojson.GeoJsonMultiPolygon -> {
is ParserGeoJsonMultiPolygon -> {
GeoJsonMultiPolygon(geometry.coordinates.map { GeoJsonPolygon(it.map { ring -> ring.map { c -> LatLng(c.lat, c.lng) } }) })
}

is com.google.maps.android.data.parser.geojson.GeoJsonGeometryCollection -> {
is ParserGeoJsonGeometryCollection -> {
GeoJsonGeometryCollection(geometry.geometries.map { toLegacyGeometry(it) })
}
}


private fun calculateBoundingBox() {
val boundsBuilder = LatLngBounds.builder()
var hasPoints = false
Expand All @@ -188,7 +218,7 @@ public class GeoJsonLayer : Layer {
}
}

is com.google.maps.android.data.MultiGeometry -> {
is MultiGeometry -> {
includeMultiGeometryBounds(geometry, boundsBuilder)
hasPoints = true
}
Expand All @@ -200,19 +230,20 @@ public class GeoJsonLayer : Layer {
}

private fun includeMultiGeometryBounds(
multiGeometry: com.google.maps.android.data.MultiGeometry,
multiGeometry: MultiGeometry,
builder: LatLngBounds.Builder,
) {
multiGeometry.getGeometryObject().forEach { geom ->
when (geom) {
is GeoJsonPoint -> builder.include(geom.getCoordinates())
is GeoJsonLineString -> geom.getCoordinates().forEach { builder.include(it) }
is GeoJsonPolygon -> geom.getOuterBoundaryCoordinates().forEach { builder.include(it) }
is com.google.maps.android.data.MultiGeometry -> includeMultiGeometryBounds(geom, builder)
is MultiGeometry -> includeMultiGeometryBounds(geom, builder)
}
}
}


override fun getMap(): GoogleMap? = mGoogleMap

override fun setMap(map: GoogleMap?) {
Expand All @@ -231,22 +262,20 @@ public class GeoJsonLayer : Layer {
override fun addLayerToMap() {
val renderer = mRenderer ?: return
mFeatures.forEach { feature ->
val modelFeature = toModelFeature(feature)
renderer.addFeature(modelFeature)
if (feature.getGeometry() != null) renderer.addFeature(toModelFeature(feature))
}
mIsLayerOnMap = true
}

override fun removeLayerFromMap() {
val renderer = mRenderer ?: return
mFeatures.forEach { feature ->
val modelFeature = toModelFeature(feature)
renderer.removeFeature(modelFeature)
mFeatureMap[feature]?.let { renderer.removeFeature(it) }
}
mIsLayerOnMap = false
}

private fun toModelFeature(feature: GeoJsonFeature): com.google.maps.android.data.renderer.model.Feature {
private fun toModelFeature(feature: GeoJsonFeature): ModelFeature {
val existing = mFeatureMap[feature]
if (existing != null) return existing

Expand All @@ -256,9 +285,9 @@ public class GeoJsonLayer : Layer {

val style =
when (modelGeometry) {
is com.google.maps.android.data.renderer.model.PointGeometry -> {
is ModelPointGeometry -> {
val pointStyle = feature.pointStyle ?: mDefaultPointStyle
com.google.maps.android.data.renderer.model.PointStyle(
ModelPointStyle(
// The renderer derives the marker's alpha from the color's alpha channel, so encode the
// legacy style's alpha into an otherwise-black color (hue 0 keeps the default marker look).
// A transparent color here (e.g. 0) would render the marker invisible.
Expand All @@ -269,43 +298,53 @@ public class GeoJsonLayer : Layer {
)
}

is com.google.maps.android.data.renderer.model.LineString -> {
is ModelLineString -> {
val lineStyle = feature.lineStringStyle ?: mDefaultLineStringStyle
com.google.maps.android.data.renderer.model.LineStyle(
ModelLineStyle(
color = lineStyle.color,
width = lineStyle.getWidth(),
geodesic = lineStyle.isGeodesic(),
)
}

is com.google.maps.android.data.renderer.model.Polygon -> {
is ModelPolygon -> {
val polygonStyle = feature.polygonStyle ?: mDefaultPolygonStyle
com.google.maps.android.data.renderer.model.PolygonStyle(
ModelPolygonStyle(
fillColor = polygonStyle.fillColor,
strokeColor = polygonStyle.getStrokeColor(),
strokeWidth = polygonStyle.getStrokeWidth(),
geodesic = polygonStyle.isGeodesic(),
)
}

is ModelMultiGeometry -> {
if (geometry is GeoJsonMultiPolygon) {
val polygonStyle = feature.polygonStyle ?: mDefaultPolygonStyle
ModelPolygonStyle(
fillColor = polygonStyle.fillColor,
strokeColor = polygonStyle.getStrokeColor(),
strokeWidth = polygonStyle.getStrokeWidth(),
geodesic = polygonStyle.isGeodesic(),
)
} else null
}

else -> {
null
}
}

val modelFeature =
com.google.maps.android.data.renderer.model
.Feature(modelGeometry, style, properties)
val modelFeature = ModelFeature(modelGeometry, style, properties)
mFeatureMap[feature] = modelFeature
mModelToLegacyFeatures[modelFeature] = feature
return modelFeature
}

private fun toModelGeometry(geometry: Geometry): com.google.maps.android.data.renderer.model.Geometry =
private fun toModelGeometry(geometry: Geometry): ModelGeometry =
when (geometry) {
is GeoJsonPoint -> {
com.google.maps.android.data.renderer.model.PointGeometry(
com.google.maps.android.data.renderer.model.Point(
ModelPointGeometry(
ModelPoint(
geometry.getCoordinates().latitude,
geometry.getCoordinates().longitude,
geometry.getAltitude(),
Expand All @@ -314,33 +353,31 @@ public class GeoJsonLayer : Layer {
}

is GeoJsonLineString -> {
com.google.maps.android.data.renderer.model.LineString(
ModelLineString(
geometry.getCoordinates().map {
com.google.maps.android.data.renderer.model
.Point(it.latitude, it.longitude)
ModelPoint(it.latitude, it.longitude)
},
)
}

is GeoJsonPolygon -> {
com.google.maps.android.data.renderer.model.Polygon(
ModelPolygon(
geometry.getOuterBoundaryCoordinates().map {
com.google.maps.android.data.renderer.model.Point(
ModelPoint(
it.latitude,
it.longitude,
)
},
geometry.getInnerBoundaryCoordinates().map { inner ->
inner.map {
com.google.maps.android.data.renderer.model
.Point(it.latitude, it.longitude)
ModelPoint(it.latitude, it.longitude)
}
},
)
}

is com.google.maps.android.data.MultiGeometry -> {
com.google.maps.android.data.renderer.model.MultiGeometry(
is MultiGeometry -> {
ModelMultiGeometry(
geometry.getGeometryObject().map { toModelGeometry(it) },
)
}
Expand All @@ -350,18 +387,23 @@ public class GeoJsonLayer : Layer {
}
}


override val features: Iterable<GeoJsonFeature>
get() = mFeatures

public fun addFeature(feature: GeoJsonFeature) {
mFeatures.add(feature)
if (mIsLayerOnMap) {
if (!mFeatures.contains(feature)) {
mFeatures.add(feature)
feature.addObserver(mFeatureObserver)
}
if (mIsLayerOnMap && feature.getGeometry() != null) {
mRenderer?.addFeature(toModelFeature(feature))
}
}

public fun removeFeature(feature: GeoJsonFeature) {
mFeatures.remove(feature)
if (!mFeatures.remove(feature)) return
feature.deleteObserver(mFeatureObserver)
val modelFeature = mFeatureMap.remove(feature)
if (modelFeature != null) {
mModelToLegacyFeatures.remove(modelFeature)
Expand All @@ -371,6 +413,17 @@ public class GeoJsonLayer : Layer {
}
}

private fun onFeatureChanged(feature: GeoJsonFeature) {
mFeatureMap.remove(feature)?.let { oldModel ->
mModelToLegacyFeatures.remove(oldModel)
if (mIsLayerOnMap) mRenderer?.removeFeature(oldModel)
}
if (mFeatures.contains(feature) && feature.getGeometry() != null) {
val updatedModel = toModelFeature(feature)
if (mIsLayerOnMap) mRenderer?.addFeature(updatedModel)
}
}

override fun setOnFeatureClickListener(listener: OnFeatureClickListener) {
mFeatureClickListener = listener
mGoogleMap?.let { map ->
Expand Down
2 changes: 2 additions & 0 deletions data/src/main/java/com/google/maps/android/data/renderer/mapview/MapViewRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,15 @@ class MapViewRenderer(
}

override fun addFeature(feature: Feature) {
removeFeature(feature)
val mapObjects = mutableListOf<Any>()
addGeometry(feature.geometry, feature, mapObjects)
if (mapObjects.isNotEmpty()) {
renderedFeatures[feature] = mapObjects
}
}


/**
* Renders a single [geometry] (recursing into [MultiGeometry] members) with [feature]'s style and
* properties, accumulating every created map object into [mapObjects] so nested geometries stay
Expand Down
Loading
Loading