react-native-maps 0.31.0 → 1.0.0-alpha.1

package/android/src/main/java/com/airbnb/android/react/maps/AirMapCallout.java

@@ -1,23 +0,0 @@
-package com.airbnb.android.react.maps;
-
-import android.content.Context;
-
-import com.facebook.react.views.view.ReactViewGroup;
-
-public class AirMapCallout extends ReactViewGroup {
-  private boolean tooltip = false;
-  public int width;
-  public int height;
-
-  public AirMapCallout(Context context) {
-    super(context);
-  }
-
-  public void setTooltip(boolean tooltip) {
-    this.tooltip = tooltip;
-  }
-
-  public boolean getTooltip() {
-    return this.tooltip;
-  }
-}

package/android/src/main/java/com/airbnb/android/react/maps/AirMapFeature.java

@@ -1,18 +0,0 @@
-package com.airbnb.android.react.maps;
-
-import android.content.Context;
-
-import com.facebook.react.views.view.ReactViewGroup;
-import com.google.android.gms.maps.GoogleMap;
-
-public abstract class AirMapFeature extends ReactViewGroup {
-  public AirMapFeature(Context context) {
-    super(context);
-  }
-
-  public abstract void addToMap(GoogleMap map);
-
-  public abstract void removeFromMap(GoogleMap map);
-
-  public abstract Object getFeature();
-}

package/android/src/main/java/com/airbnb/android/react/maps/AirMapLiteManager.java

@@ -1,20 +0,0 @@
-package com.airbnb.android.react.maps;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.google.android.gms.maps.GoogleMapOptions;
-
-public class AirMapLiteManager extends AirMapManager {
-
-  private static final String REACT_CLASS = "AIRMapLite";
-
-  @Override
-  public String getName() {
-    return REACT_CLASS;
-  }
-
-  public AirMapLiteManager(ReactApplicationContext context) {
-    super(context);
-    this.googleMapOptions = new GoogleMapOptions().liteMode(true);
-  }
-
-}

package/android/src/main/java/com/airbnb/android/react/maps/AirMapLocalTileManager.java

@@ -1,56 +0,0 @@
-package com.airbnb.android.react.maps;
-
-import android.content.Context;
-import android.os.Build;
-import android.util.DisplayMetrics;
-import android.view.WindowManager;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.ViewGroupManager;
-import com.facebook.react.uimanager.annotations.ReactProp;
-
-/**
- * Created by zavadpe on 30/11/2017.
- */
-public class AirMapLocalTileManager extends ViewGroupManager<AirMapLocalTile> {
-    private DisplayMetrics metrics;
-
-    public AirMapLocalTileManager(ReactApplicationContext reactContext) {
-        super();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            metrics = new DisplayMetrics();
-            ((WindowManager) reactContext.getSystemService(Context.WINDOW_SERVICE))
-                    .getDefaultDisplay()
-                    .getRealMetrics(metrics);
-        } else {
-            metrics = reactContext.getResources().getDisplayMetrics();
-        }
-    }
-
-    @Override
-    public String getName() {
-        return "AIRMapLocalTile";
-    }
-
-    @Override
-    public AirMapLocalTile createViewInstance(ThemedReactContext context) {
-        return new AirMapLocalTile(context);
-    }
-
-    @ReactProp(name = "pathTemplate")
-    public void setPathTemplate(AirMapLocalTile view, String pathTemplate) {
-        view.setPathTemplate(pathTemplate);
-    }
-
-    @ReactProp(name = "tileSize", defaultFloat = 256f)
-    public void setTileSize(AirMapLocalTile view, float tileSize) {
-        view.setTileSize(tileSize);
-    }
-
-    @ReactProp(name = "zIndex", defaultFloat = -1.0f)
-    public void setZIndex(AirMapLocalTile view, float zIndex) {
-        view.setZIndex(zIndex);
-    }
-
-}

package/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java

@@ -1,500 +0,0 @@
-package com.airbnb.android.react.maps;
-
-import android.view.View;
-
-import androidx.annotation.Nullable;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.common.MapBuilder;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.facebook.react.uimanager.LayoutShadowNode;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.ViewGroupManager;
-import com.facebook.react.uimanager.annotations.ReactProp;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-import com.google.android.gms.location.LocationRequest;
-import com.google.android.gms.maps.GoogleMap;
-import com.google.android.gms.maps.GoogleMapOptions;
-import com.google.android.gms.maps.model.LatLng;
-import com.google.android.gms.maps.model.LatLngBounds;
-import com.google.android.gms.maps.model.MapStyleOptions;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class AirMapManager extends ViewGroupManager<AirMapView> {
-
-  private static final String REACT_CLASS = "AIRMap";
-  private static final int ANIMATE_TO_REGION = 1;
-  private static final int ANIMATE_TO_COORDINATE = 2;
-  private static final int ANIMATE_TO_VIEWING_ANGLE = 3;
-  private static final int ANIMATE_TO_BEARING = 4;
-  private static final int FIT_TO_ELEMENTS = 5;
-  private static final int FIT_TO_SUPPLIED_MARKERS = 6;
-  private static final int FIT_TO_COORDINATES = 7;
-  private static final int SET_MAP_BOUNDARIES = 8;
-  private static final int ANIMATE_TO_NAVIGATION = 9; 
-  private static final int SET_INDOOR_ACTIVE_LEVEL_INDEX = 10;
-  private static final int SET_CAMERA = 11;
-  private static final int ANIMATE_CAMERA = 12;
-
-
-  private final Map<String, Integer> MAP_TYPES = MapBuilder.of(
-      "standard", GoogleMap.MAP_TYPE_NORMAL,
-      "satellite", GoogleMap.MAP_TYPE_SATELLITE,
-      "hybrid", GoogleMap.MAP_TYPE_HYBRID,
-      "terrain", GoogleMap.MAP_TYPE_TERRAIN,
-      "none", GoogleMap.MAP_TYPE_NONE
-  );
-
-  private final Map<String, Integer> MY_LOCATION_PRIORITY = MapBuilder.of(
-          "balanced", LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY,
-          "high", LocationRequest.PRIORITY_HIGH_ACCURACY,
-          "low", LocationRequest.PRIORITY_LOW_POWER,
-          "passive", LocationRequest.PRIORITY_NO_POWER
-  );
-
-  private final ReactApplicationContext appContext;
-  private AirMapMarkerManager markerManager;
-
-  protected GoogleMapOptions googleMapOptions;
-
-  public AirMapManager(ReactApplicationContext context) {
-    this.appContext = context;
-    this.googleMapOptions = new GoogleMapOptions();
-  }
-
-  public AirMapMarkerManager getMarkerManager() {
-    return this.markerManager;
-  }
-  public void setMarkerManager(AirMapMarkerManager markerManager) {
-    this.markerManager = markerManager;
-  }
-
-  @Override
-  public String getName() {
-    return REACT_CLASS;
-  }
-
-  @Override
-  protected AirMapView createViewInstance(ThemedReactContext context) {
-    return new AirMapView(context, this.appContext, this, googleMapOptions);
-  }
-
-  private void emitMapError(ThemedReactContext context, String message, String type) {
-    WritableMap error = Arguments.createMap();
-    error.putString("message", message);
-    error.putString("type", type);
-
-    context
-        .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-        .emit("onError", error);
-  }
-
-  @ReactProp(name = "region")
-  public void setRegion(AirMapView view, ReadableMap region) {
-    view.setRegion(region);
-  }
-
-  @ReactProp(name = "initialRegion")
-  public void setInitialRegion(AirMapView view, ReadableMap initialRegion) {
-    view.setInitialRegion(initialRegion);
-  }
-
-  @ReactProp(name = "camera")
-  public void setCamera(AirMapView view, ReadableMap camera) {
-    view.setCamera(camera);
-  }
-
-  @ReactProp(name = "initialCamera")
-  public void setInitialCamera(AirMapView view, ReadableMap initialCamera) {
-    view.setInitialCamera(initialCamera);
-  }
-
-  @ReactProp(name = "mapType")
-  public void setMapType(AirMapView view, @Nullable String mapType) {
-    int typeId = MAP_TYPES.get(mapType);
-    view.map.setMapType(typeId);
-  }
-
-  @ReactProp(name = "customMapStyleString")
-  public void setMapStyle(AirMapView view, @Nullable String customMapStyleString) {
-    view.map.setMapStyle(new MapStyleOptions(customMapStyleString));
-  }
-
-  @ReactProp(name = "mapPadding")
-  public void setMapPadding(AirMapView view, @Nullable ReadableMap padding) {
-    int left = 0;
-    int top = 0;
-    int right = 0;
-    int bottom = 0;
-    double density = (double) view.getResources().getDisplayMetrics().density;
-
-    if (padding != null) {
-      if (padding.hasKey("left")) {
-        left = (int) (padding.getDouble("left") * density);
-      }
-
-      if (padding.hasKey("top")) {
-        top = (int) (padding.getDouble("top") * density);
-      }
-
-      if (padding.hasKey("right")) {
-        right = (int) (padding.getDouble("right") * density);
-      }
-
-      if (padding.hasKey("bottom")) {
-        bottom = (int) (padding.getDouble("bottom") * density);
-      }
-    }
-
-    view.applyBaseMapPadding(left, top, right, bottom);
-    view.map.setPadding(left, top, right, bottom);
-  }
-
-  @ReactProp(name = "showsUserLocation", defaultBoolean = false)
-  public void setShowsUserLocation(AirMapView view, boolean showUserLocation) {
-    view.setShowsUserLocation(showUserLocation);
-  }
-
-  @ReactProp(name = "userLocationPriority")
-  public void setUserLocationPriority(AirMapView view, @Nullable String accuracy) {
-    view.setUserLocationPriority(MY_LOCATION_PRIORITY.get(accuracy));
-  }
-
-  @ReactProp(name = "userLocationUpdateInterval", defaultInt = 5000)
-  public void setUserLocationUpdateInterval(AirMapView view, int updateInterval) {
-    view.setUserLocationUpdateInterval(updateInterval);
-  }
-
-  @ReactProp(name = "userLocationFastestInterval", defaultInt = 5000)
-  public void setUserLocationFastestInterval(AirMapView view, int fastestInterval) {
-    view.setUserLocationFastestInterval(fastestInterval);
-  }
-
-  @ReactProp(name = "showsMyLocationButton", defaultBoolean = true)
-  public void setShowsMyLocationButton(AirMapView view, boolean showMyLocationButton) {
-    view.setShowsMyLocationButton(showMyLocationButton);
-  }
-
-  @ReactProp(name = "toolbarEnabled", defaultBoolean = true)
-  public void setToolbarEnabled(AirMapView view, boolean toolbarEnabled) {
-    view.setToolbarEnabled(toolbarEnabled);
-  }
-
-  // This is a private prop to improve performance of panDrag by disabling it when the callback
-  // is not set
-  @ReactProp(name = "handlePanDrag", defaultBoolean = false)
-  public void setHandlePanDrag(AirMapView view, boolean handlePanDrag) {
-    view.setHandlePanDrag(handlePanDrag);
-  }
-
-  @ReactProp(name = "showsTraffic", defaultBoolean = false)
-  public void setShowTraffic(AirMapView view, boolean showTraffic) {
-    view.map.setTrafficEnabled(showTraffic);
-  }
-
-  @ReactProp(name = "showsBuildings", defaultBoolean = false)
-  public void setShowBuildings(AirMapView view, boolean showBuildings) {
-    view.map.setBuildingsEnabled(showBuildings);
-  }
-
-  @ReactProp(name = "showsIndoors", defaultBoolean = false)
-  public void setShowIndoors(AirMapView view, boolean showIndoors) {
-    view.map.setIndoorEnabled(showIndoors);
-  }
-
-  @ReactProp(name = "showsIndoorLevelPicker", defaultBoolean = false)
-  public void setShowsIndoorLevelPicker(AirMapView view, boolean showsIndoorLevelPicker) {
-    view.map.getUiSettings().setIndoorLevelPickerEnabled(showsIndoorLevelPicker);
-  }
-
-  @ReactProp(name = "showsCompass", defaultBoolean = false)
-  public void setShowsCompass(AirMapView view, boolean showsCompass) {
-    view.map.getUiSettings().setCompassEnabled(showsCompass);
-  }
-
-  @ReactProp(name = "scrollEnabled", defaultBoolean = false)
-  public void setScrollEnabled(AirMapView view, boolean scrollEnabled) {
-    view.map.getUiSettings().setScrollGesturesEnabled(scrollEnabled);
-  }
-
-  @ReactProp(name = "zoomEnabled", defaultBoolean = false)
-  public void setZoomEnabled(AirMapView view, boolean zoomEnabled) {
-    view.map.getUiSettings().setZoomGesturesEnabled(zoomEnabled);
-  }
-
-  @ReactProp(name = "zoomControlEnabled", defaultBoolean = true)
-  public void setZoomControlEnabled(AirMapView view, boolean zoomControlEnabled) {
-    view.map.getUiSettings().setZoomControlsEnabled(zoomControlEnabled);
-  }
-
-  @ReactProp(name = "rotateEnabled", defaultBoolean = false)
-  public void setRotateEnabled(AirMapView view, boolean rotateEnabled) {
-    view.map.getUiSettings().setRotateGesturesEnabled(rotateEnabled);
-  }
-
-  @ReactProp(name = "scrollDuringRotateOrZoomEnabled", defaultBoolean = true)
-  public void setScrollDuringRotateOrZoomEnabled(AirMapView view, boolean scrollDuringRotateOrZoomEnabled) {
-    view.map.getUiSettings().setScrollGesturesEnabledDuringRotateOrZoom(scrollDuringRotateOrZoomEnabled);
-  }
-
-  @ReactProp(name = "cacheEnabled", defaultBoolean = false)
-  public void setCacheEnabled(AirMapView view, boolean cacheEnabled) {
-    view.setCacheEnabled(cacheEnabled);
-  }
-
-  @ReactProp(name = "loadingEnabled", defaultBoolean = false)
-  public void setLoadingEnabled(AirMapView view, boolean loadingEnabled) {
-    view.enableMapLoading(loadingEnabled);
-  }
-
-  @ReactProp(name = "moveOnMarkerPress", defaultBoolean = true)
-  public void setMoveOnMarkerPress(AirMapView view, boolean moveOnPress) {
-    view.setMoveOnMarkerPress(moveOnPress);
-  }
-
-  @ReactProp(name = "loadingBackgroundColor", customType = "Color")
-  public void setLoadingBackgroundColor(AirMapView view, @Nullable Integer loadingBackgroundColor) {
-    view.setLoadingBackgroundColor(loadingBackgroundColor);
-  }
-
-  @ReactProp(name = "loadingIndicatorColor", customType = "Color")
-  public void setLoadingIndicatorColor(AirMapView view, @Nullable Integer loadingIndicatorColor) {
-    view.setLoadingIndicatorColor(loadingIndicatorColor);
-  }
-
-  @ReactProp(name = "pitchEnabled", defaultBoolean = false)
-  public void setPitchEnabled(AirMapView view, boolean pitchEnabled) {
-    view.map.getUiSettings().setTiltGesturesEnabled(pitchEnabled);
-  }
-
-  @ReactProp(name = "minZoomLevel")
-  public void setMinZoomLevel(AirMapView view, float minZoomLevel) {
-    view.map.setMinZoomPreference(minZoomLevel);
-  }
-
-  @ReactProp(name = "maxZoomLevel")
-  public void setMaxZoomLevel(AirMapView view, float maxZoomLevel) {
-    view.map.setMaxZoomPreference(maxZoomLevel);
-  }
-
-  @ReactProp(name = "kmlSrc")
-  public void setKmlSrc(AirMapView view, String kmlUrl) {
-    if (kmlUrl != null) {
-      view.setKmlSrc(kmlUrl);
-    }
-  }
-
-  @Override
-  public void receiveCommand(AirMapView view, int commandId, @Nullable ReadableArray args) {
-    Integer duration;
-    Double lat;
-    Double lng;
-    Double lngDelta;
-    Double latDelta;
-    float bearing;
-    float angle;
-    ReadableMap region;
-    ReadableMap camera;
-
-    switch (commandId) {
-      case SET_CAMERA:
-        camera = args.getMap(0);
-        view.animateToCamera(camera, 0);
-        break;
-
-      case ANIMATE_CAMERA:
-        camera = args.getMap(0);
-        duration = args.getInt(1);
-        view.animateToCamera(camera, duration);
-        break;
-
-      case ANIMATE_TO_NAVIGATION:
-        region = args.getMap(0);
-        lng = region.getDouble("longitude");
-        lat = region.getDouble("latitude");
-        LatLng location = new LatLng(lat, lng);
-        bearing = (float)args.getDouble(1);
-        angle = (float)args.getDouble(2);
-        duration = args.getInt(3);
-        view.animateToNavigation(location, bearing, angle, duration);
-        break;
-
-      case ANIMATE_TO_REGION:
-        region = args.getMap(0);
-        duration = args.getInt(1);
-        lng = region.getDouble("longitude");
-        lat = region.getDouble("latitude");
-        lngDelta = region.getDouble("longitudeDelta");
-        latDelta = region.getDouble("latitudeDelta");
-        LatLngBounds bounds = new LatLngBounds(
-            new LatLng(lat - latDelta / 2, lng - lngDelta / 2), // southwest
-            new LatLng(lat + latDelta / 2, lng + lngDelta / 2)  // northeast
-        );
-        view.animateToRegion(bounds, duration);
-        break;
-
-      case ANIMATE_TO_COORDINATE:
-        region = args.getMap(0);
-        duration = args.getInt(1);
-        lng = region.getDouble("longitude");
-        lat = region.getDouble("latitude");
-        view.animateToCoordinate(new LatLng(lat, lng), duration);
-        break;
-
-      case ANIMATE_TO_VIEWING_ANGLE:
-        angle = (float)args.getDouble(0);
-        duration = args.getInt(1);
-        view.animateToViewingAngle(angle, duration);
-        break;
-
-      case ANIMATE_TO_BEARING:
-        bearing = (float)args.getDouble(0);
-        duration = args.getInt(1);
-        view.animateToBearing(bearing, duration);
-        break;
-
-      case FIT_TO_ELEMENTS:
-        view.fitToElements(args.getMap(0), args.getBoolean(1));
-        break;
-
-      case FIT_TO_SUPPLIED_MARKERS:
-        view.fitToSuppliedMarkers(args.getArray(0), args.getMap(1), args.getBoolean(2));
-        break;
-
-      case FIT_TO_COORDINATES:
-        view.fitToCoordinates(args.getArray(0), args.getMap(1), args.getBoolean(2));
-        break;
-
-      case SET_MAP_BOUNDARIES:
-        view.setMapBoundaries(args.getMap(0), args.getMap(1));
-        break;
-
-      case SET_INDOOR_ACTIVE_LEVEL_INDEX:
-        view.setIndoorActiveLevelIndex(args.getInt(0));
-        break;
-    }
-  }
-
-  @Override
-  @Nullable
-  public Map getExportedCustomDirectEventTypeConstants() {
-    Map<String, Map<String, String>> map = MapBuilder.of(
-        "onMapReady", MapBuilder.of("registrationName", "onMapReady"),
-        "onPress", MapBuilder.of("registrationName", "onPress"),
-        "onLongPress", MapBuilder.of("registrationName", "onLongPress"),
-        "onMarkerPress", MapBuilder.of("registrationName", "onMarkerPress"),
-        "onMarkerSelect", MapBuilder.of("registrationName", "onMarkerSelect"),
-        "onMarkerDeselect", MapBuilder.of("registrationName", "onMarkerDeselect"),
-        "onCalloutPress", MapBuilder.of("registrationName", "onCalloutPress")
-    );
-
-    map.putAll(MapBuilder.of(
-        "onUserLocationChange", MapBuilder.of("registrationName", "onUserLocationChange"),
-        "onMarkerDragStart", MapBuilder.of("registrationName", "onMarkerDragStart"),
-        "onMarkerDrag", MapBuilder.of("registrationName", "onMarkerDrag"),
-        "onMarkerDragEnd", MapBuilder.of("registrationName", "onMarkerDragEnd"),
-        "onPanDrag", MapBuilder.of("registrationName", "onPanDrag"),
-        "onKmlReady", MapBuilder.of("registrationName", "onKmlReady"),
-        "onPoiClick", MapBuilder.of("registrationName", "onPoiClick")
-    ));
-
-    map.putAll(MapBuilder.of(
-        "onIndoorLevelActivated", MapBuilder.of("registrationName", "onIndoorLevelActivated"),
-        "onIndoorBuildingFocused", MapBuilder.of("registrationName", "onIndoorBuildingFocused"),
-        "onDoublePress", MapBuilder.of("registrationName", "onDoublePress"),
-        "onMapLoaded", MapBuilder.of("registrationName", "onMapLoaded")
-    ));
-
-    return map;
-  }
-  
-  @Nullable
-  @Override
-  public Map<String, Integer> getCommandsMap() {
-    Map<String, Integer> map = this.CreateMap(
-        "setCamera", SET_CAMERA,
-        "animateCamera", ANIMATE_CAMERA,
-        "animateToRegion", ANIMATE_TO_REGION,
-        "animateToCoordinate", ANIMATE_TO_COORDINATE,
-        "animateToViewingAngle", ANIMATE_TO_VIEWING_ANGLE,
-        "animateToBearing", ANIMATE_TO_BEARING,
-        "fitToElements", FIT_TO_ELEMENTS,
-        "fitToSuppliedMarkers", FIT_TO_SUPPLIED_MARKERS,
-        "fitToCoordinates", FIT_TO_COORDINATES,
-        "animateToNavigation", ANIMATE_TO_NAVIGATION
-    );
-
-    map.putAll(MapBuilder.of(
-      "setMapBoundaries", SET_MAP_BOUNDARIES,
-      "setIndoorActiveLevelIndex", SET_INDOOR_ACTIVE_LEVEL_INDEX
-    ));
-
-    return map;
-  }
-
-  public static <K, V> Map<K, V> CreateMap(
-  K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6, K k7, V v7, K k8, V v8, K k9, V v9, K k10, V v10) {
-    Map map = new HashMap<K, V>();
-    map.put(k1, v1);
-    map.put(k2, v2);
-    map.put(k3, v3);
-    map.put(k4, v4);
-    map.put(k5, v5);
-    map.put(k6, v6);
-    map.put(k7, v7);
-    map.put(k8, v8);
-    map.put(k9, v9);
-    map.put(k10, v10);
-    return map;
-  }
-
-  @Override
-  public LayoutShadowNode createShadowNodeInstance() {
-    // A custom shadow node is needed in order to pass back the width/height of the map to the
-    // view manager so that it can start applying camera moves with bounds.
-    return new SizeReportingShadowNode();
-  }
-
-  @Override
-  public void addView(AirMapView parent, View child, int index) {
-    parent.addFeature(child, index);
-  }
-
-  @Override
-  public int getChildCount(AirMapView view) {
-    return view.getFeatureCount();
-  }
-
-  @Override
-  public View getChildAt(AirMapView view, int index) {
-    return view.getFeatureAt(index);
-  }
-
-  @Override
-  public void removeViewAt(AirMapView parent, int index) {
-    parent.removeFeatureAt(index);
-  }
-
-  @Override
-  public void updateExtraData(AirMapView view, Object extraData) {
-    view.updateExtraData(extraData);
-  }
-
-  void pushEvent(ThemedReactContext context, View view, String name, WritableMap data) {
-    context.getJSModule(RCTEventEmitter.class)
-        .receiveEvent(view.getId(), name, data);
-  }
-
-  @Override
-  public void onDropViewInstance(AirMapView view) {
-    view.doDestroy();
-    super.onDropViewInstance(view);
-  }
-
-}