@rnmapbox/maps 10.0.15 → 10.1.0-beta.11

package/ios/RCTMGL-v10/RCTMGLImages.swift

@@ -1,276 +0,0 @@
-import MapboxMaps
-
-protocol RCTMGLImageSetter : AnyObject {
-  func addImage(name: String, image: UIImage, sdf: Bool?, stretchX: [[NSNumber]], stretchY: [[NSNumber]], content: [NSNumber]?, log: String) -> Bool
-}
-
-class RCTMGLImages : UIView, RCTMGLMapComponent {
-  
-  weak var bridge : RCTBridge! = nil
-  
-  weak var style: Style? = nil
-
-  @objc
-  var onImageMissing: RCTBubblingEventBlock? = nil
-  
-  @objc
-  var images : [String:Any] = [:] {
-    didSet {
-      updateImages(images: images, oldImages: oldValue)
-    }
-  }
-    
-  var loadedImages : Set<String> = []
-  
-  var imageViews: [RCTMGLImage] = []
-
-  @objc
-  var nativeImages: [Any] = [] {
-    didSet {
-      nativeImageInfos = nativeImages.compactMap { decodeImage($0) }
-    }
-  }
-
-  typealias NativeImageInfo = (name:String, sdf: Bool, stretchX:[(from:Float, to:Float)], stretchY:[(from:Float, to:Float)], content: (left:Float,top:Float,right:Float,bottom:Float)? );
-  var nativeImageInfos: [NativeImageInfo] = []
-  
-  @objc open override func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
-    if let image = subview as? RCTMGLImage {
-      imageViews.insert(image, at: atIndex)
-    } else {
-      Logger.log(level:.warn, message: "RCTMGLImages children can only be RCTMGLImage, got \(optional: subview)")
-    }
-    super.insertReactSubview(subview, at: atIndex)
-  }
-  
-  @objc open override func removeReactSubview(_ subview: UIView!) {
-    if let image = subview as? RCTMGLImage {
-      imageViews.removeAll { $0 == image }
-      image.images = nil
-    }
-    super.removeReactSubview(subview)
-  }
-  
-  // MARK: - RCTMGLMapComponent
-
-  func waitForStyleLoad() -> Bool {
-    return false
-  }
-  
-  func addToMap(_ map: RCTMGLMapView, style: Style) {
-    self.style = style
-    map.images.append(self)
-    
-    self.addNativeImages(style: style, nativeImages: nativeImageInfos)
-    self.addImages(style: style, images: images, oldImages: [:])
-    self.addImageViews(style: style, imageViews: imageViews)
-  }
-  
-  func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool {
-    self.style = nil
-    // v10todo
-    return true
-  }
-  
-  func sameImage(oldValue: Any?, newValue: Any?) -> Bool {
-    if let oldS = oldValue as? String, let newS = newValue as? String {
-      return oldS == newS
-    } else {
-      return false
-    }
-  }
-
-  func updateImages(images: [String:Any], oldImages: [String:Any]) {
-    if let style = self.style {
-      addImages(style: style, images: images, oldImages: oldImages)
-    }
-  }
-
-  func addImages(style: Style, images: [String: Any], oldImages: [String:Any]) {
-    var missingImages : [String:Any] = [:]
-    
-    // Add image placeholder for images that are not yet available in the style. This way
-    // we can load the images asynchronously and add the ShapeSource to the map without delay.
-    // The same is required when this ShapeSource is updated with new/added images and the
-    // data references them. In which case addMissingImageToStyle will take care of loading
-    // them in a similar way.
-    //
-    // See also: https://github.com/mapbox/mapbox-gl-native/pull/14253#issuecomment-478827792
-    
-    for name in images.keys {
-      let newImage = oldImages[name] == nil
-      if oldImages[name] == nil || loadedImages.contains(name) || !sameImage(oldValue: oldImages[name], newValue: images[name]) {
-        let addPlaceholder = oldImages[name] == nil
-        if !sameImage(oldValue: oldImages[name], newValue: images[name]) {
-          missingImages[name] = images[name]
-        } else {
-          if style.styleManager.getStyleImage(forImageId: name) == nil {
-            logged("RCTMGLImages.addImagePlaceholder") {
-              try? style.addImage(placeholderImage, id: name, stretchX: [], stretchY: [])
-              missingImages[name] = images[name]
-            }
-          }
-        }
-      }
-    }
-    
-    if missingImages.count > 0 {
-      RCTMGLUtils.fetchImages(bridge, style: style, objects: missingImages, forceUpdate: true, loaded: { name in self.loadedImages.insert(name) } ,callback: { })
-    }
-  }
-  
-  private func addImageViews(style: Style, imageViews: [RCTMGLImage]) {
-    imageViews.forEach { imageView in
-      imageView.images = self
-    }
-  }
-  
-  public func addMissingImageToStyle(style: Style, imageName: String) -> Bool {
-    if let nativeImage = nativeImageInfos.first(where: { $0.name == imageName }) {
-      addNativeImages(style: style, nativeImages: [nativeImage])
-      return true
-    }
-    
-    if let image = images[imageName] {
-      addImages(style: style, images: [imageName: image], oldImages: [:])
-      return true
-    }
-    return false
-  }
-  
-  public func sendImageMissingEvent(imageName: String, payload: StyleImageMissingPayload) {
-    let payload = ["imageKey":imageName]
-    let event = RCTMGLEvent(type: .imageMissing, payload: payload)
-    if let onImageMissing = onImageMissing {
-      onImageMissing(event.toJSON())
-    }
-  }
-  
-  static func convert(stretch: [[NSNumber]], scale: CGFloat = 1.0) -> [(from: Float, to: Float)] {
-    return stretch.map{ pair in
-      return (from: pair[0].floatValue * Float(scale), to: pair[1].floatValue * Float(scale))
-    }
-  }
-  
-  static func convert(stretch: [(from: Float, to: Float)], scale: CGFloat = 1.0) -> [ImageStretches] {
-    return stretch.map { v in ImageStretches(first: v.from * Float(scale), second: v.to * Float(scale)) }
-  }
-  
-  static func convert(stretch: [[NSNumber]], scale: CGFloat = 1.0) -> [ImageStretches] {
-    return convert(stretch: convert(stretch: stretch, scale: scale))
-  }
-  
-  static func convert(stretch: [[NSNumber]], scale: Float = 1.0) -> [ImageStretches] {
-    return convert(stretch: stretch, scale: CGFloat(scale))
-  }
-
-
-  static func convert(content: (left:Float, top:Float, right:Float, bottom:Float)?, scale: CGFloat) -> ImageContent? {
-    guard let content = content else {
-      return nil
-    }
-    
-    return ImageContent(left:content.left*Float(scale), top:content.top*Float(scale), right:content.right*Float(scale), bottom:content.bottom*Float(scale))
-  }
-
-  static func convert(content: [NSNumber]?, scale: CGFloat = 1.0) -> (left:Float,top:Float,right:Float,bottom:Float)? {
-    guard let content = content else {
-      return nil
-    }
-    guard content.count == 4 else {
-      Logger.log(level: .error, message: "Image content should have 4 elements got \(content)")
-      return nil
-    }
-    return (
-      left: content[0].floatValue*Float(scale),
-      top: content[1].floatValue*Float(scale),
-      right: content[2].floatValue*Float(scale),
-      bottom: content[3].floatValue*Float(scale)
-    )
-  }
-  
-  static func convert(content: [NSNumber]?, scale: CGFloat = 1.0) -> ImageContent? {
-    return convert(content: convert(content: content, scale: scale), scale: 1.0)
-  }
-  
-  func decodeImage(_ imageNameOrInfo: Any) -> NativeImageInfo? {
-    if let imageName = imageNameOrInfo as? String {
-      return (name: imageName, sdf: false, stretchX:[],stretchY:[],content:nil)
-    } else if let imageInfo = imageNameOrInfo as? [String:Any] {
-      guard let name = imageInfo["name"] as? String else {
-        Logger.log(level: .warn, message: "NativeImage: \(imageInfo) has no name key")
-        return nil
-      }
-      var sdf = false
-      var stretchX : [(from:Float, to:Float)] = []
-      var stretchY : [(from:Float, to:Float)] = []
-      if let sdfV = imageInfo["sdf"] as? NSNumber {
-        sdf = sdfV.boolValue
-      }
-      
-      if let stretchXV = imageInfo["stretchX"] as? [[NSNumber]] {
-        stretchX = RCTMGLImages.convert(stretch: stretchXV)
-      }
-      
-      if let stretchYV = imageInfo["stretchY"] as? [[NSNumber]] {
-        stretchY = RCTMGLImages.convert(stretch: stretchYV)
-      }
-      
-      var content : (left:Float, top:Float, right:Float, bottom:Float)? = nil
-      if let contentV = imageInfo["content"] as? [NSNumber] {
-        content = RCTMGLImages.convert(content: contentV)
-      }
-      
-      return (name: name, sdf: sdf, stretchX: stretchX, stretchY: stretchY, content: content)
-    } else {
-      Logger.log(level: .warn, message: "RCTMGLImage.nativeImage, unexpected image: \(imageNameOrInfo)")
-      return nil
-    }
-  }
-  
-  func addNativeImages(style: Style, nativeImages: [NativeImageInfo]) {
-    for imageInfo in nativeImages {
-      let imageName = imageInfo.name
-      if style.styleManager.getStyleImage(forImageId: imageInfo.name) == nil {
-        if let image = UIImage(named: imageName) {
-          logged("RCTMGLImage.addNativeImage: \(imageName)") {
-            try style.addImage(image, id: imageName, sdf: imageInfo.sdf,
-                               stretchX: RCTMGLImages.convert(stretch: imageInfo.stretchX, scale: image.scale),
-                               stretchY: RCTMGLImages.convert(stretch: imageInfo.stretchY, scale: image.scale),
-                               content: RCTMGLImages.convert(content: imageInfo.content, scale: image.scale)
-            )
-          }
-        } else {
-          Logger.log(level:.error, message: "Cannot find nativeImage named \(imageName)")
-        }
-      }
-    }
-  }
-  
-  lazy var placeholderImage : UIImage = {
-    UIGraphicsBeginImageContextWithOptions(CGSize(width: 1, height: 1), false, 0.0)
-    let result = UIGraphicsGetImageFromCurrentImageContext()!
-    UIGraphicsEndImageContext()
-    return result
-  }()
-}
-
-extension RCTMGLImages : RCTMGLImageSetter {
-  func addImage(name: String, image: UIImage, sdf: Bool?, stretchX: [[NSNumber]], stretchY: [[NSNumber]], content: [NSNumber]?, log: String) -> Bool
-  {
-     return logged("\(log).addImage") {
-       if let style = style {
-         try style.addImage(image,
-                            id:name,
-                            sdf: sdf ?? false,
-                            stretchX: RCTMGLImages.convert(stretch: stretchX, scale: image.scale),
-                            stretchY: RCTMGLImages.convert(stretch: stretchY, scale: image.scale),
-                            content: RCTMGLImages.convert(content: content, scale: image.scale)
-         )
-         return true
-       } else {
-         return false
-       }
-     } ?? false
- }
-}

package/ios/RCTMGL-v10/RCTMGLImagesManager.m

@@ -1,11 +0,0 @@
-#import <React/RCTBridgeModule.h>
-#import <React/RCTViewManager.h>
-
-@interface RCT_EXTERN_MODULE(RCTMGLImagesManager, RCTViewManager)
-
-RCT_EXPORT_VIEW_PROPERTY(id, NSString)
-RCT_EXPORT_VIEW_PROPERTY(images, NSDictionary)
-RCT_EXPORT_VIEW_PROPERTY(nativeImages, NSArray)
-RCT_REMAP_VIEW_PROPERTY(onImageMissing, onImageMissing, RCTBubblingEventBlock)
-
-@end

package/ios/RCTMGL-v10/RCTMGLImagesManager.swift

@@ -1,14 +0,0 @@
-
-@objc(RCTMGLImagesManager)
-class RCTMGLImagesManager : RCTViewManager {
-  @objc
-  override static func requiresMainQueueSetup() -> Bool {
-    return true
-  }
-
-  override func view() -> UIView! {
-    let layer = RCTMGLImages()
-    layer.bridge = self.bridge
-    return layer
-  }
-}

package/ios/RCTMGL-v10/RCTMGLInteractiveElement.swift

@@ -1,64 +0,0 @@
-import MapboxMaps
-
-@objc
-class RCTMGLInteractiveElement : UIView, RCTMGLMapComponent {
-  weak var map : RCTMGLMapView? = nil
-
-  static let hitboxDefault = 44.0
-
-  @objc var draggable: Bool = false
-  
-  @objc var hasPressListener: Bool = false
-  
-  @objc var hitbox : [String:NSNumber] = [
-    "width": NSNumber(value: hitboxDefault),
-    "height": NSNumber(value: hitboxDefault)
-  ]
-  
-  @objc var id: String! = nil {
-    willSet {
-      if id != nil && newValue != id {
-        Logger.log(level:.warn, message: "Changing id from: \(optional: id) to \(optional: newValue), changing of id is supported")
-        if let map = map { removeFromMap(map, reason: .ComponentChange) }
-      }
-    }
-    didSet {
-      if oldValue != nil && oldValue != id {
-        if let map = map { addToMap(map, style: map.mapboxMap.style) }
-      }
-    }
-  }
-  
-  @objc var onDragStart: RCTBubblingEventBlock? = nil
-  
-  @objc var onPress: RCTBubblingEventBlock? = nil
-  
-  func getLayerIDs() -> [String] {
-    return []
-  }
-
-  func isDraggable() -> Bool {
-    return draggable
-  }
-  
-  func isTouchable() -> Bool {
-    return hasPressListener
-  }
-  
-  // MARK: - RCTMGLMapComponent
-  func addToMap(_ map: RCTMGLMapView, style: Style) {
-    if (self.id == nil) {
-      Logger.log(level: .error, message: "id is required on \(self) but not specified")
-    }
-    self.map = map
-  }
-
-  func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool {
-    self.map = nil
-    return true
-  }
-  
-  func waitForStyleLoad() -> Bool {
-    return true
-  }
-}

package/ios/RCTMGL-v10/RCTMGLLayer.swift

@@ -1,343 +0,0 @@
-@_spi(Experimental) import MapboxMaps
-
-protocol RCTMGLSourceConsumer : class {
-  func addToMap(_ map: RCTMGLMapView, style: Style)
-  func removeFromMap(_ map: RCTMGLMapView, style: Style)
-}
-
-@objc(RCTMGLLayer)
-class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
-  weak var bridge : RCTBridge? = nil
-
-  var waitingForID: String? = nil
-
-  @objc var sourceLayerID : String? = nil {
-    didSet { self.optionsChanged() }
-  }
-
-  var oldReatStyle: Dictionary<String, Any>? = nil
-  @objc var reactStyle : Dictionary<String, Any>? = nil {
-    willSet {
-      oldReatStyle = reactStyle
-    }
-    didSet {
-      DispatchQueue.main.async {
-        self.addStylesAndUpdate()
-      }
-    }
-  }
-  
-  var style: Style? = nil
-
-  @objc var filter : Array<Any>? = nil {
-    didSet { optionsChanged() }
-  }
-  
-  @objc var id: String! = nil {
-    willSet {
-      if id != nil && newValue != id {
-        Logger.log(level:.warn, message: "Changing id from: \(optional: id) to \(optional: newValue), changing of id is supported")
-        if let style = style { self.removeFromMap(style) }
-      }
-    }
-    didSet {
-      if oldValue != nil && oldValue != id {
-        if let map = map, let style = style { self.addToMap(map, style: style) }
-      }
-    }
-  }
-
-  @objc var sourceID: String? = nil {
-    didSet { optionsChanged() }
-  }
-  
-  @objc var minZoomLevel : NSNumber? = nil {
-    didSet { optionsChanged() }
-  }
-  @objc var maxZoomLevel : NSNumber? = nil {
-    didSet { optionsChanged() }
-  }
-
-  @objc var aboveLayerID : String? = nil {
-    didSet {
-      if let aboveLayerID = aboveLayerID {
-        if aboveLayerID != oldValue {
-          self.removeAndReaddLayer()
-        }
-      }
-    }
-  }
-
-  @objc var belowLayerID : String? = nil {
-    didSet {
-      if let belowLayerID = belowLayerID {
-        if belowLayerID != oldValue {
-          self.removeAndReaddLayer()
-        }
-      }
-    }
-  }
-  
-  @objc var layerIndex : NSNumber? = nil {
-    didSet {
-      if let layerIndex = layerIndex {
-        if layerIndex != oldValue {
-          self.removeAndReaddLayer()
-        }
-      }
-    }
-  }
-  
-  @objc weak var map: RCTMGLMapView? = nil
-
-  deinit {
-    if let waitingForID = waitingForID {
-      Logger.log(level:.warn, message: "RCTMGLLayer.removeFromMap - unmetPositionDependency: layer: \(optional: id) was waiting for layer: \(optional: waitingForID) but it hasn't added to map")
-      self.waitingForID = nil
-    }
-  }
-  
-  var styleLayer: Layer? = nil
-  
-  /// wearther we inserted the layer or we're referring to an existing layer
-  var existingLayer = false
-
-  // MARK: - RCTMGLMapComponent
-  func waitForStyleLoad() -> Bool {
-    return true
-  }
-  
-  func removeAndReaddLayer() {
-    if let map = map, let style = style {
-      self.removeFromMap(style)
-      self.addToMap(map, style:style)
-    }
-  }
-   
-  /**
-    addStyles - adds the styles defined by reactStyle to the current layer, but does not apply to the style to the map style
-   */
-  func addStyles() {
-    fatalError("Subclasses need to implement the `addStyles()` method.")
-  }
-  
-  func addStylesAndUpdate() {
-    guard styleLayer != nil else {
-      return
-    }
-
-    addStyles()
-    if let style = style,
-      let map = map {
-      if style.styleManager.styleLayerExists(forLayerId: id) {
-        self.updateLayer(map)
-      }
-    }
-  }
-  
-  func makeLayer(style: Style) throws -> Layer {
-    fatalError("Subclasses need to implement the `makeLayer(style:)` method.")
-  }
-  
-  func findLayer(style: Style, id: String) throws -> Layer {
-    return try style.layer(withId: id)
-  }
-  
-  func layerType() -> Layer.Type {
-    fatalError("Subclasses need to implement the `layerType` method. \(self)")
-  }
-
-  func apply(style : Style) throws {
-    fatalError("Subclasses need to implement the `apply` method.")
-  }
-
-  final func loggedApply(style: Style) {
-    logged("updateLayer", info: { "\(self.layerType()).\(optional: self.id)" }) {
-      try apply(style: style)
-    }
-  }
-
-  func position() -> LayerPosition {
-    if let belowLayerID = belowLayerID {
-      if aboveLayerID != nil {
-        Logger.log(level: .warn, message: "Both below layer and above layer is specified => above layer id is ingored")
-      }
-      if layerIndex != nil {
-        Logger.log(level: .warn, message: "Both below layer and layer index is specified => layer index is ignored")
-      }
-      return .below(belowLayerID)
-    } else if let aboveLayerID = aboveLayerID {
-      return .above(aboveLayerID)
-    } else if let layerIndex = layerIndex {
-      return .at(layerIndex.intValue)
-    } else {
-      return .default
-    }
-  }
-  
-  func inserLayer(_ map: RCTMGLMapView) {
-    if self.style == nil {
-      print("inserLayer but style is nil")
-    }
-    if let style = style, let styleLayer = styleLayer {
-      insert(style, layerPosition: position()) {
-        map.layerAdded(styleLayer)
-      }
-    }
-  }
-
-  func updateLayer(_ map: RCTMGLMapView) {
-    if let style = style, let _ = styleLayer {
-      loggedApply(style: style)
-    }
-  }
-  
-  func layerWithSourceID<T : Source>(in style: Style) throws -> T  {
-    let result = try style.source(withId: self.sourceID!, type: T.self)
-    return result
-  }
-
-  func sourceWithSourceID<T : Source>(in style: Style) throws -> T  {
-    let result = try style.source(withId: self.sourceID!, type: T.self)
-    return result
-  }
-
-  func addedToMap() {
-    
-  }
-  
-  func addToMap(_ map: RCTMGLMapView, style: Style) {
-    self.map = map
-    self.style = style
-    guard let id = id else {
-      Logger.log(level: .error, message: "Cannot add layer without id to the map: \(map)")
-      return
-    }
-
-    do {
-      if (style.styleManager.styleLayerExists(forLayerId: id)) {
-        styleLayer = try findLayer(style: style, id: id)
-        existingLayer = true
-      } else {
-        styleLayer = try makeLayer(style: style)
-        existingLayer = false
-      }
-    } catch {
-      Logger.log(level: .error, message: "find/makeLayer failed for layer id=\(id)", error: error)
-    }
-    
-    guard self.styleLayer != nil else {
-      Logger.log(level: .error, message: "find/makeLayer retuned nil for layer id=\(id)")
-      return
-    }
-    setOptions(&self.styleLayer!)
-    addStyles()
-    if !existingLayer {
-      inserLayer(map)
-    } else {
-      updateLayer(map)
-    }
-    addedToMap()
-  }
-  
-  func removeFromMap(_ map: RCTMGLMapView, style: Style) {
-    removeFromMap(style)
-  }
-  
-  func setOptions(_ layer: inout Layer) {
-    if let sourceLayerID = sourceLayerID {
-      layer.sourceLayer = sourceLayerID
-    }
-    
-    if let sourceID = sourceID {
-      if !(existingLayer && sourceID == DEFAULT_SOURCE_ID) && hasSource() {
-        
-        layer.source = sourceID
-      }
-    }
-    
-    if let filter = filter, filter.count > 0 {
-      do {
-        let data = try JSONSerialization.data(withJSONObject: filter, options: .prettyPrinted)
-        let decodedExpression = try JSONDecoder().decode(Expression.self, from: data)
-        layer.filter = decodedExpression
-      } catch {
-        Logger.log(level: .error, message: "parsing filters failed for layer \(optional: id): \(error.localizedDescription)")
-      }
-    }
-    
-    if let minZoom = minZoomLevel {
-      layer.minZoom = minZoom.doubleValue
-    }
-    
-    if let maxZoom = maxZoomLevel {
-      layer.maxZoom = maxZoom.doubleValue
-    }
-  }
-  
-  private func optionsChanged() {
-    if let style = self.style, self.styleLayer != nil {
-      self.setOptions(&self.styleLayer!)
-      self.loggedApply(style: style)
-    }
-  }
-
-  func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool {
-    removeFromMap(map.mapboxMap.style)
-    return true
-  }
-  
-  private func removeFromMap(_ style: Style) {
-    if let waitingForID = waitingForID {
-      Logger.log(level:.warn, message: "RCTMGLLayer.removeFromMap - unmetPositionDependency: layer: \(optional: id) was waiting for layer: \(optional: waitingForID) but it hasn't added to map")
-    }
-
-    do {
-      try style.removeLayer(withId: self.id)
-    } catch {
-      Logger.log(level: .error, message: "RCTMGLLayer.removeFromMap: removing layer failed for layer \(optional: id): \(error.localizedDescription)")
-    }
-  }
-  
-  func insert(_ style: Style, layerPosition: LayerPosition, onInsert: (() -> Void)? = nil) {
-    var idToWaitFor: String?
-    switch layerPosition {
-    case .above(let aboveId):
-      idToWaitFor = aboveId
-    case .below(let belowId):
-      idToWaitFor = belowId
-    case .at(_):
-      idToWaitFor = nil
-    default:
-      idToWaitFor = nil
-    }
-    
-    
-    if let idToWaitFor = idToWaitFor {
-      self.waitingForID = idToWaitFor
-      map!.waitForLayerWithID(idToWaitFor) { _ in
-        self.waitingForID = nil
-        self.attemptInsert(style, layerPosition: layerPosition, onInsert: onInsert)
-      }
-    } else {
-      self.attemptInsert(style, layerPosition: layerPosition, onInsert: onInsert)
-    }
-  }
-  
-  private func attemptInsert(_ style: Style, layerPosition: LayerPosition, onInsert: (() -> Void)? = nil) {
-    guard let styleLayer = self.styleLayer else {
-      return
-    }
-    
-    do {
-      try style.addLayer(styleLayer, layerPosition: layerPosition)
-      onInsert?()
-    } catch {
-      Logger.log(level: .error, message: "inserting layer failed at position \(layerPosition): \(error.localizedDescription)")
-    }
-  }
-  
-  internal func hasSource() -> Bool {
-    return true
-  }
-}