geoblacklight 5.0.0.pre.alpha.11 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e2b959de4c55a7527ad4d7687af25f972a6e219f94dc0ec8b7fb9c76154d5ee
-  data.tar.gz: 99cba751fbb1f088a2f96e40c64998e77e07bccb50511508fa57da35c8cb38a2
+  metadata.gz: 32d2ec143ca4a50dfdd5d7e36ad36cb539cda3ff0e5ba40ce6cde8c0b802bd5f
+  data.tar.gz: 4f013411904f03021301a8ea9c1512c81214c2de7b954a1cddd1803d541ecb58
 SHA512:
-  metadata.gz: f98c1fd49c6dd1c0718a22dab3fea41457f54844415cf1003b36e5a14f6584eabb91061e52bdd7cf4224deadb4557d78125d90d06f15c74b808a1acff3bd9716
-  data.tar.gz: 1d716078cca8102a668cbb9ac1e6d987b9837f9428ffcc2ec51aa7f6986681fa169200e2f0e9fe5916ba187705e154d78189e82009cf5d4ddec2148385fa0d5a
+  metadata.gz: 2cd1132286bfa264ea43924f9eefb38700570bec0b4475f49d0ee597677b1e10c2ec79370b78d5d5900b8b26f687adf68dc4dedc4c8def7c8dd0854d77cc3aa2
+  data.tar.gz: 4f986b1125c2032891fe7d1666f83f8725d75cb63604e9daafec9b0271271de3a3e360fcdc31058dc9bef58e6e65c324c5a6d3a7b781299f00f9bf8ad337525b

data/.github/workflows/build-demo-app.yml

@@ -29,13 +29,16 @@ jobs:
       - name: Install dependencies
         run: bundle install
         env:
-          RAILS_VERSION: 7.1.3
+          RAILS_VERSION: "7.2.2.1"
 
-      - name: Setup Yarn
-        run: exec "yarnpkg"
+      - name: Build frontend package
+        run: |
+          yarn install
+          yarn build
+          yarn link
 
       - name: Build
-        run: BRANCH=${{ env.BRANCH }} rails new build -m template.rb -a propshaft
+        run: BRANCH=${{ env.BRANCH }} rails new build -m template.rb -a propshaft --css bootstrap --js rollup
 
       - name: Cleanup
         run: rm -rf build/node_modules build/Gemfile.lock build/yarn.lock build/tmp

data/.github/workflows/ruby.yml

@@ -30,24 +30,17 @@ jobs:
           ruby-version: 3.2
       - name: Install json schema validator
         run: gem install json_schemer
-      - name: Run json_schemer against aarkvark fixtures
+      - name: Run json_schemer against aardvark fixtures
         run: find spec/fixtures/solr_documents -type f -name "*.json" | xargs json_schemer schema/geoblacklight-schema-aardvark.json
 
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby_version: ["3.2", "3.3"]
-        rails_version: ["7.0.8.4", "7.1.3.4", "7.2.0"]
+        ruby_version: ["3.2", "3.3", "3.4"]
+        rails_version: ["7.1.5.1", "7.2.2.1", "8.0.1"]
         asset_pipeline: ["vite"]
-        additional_engine_cart_rails_options: [""]
-        # this build has failing tests that aren't easy to replicate locally
-        # https://github.com/geoblacklight/geoblacklight/issues/1585
-        # include:
-        #   - ruby_version: "3.2"
-        #     rails_version: "7.1.3.4"
-        #     additional_engine_cart_rails_options: "--css bootstrap"
-        #     asset_pipeline: "importmap"
+        additional_engine_cart_rails_options: ["--js rollup"]
 
     name: test ruby ${{ matrix.ruby_version }} / rails ${{ matrix.rails_version }} / ${{ matrix.asset_pipeline }}
     steps:
@@ -56,18 +49,22 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby_version }}
-      - name: Install dependencies
+      - name: Install Ruby dependencies
         run: bundle install
         env:
           RAILS_VERSION: ${{ matrix.rails_version }}
-      - name: Setup Yarn
-        run: exec "yarnpkg"
+      - name: Build and link frontend package, if using vite
+        if: matrix.asset_pipeline == 'vite'
+        run: |
+          yarn install
+          yarn build
+          yarn link
       - name: Run tests
         run: bundle exec rake ci
         env:
           RAILS_VERSION: ${{ matrix.rails_version }}
           ASSET_PIPELINE: ${{ matrix.asset_pipeline }}
-          ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-keeps --skip-action-cable --skip-test -a propshaft ${{ matrix.additional_engine_cart_rails_options }}"
+          ENGINE_CART_RAILS_OPTIONS: "--skip-docker --skip-action-cable --skip-rubocop --skip-brakeman --skip-kamal --skip-solid -a propshaft --css bootstrap ${{ matrix.additional_engine_cart_rails_options }}"
           SOLR_URL: http://solr:SolrRocks@localhost:8983/solr/blacklight-core
       - name: Upload coverage artifacts
         uses: actions/upload-artifact@v4

data/Rakefile

@@ -14,7 +14,15 @@ require "open3"
 
 # Ensure the app generates with Propshaft; sprockets is no longer supported
 # https://github.com/geoblacklight/geoblacklight/issues/1265
-ENV["ENGINE_CART_RAILS_OPTIONS"] = ENV["ENGINE_CART_RAILS_OPTIONS"].to_s + " -a propshaft"
+ENV["ENGINE_CART_RAILS_OPTIONS"] = ENV["ENGINE_CART_RAILS_OPTIONS"].to_s + " -a propshaft --css bootstrap"
+
+# Ensure the app generates with the correct javascript pipeline; rollup
+# (for Vite) is the default
+ENV["ENGINE_CART_RAILS_OPTIONS"] += if ENV["ASSET_PIPELINE"] == "importmap"
+  " --js importmap"
+else
+  " --js rollup"
+end
 
 def system_with_error_handling(*args)
   Open3.popen3(*args) do |_stdin, stdout, stderr, thread|

data/app/assets/stylesheets/geoblacklight/modules/_base.scss

@@ -10,7 +10,6 @@
  *
  */
 
-@import 'facets';
 @import 'icon-customization';
 @import 'home';
 @import 'index_maps';

data/app/assets/stylesheets/geoblacklight/modules/results.scss

@@ -54,3 +54,7 @@
     }
   }
 }
+
+.row > #leaflet-viewer {
+  --bs-gutter-x: 0;
+}

data/app/components/geoblacklight/static_map_component.rb

@@ -18,6 +18,8 @@ module Geoblacklight
     end
 
     def viewer_tag
+      leaflet_options = helpers.leaflet_options.deep_dup
+      leaflet_options.SLEEP.SLEEP = false
       tag.div(nil,
         id: "static-map",
         aria: {
@@ -28,7 +30,7 @@ module Geoblacklight
           "leaflet-viewer-basemap-value" => helpers.geoblacklight_basemap,
           "leaflet-viewer-page-value" => "STATIC_MAP",
           "leaflet-viewer-map-geom-value" => @document.geometry.geojson,
-          "leaflet-viewer-options-value" => helpers.leaflet_options,
+          "leaflet-viewer-options-value" => leaflet_options,
           "leaflet-viewer-draw-initial-bounds-value" => true
         })
     end

data/app/javascript/geoblacklight/controllers/leaflet_viewer_controller.js

@@ -6,6 +6,7 @@ import { Controller } from "@hotwired/stimulus";
 import basemaps from "geoblacklight/leaflet/basemaps";
 import LayerOpacityControl from "geoblacklight/leaflet/controls/layer_opacity";
 import GeoSearchControl from "geoblacklight/leaflet/controls/geosearch";
+import Sleep from "geoblacklight/leaflet/controls/sleep";
 import { wmsInspection,
   tiledMapLayerInspection,
   featureLayerInspection,
@@ -38,8 +39,7 @@ export default class LeafletViewerController extends Controller {
   };
 
   connect() {
-    // Sets leaflet icon paths to ex. /assets/marker-icon-2x-rails-fingerprint
-    // TODO: figure out why vite @leaftlet_images alias is not working.
+    // Use leaflet icon images from CDN
     Icon.Default.imagePath = "https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.9.4/images/";
 
     // Set up layers
@@ -65,7 +65,10 @@ export default class LeafletViewerController extends Controller {
     if (this.map) return;
 
     // Set up the map and fit to bounds
-    this.map = map(this.element);
+    const sleepSettings = this.optionsValue.SLEEP || { 'SLEEP' : false }
+    this.map = map(this.element, sleepSettings);
+    if (sleepSettings.SLEEP) this.map.addHandler('SLEEP', Sleep);
+
     this.map.addLayer(this.basemap);
     this.map.addLayer(this.overlay);
     this.fitBounds(this.bounds);

data/app/javascript/geoblacklight/leaflet/controls/sleep.js

@@ -0,0 +1,100 @@
+import { DomUtil, DomEvent, Handler } from "leaflet";
+
+export default class Sleep extends Handler {
+  addHooks() {
+    const container = DomUtil.create("div", "wake-overlay w-100 h-100 position-absolute align-items-center justify-content-center", this._map._container);
+    const button = DomUtil.create("button", "btn btn-primary wake-button", container)
+
+    button.innerHTML = this._map.options.MESSAGE;
+    button.setAttribute("tabindex", "0");
+    button.style.zIndex = 2000;
+    container.style.zIndex = 1999;
+    const background = String(this._map.options.BACKGROUND);
+    container.style.background = background;
+    this.container = container;
+    if (this._map.options.MARGIN_DISTANCE) {
+      this.updateBasedOnSize()
+    } else {
+      this.sleepMap();
+    }
+    this.setListeners()
+  }
+
+  sleepMap() {
+    this._map.dragging.disable();
+    this._map.touchZoom.disable();
+    this._map.scrollWheelZoom.disable();
+    this._map.doubleClickZoom.disable();
+    this._map.boxZoom.disable();
+    this._map.keyboard.disable();  
+    this.container.classList.add('d-flex');
+    this.container.classList.remove('d-none');
+  }
+
+  wakeMap() {
+    this._map.dragging.enable();
+    this._map.touchZoom.enable();
+    this._map.scrollWheelZoom.enable();
+    this._map.doubleClickZoom.enable();
+    this._map.boxZoom.enable();
+    this._map.keyboard.enable();
+    this.container.classList.remove('d-flex');
+    this.container.classList.add('d-none');
+  }
+
+  updateBasedOnSize() {
+    const rect = this._map._container.getBoundingClientRect();
+    // sometimes the left/right side has larger margin, so we take an average
+    const calculation = ((window.innerWidth - rect.right) + rect.left) / 2;
+    if (calculation < this._map.options.MARGIN_DISTANCE) {
+      this.sleepMap();
+    } else {
+      this.wakeMap();
+    }
+  }
+
+  setListeners() {
+    const _this = this;
+    let timer;
+    let sleeptimer;
+
+    if (_this._map.options.MARGIN_DISTANCE){
+      window.addEventListener("resize", (event) => {
+        console.log(event)
+        _this.updateBasedOnSize();
+      })
+    }
+
+    DomEvent.on(_this.container, "click", (e) => {
+      _this.wakeMap()
+    });
+
+    DomEvent.on(_this.container, "focus", (e) => {
+      _this.wakeMap()
+    });
+
+    if (this._map.options.HOVERTOWAKE) {
+      DomEvent.on(this._map._container, "mouseenter", (e) => {
+        clearTimeout(sleeptimer);
+
+        timer = setTimeout(function() {
+          _this.wakeMap()
+        }, _this._map.options.WAKETIME);
+      
+      });
+
+      DomEvent.on(this._map._container, "mouseleave", (e) => {
+        clearTimeout(timer);
+      
+        sleeptimer = setTimeout(function() {
+          _this.sleepMap()
+        }, _this._map.options.SLEEPTIME);
+      });
+    }
+
+    DomEvent.on(this.container, "touchstart", (e) => {
+      _this.wakeMap()
+    });
+  }
+}
+

data/geoblacklight.gemspec

@@ -15,9 +15,10 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split(%(\x0))
   spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 3.2.0"
   spec.required_rubygems_version = ">= 2.5.2"
 
-  spec.add_dependency "rails", ">= 6.1", "< 8"
+  spec.add_dependency "rails", ">= 6.1", "< 9"
   spec.add_dependency "blacklight", "~> 8.0"
   spec.add_dependency "config"
   spec.add_dependency "faraday", "~> 2.0"

data/lib/generators/geoblacklight/assets/importmap_generator.rb

@@ -27,11 +27,6 @@ module Geoblacklight
         run "yarn link @geoblacklight/frontend" if options[:test]
       end
 
-      # Workaround for https://github.com/projectblacklight/blacklight/pull/3285
-      def update_blacklight_frontend
-        run "yarn add blacklight-frontend@8.3"
-      end
-
       # Add the customization overrides and insert before bootstrap import
       def add_customizations
         copy_file "assets/_customizations.scss", "app/assets/stylesheets/_customizations.scss"

data/lib/generators/geoblacklight/assets/vite_generator.rb

@@ -21,7 +21,7 @@ module Geoblacklight
       DESCRIPTION
 
       # Install Vite
-      def install_vite
+      def install_vite_rails
         gem "vite_rails", "~> 3.0"
         run "bundle install"
       end
@@ -37,33 +37,16 @@ module Geoblacklight
         copy_file "vite.config.ts", "vite.config.ts"
       end
 
-      # Add our package.json with non-GBL dependencies (Blacklight, Bootstrap, etc.)
-      def install_dependencies
-        copy_file "package.json", "package.json"
-        run "yarn install"
-      end
-
-      # This will write its own package.json if one doesn't exist, causing a
-      # conflict, so it needs to happen after we copy ours
-      def bundle_install
+      # Run the vite install generator (create binstubs, etc.)
+      def setup_vite
         run "bundle exec vite install"
       end
 
       # Pick a version of the frontend asset package and install it.
       def add_frontend
-        # If in local development or CI, install the version we made linkable in
-        # the test app generator. This will make it so changes made in the outer
-        # directory are picked up automatically, like a symlink. Note that this
-        # does NOT install the dependencies of the package, so we have to make
-        # sure to install those separately. See:
-        # https://classic.yarnpkg.com/lang/en/docs/cli/link/
-        # https://github.com/yarnpkg/yarn/issues/2914
-        if options[:test]
-          run "yarn link @geoblacklight/frontend"
-
         # If a branch was specified (e.g. you are running a template.rb build
         # against a test branch), use the latest version available on npm
-        elsif ENV["BRANCH"]
+        if ENV["BRANCH"]
           run "yarn add @geoblacklight/frontend@latest"
 
         # Otherwise, pick the version from npm that matches our Geoblacklight
@@ -71,6 +54,25 @@ module Geoblacklight
         else
           run "yarn add @geoblacklight/frontend@#{Geoblacklight::VERSION}"
         end
+
+        # If in local development or CI, also create a link. This will make it so
+        # changes made in the outer directory are picked up automatically.
+        # `yarn link` has to have already been run in the outer directory first.
+        run "yarn link @geoblacklight/frontend" if options[:test]
+      end
+
+      # The vite_rails gem doesn't currently install the vite-plugin-rails
+      # node package, so we need to do that manually.
+      def install_dev_dependencies
+        run "yarn add --dev vite-plugin-rails"
+      end
+
+      # Remove generated npm scripts from rollup and replace with our own.
+      # Adds a shortcut so that 'yarn build' runs our vite pipeline
+      # No easy way to do this with yarn, so we use `npm pkg`...
+      def setup_npm_scripts
+        run "npm pkg delete scripts"
+        run "npm pkg set scripts.build=\"vite build\""
       end
 
       # Add our own stylesheets that reference the versions from npm

data/lib/generators/geoblacklight/templates/base.html.erb

@@ -24,13 +24,10 @@
     <%= content_for(:head) %>
   </head>
   <body class="<%= render_body_class %>">
-    <nav id="skip-link" role="navigation" class="visually-hidden-focusable" aria-label="<%= t('blacklight.skip_links.label') %>">
-      <div class="container-xl">
-        <%= link_to t('blacklight.skip_links.search_field'), '#search_field', class: 'd-inline-flex p-2 m-1', data: { turbolinks: 'false' } %>
-        <%= link_to t('blacklight.skip_links.main_content'), '#main-container', class: 'd-inline-flex p-2 m-1', data: { turbolinks: 'false' } %>
-        <%= content_for(:skip_links) %>
-      </div>
-    </nav>
+    <%= render blacklight_config.skip_link_component.new do %>
+      <%= content_for(:skip_links) %>
+    <% end %>
+
     <%= render partial: 'shared/header_navbar' %>
 
     <main id="main-container" class="<%= container_classes %>" role="main" aria-label="<%= t('blacklight.main.aria.main_container') %>">

data/lib/generators/geoblacklight/templates/settings.yml

@@ -239,6 +239,14 @@ LEAFLET:
     STATIC_MAP:
       color: '#3388ff'
   SELECTED_COLOR: "#2C7FB8"
+  SLEEP:
+    SLEEP: true # set to false to disable
+    MARGIN_DISTANCE: 100 # set to zero / false if you want to disable this check
+    SLEEPTIME: 750
+    WAKETIME: 750
+    HOVERTOWAKE: false
+    MESSAGE: 'Click to Wake'
+    BACKGROUND: 'rgba(214, 214, 214, .7)'
   LAYERS:
     DETECT_RETINA: true
     INDEX:

data/lib/geoblacklight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Geoblacklight
-  VERSION = "5.0.0-alpha.11"
+  VERSION = "5.0.0"
 end

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@geoblacklight/frontend",
   "type": "module",
-  "version": "5.0.0-alpha.11",
+  "version": "5.0.0",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public"
@@ -23,12 +23,12 @@
     "@hotwired/stimulus": "^3.2.2",
     "@popperjs/core": "^2.11.8",
     "@samvera/clover-iiif": "^2.3.2",
-    "blacklight-frontend": "^8.4.0",
+    "blacklight-frontend": "8",
     "bootstrap": "^5.3.3",
     "esri-leaflet": "^3.0.12",
     "leaflet": "^1.9.4",
-    "leaflet-fullscreen": "^1.0.2",
     "leaflet-iiif": "^3.0.0",
+    "leaflet-fullscreen": "^1.0.2",
     "ol": "8.1.0",
     "ol-pmtiles": "^0.3.0",
     "react": "^18.2.0",

data/spec/spec_helper.rb

@@ -13,6 +13,7 @@ end
 SimpleCov.start "rails" do
   add_filter "lib/generators/geoblacklight/install_generator.rb"
   add_filter "lib/geoblacklight/version.rb"
+  add_filter "lib/geoblacklight/engine.rb"
   add_filter "lib/generators"
   add_filter "lib/tasks/geoblacklight.rake"
   add_filter "/spec"

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -13,16 +13,6 @@ class TestAppGenerator < Rails::Generators::Base
     end
   end
 
-  def build_frontend
-    run "yarn install && yarn build"
-  end
-
-  # This makes the assets available in the test app so that changes made in
-  # local development can be picked up automatically
-  def link_frontend
-    run "yarn link"
-  end
-
   def run_blacklight_generator
     say_status("warning", "GENERATING BL", :yellow)
 

data/template.rb

@@ -4,14 +4,21 @@ gem "blacklight", "~> 8.0"
 
 # Ensure the app generates with Propshaft; sprockets is no longer supported
 # https://github.com/geoblacklight/geoblacklight/issues/1265
-ENV["ENGINE_CART_RAILS_OPTIONS"] = ENV["ENGINE_CART_RAILS_OPTIONS"].to_s + " -a propshaft"
+ENV["ENGINE_CART_RAILS_OPTIONS"] = ENV["ENGINE_CART_RAILS_OPTIONS"].to_s + " -a propshaft --css bootstrap"
+
+# Use importmaps for JS if requested, otherwise default to vite
+ENV["ENGINE_CART_RAILS_OPTIONS"] += if ENV["ASSET_PIPELINE"] == "importmap"
+  " --js importmap"
+else
+  " --js rollup"
+end
 
 # Install latest version of geoblacklight gem if running
 # generator with a development branch.
 if ENV["BRANCH"]
   gem "geoblacklight", github: "geoblacklight/geoblacklight", branch: ENV["BRANCH"]
 else
-  gem "geoblacklight", "~> 4.0"
+  gem "geoblacklight", "~> 5.0"
 end
 
 run "bundle install"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 5.0.0.pre.alpha.11
+  version: 5.0.0
 platform: ruby
 authors:
 - Mike Graves
@@ -22,7 +22,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -32,7 +32,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -389,7 +389,6 @@ files:
 - app/assets/stylesheets/geoblacklight/modules/_blacklight_overrides.scss
 - app/assets/stylesheets/geoblacklight/modules/_styles.scss
 - app/assets/stylesheets/geoblacklight/modules/downloads.scss
-- app/assets/stylesheets/geoblacklight/modules/facets.scss
 - app/assets/stylesheets/geoblacklight/modules/geosearch.scss
 - app/assets/stylesheets/geoblacklight/modules/home.scss
 - app/assets/stylesheets/geoblacklight/modules/icon-customization.scss
@@ -561,6 +560,7 @@ files:
 - app/javascript/geoblacklight/leaflet/constants.js
 - app/javascript/geoblacklight/leaflet/controls/geosearch.js
 - app/javascript/geoblacklight/leaflet/controls/layer_opacity.js
+- app/javascript/geoblacklight/leaflet/controls/sleep.js
 - app/javascript/geoblacklight/leaflet/inspection.js
 - app/javascript/geoblacklight/leaflet/layer_index_map.js
 - app/javascript/geoblacklight/leaflet/layer_wmts.js
@@ -610,7 +610,6 @@ files:
 - lib/generators/geoblacklight/templates/demo-app/Dockerfile
 - lib/generators/geoblacklight/templates/demo-app/compose.yml
 - lib/generators/geoblacklight/templates/demo-app/start-server.sh
-- lib/generators/geoblacklight/templates/package.json
 - lib/generators/geoblacklight/templates/settings.yml
 - lib/generators/geoblacklight/templates/vite.config.ts
 - lib/generators/geoblacklight/templates/vite.json
@@ -948,7 +947,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/app/assets/stylesheets/geoblacklight/modules/facets.scss

@@ -1,5 +0,0 @@
-.facet-label .geoblacklight-icon {
-  display: inline;
-  padding-left: 10px;
-  padding-right: 15px;
-}

data/lib/generators/geoblacklight/templates/package.json

@@ -1,16 +0,0 @@
-{
-  "dependencies": {
-    "@github/auto-complete-element": "3.6.2",
-    "@hotwired/stimulus": "^3.2.2",
-    "@hotwired/turbo-rails": "^8.0.4",
-    "@popperjs/core": "2.11.8",
-    "blacklight-frontend": "8.3.0",
-    "bootstrap": "^5.3.3",
-    "sass": "^1.77.7"
-  },
-  "devDependencies": {
-    "vite": "^5.1.5",
-    "vite-plugin-ruby": "^5.0.0",
-    "vite-plugin-rails": "^0.5.0"
-  }
-}