diff --git a/mapconductor-bom/build.gradle.kts b/mapconductor-bom/build.gradle.kts index 574ea999..ebbfb4d5 100644 --- a/mapconductor-bom/build.gradle.kts +++ b/mapconductor-bom/build.gradle.kts @@ -131,3 +131,10 @@ signing { sign(publishing.publications["release"]) } } + +nmcp { + publishAllPublicationsToCentralPortal { + username.set(findProperty("ossrh_username") as String? ?: System.getenv("OSSRH_USERNAME") ?: "") + password.set(findProperty("ossrh_password") as String? ?: System.getenv("OSSRH_PASSWORD") ?: "") + } +} diff --git a/simple-map-app/src/main/java/com/mapconductor/simplemapapp/MainActivity.kt b/simple-map-app/src/main/java/com/mapconductor/simplemapapp/MainActivity.kt index 208eefaf..08532e48 100644 --- a/simple-map-app/src/main/java/com/mapconductor/simplemapapp/MainActivity.kt +++ b/simple-map-app/src/main/java/com/mapconductor/simplemapapp/MainActivity.kt @@ -15,14 +15,21 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.unit.dp +import com.mapconductor.core.circle.Circle +import com.mapconductor.core.circle.CircleState import com.mapconductor.core.features.GeoPoint import com.mapconductor.core.info.InfoBubble import com.mapconductor.core.map.MapCameraPosition import com.mapconductor.core.marker.Marker +import com.mapconductor.core.marker.MarkerState import com.mapconductor.geojson.GeoJSONFeature import com.mapconductor.geojson.GeoJSONLayer import com.mapconductor.geojson.GeoJSONLayerState import com.mapconductor.geojson.GeoJSONParser +import com.mapconductor.googlemaps.GoogleMapView +import com.mapconductor.googlemaps.rememberGoogleMapViewState +import com.mapconductor.maplibre.MapLibreDesign import com.mapconductor.maplibre.MapLibreMapView import com.mapconductor.maplibre.rememberMapLibreMapViewState import com.mapconductor.simplemapapp.ui.theme.MapConductorSDKTheme @@ -42,7 +49,7 @@ class MainActivity : ComponentActivity() { setContent { MapConductorSDKTheme { Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding -> - SimpleMap(modifier = Modifier.padding(innerPadding)) + SimpleMapScreen(modifier = Modifier.padding(innerPadding)) } } } @@ -102,6 +109,37 @@ fun SimpleMap(modifier: Modifier) { ) } } +@Composable +fun SimpleMapScreen(modifier: Modifier) { + val mapState = rememberMapLibreMapViewState( + cameraPosition = MapCameraPosition( + position = GeoPoint(35.6762, 139.6503), + zoom = 15.0, + ), + mapDesign = MapLibreDesign.OpenMapTiles, + ) + + MapLibreMapView( + modifier = modifier, + state = mapState, + ) { + Marker( + state = MarkerState( + position = GeoPoint(35.6762, 139.6503), + ) + ) + + Circle( + state = CircleState( + center = GeoPoint(35.6762, 139.6503), + radiusMeters = 500.0, + fillColor = Color.Green.copy(alpha = 0.5f), + strokeColor = Color.Blue, + strokeWidth = 3.dp, + ) + ) + } +} @Composable fun GeoJsonLayerExample(modifier: Modifier = Modifier) {