diff --git a/.gitignore b/.gitignore
index d517840..ccc0530 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@ spec/internal
jetty
.DS_Store
.idea/
+.rakeTasks
+.internal_test_app
diff --git a/.rubocop.yml b/.rubocop.yml
new file mode 100644
index 0000000..2af4729
--- /dev/null
+++ b/.rubocop.yml
@@ -0,0 +1,99 @@
+require: rubocop-rspec
+
+AllCops:
+ DisplayCopNames: true
+ TargetRubyVersion: 2.3
+ Exclude:
+ - "lib/generators/blacklight_maps/templates/**/*"
+ - "blacklight-maps.gemspec"
+
+# engine_cart block includes conditional, not duplication
+Bundler/DuplicatedGem:
+ Exclude:
+ - 'Gemfile'
+
+# engine_cart block is following default Rails order
+Bundler/OrderedGems:
+ Exclude:
+ - 'Gemfile'
+
+Layout/IndentationConsistency:
+ EnforcedStyle: normal
+
+Metrics/AbcSize:
+ Max: 20
+ Exclude:
+ - 'lib/blacklight/maps/maps_search_builder.rb'
+
+Metrics/BlockLength:
+ Exclude:
+ - "spec/**/*"
+
+Metrics/ClassLength:
+ Exclude:
+ - 'lib/blacklight/maps/export.rb'
+
+Metrics/LineLength:
+ Max: 200
+ Exclude:
+ - 'lib/blacklight/maps/engine.rb'
+ - 'spec/**/*'
+
+Metrics/MethodLength:
+ Max: 15
+
+Naming/HeredocDelimiterNaming:
+ Enabled: false
+
+Naming/PredicateName:
+ NamePrefixBlacklist:
+ - is_
+
+Rails:
+ Enabled: true
+
+Rails/OutputSafety:
+ Enabled: false
+
+RSpec/AnyInstance:
+ Exclude:
+ - 'spec/system/initial_view_spec.rb'
+
+RSpec/BeforeAfterAll:
+ Enabled: false
+
+RSpec/DescribeClass:
+ Exclude:
+ - 'spec/system/*'
+
+RSpec/FilePath:
+ Exclude:
+ - 'spec/lib/blacklight/maps/*'
+
+RSpec/MessageSpies:
+ EnforcedStyle: receive
+
+RSpec/MultipleExpectations:
+ Max: 4
+
+RSpec/NestedGroups:
+ Max: 5
+
+RSpec/PredicateMatcher:
+ Exclude:
+ - 'spec/lib/blacklight/maps/render_constraints_override_spec.rb'
+
+# https://github.com/rubocop-hq/rubocop/issues/6439
+Style/AccessModifierDeclarations:
+ Enabled: false
+
+Style/BracesAroundHashParameters:
+ Exclude:
+ - 'spec/lib/blacklight/maps/export_spec.rb'
+
+Style/Documentation:
+ Enabled: false
+
+Style/SignalException:
+ Exclude:
+ - 'spec/**/*'
diff --git a/.solr_wrapper.yml b/.solr_wrapper.yml
new file mode 100644
index 0000000..cd872d4
--- /dev/null
+++ b/.solr_wrapper.yml
@@ -0,0 +1,7 @@
+# Place any default configuration for solr_wrapper here
+# you must first run 'rake engine_cart:generate' to create the test app
+# before running 'solr_wrapper' from project root
+# port: 8983
+collection:
+ dir: ./.internal_test_app/solr/conf/
+ name: blacklight-core
diff --git a/.travis.yml b/.travis.yml
index 0c63ba0..50565b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,28 @@
-notifications:
- email: false
language: ruby
sudo: false
-rvm:
- - 2.6.0
+dist: bionic
-matrix:
- include:
- env: "RAILS_VERSION=4.2.11"
+addons:
+ chrome: stable
before_install:
- - gem install bundler
+ - google-chrome-stable --headless --disable-gpu --no-sandbox --remote-debugging-port=9222 http://localhost &
env:
- - "RAILS_VERSION=4.2.6"
-
-notifications:
- irc: "irc.freenode.org#blacklight"
- email:
- - blacklight-commits@googlegroups.com
-
-global_env:
+ global:
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+ - ENGINE_CART_RAILS_OPTIONS='--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
+
+matrix:
+ include:
+ - rvm: 2.7.0
+ env: "RAILS_VERSION=6.0.2.2"
+ - rvm: 2.6.5
+ env: "RAILS_VERSION=6.0.2.2"
+ - rvm: 2.6.5
+ env: "RAILS_VERSION=5.2.4.2"
+ - rvm: 2.5.7
+ env: "RAILS_VERSION=5.2.4.2"
+ fast_finish: true
+jdk: openjdk11
diff --git a/Gemfile b/Gemfile
index 59c7859..0b2c992 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,15 +1,48 @@
+# frozen_string_literal: true
+
source 'https://rubygems.org'
-# Specify your gem's dependencies in blacklight-maps.gemspec
gemspec
-group :test do
- gem 'simplecov', require: false
+group :development, :test do
gem 'coveralls', require: false
end
-file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path("../spec/internal", __FILE__))
-if File.exists?(file)
- puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
- instance_eval File.read(file)
+gem 'engine_cart'
+# BEGIN ENGINE_CART BLOCK
+# engine_cart: 1.2.0
+# engine_cart stanza: 0.10.0
+# the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
+file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app', File.dirname(__FILE__)))
+if File.exist?(file)
+ begin
+ eval_gemfile file
+ rescue Bundler::GemfileError => e
+ Bundler.ui.warn '[EngineCart] Skipping Rails application dependencies:'
+ Bundler.ui.warn e.message
+ end
+else
+ Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
+
+ if ENV['RAILS_VERSION']
+ if ENV['RAILS_VERSION'] == 'edge'
+ gem 'rails', github: 'rails/rails'
+ ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge --skip-turbolinks'
+ else
+ gem 'rails', ENV['RAILS_VERSION']
+ end
+ end
+
+ case ENV['RAILS_VERSION']
+ when /^5.[12]/, /^6.0/
+ gem 'sass-rails', '~> 5.0'
+ when /^4.2/
+ gem 'responders', '~> 2.0'
+ gem 'sass-rails', '>= 5.0'
+ gem 'coffee-rails', '~> 4.1.0'
+ gem 'json', '~> 1.8'
+ when /^4.[01]/
+ gem 'sass-rails', '< 5.0'
+ end
end
+# END ENGINE_CART BLOCK
diff --git a/README.md b/README.md
index 0ebf6bd..d681483 100644
--- a/README.md
+++ b/README.md
@@ -53,11 +53,11 @@ Blacklight-Maps requires that your Solr index include at least one (but preferab
```
# coordinates: lon lat or lat,lon
- # bounding box: minX minY maxX maxY
- coordinates_field:
+ # bounding box: ENVELOPE(minX, maxX, maxY, minY)
+ coordinates_srpt:
- 78.96288 20.593684
- 20.593684,78.96288
- - 68.162386 6.7535159 97.395555 35.5044752
+ - ENVELOPE(68.162386, 97.395555, 35.5044752, 6.7535159)
```
2. An indexed, stored string field containing a properly-formatted [GeoJSON](http://geojson.org) feature object for a point or bounding box that includes the coordinates and (preferably) location name. This field can be multivalued.
@@ -74,7 +74,7 @@ Blacklight-Maps requires that your Solr index include at least one (but preferab
3. An indexed, stored text or string field containing location names. This field can be multivalued.
```
- placename_field: India
+ subject_geo_ssim: India
```
##### Why so complicated?
@@ -88,10 +88,10 @@ Blacklight-Maps can be used with either field type (#1 or #2), however to take a
**Important:** If you are NOT using the geojson field (#2), you should create a `copyField` in your Solr schema.xml to copy the coordinates from the `location_rpt` field to a string field that is stored, indexed, and multivalued to allow for proper faceting of the coordinate values in the catalog#map and catalog#index views.
```
-
-
+
+
-
+
```
Support for additional field types may be added in the future.
@@ -112,9 +112,9 @@ Blacklight-Maps expects you to provide these configuration options:
+ `placename_field` = the name of the Solr field containing the location names
+ `coordinates_field` = the name of the Solr `location_rpt` type field containing geospatial coordinate data
-In addition, you must add the geospatial facet field to the list of facet fields:
+In addition, you must add the geospatial facet field to the list of facet fields in `app/controllers/catalog_controller.rb`, for example:
```ruby
-config.add_facet_field 'geojson_field', :limit => -2, :label => 'Coordinates', :show => false
+config.add_facet_field 'geojson_ssim', :limit => -2, :label => 'Coordinates', :show => false
```
#### Optional
diff --git a/Rakefile b/Rakefile
index f5562f5..6a4548e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,43 +1,46 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
-ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.6.0.zip"
-APP_ROOT = File.dirname(__FILE__)
-
-require 'rspec/core/rake_task'
-require 'engine_cart/rake_task'
+begin
+ require 'bundler/setup'
+rescue LoadError
+ puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
-require 'jettywrapper'
+require 'rdoc/task'
+RDoc::Task.new(:rdoc) do |rdoc|
+ rdoc.rdoc_dir = 'rdoc'
+ rdoc.title = 'BlacklightMaps'
+ rdoc.options << '--line-numbers'
+ rdoc.rdoc_files.include('README.rdoc')
+ rdoc.rdoc_files.include('lib/**/*.rb')
+end
-task default: :ci
+Bundler::GemHelper.install_tasks
-RSpec::Core::RakeTask.new(:spec)
+Rake::Task.define_task(:environment)
-desc "Load fixtures"
-task :fixtures => ['engine_cart:generate'] do
- EngineCart.within_test_app do
- system "rake blacklight_maps:solr:seed RAILS_ENV=test"
- end
-end
+load 'lib/railties/blacklight_maps.rake'
-desc "Execute Continuous Integration build"
-task :ci => ['engine_cart:generate', 'jetty:clean', 'blacklight_maps:configure_jetty'] do
-
- require 'jettywrapper'
- jetty_params = Jettywrapper.load_config('test')
+task default: :ci
- error = Jettywrapper.wrap(jetty_params) do
- Rake::Task['fixtures'].invoke
- Rake::Task['spec'].invoke
- end
- raise "test failures: #{error}" if error
-end
+require 'engine_cart/rake_task'
+require 'solr_wrapper'
-namespace :blacklight_maps do
- desc "Copies the default SOLR config for the bundled Testing Server"
- task :configure_jetty do
- FileList['solr_conf/conf/*'].each do |f|
- cp("#{f}", 'jetty/solr/blacklight-core/conf/', :verbose => true)
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new
+
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new(:rubocop)
+
+desc 'Run test suite'
+task ci: [:rubocop, 'engine_cart:generate'] do
+ SolrWrapper.wrap do |solr|
+ solr.with_collection do
+ within_test_app do
+ system 'RAILS_ENV=test rake blacklight_maps:index:seed'
+ end
+ Rake::Task['spec'].invoke
end
end
-end
\ No newline at end of file
+end
diff --git a/app/assets/images/blacklight/blacklight-maps_maps-svg.svg b/app/assets/images/blacklight/blacklight-maps_maps-svg.svg
new file mode 100644
index 0000000..71db703
--- /dev/null
+++ b/app/assets/images/blacklight/blacklight-maps_maps-svg.svg
@@ -0,0 +1,3 @@
+
+
+
diff --git a/app/assets/images/blacklight/maps.svg b/app/assets/images/blacklight/maps.svg
new file mode 100644
index 0000000..4e9874c
--- /dev/null
+++ b/app/assets/images/blacklight/maps.svg
@@ -0,0 +1,3 @@
+
+
+
diff --git a/app/assets/javascripts/blacklight-maps.js b/app/assets/javascripts/blacklight-maps.js
index 1e1bea3..1791564 100644
--- a/app/assets/javascripts/blacklight-maps.js
+++ b/app/assets/javascripts/blacklight-maps.js
@@ -1,7 +1,4 @@
-// for Blacklight.onLoad:
-//= require blacklight/core
-
//= require leaflet
//= require leaflet.markercluster
-//= require_tree .
\ No newline at end of file
+//= require_tree .
diff --git a/app/assets/javascripts/blacklight-maps/blacklight-maps-browse.js b/app/assets/javascripts/blacklight-maps/blacklight-maps-browse.js
index c16592e..dfebd01 100644
--- a/app/assets/javascripts/blacklight-maps/blacklight-maps-browse.js
+++ b/app/assets/javascripts/blacklight-maps/blacklight-maps-browse.js
@@ -5,8 +5,8 @@
// Configure default options and those passed via the constructor options
var options = $.extend({
- tileurl : 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
- mapattribution : 'Map data © OpenStreetMap contributors, CC-BY-SA ',
+ tileurl : 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+ mapattribution : 'Map data © OpenStreetMap contributors, CC-BY-SA ',
initialzoom: 2,
singlemarkermode: true,
searchcontrol: false,
@@ -21,7 +21,7 @@
// Extend options from data-attributes
$.extend(options, this.data());
- var mapped_items = '' + geojson_docs.features.length + ' location' + (geojson_docs.features.length !== 1 ? 's' : '') + ' mapped ';
+ var mapped_items = '' + geojson_docs.features.length + ' ' + ' location' + (geojson_docs.features.length !== 1 ? 's' : '') + ' mapped ';
var mapped_caveat = 'Only items with location data are shown below ';
@@ -31,12 +31,12 @@
// Update page links with number of mapped items, disable sort, per_page, pagination
if (sortAndPerPage.length) { // catalog#index and #map view
- var page_links = sortAndPerPage.find('.page_links');
- var result_count = page_links.find('.page_entries').find('strong').last().html();
- page_links.html('' + result_count + ' items found ' + mapped_items + mapped_caveat);
+ var page_links = sortAndPerPage.find('.page-links');
+ var result_count = page_links.find('.page-entries').find('strong').last().html();
+ page_links.html('' + result_count + ' items found ' + mapped_items + mapped_caveat);
sortAndPerPage.find('.dropdown-toggle').hide();
} else { // catalog#show view
- $(this.selector).before(mapped_items);
+ $(this).before(mapped_items);
}
// determine whether to use item location or result count in cluster icon display
@@ -119,7 +119,6 @@
var container = L.DomUtil.create('div', 'leaflet-bar leaflet-control');
this.link = L.DomUtil.create('a', 'leaflet-bar-part search-control', container);
this.link.title = options.searchctrlcue;
- this.icon = L.DomUtil.create('i', 'glyphicon glyphicon-search', this.link);
L.DomEvent.addListener(this.link, 'click', _search);
diff --git a/app/assets/stylesheets/blacklight_maps/blacklight-maps.scss b/app/assets/stylesheets/blacklight_maps/blacklight-maps.scss
index 07582af..5e666b1 100644
--- a/app/assets/stylesheets/blacklight_maps/blacklight-maps.scss
+++ b/app/assets/stylesheets/blacklight_maps/blacklight-maps.scss
@@ -1,8 +1,7 @@
+@charset "UTF-8";
/* Master manifest file for engine, so local app can require
* this one file, but get all our files -- and local app
* require does not need to change if we change file list.
*/
-@charset "UTF-8";
-
@import 'default';
\ No newline at end of file
diff --git a/app/assets/stylesheets/blacklight_maps/default.scss b/app/assets/stylesheets/blacklight_maps/default.scss
index 2dacdf2..5298cd6 100644
--- a/app/assets/stylesheets/blacklight_maps/default.scss
+++ b/app/assets/stylesheets/blacklight_maps/default.scss
@@ -1,6 +1,8 @@
@import 'leaflet';
-@import 'leaflet.markercluster';
-@import 'leaflet.markercluster.default';
+@import 'MarkerCluster';
+@import 'MarkerCluster.Default';
+//@import 'leaflet.markercluster';
+//@import 'leaflet.markercluster.default';
body.blacklight-catalog-map {
@@ -13,22 +15,22 @@ body.blacklight-catalog-map {
}
}
-
+// TODO: I think below is no longer needed?
.view-icon-maps {
&:before { content: "\e135"; }
}
#sortAndPerPage {
- .page_links {
+ .page-links {
.mapped-count {
- margin-left: 7px;
+ margin-left: 10px;
color: dimgray;
}
.mapped-caveat {
- margin-left: 7px;
+ margin-left: 10px;
font-size: 12px;
color: darkgray;
}
@@ -45,7 +47,7 @@ body.blacklight-catalog-map {
& ~ div.record-padding {
- div.pagination {
+ nav.pagination {
display: none;
}
@@ -65,6 +67,7 @@ body.blacklight-catalog-map {
a.leaflet-bar-part.search-control {
cursor: pointer;
+ &:before { content: "\1F50D"; }
}
/* Portrait tablet to landscape and desktop */
diff --git a/app/helpers/blacklight/blacklight_maps_helper_behavior.rb b/app/helpers/blacklight/blacklight_maps_helper_behavior.rb
index 1891d8d..fb17732 100644
--- a/app/helpers/blacklight/blacklight_maps_helper_behavior.rb
+++ b/app/helpers/blacklight/blacklight_maps_helper_behavior.rb
@@ -1,101 +1,96 @@
-module Blacklight::BlacklightMapsHelperBehavior
+# frozen_string_literal: true
- # @param [String] id the html id
- # @param [Hash] tag_options options to put on the tag
- def blacklight_map_tag id, tag_options = {}, &block
- default_data = {
- maxzoom: blacklight_config.view.maps.maxzoom,
- tileurl: blacklight_config.view.maps.tileurl,
- mapattribution: blacklight_config.view.maps.mapattribution
- }
-
- options = {id: id, data: default_data}.deep_merge(tag_options)
- if block_given?
- content_tag(:div, options, &block)
- else
- tag(:div, options)
+module Blacklight
+ module BlacklightMapsHelperBehavior
+ # @param id [String] the html element id
+ # @param tag_options [Hash] options to put on the tag
+ def blacklight_map_tag(id, tag_options = {}, &block)
+ maps_config = blacklight_config.view.maps
+ default_data = {
+ maxzoom: maps_config.maxzoom,
+ tileurl: maps_config.tileurl,
+ mapattribution: maps_config.mapattribution
+ }
+ options = { id: id, data: default_data }.deep_merge(tag_options)
+ block_given? ? content_tag(:div, options, &block) : tag(:div, options)
end
- end
- # return the placename value to be used as a link
- def placename_value(geojson_hash)
- geojson_hash[:properties][blacklight_config.view.maps.placename_property.to_sym]
- end
-
- # create a link to a bbox spatial search
- def link_to_bbox_search bbox_coordinates
- coords_for_search = bbox_coordinates.map { |v| v.to_s }
- link_to(t('blacklight.maps.interactions.bbox_search'),
- search_catalog_path(spatial_search_type: "bbox",
- coordinates: "[#{coords_for_search[1]},#{coords_for_search[0]} TO #{coords_for_search[3]},#{coords_for_search[2]}]",
- view: default_document_index_view_type))
- end
-
- # create a link to a location name facet value
- def link_to_placename_field field_value, field, displayvalue = nil
- if params[:f] && params[:f][field] && params[:f][field].include?(field_value)
- new_params = params
- else
- new_params = search_state.add_facet_params(field, field_value)
+ # return the placename value to be used as a link
+ # @param geojson_hash [Hash]
+ def placename_value(geojson_hash)
+ geojson_hash[:properties][blacklight_config.view.maps.placename_property.to_sym]
end
- new_params[:view] = default_document_index_view_type
- link_to(displayvalue.presence || field_value,
- search_catalog_path(new_params.except(:id, :spatial_search_type, :coordinates)))
- end
- # create a link to a spatial search for a set of point coordinates
- def link_to_point_search point_coordinates
- new_params = params.except(:controller, :action, :view, :id, :spatial_search_type, :coordinates)
- new_params[:spatial_search_type] = "point"
- new_params[:coordinates] = "#{point_coordinates[1]},#{point_coordinates[0]}"
- new_params[:view] = default_document_index_view_type
- link_to(t('blacklight.maps.interactions.point_search'), search_catalog_path(new_params))
- end
+ # create a link to a bbox spatial search
+ # @param bbox [Array]
+ def link_to_bbox_search(bbox)
+ bbox_coords = bbox.map(&:to_s)
+ bbox_search_coords = "[#{bbox_coords[1]},#{bbox_coords[0]} TO #{bbox_coords[3]},#{bbox_coords[2]}]"
+ link_to(t('blacklight.maps.interactions.bbox_search'),
+ search_catalog_path(spatial_search_type: 'bbox',
+ coordinates: bbox_search_coords,
+ view: default_document_index_view_type))
+ end
- # return the facet field containing geographic data
- def map_facet_field
- blacklight_config.view.maps.facet_mode == "coordinates" ?
- blacklight_config.view.maps.coordinates_facet_field :
- blacklight_config.view.maps.geojson_field
- end
+ # create a link to a location name facet value
+ # @param field_value [String] Solr field value
+ # @param field [String] Solr field name
+ # @param display_value [String] value to display instead of field_value
+ def link_to_placename_field(field_value, field, display_value = nil)
+ new_params = if params[:f] && params[:f][field]&.include?(field_value)
+ search_state.params
+ else
+ search_state.add_facet_params(field, field_value)
+ end
+ new_params[:view] = default_document_index_view_type
+ new_params.except!(:id, :spatial_search_type, :coordinates, :controller, :action)
+ link_to(display_value.presence || field_value, search_catalog_path(new_params))
+ end
- # return an array of Blacklight::SolrResponse::Facets::FacetItem items
- def map_facet_values
- if @response.aggregations[map_facet_field]
- @response.aggregations[map_facet_field].items
- else
- []
+ # create a link to a spatial search for a set of point coordinates
+ # @param point_coords [Array]
+ def link_to_point_search(point_coords)
+ new_params = params.except(:controller, :action, :view, :id, :spatial_search_type, :coordinates)
+ new_params[:spatial_search_type] = 'point'
+ new_params[:coordinates] = "#{point_coords[1]},#{point_coords[0]}"
+ new_params[:view] = default_document_index_view_type
+ new_params.permit!
+ link_to(t('blacklight.maps.interactions.point_search'), search_catalog_path(new_params))
end
- end
- # render the location name for the Leaflet popup
- # separate from BlacklightMapsHelperBehavior#placename_value so
- # location name display can be easily customized
- def render_placename_heading(geojson_hash)
- geojson_hash[:properties][blacklight_config.view.maps.placename_property.to_sym]
- end
+ # render the location name for the Leaflet popup
+ # @param geojson_hash [Hash]
+ def render_placename_heading(geojson_hash)
+ geojson_hash[:properties][blacklight_config.view.maps.placename_property.to_sym]
+ end
- # render the map for #index and #map views
- def render_index_mapview
- render :partial => 'catalog/index_mapview',
- :locals => {:geojson_features => serialize_geojson(map_facet_values)}
- end
+ # render the map for #index and #map views
+ def render_index_mapview
+ maps_config = blacklight_config.view.maps
+ map_facet_field = if maps_config.facet_mode == 'coordinates'
+ maps_config.coordinates_facet_field
+ else
+ maps_config.geojson_field
+ end
+ map_facet_values = @response.aggregations[map_facet_field]&.items || []
+ render partial: 'catalog/index_mapview',
+ locals: { geojson_features: serialize_geojson(map_facet_values) }
+ end
- # determine the type of spatial search to use based on coordinates (bbox or point)
- def render_spatial_search_link coordinates
- if coordinates.length == 4
- link_to_bbox_search(coordinates)
- else
- link_to_point_search(coordinates)
+ # determine the type of spatial search to use based on coordinates (bbox or point)
+ # @param coords [Array]
+ def render_spatial_search_link(coords)
+ coords.length == 4 ? link_to_bbox_search(coords) : link_to_point_search(coords)
end
- end
- # pass the document or facet values to BlacklightMaps::GeojsonExport
- def serialize_geojson(documents, options={})
- export = BlacklightMaps::GeojsonExport.new(controller,
- controller.action_name,
- documents,
- options)
- export.to_geojson
+ # pass the document or facet values to BlacklightMaps::GeojsonExport
+ # @param documents [Array || SolrDocument]
+ def serialize_geojson(documents, options = {})
+ export = BlacklightMaps::GeojsonExport.new(controller,
+ action_name.to_sym,
+ documents,
+ options)
+ export.to_geojson
+ end
end
end
diff --git a/app/helpers/blacklight_maps_helper.rb b/app/helpers/blacklight_maps_helper.rb
index 24f2d26..9e51ca8 100644
--- a/app/helpers/blacklight_maps_helper.rb
+++ b/app/helpers/blacklight_maps_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
module BlacklightMapsHelper
include Blacklight::BlacklightMapsHelperBehavior
end
diff --git a/app/views/catalog/_show_maplet_default.html.erb b/app/views/catalog/_show_maplet_default.html.erb
index 2fc314f..367e142 100644
--- a/app/views/catalog/_show_maplet_default.html.erb
+++ b/app/views/catalog/_show_maplet_default.html.erb
@@ -1,10 +1,9 @@
<% # map for catalog#show view %>
-
- <% if @document[blacklight_config.view.maps.geojson_field.to_sym] || @document[blacklight_config.view.maps.coordinates_field.to_sym] %>
- <% geojson_features = serialize_geojson(@document) %>
- <%= blacklight_map_tag('blacklight-show-map',
- {data:{initialzoom:blacklight_config.view.maps.show_initial_zoom,
- singlemarkermode:false}}) %>
- <%= javascript_tag "$('#blacklight-show-map').blacklight_leaflet_map(#{geojson_features});" %>
- <% end %>
-
\ No newline at end of file
+<% if @document[blacklight_config.view.maps.geojson_field.to_sym] || @document[blacklight_config.view.maps.coordinates_field.to_sym] %>
+
+ <%= blacklight_map_tag('blacklight-show-map',
+ {data:{initialzoom:blacklight_config.view.maps.show_initial_zoom,
+ singlemarkermode:false}}) %>
+ <%= javascript_tag "$('#blacklight-show-map').blacklight_leaflet_map(#{serialize_geojson(@document)});" %>
+
+<% end %>
diff --git a/app/views/catalog/map.html.erb b/app/views/catalog/map.html.erb
index 931bf56..8cf99e0 100644
--- a/app/views/catalog/map.html.erb
+++ b/app/views/catalog/map.html.erb
@@ -1,8 +1,8 @@
<%= t('blacklight.maps.title') %>
-
<%= t('blacklight.maps.leader') %>
+
<%= t('blacklight.maps.leader_html') %>
<%= render 'search_results' %>
<%# have to put this at the end so it overrides 'catalog/search_results' %>
-<% @page_title = t('blacklight.maps.title', :application_name => application_name) %>
\ No newline at end of file
+<% @page_title = t('blacklight.maps.title', application_name: application_name) %>
\ No newline at end of file
diff --git a/blacklight-maps.gemspec b/blacklight-maps.gemspec
index b7acaa2..fe140cb 100644
--- a/blacklight-maps.gemspec
+++ b/blacklight-maps.gemspec
@@ -1,33 +1,34 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
require 'blacklight/maps/version'
-Gem::Specification.new do |spec|
- spec.name = "blacklight-maps"
- spec.version = Blacklight::Maps::VERSION
- spec.authors = ["Chris Beer", "Jack Reed", "Eben English"]
- spec.email = ["cabeer@stanford.edu", "pjreed@stanford.edu", "eenglish@bpl.org"]
- spec.summary = %q{Maps for Blacklight}
- spec.homepage = "https://github.com/projectblacklight/blacklight-maps"
- spec.license = "Apache-2.0"
+Gem::Specification.new do |s|
+ s.name = 'blacklight-maps'
+ s.version = Blacklight::Maps::VERSION
+ s.authors = ['Chris Beer', 'Jack Reed', 'Eben English']
+ s.email = %w[cabeer@stanford.edu pjreed@stanford.edu eenglish@bpl.org]
+ s.summary = 'Maps for Blacklight'
+ s.description = 'Blacklight plugin providing map views for records with geographic data.'
+ s.homepage = 'https://github.com/projectblacklight/blacklight-maps'
+ s.license = 'Apache-2.0'
- spec.files = `git ls-files -z`.split("\x0")
- spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
- spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
- spec.require_paths = ["lib"]
+ s.files = `git ls-files -z`.split("\x0")
+ s.test_files = s.files.grep(%r{^(test|spec|features)/})
+ s.bindir = 'exe'
+ s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
+ s.require_paths = ['lib']
- spec.add_dependency "rails", "< 6"
- spec.add_dependency "blacklight", ">= 6.1.0", "< 7.0.0"
- spec.add_dependency "bootstrap-sass", "~> 3.2"
- spec.add_dependency "leaflet-rails", "0.7.7"
- spec.add_dependency "leaflet-markercluster-rails"
+ s.add_dependency 'blacklight', '>= 7.8.0', '< 8'
+ s.add_dependency 'rails', '>= 5.1', '< 7'
- spec.add_development_dependency "bundler", "~> 1.5"
- spec.add_development_dependency "rake"
- spec.add_development_dependency "rspec-rails", "~> 3.0"
- spec.add_development_dependency "jettywrapper"
- spec.add_development_dependency "engine_cart", "~> 0.4.0"
- spec.add_development_dependency "capybara"
- spec.add_development_dependency "poltergeist", ">= 1.5.0"
+ s.add_development_dependency 'capybara'
+ s.add_development_dependency 'engine_cart', '~> 2.1'
+ s.add_development_dependency 'rspec-rails', '~> 3.0'
+ s.add_development_dependency 'rubocop', '~> 0.63.0'
+ s.add_development_dependency 'rubocop-rspec', '~> 1.8'
+ s.add_development_dependency 'selenium-webdriver', '>= 3.13.1'
+ s.add_development_dependency 'solr_wrapper', '~> 2.0'
+ s.add_development_dependency 'webdrivers', '~> 3.0'
end
diff --git a/config/jetty.yml b/config/jetty.yml
deleted file mode 100644
index d685fa2..0000000
--- a/config/jetty.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-development:
- startup_wait: 15
- jetty_port: 8983
-test:
- startup_wait: 60
- jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8983 %>
- <%= ENV['TEST_JETTY_PATH'] ? "jetty_home: " + ENV['TEST_JETTY_PATH'] : '' %>
\ No newline at end of file
diff --git a/config/locales/blacklight-maps-zh.yml b/config/locales/blacklight-maps-zh.yml
index 9dbcef9..f667ac3 100644
--- a/config/locales/blacklight-maps-zh.yml
+++ b/config/locales/blacklight-maps-zh.yml
@@ -3,18 +3,18 @@ zh:
maps:
interactions:
- bbox_search: 'View items that intersect with this bounding box'
- placename_search: 'View items from this location'
+ bbox_search: '查看与此边界框相交的项目'
+ placename_search: '查看此位置的物品'
item: '资料'
- point_search: 'View items from this location'
- search_ctrl_cue: 'Search for all items within the current map window'
+ point_search: '查看此位置的物品'
+ search_ctrl_cue: '在当前地图窗口中搜索所有项目'
title: '地图'
- leader: 'Click on a marker to search for items from that location.'
+ leader: '单击标记以从该位置搜索项目,或使用 🔍 按钮搜索当前地图窗口中的所有项目。'
search:
filters:
coordinates:
- bbox: 'Bounding Box'
- point: 'Coordinates'
+ bbox: '边界框'
+ point: '座标'
view:
maps: '地图'
diff --git a/config/locales/blacklight-maps.ar.yml b/config/locales/blacklight-maps.ar.yml
new file mode 100644
index 0000000..30c41d7
--- /dev/null
+++ b/config/locales/blacklight-maps.ar.yml
@@ -0,0 +1,21 @@
+ar:
+ blacklight:
+
+ maps:
+ interactions:
+ bbox_search: 'عرض العناصر التي تتقاطع مع هذا المربع المحيط'
+ placename_search: 'عرض العناصر من هذا الموقع'
+ item: 'مادة'
+ point_search: 'عرض العناصر من هذا الموقع'
+ search_ctrl_cue: 'ابحث عن جميع العناصر داخل نافذة الخريطة الحالية'
+ title: 'خريطة'
+ leader_html: "انقر فوق علامة للبحث عن عناصر من هذا الموقع ، أو استخدم الزر للبحث عن جميع العناصر الموجودة في نافذة الخريطة الحالية."
+
+ search:
+ filters:
+ coordinates:
+ bbox: 'المربع المحيط'
+ point: 'إحداثيات'
+ view:
+ maps: 'خريطة'
+
diff --git a/config/locales/blacklight-maps.de.yml b/config/locales/blacklight-maps.de.yml
new file mode 100644
index 0000000..3fd1376
--- /dev/null
+++ b/config/locales/blacklight-maps.de.yml
@@ -0,0 +1,21 @@
+de:
+ blacklight:
+
+ maps:
+ interactions:
+ bbox_search: 'Zeigen Sie Elemente an, die sich mit diesem Begrenzungsrahmen überschneiden'
+ placename_search: 'Zeigen Sie Elemente von diesem Speicherort aus an'
+ item: 'Artikel'
+ point_search: 'Zeigen Sie Elemente von diesem Speicherort aus an'
+ search_ctrl_cue: 'Suchen Sie nach allen Elementen im aktuellen Kartenfenster'
+ title: 'Karte'
+ leader_html: "Klicken Sie auf eine Markierung, um nach Elementen von diesem Ort aus zu suchen, oder verwenden Sie die 🔍 Schaltfläche, um nach allen Elementen im aktuellen Kartenfenster zu suchen."
+
+ search:
+ filters:
+ coordinates:
+ bbox: 'Begrenzungsrahmen'
+ point: 'Koordinaten'
+ view:
+ maps: 'Karte'
+
diff --git a/config/locales/blacklight-maps.en.yml b/config/locales/blacklight-maps.en.yml
index 24ea821..4b970bb 100644
--- a/config/locales/blacklight-maps.en.yml
+++ b/config/locales/blacklight-maps.en.yml
@@ -9,7 +9,7 @@ en:
point_search: 'View items from this location'
search_ctrl_cue: 'Search for all items within the current map window'
title: 'Map'
- leader: 'Click on a marker to search for items from that location.'
+ leader_html: "Haga clic en un marcador para buscar elementos desde esa ubicación, o use el 🔍 botón para buscar todos los elementos dentro de la ventana del mapa actual."
search:
filters:
diff --git a/config/locales/blacklight-maps.es.yml b/config/locales/blacklight-maps.es.yml
new file mode 100644
index 0000000..22da71f
--- /dev/null
+++ b/config/locales/blacklight-maps.es.yml
@@ -0,0 +1,21 @@
+es:
+ blacklight:
+
+ maps:
+ interactions:
+ bbox_search: 'Ver elementos que se cruzan con este cuadro delimitador'
+ placename_search: 'Ver elementos desde esta ubicación'
+ item: 'articulo'
+ point_search: 'Ver elementos desde esta ubicación'
+ search_ctrl_cue: 'Buscar todos los elementos dentro de la ventana del mapa actual'
+ title: 'Mapa'
+ leader_html: "Click on a marker to search for items from that location, or use the 🔍 button to search for all items within the current map window."
+
+ search:
+ filters:
+ coordinates:
+ bbox: 'Cuadro delimitador'
+ point: 'Coordenadas'
+ view:
+ maps: 'Mapa'
+
diff --git a/config/locales/blacklight-maps.fr.yml b/config/locales/blacklight-maps.fr.yml
index 2644e4e..f9cbe68 100644
--- a/config/locales/blacklight-maps.fr.yml
+++ b/config/locales/blacklight-maps.fr.yml
@@ -3,18 +3,18 @@ fr:
maps:
interactions:
- bbox_search: 'View items that intersect with this bounding box'
- placename_search: 'View items from this location'
- item: 'item'
- point_search: 'View items from this location'
- search_ctrl_cue: 'Search for all items within the current map window'
+ bbox_search: 'Afficher les éléments qui coupent avec ce cadre de sélection'
+ placename_search: 'Afficher les éléments de cet emplacement'
+ item: 'article'
+ point_search: 'Afficher les éléments de cet emplacement'
+ search_ctrl_cue: 'Rechercher tous les éléments dans la fenêtre de carte actuelle'
title: 'Carte'
- leader: 'Click on a marker to search for items from that location.'
+ leader: 'Cliquez sur un marqueur pour rechercher des éléments à partir de cet emplacement, ou utilisez le 🔍 pour rechercher tous les éléments dans la fenêtre de carte actuelle.'
search:
filters:
coordinates:
- bbox: 'Bounding Box'
- point: 'Coordinates'
+ bbox: 'Boîte de délimitation'
+ point: 'Coordonnés'
view:
maps: 'Carte'
diff --git a/config/locales/blacklight-maps.hu.yml b/config/locales/blacklight-maps.hu.yml
new file mode 100644
index 0000000..243f4e7
--- /dev/null
+++ b/config/locales/blacklight-maps.hu.yml
@@ -0,0 +1,21 @@
+hu:
+ blacklight:
+
+ maps:
+ interactions:
+ bbox_search: 'Tekintse meg azokat az elemeket, amelyek keresztezik ezt a határolódobozt'
+ placename_search: 'Tekintse meg az ezen a helyen található elemeket'
+ item: 'tétel'
+ point_search: 'Tekintse meg az ezen a helyen található elemeket'
+ search_ctrl_cue: 'Az összes elem keresése az aktuális térkép ablakban'
+ title: 'Térkép'
+ leader_html: "Kattintson a jelölőre az adott helyről elemek kereséséhez, vagy használja a 🔍 gombot az összes elem kereséséhez az aktuális térkép ablakban."
+
+ search:
+ filters:
+ coordinates:
+ bbox: 'Határoló doboz'
+ point: 'Koordináták'
+ view:
+ maps: 'Térkép'
+
diff --git a/config/locales/blacklight-maps.it.yml b/config/locales/blacklight-maps.it.yml
index 919edeb..2eb8424 100644
--- a/config/locales/blacklight-maps.it.yml
+++ b/config/locales/blacklight-maps.it.yml
@@ -3,18 +3,18 @@ it:
maps:
interactions:
- bbox_search: 'View items that intersect with this bounding box'
- placename_search: 'View items from this location'
- item: 'item'
- point_search: 'View items from this location'
- search_ctrl_cue: 'Search for all items within the current map window'
+ bbox_search: 'Visualizza gli elementi che si intersecano con questo rettangolo di selezione'
+ placename_search: 'Visualizza articoli da questa posizione'
+ item: 'articolo'
+ point_search: 'Visualizza articoli da questa posizione'
+ search_ctrl_cue: 'Cerca tutti gli elementi nella finestra della mappa corrente'
title: 'Mappa'
- leader: 'Click on a marker to search for items from that location.'
+ leader: 'Fai clic su un marcatore per cercare elementi da quella posizione oppure usa 🔍 per cercare tutti gli elementi nella finestra della mappa corrente.'
search:
filters:
coordinates:
- bbox: 'Bounding Box'
- point: 'Coordinates'
+ bbox: 'Rettangolo di selezione'
+ point: 'Coordinate'
view:
maps: 'Mappa'
diff --git a/config/locales/blacklight-maps.nl.yml b/config/locales/blacklight-maps.nl.yml
new file mode 100644
index 0000000..fecd991
--- /dev/null
+++ b/config/locales/blacklight-maps.nl.yml
@@ -0,0 +1,21 @@
+nl:
+ blacklight:
+
+ maps:
+ interactions:
+ bbox_search: 'Bekijk items die kruisen met dit selectiekader'
+ placename_search: 'Bekijk items van deze locatie'
+ item: 'item'
+ point_search: 'Bekijk items van deze locatie'
+ search_ctrl_cue: 'Zoek naar alle items in het huidige kaartvenster'
+ title: 'Kaart'
+ leader_html: "Klik op een markering om naar items op die locatie te zoeken of gebruik de 🔍 knop om te zoeken naar alle items in het huidige kaartvenster."
+
+ search:
+ filters:
+ coordinates:
+ bbox: 'Begrenzende doos'
+ point: 'Coördinaten'
+ view:
+ maps: 'Kaart'
+
diff --git a/config/locales/blacklight-maps.pt-BR.yml b/config/locales/blacklight-maps.pt-BR.yml
new file mode 100644
index 0000000..a2e2941
--- /dev/null
+++ b/config/locales/blacklight-maps.pt-BR.yml
@@ -0,0 +1,21 @@
+pt-BR:
+ blacklight:
+
+ maps:
+ interactions:
+ bbox_search: 'Exibir itens que se cruzam com esta caixa delimitadora'
+ placename_search: 'Ver itens deste local'
+ item: 'item'
+ point_search: 'Ver itens deste local'
+ search_ctrl_cue: 'Pesquise todos os itens na janela atual do mapa'
+ title: 'Mapa'
+ leader_html: "Clique em um marcador para procurar itens desse local ou use o 🔍 para procurar todos os itens na janela atual do mapa."
+
+ search:
+ filters:
+ coordinates:
+ bbox: 'Caixa delimitadora'
+ point: 'Coordenadas'
+ view:
+ maps: 'Mapa'
+
diff --git a/config/locales/blacklight-maps.sq.yml b/config/locales/blacklight-maps.sq.yml
new file mode 100644
index 0000000..3d661bc
--- /dev/null
+++ b/config/locales/blacklight-maps.sq.yml
@@ -0,0 +1,21 @@
+sq:
+ blacklight:
+
+ maps:
+ interactions:
+ bbox_search: 'Shikoni artikujt që kryqëzohen me këtë kuti kufizuese'
+ placename_search: 'Shikoni artikujt nga ky vendndodhje'
+ item: 'artikull'
+ point_search: 'Shikoni artikujt nga ky vendndodhje'
+ search_ctrl_cue: 'Kërkoni për të gjithë artikujt brenda dritares aktuale të hartës'
+ title: 'Hartë'
+ leader_html: "Klikoni në një shënues për të kërkuar artikuj nga ai vend, ose përdorni 🔍 butoni për të kërkuar të gjitha artikujt brenda dritares aktuale të hartës."
+
+ search:
+ filters:
+ coordinates:
+ bbox: 'Kuti kufizuese'
+ point: 'Koordinon'
+ view:
+ maps: 'Hartë'
+
diff --git a/config/routes.rb b/config/routes.rb
index 9e18c75..c5be6fe 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,5 @@
+# frozen_string_literal: true
+
Rails.application.routes.draw do
- get 'map', :to => 'catalog#map', :as => 'map'
+ get 'map', to: 'catalog#map', as: 'map'
end
-
diff --git a/lib/blacklight/maps.rb b/lib/blacklight/maps.rb
index f9749ee..d47e038 100644
--- a/lib/blacklight/maps.rb
+++ b/lib/blacklight/maps.rb
@@ -1,13 +1,19 @@
-require "blacklight/maps/version"
+# frozen_string_literal: true
+
+require 'blacklight/maps/version'
module Blacklight
module Maps
- require 'blacklight/maps/controller_override'
+ require 'blacklight/maps/controller'
require 'blacklight/maps/render_constraints_override'
require 'blacklight/maps/engine'
require 'blacklight/maps/export'
require 'blacklight/maps/geometry'
require 'blacklight/maps/maps_search_builder'
+ # returns the full path to the blacklight plugin installation
+ def self.root
+ @root ||= File.expand_path(File.dirname(File.dirname(File.dirname(__FILE__))))
+ end
end
end
diff --git a/lib/blacklight/maps/controller.rb b/lib/blacklight/maps/controller.rb
new file mode 100644
index 0000000..bc91f41
--- /dev/null
+++ b/lib/blacklight/maps/controller.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module BlacklightMaps
+ module Controller
+ extend ActiveSupport::Concern
+
+ included do
+ helper BlacklightMaps::RenderConstraintsOverride
+ end
+
+ def map
+ (@response, @document_list) = search_service.search_results
+ params[:view] = 'maps'
+ respond_to do |format|
+ format.html
+ end
+ end
+
+ ##
+ # BlacklightMaps override: update to look for spatial query params
+ # Check if any search parameters have been set
+ # @return [Boolean]
+ def has_search_parameters?
+ params[:coordinates].present? || super
+ end
+ end
+end
diff --git a/lib/blacklight/maps/controller_override.rb b/lib/blacklight/maps/controller_override.rb
deleted file mode 100644
index 860b0f1..0000000
--- a/lib/blacklight/maps/controller_override.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-module BlacklightMaps
- module ControllerOverride
- extend ActiveSupport::Concern
-
- included do
- self.send(:include, BlacklightMaps::RenderConstraintsOverride)
- self.send(:helper, BlacklightMaps::RenderConstraintsOverride)
- end
-
- def map
- (@response, @document_list) = search_results(params)
- params[:view] = 'maps'
- respond_to do |format|
- format.html
- end
- end
-
- end
-
-end
\ No newline at end of file
diff --git a/lib/blacklight/maps/engine.rb b/lib/blacklight/maps/engine.rb
index 0f7d2f2..c05e4d3 100644
--- a/lib/blacklight/maps/engine.rb
+++ b/lib/blacklight/maps/engine.rb
@@ -1,29 +1,28 @@
+# frozen_string_literal: true
+
require 'blacklight'
-require 'leaflet-rails'
-require 'leaflet-markercluster-rails'
module Blacklight
module Maps
class Engine < Rails::Engine
-
# Set some default configurations
- initializer 'blacklight-maps.default_config' do |app|
- Blacklight::Configuration.default_values[:view].maps.geojson_field = "geojson"
- Blacklight::Configuration.default_values[:view].maps.placename_property = "placename"
- Blacklight::Configuration.default_values[:view].maps.coordinates_field = "coordinates"
- Blacklight::Configuration.default_values[:view].maps.search_mode = "placename" # or 'coordinates'
+ initializer 'blacklight-maps.default_config' do |_app|
+ Blacklight::Configuration.default_values[:view].maps.geojson_field = 'geojson_ssim'
+ Blacklight::Configuration.default_values[:view].maps.placename_property = 'placename'
+ Blacklight::Configuration.default_values[:view].maps.coordinates_field = 'coordinates_srpt'
+ Blacklight::Configuration.default_values[:view].maps.search_mode = 'placename' # or 'coordinates'
Blacklight::Configuration.default_values[:view].maps.spatial_query_dist = 0.5
- Blacklight::Configuration.default_values[:view].maps.placename_field = "placename_field"
- Blacklight::Configuration.default_values[:view].maps.coordinates_facet_field = "coordinates_facet_field"
- Blacklight::Configuration.default_values[:view].maps.facet_mode = "geojson" # or 'coordinates'
- Blacklight::Configuration.default_values[:view].maps.tileurl = "http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
+ Blacklight::Configuration.default_values[:view].maps.placename_field = 'subject_geo_ssim'
+ Blacklight::Configuration.default_values[:view].maps.coordinates_facet_field = 'coordinates_ssim'
+ Blacklight::Configuration.default_values[:view].maps.facet_mode = 'geojson' # or 'coordinates'
+ Blacklight::Configuration.default_values[:view].maps.tileurl = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'
Blacklight::Configuration.default_values[:view].maps.mapattribution = 'Map data © OpenStreetMap contributors, CC-BY-SA '
Blacklight::Configuration.default_values[:view].maps.maxzoom = 18
Blacklight::Configuration.default_values[:view].maps.show_initial_zoom = 5
end
# Add our helpers
- initializer 'blacklight-maps.helpers' do |app|
+ initializer 'blacklight-maps.helpers' do |_app|
ActionView::Base.send :include, BlacklightMapsHelper
end
diff --git a/lib/blacklight/maps/export.rb b/lib/blacklight/maps/export.rb
index 29ce129..f7165d9 100644
--- a/lib/blacklight/maps/export.rb
+++ b/lib/blacklight/maps/export.rb
@@ -1,5 +1,6 @@
-module BlacklightMaps
+# frozen_string_literal: true
+module BlacklightMaps
# This class provides the ability to export a response document to GeoJSON.
# The export is formated as a GeoJSON FeatureCollection, where the features
# consist of an array of Point features. For more on the GeoJSON
@@ -8,146 +9,164 @@ module BlacklightMaps
class GeojsonExport
include BlacklightMaps
- # controller is a Blacklight CatalogController object passed by a helper
- # action is the controller action
- # response_docs is passed by a helper, and is either:
+ # @param controller [CatalogController]
+ # @param action [Symbol] the controller action
+ # @param response_docs [Array || SolrDocument] either:
# - index view, map view: an array of facet values
# - show view: the document object
- # options is an optional hash of possible configuration options
- def initialize(controller, action, response_docs, options={})
+ # @param options [Hash] optional hash of configuration options
+ def initialize(controller, action, response_docs, options = {})
@controller = controller
@action = action
@response_docs = response_docs
@options = options
+ @features = []
end
- # build the GeoJSON FeatureCollection
+ # builds the GeoJSON FeatureCollection
def to_geojson
- geojson_docs = { type: 'FeatureCollection',
- features: build_geojson_features }
- geojson_docs.to_json
+ { type: 'FeatureCollection', features: build_geojson_features }.to_json
end
private
- def blacklight_maps_config
+ def maps_config
@controller.blacklight_config.view.maps
end
def geojson_field
- blacklight_maps_config.geojson_field
+ maps_config.geojson_field
end
def coordinates_field
- blacklight_maps_config.coordinates_field
+ maps_config.coordinates_field
end
- def search_mode
- blacklight_maps_config.search_mode
+ def build_geojson_features
+ if @action == :index || @action == :map
+ build_index_features
+ elsif @action == :show
+ build_show_features
+ end
+ @features
end
- def facet_mode
- blacklight_maps_config.facet_mode
+ # build GeoJSON features array for index and map views
+ def build_index_features
+ @response_docs.each do |geofacet|
+ @features << if maps_config.facet_mode == 'coordinates'
+ build_feature_from_coords(geofacet.value, geofacet.hits)
+ else
+ build_feature_from_geojson(geofacet.value, geofacet.hits)
+ end
+ end
end
- def placename_property
- blacklight_maps_config.placename_property
+ # build GeoJSON features array for show view
+ def build_show_features
+ doc = @response_docs
+ return unless doc[geojson_field] || doc[coordinates_field]
+
+ if doc[geojson_field]
+ build_features_from_geojson(doc[geojson_field])
+ elsif doc[coordinates_field]
+ build_features_from_coords(doc[coordinates_field])
+ end
end
- # build GeoJSON features array
- # determine how to build GeoJSON feature based on config and controller#action
- def build_geojson_features
- features = []
- case @action
- when "index", "map"
- @response_docs.each do |geofacet|
- if facet_mode == "coordinates"
- features.push(build_feature_from_coords(geofacet.value, geofacet.hits))
- else
- features.push(build_feature_from_geojson(geofacet.value, geofacet.hits))
- end
- end
- when "show"
- doc = @response_docs
- return unless doc[geojson_field] || doc[coordinates_field]
- if doc[geojson_field]
- doc[geojson_field].uniq.each do |loc|
- features.push(build_feature_from_geojson(loc))
- end
- elsif doc[coordinates_field]
- doc[coordinates_field].uniq.each do |coords|
- features.push(build_feature_from_coords(coords))
- end
- end
+ def build_features_from_geojson(geojson_field_values)
+ return unless geojson_field_values
+
+ geojson_field_values.uniq.each do |loc|
+ @features << build_feature_from_geojson(loc)
end
- features
end
- # build blacklight-maps GeoJSON feature from GeoJSON-formatted data
+ def build_features_from_coords(coordinates_field_values)
+ return unless coordinates_field_values
+
+ coordinates_field_values.uniq.each do |coords|
+ @features << build_feature_from_coords(coords)
+ end
+ end
+
+ # build GeoJSON feature from incoming GeoJSON data
# turn bboxes into points for index view so we don't get weird mix of boxes and markers
+ # @param loc [Hash]
+ # @param hits [Integer]
def build_feature_from_geojson(loc, hits = nil)
- geojson_hash = JSON.parse(loc).deep_symbolize_keys
- if @action != "show" && geojson_hash[:bbox]
- geojson_hash[:geometry][:coordinates] = Geometry::Point.new(Geometry::BoundingBox.new(geojson_hash[:bbox]).find_center).normalize_for_search
- geojson_hash[:geometry][:type] = "Point"
- geojson_hash.delete(:bbox)
+ geojson = JSON.parse(loc).deep_symbolize_keys
+ if @action != :show && geojson[:bbox]
+ bbox = Geometry::BoundingBox.new(geojson[:bbox])
+ geojson[:geometry][:coordinates] = Geometry::Point.new(bbox.find_center).normalize_for_search
+ geojson[:geometry][:type] = 'Point'
+ geojson.delete(:bbox)
end
- geojson_hash[:properties] ||= {}
- geojson_hash[:properties][:hits] = hits.to_i if hits
- geojson_hash[:properties][:popup] = render_leaflet_popup_content(geojson_hash, hits)
- geojson_hash
+ geojson[:properties] ||= {}
+ geojson[:properties][:hits] = hits.to_i if hits
+ geojson[:properties][:popup] = render_leaflet_popup_content(geojson, hits)
+ geojson
end
- # build blacklight-maps GeoJSON feature from coordinate data
+ # build GeoJSON feature from incoming raw coordinate data
# turn bboxes into points for index view so we don't get weird mix of boxes and markers
+ # @param coords [String]
+ # @param hits [Integer]
def build_feature_from_coords(coords, hits = nil)
- geojson_hash = {type: "Feature", geometry: {}, properties: {}}
- if coords.scan(/[\s]/).length == 3 # bbox
- if @action != "show"
- geojson_hash[:geometry][:type] = "Point"
- geojson_hash[:geometry][:coordinates] = Geometry::Point.new(Geometry::BoundingBox.from_lon_lat_string(coords).find_center).normalize_for_search
- else
- coords_array = coords.split(' ').map { |v| v.to_f }
- geojson_hash[:bbox] = coords_array
- geojson_hash[:geometry][:type] = "Polygon"
- geojson_hash[:geometry][:coordinates] = [[[coords_array[0],coords_array[1]],
- [coords_array[2],coords_array[1]],
- [coords_array[2],coords_array[3]],
- [coords_array[0],coords_array[3]],
- [coords_array[0],coords_array[1]]]]
- end
- elsif coords.match(/^[-]?[\d]*[\.]?[\d]*[ ,][-]?[\d]*[\.]?[\d]*$/) # point
- geojson_hash[:geometry][:type] = "Point"
- if coords.match(/,/)
- coords_array = coords.split(',').reverse
- else
- coords_array = coords.split(' ')
- end
- geojson_hash[:geometry][:coordinates] = coords_array.map { |v| v.to_f }
+ geojson = { type: 'Feature', properties: {} }
+ if coords =~ /ENVELOPE/ # bbox
+ geojson.merge!(build_bbox_feature_from_coords(coords))
+ elsif coords =~ /^[-]?[\d]*[\.]?[\d]*[ ,][-]?[\d]*[\.]?[\d]*$/ # point
+ geojson[:geometry] = build_point_geometry(coords)
else
Rails.logger.error("This coordinate format is not yet supported: '#{coords}'")
end
- geojson_hash[:properties] = { popup: render_leaflet_popup_content(geojson_hash, hits) } if geojson_hash[:geometry][:coordinates]
- geojson_hash[:properties][:hits] = hits.to_i if hits
- geojson_hash
+ geojson[:properties] = { popup: render_leaflet_popup_content(geojson, hits) } if geojson[:geometry][:coordinates]
+ geojson[:properties][:hits] = hits.to_i if hits
+ geojson
+ end
+
+ # @param coords [String]
+ def build_bbox_feature_from_coords(coords)
+ geojson = { geometry: {} }
+ bbox = Geometry::BoundingBox.from_wkt_envelope(coords)
+ if @action != :show
+ geojson[:geometry][:type] = 'Point'
+ geojson[:geometry][:coordinates] = Geometry::Point.new(bbox.find_center).normalize_for_search
+ else
+ coords_array = bbox.to_a
+ geojson[:bbox] = coords_array
+ geojson[:geometry][:type] = 'Polygon'
+ geojson[:geometry][:coordinates] = bbox.geojson_geometry_array
+ end
+ geojson
+ end
+
+ # @param coords [String]
+ def build_point_geometry(coords)
+ geometry = { type: 'Point' }
+ coords_array = coords =~ /,/ ? coords.split(',').reverse : coords.split(' ')
+ geometry[:coordinates] = coords_array.map(&:to_f)
+ geometry
end
- # Render to string the partial for each individual doc.
+ # Render to string the partial for each individual feature.
# For placename searching, render catalog/map_placename_search partial,
- # full geojson hash is passed to the partial for easier local customization
+ # pass the full geojson hash to the partial for easier local customization
# For coordinate searches (or features with only coordinate data),
# render catalog/map_coordinate_search partial
- def render_leaflet_popup_content(geojson_hash, hits=nil)
- if search_mode == 'placename' && geojson_hash[:properties][placename_property.to_sym]
- @controller.render_to_string partial: 'catalog/map_placename_search',
- locals: { geojson_hash: geojson_hash, hits: hits }
+ # @param geojson [Hash]
+ # @param hits [Integer]
+ def render_leaflet_popup_content(geojson, hits = nil)
+ if maps_config.search_mode == 'placename' &&
+ geojson[:properties][maps_config.placename_property.to_sym]
+ partial = 'catalog/map_placename_search'
+ locals = { geojson_hash: geojson, hits: hits }
else
- @controller.render_to_string partial: 'catalog/map_spatial_search',
- locals: { coordinates: geojson_hash[:bbox].presence || geojson_hash[:geometry][:coordinates],
- hits: hits }
+ partial = 'catalog/map_spatial_search'
+ locals = { coordinates: geojson[:bbox].presence || geojson[:geometry][:coordinates], hits: hits }
end
+ @controller.render_to_string(partial: partial, locals: locals)
end
-
end
-
end
diff --git a/lib/blacklight/maps/geometry.rb b/lib/blacklight/maps/geometry.rb
index 6a02a10..0013f17 100644
--- a/lib/blacklight/maps/geometry.rb
+++ b/lib/blacklight/maps/geometry.rb
@@ -1,15 +1,14 @@
-module BlacklightMaps
+# frozen_string_literal: true
+module BlacklightMaps
# Parent class of geospatial objects used in BlacklightMaps
class Geometry
-
# This class contains Bounding Box objects and methods for interacting with
# them.
class BoundingBox
-
# points is an array containing longitude and latitude values which
# relate to the southwest and northeast points of a bounding box
- # [west, south, east, north] ([swlng, swlat, nelng, nelat]).
+ # [west, south, east, north] ([minX, minY, maxX, maxY]).
def initialize(points)
@west = points[0].to_f
@south = points[1].to_f
@@ -17,15 +16,24 @@ def initialize(points)
@north = points[3].to_f
end
+ def geojson_geometry_array
+ [
+ [
+ [@west, @south],
+ [@east, @south],
+ [@east, @north],
+ [@west, @north],
+ [@west, @south]
+ ]
+ ]
+ end
+
# Returns an array [lng, lat] which is the centerpoint of a BoundingBox.
def find_center
center = []
center[0] = (@west + @east) / 2
center[1] = (@south + @north) / 2
-
- # Handle bounding boxes that cross the dateline
- center[0] -= 180 if @west > @east
-
+ center[0] -= 180 if @west > @east # handle bboxes that cross the dateline
center
end
@@ -34,11 +42,21 @@ def find_center
def self.from_lon_lat_string(points)
new(points.split(' '))
end
+
+ # Creates a new bounding box from from a Solr WKT Envelope string
+ # "ENVELOPE(34.26, 35.89, 33.33, 29.47)" (minX, maxX, maxY, minY)
+ def self.from_wkt_envelope(envelope)
+ coords = envelope.gsub(/[[A-Z]\(\)]/, '')&.split(', ')
+ new([coords[0], coords[3], coords[1], coords[2]])
+ end
+
+ def to_a
+ [@west, @south, @east, @north]
+ end
end
# This class contains Point objects and methods for working with them
class Point
-
# points is an array corresponding to the longitude and latitude values
# [long, lat]
def initialize(points)
@@ -49,13 +67,9 @@ def initialize(points)
# returns a string that can be used as the value of solr_parameters[:pt]
# normalizes any long values >180 or <-180
def normalize_for_search
- case
- when @long > 180
- @long -= 360
- when @long < -180
- @long += 360
- end
- [@long,@lat]
+ @long -= 360 if @long > 180
+ @long += 360 if @long < -180
+ [@long, @lat]
end
# Creates a new point from from a coordinate string
@@ -63,8 +77,6 @@ def normalize_for_search
def self.from_lat_lon_string(points)
new(points.split(',').reverse)
end
-
end
-
end
end
diff --git a/lib/blacklight/maps/maps_search_builder.rb b/lib/blacklight/maps/maps_search_builder.rb
index 17fbbd7..46f18ee 100644
--- a/lib/blacklight/maps/maps_search_builder.rb
+++ b/lib/blacklight/maps/maps_search_builder.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
module BlacklightMaps
module MapsSearchBuilderBehavior
extend ActiveSupport::Concern
@@ -11,7 +13,7 @@ def add_spatial_search_to_solr(solr_parameters = {})
if blacklight_params[:spatial_search_type] && blacklight_params[:coordinates]
solr_parameters[:fq] ||= []
if blacklight_params[:spatial_search_type] == 'bbox'
- solr_parameters[:fq] << blacklight_config.view.maps.coordinates_field + ":" + blacklight_params[:coordinates]
+ solr_parameters[:fq] << "#{blacklight_config.view.maps.coordinates_field}:#{blacklight_params[:coordinates]}"
else
solr_parameters[:fq] << "{!geofilt sfield=#{blacklight_config.view.maps.coordinates_field}}"
solr_parameters[:pt] = blacklight_params[:coordinates]
@@ -20,6 +22,5 @@ def add_spatial_search_to_solr(solr_parameters = {})
end
solr_parameters
end
-
end
-end
\ No newline at end of file
+end
diff --git a/lib/blacklight/maps/render_constraints_override.rb b/lib/blacklight/maps/render_constraints_override.rb
index 69ea27a..86b522c 100644
--- a/lib/blacklight/maps/render_constraints_override.rb
+++ b/lib/blacklight/maps/render_constraints_override.rb
@@ -1,61 +1,95 @@
+# frozen_string_literal: true
+
# Meant to be applied on top of Blacklight view helpers, to over-ride
# certain methods from RenderConstraintsHelper (newish in BL),
# to affect constraints rendering
module BlacklightMaps
-
module RenderConstraintsOverride
-
- # BlacklightMaps override: update to look for spatial query params
- def has_search_parameters?
- has_spatial_parameters? || super
- end
-
- def has_spatial_parameters?
- !params[:coordinates].blank?
+ # @param search_state [Blacklight::SearchState]
+ # @return [Boolean]
+ def has_spatial_parameters?(search_state)
+ search_state.params[:coordinates].present?
end
# BlacklightMaps override: check for coordinate parameters
- def query_has_constraints?(localized_params = params)
- has_search_parameters? || super
+ # @param params_or_search_state [Blacklight::SearchState || ActionController::Parameters]
+ # @return [Boolean]
+ def query_has_constraints?(params_or_search_state = search_state)
+ search_state = convert_to_search_state(params_or_search_state)
+ has_spatial_parameters?(search_state) || super
end
# BlacklightMaps override: include render_spatial_query() in rendered constraints
- def render_constraints(localized_params = params)
- render_spatial_query(localized_params) + super
+ # @param localized_params [Hash] localized_params query parameters
+ # @param local_search_state [Blacklight::SearchState]
+ # @return [String]
+ def render_constraints(localized_params = params, local_search_state = search_state)
+ params_or_search_state = if localized_params != params
+ localized_params
+ else
+ local_search_state
+ end
+ render_spatial_query(params_or_search_state) + super
end
# BlacklightMaps override: include render_search_to_s_coord() in rendered constraints
# Simpler textual version of constraints, used on Search History page.
+ # @param params [Hash]
+ # @return [String]
def render_search_to_s(params)
render_search_to_s_coord(params) + super
end
##
# Render the search query constraint
+ # @param params [Hash]
+ # @return [String]
def render_search_to_s_coord(params)
- return "".html_safe if params[:coordinates].blank?
- render_search_to_s_element(spatial_constraint_label(params), render_filter_value(params[:coordinates]) )
+ return ''.html_safe if params[:coordinates].blank?
+
+ render_search_to_s_element(spatial_constraint_label(params),
+ render_filter_value(params[:coordinates]))
end
# Render the spatial query constraints
- def render_spatial_query(localized_params = params)
+ # @param params_or_search_state [Blacklight::SearchState || ActionController::Parameters]
+ # @return [String]
+ def render_spatial_query(params_or_search_state = search_state)
+ search_state = convert_to_search_state(params_or_search_state)
+
# So simple don't need a view template, we can just do it here.
- return ''.html_safe if localized_params[:coordinates].blank?
+ return ''.html_safe if search_state.params[:coordinates].blank?
- render_constraint_element(spatial_constraint_label(localized_params),
- localized_params[:coordinates],
- :classes => ['coordinates'],
- :remove => remove_constraint_url(localized_params.merge(:coordinates=>nil,
- :spatial_search_type=>nil,
- :action=>'index')))
+ render_constraint_element(spatial_constraint_label(search_state),
+ search_state.params[:coordinates],
+ classes: ['coordinates'],
+ remove: remove_spatial_params(search_state)) # _params.except!(:coordinates, :spatial_search_type)
end
- def spatial_constraint_label(params)
- (params[:spatial_search_type] && params[:spatial_search_type] == 'bbox') ?
- t('blacklight.search.filters.coordinates.bbox') :
- t('blacklight.search.filters.coordinates.point')
+ ##
+ #
+ # @param search_state [Blacklight::SearchState]
+ # @return [String]
+ # remove the spatial params from params
+ def remove_spatial_params(search_state)
+ search_action_path(search_state.params.dup.except!(:coordinates, :spatial_search_type))
end
+ ##
+ # render the label for the spatial constraint
+ # @param params_or_search_state [Blacklight::SearchState || ActionController::Parameters]
+ # @return [String]
+ def spatial_constraint_label(params_or_search_state)
+ search_params = if params_or_search_state.is_a?(Blacklight::SearchState)
+ params_or_search_state.params
+ else
+ params_or_search_state
+ end
+ if search_params[:spatial_search_type] && search_params[:spatial_search_type] == 'bbox'
+ t('blacklight.search.filters.coordinates.bbox')
+ else
+ t('blacklight.search.filters.coordinates.point')
+ end
+ end
end
-
-end
\ No newline at end of file
+end
diff --git a/lib/blacklight/maps/version.rb b/lib/blacklight/maps/version.rb
index feb3501..2e05d0e 100644
--- a/lib/blacklight/maps/version.rb
+++ b/lib/blacklight/maps/version.rb
@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
module Blacklight
module Maps
- VERSION = "0.5.2"
+ VERSION = '0.5.2'
end
end
diff --git a/lib/generators/blacklight_maps/install_generator.rb b/lib/generators/blacklight_maps/install_generator.rb
index 6797811..36d0329 100644
--- a/lib/generators/blacklight_maps/install_generator.rb
+++ b/lib/generators/blacklight_maps/install_generator.rb
@@ -1,61 +1,68 @@
+# frozen_string_literal: true
+
require 'rails/generators'
module BlacklightMaps
class Install < Rails::Generators::Base
+ source_root File.expand_path('templates', __dir__)
+
+ desc 'Install Blacklight-Maps'
- source_root File.expand_path('../templates', __FILE__)
+ def verify_blacklight_installed
+ return if IO.read('app/controllers/application_controller.rb').include?('include Blacklight::Controller')
- desc "Install Blacklight-Maps"
+ say_status('info', 'BLACKLIGHT NOT INSTALLED; GENERATING BLACKLIGHT', :blue)
+ generate 'blacklight:install'
+ end
def assets
- copy_file "blacklight_maps.css.scss", "app/assets/stylesheets/blacklight_maps.css.scss"
-
- unless IO.read("app/assets/javascripts/application.js").include?('blacklight-maps')
- marker = IO.read("app/assets/javascripts/application.js").include?('turbolinks') ?
- '//= require turbolinks' : "//= require jquery_ujs"
- insert_into_file "app/assets/javascripts/application.js", :after => marker do
- %q{
-//
-// Required by Blacklight-Maps
-//= require blacklight-maps}
- end
+ copy_file 'blacklight_maps.css.scss', 'app/assets/stylesheets/blacklight_maps.css.scss'
+ return if IO.read('app/assets/javascripts/application.js').include?('blacklight-maps')
+
+ marker = '//= require blacklight/blacklight'
+ insert_into_file 'app/assets/javascripts/application.js', after: marker do
+ "\n// Required by BlacklightMaps" \
+ "\n//= require blacklight-maps"
end
+ append_to_file 'config/initializers/assets.rb',
+ "\nRails.application.config.assets.paths << Rails.root.join('vendor', 'assets', 'images')\n"
end
def inject_search_builder
- inject_into_file 'app/models/search_builder.rb', after: /include Blacklight::Solr::SearchBuilderBehavior.*$/ do
+ inject_into_file 'app/models/search_builder.rb',
+ after: /include Blacklight::Solr::SearchBuilderBehavior.*$/ do
"\n include BlacklightMaps::MapsSearchBuilderBehavior\n"
end
end
def install_catalog_controller_mixin
- inject_into_file "app/controllers/catalog_controller.rb", after: /include Blacklight::Catalog.*$/ do
- "\n include BlacklightMaps::ControllerOverride\n"
+ inject_into_file 'app/controllers/catalog_controller.rb',
+ after: /include Blacklight::Catalog.*$/ do
+ "\n include BlacklightMaps::Controller\n"
end
end
def install_search_history_controller
- target_file = "app/controllers/search_history_controller.rb"
- if File.exists?(target_file)
- inject_into_file target_file, after: /include Blacklight::SearchHistory/ do
+ target_file = 'app/controllers/search_history_controller.rb'
+ if File.exist?(target_file)
+ inject_into_file target_file,
+ after: /include Blacklight::SearchHistory/ do
"\n helper BlacklightMaps::RenderConstraintsOverride\n"
end
else
- copy_file "search_history_controller.rb", target_file
+ copy_file 'search_history_controller.rb', target_file
end
end
- def install_saved_searches_controller
- target_file = "app/controllers/saved_searches_controller.rb"
- if File.exists?(target_file)
- inject_into_file target_file, after: /include Blacklight::SavedSearches/ do
- "\n helper BlacklightMaps::RenderConstraintsOverride\n"
- end
- else
- copy_file "saved_searches_controller.rb", target_file
+ # TODO: inject Solr configuration (if needed)
+ def inject_solr_configuration
+ target_file = 'solr/conf/schema.xml'
+ return unless File.exist?(target_file)
+
+ inject_into_file target_file,
+ after: %r{ } do
+ "\n \n"
end
end
-
-
end
-end
\ No newline at end of file
+end
diff --git a/lib/generators/blacklight_maps/templates/saved_searches_controller.rb b/lib/generators/blacklight_maps/templates/saved_searches_controller.rb
deleted file mode 100644
index 91abc3e..0000000
--- a/lib/generators/blacklight_maps/templates/saved_searches_controller.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class SavedSearchesController < ApplicationController
- include Blacklight::SavedSearches
-
- helper BlacklightMaps::RenderConstraintsOverride
-end
\ No newline at end of file
diff --git a/lib/generators/blacklight_maps/templates/search_history_controller.rb b/lib/generators/blacklight_maps/templates/search_history_controller.rb
index f4ddc81..10e3cfe 100644
--- a/lib/generators/blacklight_maps/templates/search_history_controller.rb
+++ b/lib/generators/blacklight_maps/templates/search_history_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class SearchHistoryController < ApplicationController
include Blacklight::SearchHistory
diff --git a/solr_conf/conf/schema.xml b/lib/generators/blacklight_maps/templates/solr/conf/schema.xml
similarity index 100%
rename from solr_conf/conf/schema.xml
rename to lib/generators/blacklight_maps/templates/solr/conf/schema.xml
diff --git a/solr_conf/conf/solrconfig.xml b/lib/generators/blacklight_maps/templates/solr/conf/solrconfig.xml
similarity index 100%
rename from solr_conf/conf/solrconfig.xml
rename to lib/generators/blacklight_maps/templates/solr/conf/solrconfig.xml
diff --git a/lib/railties/blacklight_maps.rake b/lib/railties/blacklight_maps.rake
index 613f6d5..5694b9f 100644
--- a/lib/railties/blacklight_maps.rake
+++ b/lib/railties/blacklight_maps.rake
@@ -1,14 +1,17 @@
-require 'rails/generators'
-require 'generators/blacklight_maps/install_generator'
+# frozen_string_literal: true
namespace :blacklight_maps do
- namespace :solr do
- desc "Put sample data into solr"
- task :seed => :environment do
- docs = YAML::load(File.open(File.expand_path(File.join('..', '..', '..', 'spec', 'fixtures', 'sample_solr_documents.yml'), __FILE__)))
+ namespace :index do
+ desc 'Put sample data into solr'
+ task seed: [:environment] do
+ require 'yaml'
+ docs = YAML.safe_load(File.open(File.join(Blacklight::Maps.root,
+ 'spec',
+ 'fixtures',
+ 'sample_solr_documents.yml')))
conn = Blacklight.default_index.connection
conn.add docs
conn.commit
end
end
-end
\ No newline at end of file
+end
diff --git a/spec/controllers/catalog_controller_spec.rb b/spec/controllers/catalog_controller_spec.rb
index 391e258..e624477 100644
--- a/spec/controllers/catalog_controller_spec.rb
+++ b/spec/controllers/catalog_controller_spec.rb
@@ -1,22 +1,32 @@
+# frozen_string_literal: true
+
require 'spec_helper'
describe CatalogController do
-
render_views
- describe "GET 'map'" do
+ # test setting configuration defaults in Blacklight::Maps::Engine here
+ describe 'maps config' do
+ let(:maps_config) { described_class.blacklight_config.view.maps }
+ it 'sets the defaults in blacklight_config' do
+ %i[geojson_field placename_property coordinates_field search_mode spatial_query_dist
+ placename_field coordinates_facet_field facet_mode tileurl mapattribution maxzoom
+ show_initial_zoom].each do |config_method|
+ expect(maps_config.send(config_method)).not_to be_blank
+ end
+ end
+ end
+
+ describe "GET 'map'" do
before { get :map }
- it "should respond to the #map action" do
- expect(response).to be_success
- expect(assigns(:document_list)).to_not be_nil
+ it 'responds to the #map action' do
+ expect(response.code).to eq '200'
end
- it "should render the '/map' page" do
- expect(response.body).to have_css 'body.blacklight-catalog-map'
+ it "renders the '/map' partial" do
+ expect(response.body).to have_selector('#blacklight-index-map')
end
-
end
-
-end
\ No newline at end of file
+end
diff --git a/spec/features/initial_view_spec.rb b/spec/features/initial_view_spec.rb
deleted file mode 100644
index f40da57..0000000
--- a/spec/features/initial_view_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-feature 'Initial view parameter', js: true do
- before :all do
- CatalogController.configure_blacklight do |config|
- config.view.maps.facet_mode = 'coordinates'
- config.view.maps.coordinates_facet_field = 'coordinates_facet'
- config.add_facet_field 'coordinates_facet', :limit => -2, :label => 'Coordinates', :show => false
- end
- end
- scenario 'defaults to zoom area of markers' do
- visit search_catalog_path f: { format: ['Book'] }, view: 'maps'
- expect(page).to have_css '.leaflet-marker-icon.marker-cluster', count: 8
- end
- scenario 'when provided sets map to its view' do
- map_tag = '
'.html_safe
- expect_any_instance_of(Blacklight::BlacklightMapsHelperBehavior).to receive(:blacklight_map_tag).and_return(map_tag)
- visit search_catalog_path f: { format: ['Book'] }, view: 'maps'
- expect(page).to_not have_css '.leaflet-marker-icon.marker-cluster'
- end
-end
diff --git a/spec/features/maps_spec.rb b/spec/features/maps_spec.rb
deleted file mode 100644
index 29705b4..0000000
--- a/spec/features/maps_spec.rb
+++ /dev/null
@@ -1,202 +0,0 @@
-require 'spec_helper'
-
-describe "Map View", js: true do
-
- before :each do
- CatalogController.blacklight_config = Blacklight::Configuration.new
- end
-
- describe "catalog#index and catalog#map views" do
-
- describe "catalog#index map view" do
-
- before :each do
- CatalogController.configure_blacklight do |config|
- # use geojson facet for blacklight-maps catalog#index map view specs
- config.add_facet_field 'geojson', :limit => -2, :label => 'GeoJSON', :show => false
- config.add_facet_fields_to_solr_request!
- end
- visit search_catalog_path :q => 'korea', :view => 'maps'
- end
-
- it "should display map elements" do
- expect(page).to have_selector("#documents.map")
- expect(page).to have_selector("#blacklight-index-map")
- end
-
- it "should display tile layer attribution" do
- expect(find("div.leaflet-control-container")).to have_content('OpenStreetMap contributors, CC-BY-SA')
- end
-
- describe "#sortAndPerPage" do
-
- it "should show the mapped item count" do
- expect(page).to have_selector(".mapped-count .badge", text: "4")
- end
-
- it "should show the mapped item caveat" do
- expect(page).to have_selector(".mapped-caveat")
- end
-
- # TODO: placeholder spec: #sortAndPerPage > .view-type > .view-type-group
- # should show active map icon. however, this spec doesn't work because
- # Blacklight::ConfigurationHelperBehavior#has_alternative_views? returns false,
- # so catalog/_view_type_group partial renders no content, can't figure out why
- it "should show the map view icon" #do
- #expect(page).to have_selector(".view-type-maps.active")
- #end
-
- end
-
- describe "data attributes" do
-
- it "maxzoom should be from config" do
- expect(page).to have_selector("#blacklight-index-map[data-maxzoom='#{CatalogController.blacklight_config.view.maps.maxzoom}']")
- end
-
- it "tileurl should be from config" do
- expect(page).to have_selector("#blacklight-index-map[data-tileurl='#{CatalogController.blacklight_config.view.maps.tileurl}']")
- end
-
- end
-
- describe "marker clusters" do
-
- before {
- 0.upto(2) { find("a.leaflet-control-zoom-out").click } # zoom out to create cluster
- }
-
- it "should have marker cluster div" do
- expect(page).to have_selector("div.marker-cluster")
- end
-
- it "should only have one marker cluster" do
- expect(page).to have_selector("div.marker-cluster", count: 1)
- end
-
- it "should show the result count" do
- expect(find("div.marker-cluster")).to have_content(4)
- end
-
- describe "click marker cluster" do
-
- before { find("div.marker-cluster").click }
-
- it "should split into two marker clusters" do
- expect(page).to have_selector("div.marker-cluster", count: 2)
- end
-
- end
-
- end
-
- describe "marker popups" do
- before do
- find('.marker-cluster', text: '1', match: :first).click
- end
-
- it "should show a popup with correct content" do
- expect(page).to have_selector("div.leaflet-popup-content-wrapper")
- expect(page).to have_content("Seoul (Korea)")
- end
-
- describe "click search link" do
-
- before { find("div.leaflet-popup-content a").click }
-
- it "should run a new search" do
- expect(page).to have_selector(".constraint-value .filterValue", text: "Seoul (Korea)")
- end
-
- it "should use the default view type" do
- expect(current_url).to include("view=list")
- end
-
- end
-
- end
-
- describe "map search control" do
-
- it "should have a search control" do
- expect(page).to have_selector(".leaflet-control .search-control")
- end
-
- describe "search control hover" do
-
- before { find(".search-control").hover }
-
- it "should add a border to the map" do
- expect(page).to have_selector(".leaflet-overlay-pane path")
- end
-
- end
-
- describe "search control click" do
-
- before { find(".search-control").click }
-
- it "should run a new search" do
- expect(page).to have_selector(".constraint.coordinates")
- expect(current_url).to include("view=list")
- end
-
- end
-
- end
-
- end
-
- describe "catalog#map view" do
-
- before :each do
- CatalogController.configure_blacklight do |config|
- # use coordinates_facet facet for blacklight-maps catalog#map view specs
- config.view.maps.facet_mode = 'coordinates'
- config.view.maps.coordinates_facet_field = 'coordinates_facet'
- config.add_facet_field 'coordinates_facet', :limit => -2, :label => 'Coordinates', :show => false
- config.add_facet_fields_to_solr_request!
- end
- visit map_path
- # print page.html # debugging
- end
-
- it "should display map elements" do
- expect(page).to have_selector("#documents.map")
- expect(page).to have_selector("#blacklight-index-map")
- end
-
- it "should display some markers" do
- expect(page).to have_selector("div.marker-cluster")
- end
-
- describe "marker popups" do
-
- before :each do
- 0.upto(1) { find("a.leaflet-control-zoom-in").click } # zoom in
- find(".marker-cluster:first-child").click
- end
-
- it "should show a popup with correct content" do
- expect(page).to have_selector("div.leaflet-popup-content-wrapper")
- expect(page).to have_content("[35.86166, 104.195397]")
- end
-
- describe "click search link" do
-
- before { find("div.leaflet-popup-content a").click }
-
- it "should run a new search" do
- expect(page).to have_selector(".constraint-value .filterValue", text: "35.86166,104.195397")
- expect(current_url).to include("view=list")
- end
-
- end
-
- end
-
- end
-
- end
-
-end
diff --git a/spec/features/show_view_maplet_spec.rb b/spec/features/show_view_maplet_spec.rb
deleted file mode 100644
index 7a0158b..0000000
--- a/spec/features/show_view_maplet_spec.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-require 'spec_helper'
-
-describe "catalog#show view", js: true do
-
- before :each do
- CatalogController.blacklight_config = Blacklight::Configuration.new
- CatalogController.configure_blacklight do |config|
- # add maplet to show view partials
- config.show.partials << :show_maplet
- end
- end
-
- describe "item with point feature" do
-
- before :each do
- visit solr_document_path("00314247")
- end
-
- it "should display the maplet" do
- expect(page).to have_selector("#blacklight-show-map-container")
- end
-
- it "should have a single marker icon" do
- expect(page).to have_selector(".leaflet-marker-icon", count: 1)
- end
-
- describe "click marker icon" do
-
- before { find(".leaflet-marker-icon").click }
-
- it "should show a popup with correct content" do
- expect(page).to have_selector("div.leaflet-popup-content-wrapper")
- expect(page).to have_content("Japan")
- end
-
- end
-
- end
-
- describe "item with point and bbox features" do
-
- before :each do
- visit solr_document_path("2008308175")
- end
-
- it "should show the correct mapped item count" do
- expect(page).to have_selector(".mapped-count .badge", text: "2")
- end
-
- it "should show a bounding box and a point marker" do
- expect(page).to have_selector(".leaflet-overlay-pane path.leaflet-clickable")
- expect(page).to have_selector(".leaflet-marker-icon")
- end
-
- describe "click bbox path" do
-
- before do
- 0.upto(4) { find("a.leaflet-control-zoom-in").click } #so bbox not covered by point
- find(".leaflet-overlay-pane svg").click
- end
-
- it "should show a popup with correct content" do
- expect(page).to have_selector("div.leaflet-popup-content-wrapper")
- expect(page).to have_content("[68.162386, 6.7535159, 97.395555, 35.5044752]")
- end
-
- end
-
- end
-
- describe "item with bbox feature" do
-
- before :each do
- CatalogController.configure_blacklight do |config|
- # set zoom config so we can test whether setMapBounds() is correct
- config.view.maps.maxzoom = 8
- config.view.maps.show_initial_zoom = 10
- end
- visit solr_document_path("2009373514")
- end
-
- it "should display a bounding box" do
- expect(page).to have_selector(".leaflet-overlay-pane path.leaflet-clickable")
- end
-
- it "should zoom to the correct map bounds" do
- # if setMapBounds() zoom >= maxzoom, zoom-in control will be disabled
- expect(page).to have_selector(".leaflet-control-zoom-in.leaflet-disabled")
- end
-
- end
-
-end
\ No newline at end of file
diff --git a/spec/fixtures/sample_solr_documents.yml b/spec/fixtures/sample_solr_documents.yml
index 1d3c8ff..2918f57 100644
--- a/spec/fixtures/sample_solr_documents.yml
+++ b/spec/fixtures/sample_solr_documents.yml
@@ -1,9 +1,145 @@
---
-- lc_1letter_facet:
+- subtitle_tsim: 'guft va gū-yi Akbar Ganjī bā ʻAbd Allāh Nūrī : bih payvast-i matn-i istīz̤āḥ-i ʻAbd Allāh Nūrī dar Majlis-i panjum'
+ author_vern_ssim: "نورى، عبد الله"
+ subject_addl_ssim:
+ - Interviews
+ - Trials, litigation, etc
+ - Officials and employees Interviews
+ - Politics and government 1997-
+ title_tsim: Naqdī barā-yi tamām-i fuṣūl
+ subject_era_ssim:
+ - 1997-
+ id: 00313831
+ isbn_ssim:
+ - '9645625963'
+ subject_geo_ssim:
+ - Iran
+ subject_ssim:
+ - Nūrī, ʻAbd Allāh, 1949-
+ - Iran. Vizārat-i Kishvar
+ lc_alpha_ssim:
+ - DS
+ title_series_tsim:
+ - Farhang-i ʻumūmī
+ - "فرهنگ عمومى"
+ subtitle_tsim:
+ - 'guft va gū-yi Akbar Ganjī bā ʻAbd Allāh Nūrī : bih payvast-i matn-i istīz̤āḥ-i
+ ʻAbd Allāh Nūrī dar Majlis-i panjum.'
+ - "گفت و گوى اکبر گنجى با عبد الله نورى : به پيوست متن استيضاح عبد الله نورى در
+ مجلس پنجم"
+ lc_1letter_ssim:
+ - D - World History
+ author_tsim:
+ - Nūrī, ʻAbd Allāh,
+ - "نورى، عبد الله"
+ marc_ss: "01988cam
+ a2200421 a 4500 00313831 DLC 20090121100001.0 010611s2000 ir b 001 0dper d 00313831 9645625963 (CStRLIN)DCLN01-B3014 MH MH CStRLIN DLC-R lccopycat lcode a-ir--- DS318.84.N87 N87
+ 2000 (3 (4 880-01 Nūrī, ʻAbd Allāh, 1949- 880-02 Naqdī barā-yi tamām-i fuṣūl : guft
+ va gū-yi Akbar Ganjī bā ʻAbd Allāh Nūrī : bih payvast-i matn-i istīz̤āḥ-i
+ ʻAbd Allāh Nūrī dar Majlis-i panjum. Critique for all seasons : Akbar Ganji's conversation with Abdullah Nuri 880-03 Chāp-i 1. 880-04 Tihrān
+ : Ṭarḥ-i Naw, 2000. 245 p. ; 22 cm. 880-05 Farhang-i ʻumūmī Includes bibliographical
+ references and index. 880-06 Nūrī,
+ ʻAbd Allāh, 1949- Interviews. Iran. Vizārat-i Kishvar Officials and employees Interviews. 880-07 Nūrī,
+ ʻAbd Allāh, 1949- Trials,
+ litigation, etc. Iran Politics and government 1997- 880-08 Ganjī, Akbar. 100-01/(3/r نورى، عبد الله. 245-02/(3/r نقدى
+ براى تمام فصول : گفت و گوى اکبر گنجى با عبد الله
+ نورى : به پيوست متن استيضاح عبد الله نورى در مجلس پنجم. 250-03/(4/r چاپ 1. 260-04/(3/r تهران : طرح نو، 2000. 440-05/(3/r فرهنگ عمومى 600-06/(3/r نورى،
+ عبد الله. 600-07/(3/r نورى، عبد الله. 700-08/(3/r گنجى، اكبر. "
+ published_ssim:
+ - Tihrān
+ author_tsim: Nūrī, ʻAbd Allāh, 1949-
+ title_vern_ssim: "نقدى براى تمام فصول :"
+ lc_callnum_ssim:
+ - DS318.84.N87 N87 2000
+ title_tsim:
+ - 'Naqdī barā-yi tamām-i fuṣūl :'
+ - "نقدى براى تمام فصول :"
+ pub_date_ssim:
+ - '2000'
+ pub_date_si: 2000
+ published_vern_ssim:
+ - "تهران :"
+ format: Book
+ subtitle_vern_ssim: "گفت و گوى اکبر گنجى با عبد الله نورى : به پيوست متن استيضاح
+ عبد الله نورى در مجلس پنجم"
+ material_type_ssim:
+ - 245 p.
+ lc_b4cutter_ssim:
+ - DS318.84.N87
+ subject_tsim:
+ - Nūrī, ʻAbd Allāh, 1949-
+ - Iran. Vizārat-i Kishvar
+ - Iran
+ - "نورى، عبد الله"
+ title_si: 'naqdī barā-yi tamām-i fuṣūl :guft va gū-yi akbar ganjī bā ʻabd allāh nūrī : bih payvast-i matn-i istīz̤āḥ-i ʻabd allāh nūrī dar majlis-i
+ panjum'
+ author_si: Nūrī ʻAbd Allāh 1949 Naqdī barāyi tamāmi fuṣūl guft va gūyi Akbar Ganjī bā ʻAbd Allāh Nūrī bih payvasti matni istīz̤āḥi ʻAbd Allāh Nūrī dar Majlisi panjum
+ title_addl_tsim:
+ - 'Naqdī barā-yi tamām-i fuṣūl : guft va gū-yi Akbar Ganjī bā ʻAbd Allāh Nūrī : bih payvast-i matn-i istīz̤āḥ-i ʻAbd Allāh Nūrī dar Majlis-i panjum.'
+ - 'Critique for all seasons : Akbar Ganji''s conversation with Abdullah Nuri'
+ - "نقدى براى تمام فصول : گفت و گوى اکبر گنجى با عبد الله نورى : به پيوست متن استيضاح عبد الله نورى در مجلس پنجم"
+ author_addl_tsim:
+ - Ganjī, Akbar.
+ - "گنجى، اكبر"
+ language_ssim:
+ - Persian
+ timestamp: '2014-02-03T18:42:53.056Z'
+ geojson_ssim:
+ - "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[53.688046,32.427908]},\"properties\":{\"placename\":\"Iran\"}}"
+ coordinates_srpt:
+ - 32.427908,53.688046
+ - ENVELOPE(44.0318907, 63.3333366, 39.7816755, 25.0594286)
+- lc_1letter_ssim:
- P - Language & Literature
- author_t:
+ author_tsim:
- Ayaz, Shaikh,
- marc_display: "00799cam
+ marc_ss: "00799cam
a2200241 a 4500 00282214 DLC 20090120022042.0 000417s1998 pk 000 0 urdo Farruk̲h̲ī, Āṣif, 1959- Pīrzādah, Shāh Muḥammad. "
- published_display:
+ published_ssim:
- Karācī
- author_display: Ayaz, Shaikh, 1923-1997
- lc_callnum_display:
+ author_tsim: Ayaz, Shaikh, 1923-1997
+ lc_callnum_ssim:
- PK2788.9.A9 F55 1998
- title_t:
+ title_tsim:
- Fikr-i Ayāz /
- pub_date:
+ pub_date_ssim:
- '1998'
- pub_date_sort: 1998
+ pub_date_si: 1998
format: Book
- material_type_display:
+ material_type_ssim:
- 375 p.
- lc_b4cutter_facet:
+ lc_b4cutter_ssim:
- PK2788.9.A9
- title_display: Fikr-i Ayāz
- title_sort: fikr-i ayāz
+ title_tsim: Fikr-i Ayāz
+ title_si: fikr-i ayāz
id: 00282214
- author_sort: Ayaz Shaikh 19231997 Fikri Ayāz
- title_addl_t:
+ author_si: Ayaz Shaikh 19231997 Fikri Ayāz
+ title_addl_tsim:
- Fikr-i Ayāz /
- author_addl_t:
+ author_addl_tsim:
- Farruk̲h̲ī, Āṣif,
- Pīrzādah, Shāh Muḥammad.
- lc_alpha_facet:
+ lc_alpha_ssim:
- PK
- language_facet:
+ language_ssim:
- Urdu
timestamp: '2014-02-03T18:42:53.056Z'
-- lc_1letter_facet:
+- lc_1letter_ssim:
- M - Music
- author_t:
+ author_tsim:
- Ayaz, Shaikh,
- marc_display: "00778cam
+ marc_ss: "00778cam
a22002417a 4500 00282371 DLC 20090120021204.0 000509s1986 pk 000 0 urdo Includes bibliographical
references. "
- published_display:
+ published_ssim:
- Karācī
- author_display: Ayaz, Shaikh, 1923-1997
- lc_callnum_display:
+ author_tsim: Ayaz, Shaikh, 1923-1997
+ lc_callnum_ssim:
- MLCME 2002/02660 (D)
- title_t:
+ title_tsim:
- Sāhivāl jail kī ḍāʼirī /
- pub_date:
+ pub_date_ssim:
- '1986'
- pub_date_sort: 1986
+ pub_date_si: 1986
format: Book
- material_type_display:
+ material_type_ssim:
- 232 p.
- lc_b4cutter_facet:
+ lc_b4cutter_ssim:
- MLCME 2002/02660 (D)
- title_display: Sāhivāl jail kī ḍāʼirī
- title_sort: sāhivāl jail kī ḍāʼirī
+ title_tsim: Sāhivāl jail kī ḍāʼirī
+ title_si: sāhivāl jail kī ḍāʼirī
id: 00282371
- author_sort: Ayaz Shaikh 19231997 Sāhivāl jail kī ḍāʼirī
- title_addl_t:
+ author_si: Ayaz Shaikh 19231997 Sāhivāl jail kī ḍāʼirī
+ title_addl_tsim:
- Sāhivāl jail kī ḍāʼirī /
- language_facet:
+ language_ssim:
- Urdu
timestamp: '2014-02-03T18:42:53.056Z'
-- subtitle_display: 'guft va gū-yi Akbar Ganjī bā ʻAbd Allāh Nūrī : bih payvast-i
- matn-i istīz̤āḥ-i ʻAbd Allāh Nūrī dar Majlis-i panjum'
- author_vern_display: "نورى، عبد الله"
- subject_addl_t:
- - Interviews
- - Trials, litigation, etc
- - Officials and employees Interviews
- - Politics and government 1997-
- title_display: Naqdī barā-yi tamām-i fuṣūl
- subject_era_facet:
- - 1997-
- id: 00313831
- isbn_t:
- - '9645625963'
- subject_geo_facet:
- - Iran
- subject_topic_facet:
- - Nūrī, ʻAbd Allāh, 1949-
- - Iran. Vizārat-i Kishvar
- lc_alpha_facet:
- - DS
- title_series_t:
- - Farhang-i ʻumūmī
- - "فرهنگ عمومى"
- subtitle_t:
- - 'guft va gū-yi Akbar Ganjī bā ʻAbd Allāh Nūrī : bih payvast-i matn-i istīz̤āḥ-i
- ʻAbd Allāh Nūrī dar Majlis-i panjum.'
- - "گفت و گوى اکبر گنجى با عبد الله نورى : به پيوست متن استيضاح عبد الله نورى در
- مجلس پنجم"
- lc_1letter_facet:
- - D - World History
- author_t:
- - Nūrī, ʻAbd Allāh,
- - "نورى، عبد الله"
- marc_display: "01988cam
- a2200421 a 4500 00313831 DLC 20090121100001.0 010611s2000 ir b 001 0dper d 00313831 9645625963 (CStRLIN)DCLN01-B3014 MH MH CStRLIN DLC-R lccopycat lcode a-ir--- DS318.84.N87 N87
- 2000 (3 (4 880-01 Nūrī, ʻAbd Allāh, 1949- 880-02 Naqdī barā-yi tamām-i fuṣūl : guft
- va gū-yi Akbar Ganjī bā ʻAbd Allāh Nūrī : bih payvast-i matn-i istīz̤āḥ-i
- ʻAbd Allāh Nūrī dar Majlis-i panjum. Critique for all seasons : Akbar Ganji's conversation with Abdullah Nuri 880-03 Chāp-i 1. 880-04 Tihrān
- : Ṭarḥ-i Naw, 2000. 245 p. ; 22 cm. 880-05 Farhang-i ʻumūmī Includes bibliographical
- references and index. 880-06 Nūrī,
- ʻAbd Allāh, 1949- Interviews. Iran. Vizārat-i Kishvar Officials and employees Interviews. 880-07 Nūrī,
- ʻAbd Allāh, 1949- Trials,
- litigation, etc. Iran Politics and government 1997- 880-08 Ganjī, Akbar. 100-01/(3/r نورى، عبد الله. 245-02/(3/r نقدى
- براى تمام فصول : گفت و گوى اکبر گنجى با عبد الله
- نورى : به پيوست متن استيضاح عبد الله نورى در مجلس پنجم. 250-03/(4/r چاپ 1. 260-04/(3/r تهران : طرح نو، 2000. 440-05/(3/r فرهنگ عمومى 600-06/(3/r نورى،
- عبد الله. 600-07/(3/r نورى، عبد الله. 700-08/(3/r گنجى، اكبر. "
- published_display:
- - Tihrān
- author_display: Nūrī, ʻAbd Allāh, 1949-
- title_vern_display: "نقدى براى تمام فصول :"
- lc_callnum_display:
- - DS318.84.N87 N87 2000
- title_t:
- - 'Naqdī barā-yi tamām-i fuṣūl :'
- - "نقدى براى تمام فصول :"
- pub_date:
- - '2000'
- pub_date_sort: 2000
- published_vern_display:
- - "تهران :"
- format: Book
- subtitle_vern_display: "گفت و گوى اکبر گنجى با عبد الله نورى : به پيوست متن استيضاح
- عبد الله نورى در مجلس پنجم"
- material_type_display:
- - 245 p.
- lc_b4cutter_facet:
- - DS318.84.N87
- subject_t:
- - Nūrī, ʻAbd Allāh, 1949-
- - Iran. Vizārat-i Kishvar
- - Iran
- - "نورى، عبد الله"
- title_sort: 'naqdī barā-yi tamām-i fuṣūl :guft va gū-yi akbar ganjī bā ʻabd
- allāh nūrī : bih payvast-i matn-i istīz̤āḥ-i ʻabd allāh nūrī dar majlis-i
- panjum'
- author_sort: Nūrī ʻAbd Allāh 1949 Naqdī barāyi tamāmi fuṣūl guft va gūyi
- Akbar Ganjī bā ʻAbd Allāh Nūrī bih payvasti matni istīz̤āḥi ʻAbd Allāh
- Nūrī dar Majlisi panjum
- title_addl_t:
- - 'Naqdī barā-yi tamām-i fuṣūl : guft va gū-yi Akbar Ganjī bā ʻAbd Allāh
- Nūrī : bih payvast-i matn-i istīz̤āḥ-i ʻAbd Allāh Nūrī dar Majlis-i panjum.'
- - 'Critique for all seasons : Akbar Ganji''s conversation with Abdullah Nuri'
- - "نقدى براى تمام فصول : گفت و گوى اکبر گنجى با عبد الله نورى : به پيوست متن
- استيضاح عبد الله نورى در مجلس پنجم"
- author_addl_t:
- - Ganjī, Akbar.
- - "گنجى، اكبر"
- language_facet:
- - Persian
- timestamp: '2014-02-03T18:42:53.056Z'
- geojson: "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[53.688046,32.427908]},\"properties\":{\"placename\":\"Iran\"}}"
- coordinates:
- - 53.688046 32.427908
- - 44.0318907 25.0594286 63.3333366 39.7816755
-- author_t:
+- author_tsim:
- Yoshida, Hajime,
- "吉田一"
- marc_display: "00956dam
+ marc_ss: "00956dam
a22002655a 4500 00314247 DLC 20090126095911.0 000214s1997 ja 000 0 jpn 600-04/$1 久保栄, 1901-1958. 火山灰地. "
- published_display:
+ published_ssim:
- Tōkyō
- title_vern_display: "久保栄 「火山灰地」 を読む"
- author_display: Yoshida, Hajime, 1934-
- title_t:
+ title_vern_ssim: "久保栄 「火山灰地」 を読む"
+ author_tsim: Yoshida, Hajime, 1934-
+ title_tsim:
- Kubo Sakae "Kazanbaichi" o yomu /
- "久保栄 「火山灰地」 を読む"
- pub_date:
+ pub_date_ssim:
- '1997'
- pub_date_sort: 1997
- published_vern_display:
+ pub_date_si: 1997
+ published_vern_ssim:
- "東京"
format: Book
- author_vern_display: "吉田一, 1934-"
- material_type_display:
+ author_vern_ssim: "吉田一, 1934-"
+ material_type_ssim:
- 480 p.
- title_display: Kubo Sakae "Kazanbaichi" o yomu
- subject_addl_t:
+ title_tsim: Kubo Sakae "Kazanbaichi" o yomu
+ subject_addl_ssim:
- 20th century
- Japan History
- subject_t:
+ subject_tsim:
- Kubo, Sakae, 1901-1958. Kazanbaichi
- Japanese drama
- Political plays, Japanese
- Theater
- "久保栄, 1901-1958. 火山灰地"
- subject_era_facet:
+ subject_era_ssim:
- 20th century
- title_sort: kubo sakae "kazanbaichi" o yomu
+ title_si: kubo sakae "kazanbaichi" o yomu
id: '00314247'
- author_sort: Yoshida Hajime 1934 Kubo Sakae Kazanbaichi o yomu
- title_addl_t:
+ author_si: Yoshida Hajime 1934 Kubo Sakae Kazanbaichi o yomu
+ title_addl_tsim:
- Kubo Sakae "Kazanbaichi" o yomu /
- "久保栄 「火山灰地」 を読む"
- subject_geo_facet:
+ subject_geo_ssim:
- Japan
- subject_topic_facet:
+ subject_ssim:
- Kubo, Sakae, 1901-1958
- Japanese drama
- Political plays, Japanese
- Theater
- language_facet:
+ language_ssim:
- Japanese
timestamp: '2014-02-03T18:42:53.056Z'
- geojson: "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[138.252924,36.204824]},\"properties\":{\"placename\":\"Japan\"}}"
- coordinates:
- - 138.252924 36.204824
- - 122.9338302 24.0460446 153.9874305 45.5227719
-- lc_1letter_facet:
+ geojson_ssim:
+ - "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[138.252924,36.204824]},\"properties\":{\"placename\":\"Japan\"}}"
+ coordinates_srpt:
+ - 36.204824,138.252924
+ - ENVELOPE(122.9338302, 153.9874305, 45.5227719, 24.0460446)
+- lc_1letter_ssim:
- D - World History
- author_t:
+ author_tsim:
- Vi︠a︡tkin, M. P. (Mikhail Porfirʹevich),
- marc_display: "00987cam
+ marc_ss: "00987cam
a22002531 4500 43037890 DLC 20090126171234.0 810731m19419999ru b b 000 0 ruso Institut istorii (Akademii︠a︡
nauk SSSR) Akademii︠a︡ nauk Kazakhskoĭ SSR, Alma Ata. "
- published_display:
+ published_ssim:
- Moskva
- author_display: Vi︠a︡tkin, M. P. (Mikhail Porfirʹevich), 1895-1967
- lc_callnum_display:
+ author_tsim: Vi︠a︡tkin, M. P. (Mikhail Porfirʹevich), 1895-1967
+ lc_callnum_ssim:
- DK861.K3 V5
- title_t:
+ title_tsim:
- Ocherki po istorii Kazakhskoĭ SSR.
- pub_date:
+ pub_date_ssim:
- '1941'
- pub_date_sort: 1941
+ pub_date_si: 1941
format: Book
- material_type_display:
+ material_type_ssim:
- v.
- lc_b4cutter_facet:
+ lc_b4cutter_ssim:
- DK861.K3
- title_display: Ocherki po istorii Kazakhskoĭ SSR
- subject_addl_t:
+ title_tsim: Ocherki po istorii Kazakhskoĭ SSR
+ subject_addl_ssim:
- History
- subject_t:
+ subject_tsim:
- Kazakhstan
- title_sort: ocherki po istorii kazakhskoĭ ssr
+ title_si: ocherki po istorii kazakhskoĭ ssr
id: '43037890'
- author_sort: Vi︠a︡tkin M P Mikhail Porfirʹevich 18951967 Ocherki po istorii Kazakhskoĭ
+ author_si: Vi︠a︡tkin M P Mikhail Porfirʹevich 18951967 Ocherki po istorii Kazakhskoĭ
SSR
- title_addl_t:
+ title_addl_tsim:
- Ocherki po istorii Kazakhskoĭ SSR.
- subject_geo_facet:
+ subject_geo_ssim:
- Kazakhstan
- author_addl_t:
+ author_addl_tsim:
- Institut istorii (Akademii︠a︡ nauk SSSR)
- Akademii︠a︡ nauk Kazakhskoĭ SSR, Alma Ata.
- lc_alpha_facet:
+ lc_alpha_ssim:
- DK
- language_facet:
+ language_ssim:
- Russian
timestamp: '2014-02-03T18:42:53.056Z'
- geojson: "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[66.923684,48.019573]},\"properties\":{\"placename\":\"Kazakhstan\"}}"
- coordinates:
- - 66.923684 48.019573
- - 46.4936719 40.568584 87.315415 55.441984
-- lc_1letter_facet:
+ geojson_ssim:
+ - "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[66.923684,48.019573]},\"properties\":{\"placename\":\"Kazakhstan\"}}"
+ coordinates_srpt:
+ - 48.019573,66.923684
+ - ENVELOPE(46.4936719, 87.315415, 55.441984, 40.568584)
+- lc_1letter_ssim:
- K - Law
- author_t:
+ author_tsim:
- Korea (North)
- marc_display: "00955cam
+ marc_ss: "00955cam
a22002411 4500 53029833 DLC 20090126171326.0 860911s1952 ru f000 0 rus Mazur, I︠U︡. N. Korea (North) Constitution. "
- published_display:
+ published_ssim:
- Moskva
- author_display: Korea (North)
- lc_callnum_display:
+ author_tsim: Korea (North)
+ lc_callnum_ssim:
- KPC13 1952
- title_t:
+ title_tsim:
- Konstitut︠s︡ii︠a︡ i osnovnye zakonodatelʹnye akty Koreĭskoĭ Narodno-Demokraticheskoĭ
Respubliki.
- pub_date:
+ pub_date_ssim:
- '1952'
- pub_date_sort: 1952
+ pub_date_si: 1952
format: Book
- material_type_display:
+ material_type_ssim:
- 396 p.
- lc_b4cutter_facet:
+ lc_b4cutter_ssim:
- KPC13
- title_display: Konstitut︠s︡ii︠a︡ i osnovnye zakonodatelʹnye akty Koreĭskoĭ Narodno-Demokraticheskoĭ
+ title_tsim: Konstitut︠s︡ii︠a︡ i osnovnye zakonodatelʹnye akty Koreĭskoĭ Narodno-Demokraticheskoĭ
Respubliki
- title_sort: konstitut︠s︡ii︠a︡ i osnovnye zakonodatelʹnye akty koreĭskoĭ narodno-demokraticheskoĭ
+ title_si: konstitut︠s︡ii︠a︡ i osnovnye zakonodatelʹnye akty koreĭskoĭ narodno-demokraticheskoĭ
respubliki
id: '53029833'
- author_sort: Korea North Laws etc Konstitut︠s︡ii︠a︡ i osnovnye zakonodatelʹnye akty
+ author_si: Korea North Laws etc Konstitut︠s︡ii︠a︡ i osnovnye zakonodatelʹnye akty
Koreĭskoĭ NarodnoDemokraticheskoĭ Respubliki Konstitut︠s︡ii︠a︡ i osnovnye zakonodatelʹnye
akty Koreĭskoĭ NarodnoDemokraticheskoĭ Respubliki
- title_addl_t:
+ title_addl_tsim:
- Konstitut︠s︡ii︠a︡ i osnovnye zakonodatelʹnye akty Koreĭskoĭ Narodno-Demokraticheskoĭ
Respubliki.
- Laws, etc. (Konstitut︠s︡ii︠a︡ i osnovnye zakonodatelʹnye akty Koreĭskoĭ Narodno-Demokraticheskoĭ
Respubliki)
- author_addl_t:
+ author_addl_tsim:
- Mazur, I︠U︡. N.
- Korea (North)
- title_added_entry_t:
+ title_added_entry_tsim:
- Constitution
- title_series_t:
+ title_series_tsim:
- Zakonodatelʹstvo stran narodnoĭ demokratii
- lc_alpha_facet:
+ lc_alpha_ssim:
- KPC
- language_facet:
+ language_ssim:
- Russian
timestamp: '2014-02-03T18:42:53.056Z'
-- lc_1letter_facet:
+- lc_1letter_ssim:
- D - World History
- marc_display: "01062cam
+ marc_ss: "01062cam
a2200301 a 4500 77826928 DLC 20090122103906.0 070816s1976 ko 000 0ckor 瑞文 文庫 ;237 700-05/$1 李 民樹, 1916- "
- published_display:
+ published_ssim:
- Sŏul
- title_vern_display: "高麗 人物 列傅"
- lc_callnum_display:
+ title_vern_ssim: "高麗 人物 列傅"
+ lc_callnum_ssim:
- DS912.38 .K982 1976
- title_t:
+ title_tsim:
- Koryŏ inmul yŏlchŏn /
- "高麗 人物 列傅"
- pub_date:
+ pub_date_ssim:
- '1976'
- pub_date_sort: 1976
- published_vern_display:
+ pub_date_si: 1976
+ published_vern_ssim:
- "서울"
format: Book
- material_type_display:
+ material_type_ssim:
- 255 p.
- lc_b4cutter_facet:
+ lc_b4cutter_ssim:
- DS912.38
- title_display: Koryŏ inmul yŏlchŏn
- subject_addl_t:
+ title_tsim: Koryŏ inmul yŏlchŏn
+ subject_addl_ssim:
- History Koryŏ period, 935-1392 Biography
- Biography
- subject_t:
+ subject_tsim:
- Korea
- subject_era_facet:
+ subject_era_ssim:
- Koryŏ period, 935-1392
- title_sort: koryŏ inmul yŏlchŏn
+ title_si: koryŏ inmul yŏlchŏn
id: '77826928'
- author_sort: "\U0010FFFF Koryŏ inmul yŏlchŏn"
- title_addl_t:
+ author_si: "\U0010FFFF Koryŏ inmul yŏlchŏn"
+ title_addl_tsim:
- Koryŏ inmul yŏlchŏn /
- Koryŏsa. Yŏlchŏn. Selections
- "高麗 人物 列傅"
- "高麗史. 列傅. Selections"
- subject_geo_facet:
+ subject_geo_ssim:
- Korea
- author_addl_t:
+ author_addl_tsim:
- Yi, Min-su,
- "李 民樹"
- title_series_t:
+ title_series_tsim:
- Sŏmun munʼgo ; 237
- "瑞文 文庫 ; 237"
- lc_alpha_facet:
+ lc_alpha_ssim:
- DS
- language_facet:
+ language_ssim:
- Korean
timestamp: '2014-02-03T18:42:53.056Z'
- geojson: "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[127.766922,35.907757]},\"properties\":{\"placename\":\"Korea\"}}"
- coordinates:
- - 124.608139 33.1061096 130.9232178 38.6169312
- - 127.766922 35.907757
-- lc_1letter_facet:
+ geojson_ssim:
+ - "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[127.766922,35.907757]},\"properties\":{\"placename\":\"Korea\"}}"
+ coordinates_srpt:
+ - ENVELOPE(124.608139, 130.9232178, 38.6169312, 33.1061096)
+ - 35.907757,127.766922
+- lc_1letter_ssim:
- P - Language & Literature
- author_t:
+ author_tsim:
- Parikshit Sharma, Ogeti,
- marc_display: "00813cam
+ marc_ss: "00813cam
a2200217 i 4500 78908283 DLC 20090121104206.0 790619s1976 ii 000 0 sano Poetry. Yaśodharā (Wife of Gautama Buddha) Poetry. "
- published_display:
+ published_ssim:
- Puṇyapattanam
- Haidrābāda
- author_display: Parikshit Sharma, Ogeti, 1930-
- lc_callnum_display:
+ author_tsim: Parikshit Sharma, Ogeti, 1930-
+ lc_callnum_ssim:
- PK3799.P29 Y3
- title_t:
+ title_tsim:
- Yaśodharā-mahākāvyam /
- pub_date:
+ pub_date_ssim:
- '1976'
- pub_date_sort: 1976
+ pub_date_si: 1976
format: Book
- material_type_display:
+ material_type_ssim:
- 24, 128, 2 p.
- lc_b4cutter_facet:
+ lc_b4cutter_ssim:
- PK3799.P29
- title_display: Yaśodharā-mahākāvyam
- subject_addl_t:
+ title_tsim: Yaśodharā-mahākāvyam
+ subject_addl_ssim:
- Poetry
- subject_t:
+ subject_tsim:
- Gautama Buddha
- Yaśodharā (Wife of Gautama Buddha)
- title_sort: yaśodharā-mahākāvyam
+ title_si: yaśodharā-mahākāvyam
id: '78908283'
- author_sort: Parikshit Sharma Ogeti 1930 Yaśodharāmahākāvyam
- title_addl_t:
+ author_si: Parikshit Sharma Ogeti 1930 Yaśodharāmahākāvyam
+ title_addl_tsim:
- Yaśodharā-mahākāvyam /
- subject_topic_facet:
+ subject_ssim:
- Gautama Buddha
- Yaśodharā (Wife of Gautama Buddha)
- title_series_t:
+ title_series_tsim:
- Śāradā-gaurava-grantha-mālā ; 37
- lc_alpha_facet:
+ lc_alpha_ssim:
- PK
- language_facet:
+ language_ssim:
- Sanskrit
timestamp: '2014-02-03T18:42:53.056Z'
-- lc_1letter_facet:
+- lc_1letter_ssim:
- H - Social Sciences
- author_t:
+ author_tsim:
- Iṣlāḥī, Amīn Aḥsan,
- marc_display: "00729cam
+ marc_ss: "00729cam
a2200229 i 4500 79930185 DLC 20090123080110.0 791203r19781950pk 000 0 urdo Pakistan. Women Pakistan Social
conditions. "
- published_display:
+ published_ssim:
- Lāhaur
- author_display: Iṣlāḥī, Amīn Aḥsan, 1904-1997
- lc_callnum_display:
+ author_tsim: Iṣlāḥī, Amīn Aḥsan, 1904-1997
+ lc_callnum_ssim:
- HQ1745.5 .I83 1978
- title_t:
+ title_tsim:
- Pākistānī ʻaurat dorāhe par /
- pub_date:
+ pub_date_ssim:
- '1978'
- pub_date_sort: 1978
+ pub_date_si: 1978
format: Book
- material_type_display:
+ material_type_ssim:
- 8, 174 p.
- lc_b4cutter_facet:
+ lc_b4cutter_ssim:
- HQ1745.5
- title_display: Pākistānī ʻaurat dorāhe par
- subject_addl_t:
+ title_tsim: Pākistānī ʻaurat dorāhe par
+ subject_addl_ssim:
- Pakistan
- Pakistan Social conditions
- subject_t:
+ subject_tsim:
- Women
- title_sort: pākistānī ʻaurat dorāhe par
+ title_si: pākistānī ʻaurat dorāhe par
id: '79930185'
- author_sort: Iṣlāḥī Amīn Aḥsan 19041997 Pākistānī ʻaurat dorāhe par
- title_addl_t:
+ author_si: Iṣlāḥī Amīn Aḥsan 19041997 Pākistānī ʻaurat dorāhe par
+ title_addl_tsim:
- Pākistānī ʻaurat dorāhe par /
- subject_geo_facet:
+ subject_geo_ssim:
- Pakistan
- subject_topic_facet:
+ subject_ssim:
- Women
- lc_alpha_facet:
+ lc_alpha_ssim:
- HQ
- language_facet:
+ language_ssim:
- Urdu
timestamp: '2014-02-03T18:42:53.056Z'
- geojson:
+ geojson_ssim:
- "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[69.34511599999999,30.375321]},\"properties\":{\"placename\":\"Pakistan\"}}"
- "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Polygon\",\"coordinates\":[[[60.872972, 23.6946945], [77.8334694, 23.6946945], [77.8334694, 37.084107], [60.872972, 37.084107], [60.872972, 23.6946945]]]},\"bbox\":[60.872972, 23.6946945, 77.8334694, 37.084107]}"
- coordinates:
- - 60.872972 23.6946945 77.8334694 37.084107
- - 69.34511599999999 30.375321
-- lc_1letter_facet:
+ coordinates_srpt:
+ - ENVELOPE(60.872972, 77.8334694, 37.084107, 23.6946945)
+ - 30.375321,69.34511599999999
+- lc_1letter_ssim:
- M - Music
- author_t:
+ author_tsim:
- Nārāyaṇapaṇḍita,
- marc_display: "01012cam
+ marc_ss: "01012cam
a22002657a 4500 85910001 DLC 20090121023106.0 heuamb---baca heubmb---baaa Washington, D.C. :Library of Congress
Photoduplication Service, 1985. 1 microfiche ; 11 x 15 cm. "
- published_display:
+ published_ssim:
- Trivandrum
- author_display: Nārāyaṇapaṇḍita, 17th cent
- lc_callnum_display:
+ author_tsim: Nārāyaṇapaṇḍita, 17th cent
+ lc_callnum_ssim:
- Microfiche 90/61328 (P)
- title_t:
+ title_tsim:
- Āśleṣāśataka of Nārāyaṇa Paṇḍita
- pub_date:
+ pub_date_ssim:
- '1946'
- pub_date_sort: 1946
+ pub_date_si: 1946
format: Book
- material_type_display:
+ material_type_ssim:
- xii, 24 p.
- lc_b4cutter_facet:
+ lc_b4cutter_ssim:
- Microfiche 90/61328 (P)
- title_display: Āśleṣāśataka of Nārāyaṇa Paṇḍita
- title_sort: āśleṣāśataka of nārāyaṇa paṇḍita
+ title_tsim: Āśleṣāśataka of Nārāyaṇa Paṇḍita
+ title_si: āśleṣāśataka of nārāyaṇa paṇḍita
id: '85910001'
- author_sort: Nārāyaṇapaṇḍita 17th cent Āśleṣāśataka of Nārāyaṇa Paṇḍita
+ author_si: Nārāyaṇapaṇḍita 17th cent Āśleṣāśataka of Nārāyaṇa Paṇḍita
microform
- title_addl_t:
+ title_addl_tsim:
- Āśleṣāśataka of Nārāyaṇa Paṇḍita
- language_facet:
+ language_ssim:
- Sanskrit
timestamp: '2014-02-03T18:42:53.056Z'
-- subtitle_display: sipurim mafliʼim ha-mevusasim ʻal ʻuvdot hisṭoriyot
- author_vern_display: "פינקל, חיים יעקב"
- subject_addl_t:
+- subtitle_tsim: sipurim mafliʼim ha-mevusasim ʻal ʻuvdot hisṭoriyot
+ author_vern_ssim: "פינקל, חיים יעקב"
+ subject_addl_ssim:
- Anecdotes
- title_display: Shodede-yam Yehudiyim
+ title_tsim: Shodede-yam Yehudiyim
id: '86207417'
- isbn_t:
+ isbn_ssim:
- '9650101373'
- subject_topic_facet:
+ subject_ssim:
- Jewish pirates
- Jewish criminals
- lc_alpha_facet:
+ lc_alpha_ssim:
- G
- subtitle_t:
+ subtitle_tsim:
- sipurim mafliʼim ha-mevusasim ʻal ʻuvdot hisṭoriyot /
- "ספורים מפליאים המבוססים על עובדות היסטוריות /"
- author_t:
+ author_tsim:
- Finkel, Chaim Jacob.
- "פינקל, חיים יעקב"
- lc_1letter_facet:
+ lc_1letter_ssim:
- G - Geography, Anthropology, Recreation
- marc_display: "01258cam
+ marc_ss: "01258cam
a2200301 a 4500 86207417 DLC 20090123161900.0 930810s1984 is a 000 0 heb 260-03/(2/r ירושלים : דביר, c1984. "
- published_display:
+ published_ssim:
- Yerushalayim
- author_display: Finkel, Chaim Jacob
- title_vern_display: "שודדי־ים יהודיים :"
- lc_callnum_display:
+ author_tsim: Finkel, Chaim Jacob
+ title_vern_ssim: "שודדי־ים יהודיים :"
+ lc_callnum_ssim:
- G535 .F54 1984
- title_t:
+ title_tsim:
- 'Shodede-yam Yehudiyim :'
- "שודדי־ים יהודיים :"
- pub_date:
+ pub_date_ssim:
- '1984'
- pub_date_sort: 1984
- published_vern_display:
+ pub_date_si: 1984
+ published_vern_ssim:
- "ירושלים :"
format: Book
- subtitle_vern_display: "ספורים מפליאים המבוססים על עובדות היסטוריות /"
- lc_b4cutter_facet:
+ subtitle_vern_ssim: "ספורים מפליאים המבוססים על עובדות היסטוריות /"
+ lc_b4cutter_ssim:
- G535
- material_type_display:
+ material_type_ssim:
- 283 p.
- subject_t:
+ subject_tsim:
- Jewish pirates
- Jewish criminals
- title_sort: shodede-yam yehudiyim :sipurim mafliʼim ha-mevusasim ʻal ʻuvdot hisṭoriyot
- author_sort: Finkel Chaim Jacob Jewish pirates Hebrew Shodedeyam Yehudiyim sipurim
+ title_si: shodede-yam yehudiyim :sipurim mafliʼim ha-mevusasim ʻal ʻuvdot hisṭoriyot
+ author_si: Finkel Chaim Jacob Jewish pirates Hebrew Shodedeyam Yehudiyim sipurim
mafliʼim hamevusasim ʻal ʻuvdot hisṭoriyot
- title_addl_t:
+ title_addl_tsim:
- 'Shodede-yam Yehudiyim : sipurim mafliʼim ha-mevusasim ʻal ʻuvdot hisṭoriyot
/'
- Jewish pirates. Hebrew
- "שודדי־ים יהודיים : ספורים מפליאים המבוססים על עובדות היסטוריות /"
- title_added_entry_t:
+ title_added_entry_tsim:
- Jewish pirates.
- language_facet:
+ language_ssim:
- Hebrew
timestamp: '2014-02-03T18:42:53.056Z'
-- lc_1letter_facet:
+- lc_1letter_ssim:
- B - Philosophy, Psychology, Religion
- author_t:
+ author_tsim:
- Muvaḥḥid Abṭaḥī, Ḥujjat.
- "موحد ابطحى، خجة"
- marc_display: "01657cam
+ marc_ss: "01657cam
a2200337 a 4500 87931798 DLC 20090121115059.0 060428m19869999ir ah b 000 0 per d 260-05/(3/r اصفهان : حوزۀ علميه، 1365- [1986- ]. "
- published_display:
+ published_ssim:
- Iṣfahān
- title_vern_display: "اشنائى با حوزههاى علميۀ شيعه در طول تاريخ /"
- author_display: Muvaḥḥid Abṭaḥī, Ḥujjat
- lc_callnum_display:
+ title_vern_ssim: "اشنائى با حوزههاى علميۀ شيعه در طول تاريخ /"
+ author_tsim: Muvaḥḥid Abṭaḥī, Ḥujjat
+ lc_callnum_ssim:
- BP44 .M88 1986
- title_t:
+ title_tsim:
- Āshnāʼī bā ḥawzahʹhā-yi ʻilmīyah-ʼi Shīʻah dar ṭūl-i tārīkh /
- "اشنائى با حوزههاى علميۀ شيعه در طول تاريخ /"
- pub_date:
+ pub_date_ssim:
- '1986'
- pub_date_sort: 1986
- published_vern_display:
+ pub_date_si: 1986
+ published_vern_ssim:
- "اصفهان :"
format: Book
- author_vern_display: "موحد ابطحى، خجة"
- material_type_display:
+ author_vern_ssim: "موحد ابطحى، خجة"
+ material_type_ssim:
- v. <1>
- lc_b4cutter_facet:
+ lc_b4cutter_ssim:
- BP44
- title_display: Āshnāʼī bā ḥawzahʹhā-yi ʻilmīyah-ʼi Shīʻah dar ṭūl-i tārīkh
- subject_addl_t:
+ title_tsim: Āshnāʼī bā ḥawzahʹhā-yi ʻilmīyah-ʼi Shīʻah dar ṭūl-i tārīkh
+ subject_addl_ssim:
- Islamic countries
- Education Islamic countries
- subject_t:
+ subject_tsim:
- Religious institutions
- Shiites
- Islamic universities and colleges
- title_sort: āshnāʼī bā ḥawzahʹhā-yi ʻilmīyah-ʼi shīʻah dar ṭūl-i tārīkh
+ title_si: āshnāʼī bā ḥawzahʹhā-yi ʻilmīyah-ʼi shīʻah dar ṭūl-i tārīkh
id: '87931798'
- author_sort: Muvaḥḥid Abṭaḥī Ḥujjat Āshnāʼī bā ḥawzahʹhāyi ʻilmīyahʼi
+ author_si: Muvaḥḥid Abṭaḥī Ḥujjat Āshnāʼī bā ḥawzahʹhāyi ʻilmīyahʼi
Shīʻah dar ṭūli tārīkh
- title_addl_t:
+ title_addl_tsim:
- Āshnāʼī bā ḥawzahʹhā-yi ʻilmīyah-ʼi Shīʻah dar ṭūl-i tārīkh /
- Āshnāyī bā ḥawzahʹhā-yi ʻilmīyah-ʼi Shīʻah dar ṭūl-i tārīkh
- Ḥawzahʹhā-yi ʻilmīyah-ʼi Shīʻah
- "اشنائى با حوزههاى علميۀ شيعه در طول تاريخ /"
- "اشنايى با حوزههاى علميۀ شيعه در طول تاريخ"
- "حوزه هاى علميۀ شيعه"
- subject_geo_facet:
+ subject_geo_ssim:
- Islamic countries
- subject_topic_facet:
+ subject_ssim:
- Religious institutions
- Shiites
- Islamic universities and colleges
- lc_alpha_facet:
+ lc_alpha_ssim:
- BP
- language_facet:
+ language_ssim:
- Persian
timestamp: '2014-02-03T18:42:53.056Z'
-- lc_1letter_facet:
+- lc_1letter_ssim:
- M - Music
- author_t:
+ author_tsim:
- Lomtʻatʻiże, Čola,
- marc_display: "00610cam
+ marc_ss: "00610cam
a22001817a 4500 90142413 DLC 20090126150928.0 900409s1975 gs 000 0 geo 65 p. ; 22 cm. Industrial workers; life style "
- published_display:
+ published_ssim:
- Tʻbilisi
- author_display: Lomtʻatʻiże, Čola, 1879-1915
- lc_callnum_display:
+ author_tsim: Lomtʻatʻiże, Čola, 1879-1915
+ lc_callnum_ssim:
- MLCSN 96/3906 (H)
- title_t:
+ title_tsim:
- 'Mrecvelobis mušakis cʻxovrebis cesi :'
- pub_date:
+ pub_date_ssim:
- '1975'
- pub_date_sort: 1975
- subtitle_display: tʻeoriul-metʻoduri narkvevi
+ pub_date_si: 1975
+ subtitle_tsim: tʻeoriul-metʻoduri narkvevi
format: Book
- material_type_display:
+ material_type_ssim:
- 65 p.
- lc_b4cutter_facet:
+ lc_b4cutter_ssim:
- MLCSN 96/3906 (H)
- title_display: Mrecvelobis mušakis cʻxovrebis cesi
- subject_t:
+ title_tsim: Mrecvelobis mušakis cʻxovrebis cesi
+ subject_tsim:
- Industrial workers; life style
- title_sort: mrecvelobis mušakis cʻxovrebis cesi :tʻeoriul-metʻoduri narkvevi
+ title_si: mrecvelobis mušakis cʻxovrebis cesi :tʻeoriul-metʻoduri narkvevi
id: '90142413'
- author_sort: Lomtʻatʻiże Čola 18791915 Mrecvelobis mušakis cʻxovrebis cesi tʻeoriulmetʻoduri
+ author_si: Lomtʻatʻiże Čola 18791915 Mrecvelobis mušakis cʻxovrebis cesi tʻeoriulmetʻoduri
narkvevi
- title_addl_t:
+ title_addl_tsim:
- 'Mrecvelobis mušakis cʻxovrebis cesi : tʻeoriul-metʻoduri narkvevi /'
- Obraz zhizni rabotnika promyshlennosti
- subject_topic_facet:
+ subject_ssim:
- Industrial workers; life style
- language_facet:
+ language_ssim:
- Georgian
- subtitle_t:
+ subtitle_tsim:
- tʻeoriul-metʻoduri narkvevi /
timestamp: '2014-02-03T18:42:53.056Z'
-- lc_1letter_facet:
+- lc_1letter_ssim:
- K - Law
- author_t:
+ author_tsim:
- Korea (North)
- marc_display: "01106cam
+ marc_ss: "01106cam
a2200325 a 4500 92117465 DLC 20090126171556.0 920805s1990 ko l 000 0 kor 700-04/$1 鄭 慶謨, 1937- 700-05/$1 崔 逹坤. "
- published_display:
+ published_ssim:
- Sŏul Tʻŭkpyŏlsi
- title_vern_display: "北韓 法令集 /"
- author_display: Korea (North)
- lc_callnum_display:
+ title_vern_ssim: "北韓 法令集 /"
+ author_tsim: Korea (North)
+ lc_callnum_ssim:
- KPC13 .K67 1990
- title_t:
+ title_tsim:
- Pukhan pŏmnyŏngjip /
- "北韓 法令集 /"
- pub_date:
+ pub_date_ssim:
- '1990'
- pub_date_sort: 1990
- published_vern_display:
+ pub_date_si: 1990
+ published_vern_ssim:
- "서울 持別市 :"
format: Book
- material_type_display:
+ material_type_ssim:
- 5 v.
- lc_b4cutter_facet:
+ lc_b4cutter_ssim:
- KPC13
- title_display: Pukhan pŏmnyŏngjip
- subject_addl_t:
+ title_tsim: Pukhan pŏmnyŏngjip
+ subject_addl_ssim:
- Korea (North)
- subject_t:
+ subject_tsim:
- Law
- title_sort: pukhan pŏmnyŏngjip
+ title_si: pukhan pŏmnyŏngjip
id: '92117465'
- author_sort: Korea North Laws etc Pukhan pŏmnyŏngjip
- title_addl_t:
+ author_si: Korea North Laws etc Pukhan pŏmnyŏngjip
+ title_addl_tsim:
- Pukhan pŏmnyŏngjip /
- Laws, etc
- "北韓 法令集 /"
- subject_geo_facet:
+ subject_geo_ssim:
- Korea (North)
- subject_topic_facet:
+ subject_ssim:
- Law
- author_addl_t:
+ author_addl_tsim:
- Chŏng, Kyŏng-mo,
- Chʻoe, Tal-gon.
- "鄭 慶謨,"
- "崔 逹坤."
- lc_alpha_facet:
+ lc_alpha_ssim:
- KPC
- language_facet:
+ language_ssim:
- Korean
timestamp: '2014-02-03T18:42:53.056Z'
- geojson: "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[127.766922,35.907757]},\"properties\":{\"placename\":\"Korea (North)\"}}"
- coordinates: 127.766922 35.907757
-- subtitle_display: ṿe-hu perush yafeh u-menupeh ʻal Shulḥan ʻarukh Oraḥ ḥayim
+ geojson_ssim:
+ - "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[127.766922,35.907757]},\"properties\":{\"placename\":\"Korea (North)\"}}"
+ coordinates_srpt: 35.907757,127.766922
+- subtitle_tsim: ṿe-hu perush yafeh u-menupeh ʻal Shulḥan ʻarukh Oraḥ ḥayim
asher ḥiber Yosef Ḳaro ... ʻim ḥidushe dinim she-hishmiṭ ha-gaʼon ... ṿe-himtsiʼam
... Mosheh Iserlish
- author_vern_display: "ישראל מאיר, הכהן"
- subject_addl_t:
+ author_vern_ssim: "ישראל מאיר, הכהן"
+ subject_addl_ssim:
- Customs and practices
- title_display: Sefer Mishnah berurah
+ title_tsim: Sefer Mishnah berurah
id: '92828023'
- subject_topic_facet:
+ subject_ssim:
- Karo, Joseph ben Ephraim, 1488-1575
- Jewish law
- Judaism
- lc_alpha_facet:
+ lc_alpha_ssim:
- BM
- subtitle_t:
+ subtitle_tsim:
- ṿe-hu perush yafeh u-menupeh ʻal Shulḥan ʻarukh Oraḥ ḥayim asher ḥiber Yosef
Ḳaro ... ʻim ḥidushe dinim she-hishmiṭ ha-gaʼon ... ṿe-himtsiʼam ... Mosheh
Iserlish /
- "והוא פירוש יפה ומנפה על שלחן ערוך ארח חיים אשר חבר יוסף קארו ... עם חידושי דינים
שהשמיט הגאון ... והמציאם משה איסרליש /"
- author_t:
+ author_tsim:
- Israel Meir, ha-Kohen,
- "ישראל מאיר, הכהן"
- lc_1letter_facet:
+ lc_1letter_ssim:
- B - Philosophy, Psychology, Religion
- marc_display: "03361cam
+ marc_ss: "03361cam
a2200493 a 4500 92828023 DLC 20090122150744.0 921008m19929999is 000 0 heb 740-09/(2/rספר משנה ברורה המנקד. 740-10/(2/r איש מצליח. "
- published_display:
+ published_ssim:
- Jerusalem?
- author_display: Israel Meir, ha-Kohen, 1838-1933
- title_vern_display: "ספר משנה ברורה :"
- lc_callnum_display:
+ author_tsim: Israel Meir, ha-Kohen, 1838-1933
+ title_vern_ssim: "ספר משנה ברורה :"
+ lc_callnum_ssim:
- BM520.88.A53 I88 1992b
- title_t:
+ title_tsim:
- 'Sefer Mishnah berurah :'
- "ספר משנה ברורה :"
- pub_date:
+ pub_date_ssim:
- '1992'
- pub_date_sort: 1992
- published_vern_display:
+ pub_date_si: 1992
+ published_vern_ssim:
- "[Jerusalem? :"
format: Book
- subtitle_vern_display: "והוא פירוש יפה ומנפה על שלחן ערוך ארח חיים אשר חבר יוסף
+ subtitle_vern_ssim: "והוא פירוש יפה ומנפה על שלחן ערוך ארח חיים אשר חבר יוסף
קארו ... עם חידושי דינים שהשמיט הגאון ... והמציאם משה איסרליש /"
- lc_b4cutter_facet:
+ lc_b4cutter_ssim:
- BM520.88.A53
- material_type_display:
+ material_type_ssim:
- v. <1-5>
- subject_t:
+ subject_tsim:
- Karo, Joseph ben Ephraim, 1488-1575. Oraḥ ḥayim
- Jewish law
- Judaism
- "שלחן ערוך. ארח חיים"
- title_sort: sefer mishnah berurah :ṿe-hu perush yafeh u-menupeh ʻal shulḥan ʻarukh
+ title_si: sefer mishnah berurah :ṿe-hu perush yafeh u-menupeh ʻal shulḥan ʻarukh
oraḥ ḥayim asher ḥiber yosef ḳaro ... ʻim ḥidushe dinim she-hishmiṭ ha-gaʼon
... ṿe-himtsiʼam ... mosheh iserlish
- author_sort: Israel Meir haKohen 18381933 Mishnah berurah Sefer Mishnah berurah
+ author_si: Israel Meir haKohen 18381933 Mishnah berurah Sefer Mishnah berurah
ṿehu perush yafeh umenupeh ʻal Shulḥan ʻarukh Oraḥ ḥayim asher ḥiber Yosef
Ḳaro ʻim ḥidushe dinim shehishmiṭ hagaʼon ṿehimtsiʼam Mosheh Iserlish
- title_addl_t:
+ title_addl_tsim:
- 'Sefer Mishnah berurah : ṿe-hu perush yafeh u-menupeh ʻal Shulḥan ʻarukh Oraḥ
ḥayim asher ḥiber Yosef Ḳaro ... ʻim ḥidushe dinim she-hishmiṭ ha-gaʼon ...
ṿe-himtsiʼam ... Mosheh Iserlish /'
@@ -1255,12 +1254,12 @@
- "ספר משנה ברורה : והוא פירוש יפה ומנפה על שלחן ערוך ארח חיים אשר חבר יוסף קארו
... עם חידושי דינים שהשמיט הגאון ... והמציאם משה איסרליש /"
- "משנה ברורה"
- author_addl_t:
+ author_addl_tsim:
- Isserles, Moses ben Israel,
- Karo, Joseph ben Ephraim,
- "איסרליש, משה"
- "קארו, יוסף."
- title_added_entry_t:
+ title_added_entry_tsim:
- Oraḥ ḥayim
- Mishnah berurah.
- Sefer Mishnah berurah ha-menuḳad.
@@ -1269,32 +1268,32 @@
- "משנה ברורה"
- "ספר משנה ברורה המנקד"
- "איש מצליח"
- language_facet:
+ language_ssim:
- Hebrew
timestamp: '2014-02-03T18:42:53.056Z'
-- subtitle_display: 'kangnam yŏin kwa sin pʻalbulchʻul : Kim Hong-sin setʻae rŭpʻo'
- author_vern_display: "김 홍신, 1947-"
- subject_addl_t:
+- subtitle_tsim: 'kangnam yŏin kwa sin pʻalbulchʻul : Kim Hong-sin setʻae rŭpʻo'
+ author_vern_ssim: "김 홍신, 1947-"
+ subject_addl_ssim:
- Korea (South) Social conditions
- Social conditions
- title_display: Ajikto kŭrŏk chŏrŏk sasimnikka
+ title_tsim: Ajikto kŭrŏk chŏrŏk sasimnikka
id: '94120425'
- subject_geo_facet:
+ subject_geo_ssim:
- Seoul (Korea)
- Korea (South)
- subject_topic_facet:
+ subject_ssim:
- Women
- lc_alpha_facet:
+ lc_alpha_ssim:
- HQ
- subtitle_t:
+ subtitle_tsim:
- 'kangnam yŏin kwa sin pʻalbulchʻul : Kim Hong-sin setʻae rŭpʻo.'
- "강남 여인 과 신 팔불출 : 金 洪信 세태 르포"
- author_t:
+ author_tsim:
- Kim, Hong-sin,
- "김 홍신"
- lc_1letter_facet:
+ lc_1letter_ssim:
- H - Social Sciences
- marc_display: "01149cam
+ marc_ss: "01149cam
a2200301 a 4500 94120425 DLC 20090123075708.0 940328s1990 ko 000 0 kor d 260-04/$1 서울 : 女苑 出版局, 1990 (1992 printing) "
- published_display:
+ published_ssim:
- Sŏul
- author_display: Kim, Hong-sin, 1947-
- title_vern_display: "아직도 그럭 저럭 사십니까"
- lc_callnum_display:
+ author_tsim: Kim, Hong-sin, 1947-
+ title_vern_ssim: "아직도 그럭 저럭 사십니까"
+ lc_callnum_ssim:
- HQ1765.5 .K46 1990
- title_t:
+ title_tsim:
- 'Ajikto kŭrŏk chŏrŏk sasimnikka :'
- "아직도 그럭 저럭 사십니까"
- pub_date:
+ pub_date_ssim:
- '1990'
- pub_date_sort: 1990
- published_vern_display:
+ pub_date_si: 1990
+ published_vern_ssim:
- "서울"
format: Book
- subtitle_vern_display: "강남 여인 과 신 팔불출 : 金 洪信 세태 르포"
- lc_b4cutter_facet:
+ subtitle_vern_ssim: "강남 여인 과 신 팔불출 : 金 洪信 세태 르포"
+ lc_b4cutter_ssim:
- HQ1765.5
- material_type_display:
+ material_type_ssim:
- 289 p.
- subject_t:
+ subject_tsim:
- Women
- Seoul (Korea)
- title_sort: 'ajikto kŭrŏk chŏrŏk sasimnikka :kangnam yŏin kwa sin pʻalbulchʻul
+ title_si: 'ajikto kŭrŏk chŏrŏk sasimnikka :kangnam yŏin kwa sin pʻalbulchʻul
: kim hong-sin setʻae rŭpʻo'
- author_sort: Kim Hongsin 1947 Ajikto kŭrŏk chŏrŏk sasimnikka kangnam yŏin kwa
+ author_si: Kim Hongsin 1947 Ajikto kŭrŏk chŏrŏk sasimnikka kangnam yŏin kwa
sin pʻalbulchʻul Kim Hongsin setʻae rŭpʻo
- title_addl_t:
+ title_addl_tsim:
- 'Ajikto kŭrŏk chŏrŏk sasimnikka : kangnam yŏin kwa sin pʻalbulchʻul : Kim
Hong-sin setʻae rŭpʻo.'
- "아직도 그럭 저럭 사십니까 : 강남 여인 과 신 팔불출 : 金 洪信 세태 르포"
- language_facet:
+ language_ssim:
- Korean
timestamp: '2014-02-03T18:42:53.056Z'
- geojson:
+ geojson_ssim:
- "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[126.9779692,37.566535]},\"properties\":{\"placename\":\"Seoul (Korea)\"}}"
- "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[127.766922,35.907757]},\"properties\":{\"placename\":\"Korea (South)\"}}"
- coordinates:
- - 126.9779692 37.566535
- - 127.766922 35.907757
-- subtitle_display: dar khiradvarzī-i siyāsī va huvīyat-i mā Īrānīyān
- author_vern_display: "رجايى، فرهنگ ."
- subject_addl_t:
+ coordinates_srpt:
+ - 37.566535,126.9779692
+ - 35.907757,127.766922
+- subtitle_tsim: dar khiradvarzī-i siyāsī va huvīyat-i mā Īrānīyān
+ author_vern_ssim: "رجايى، فرهنگ ."
+ subject_addl_ssim:
- Iran
- Ethnic identity
- Politics and government
- Civilization
- title_display: Maʻrakah-ʼi jahānʹbīnīʹhā
+ title_tsim: Maʻrakah-ʼi jahānʹbīnīʹhā
id: '96933325'
- subject_geo_facet:
+ subject_geo_ssim:
- Iran
- subject_topic_facet:
+ subject_ssim:
- Political science
- Iranians
- lc_alpha_facet:
+ lc_alpha_ssim:
- DS
- title_series_t:
+ title_series_tsim:
- Sipihr-i farhang va jāmiʻah ; 1
- "سپهر فرهنگ و جامعه ؛ 1"
- subtitle_t:
+ subtitle_tsim:
- dar khiradvarzī-i siyāsī va huvīyat-i mā Īrānīyān /
- "در خردورزى سياسى و هويت ما ايرانيان /"
- author_t:
+ author_tsim:
- Rajāyī, Farhang,
- "رجايى، فرهنگ ."
- lc_1letter_facet:
+ lc_1letter_ssim:
- D - World History
- marc_display: "01484cam
+ marc_ss: "01484cam
a2200349 a 4500 96933325 DLC 20090121112252.0 040115s1994 ir b 001 0 per احياء كتاب،1373 [1994 or 1995]. 440-05/(3/r سپهر فرهنگ و جامعه ؛ 1 "
- published_display:
+ published_ssim:
- Tihrān
- author_display: Rajāyī, Farhang, 1952 or 3-
- title_vern_display: "معركۀ جهانبينىها :"
- lc_callnum_display:
+ author_tsim: Rajāyī, Farhang, 1952 or 3-
+ title_vern_ssim: "معركۀ جهانبينىها :"
+ lc_callnum_ssim:
- DS274 .R327 1994
- title_t:
+ title_tsim:
- 'Maʻrakah-ʼi jahānʹbīnīʹhā :'
- "معركۀ جهانبينىها :"
- pub_date:
+ pub_date_ssim:
- '1994'
- pub_date_sort: 1994
- published_vern_display:
+ pub_date_si: 1994
+ published_vern_ssim:
- "تهران :"
format: Book
- subtitle_vern_display: "در خردورزى سياسى و هويت ما ايرانيان /"
- material_type_display:
+ subtitle_vern_ssim: "در خردورزى سياسى و هويت ما ايرانيان /"
+ material_type_ssim:
- 323 p.
- lc_b4cutter_facet:
+ lc_b4cutter_ssim:
- DS274
- subject_t:
+ subject_tsim:
- Political science
- Iranians
- Iran
- title_sort: maʻrakah-ʼi jahānʹbīnīʹhā :dar khiradvarzī-i siyāsī va huvīyat-i
+ title_si: maʻrakah-ʼi jahānʹbīnīʹhā :dar khiradvarzī-i siyāsī va huvīyat-i
mā īrānīyān
- author_sort: Rajāyī Farhang 1952 or 3 Maʻrakahʼi jahānʹbīnīʹhā dar khiradvarzīi
+ author_si: Rajāyī Farhang 1952 or 3 Maʻrakahʼi jahānʹbīnīʹhā dar khiradvarzīi
siyāsī va huvīyati mā Īrānīyān
- title_addl_t:
+ title_addl_tsim:
- 'Maʻrakah-ʼi jahānʹbīnīʹhā : dar khiradvarzī-i siyāsī va huvīyat-i mā
Īrānīyān /'
- "معركۀ جهانبينىها : در خردورزى سياسى و هويت ما ايرانيان /"
- language_facet:
+ language_ssim:
- Persian
timestamp: '2014-02-03T18:42:53.056Z'
- geojson: "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[53.688046,32.427908]},\"properties\":{\"placename\":\"Iran\"}}"
- coordinates:
- - 53.688046 32.427908
- - 44.0318907 25.0594286 63.3333366 39.7816755
-- lc_1letter_facet:
+ geojson_ssim:
+ - "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[53.688046,32.427908]},\"properties\":{\"placename\":\"Iran\"}}"
+ coordinates_srpt:
+ - 32.427908,53.688046
+ - ENVELOPE(44.0318907, 63.3333366, 39.7816755, 25.0594286)
+- lc_1letter_ssim:
- P - Language & Literature
- author_t:
+ author_tsim:
- Nārāyaṇa Paṇḍitācārya,
- marc_display: "01588cam
+ marc_ss: "01588cam
a2200313 a 4500 2001417245 DLC 20090121030347.0 011001m20009999ii 001 0 sano Mandopakāriṇī.2000. Shyamachar, A. B. Pandurangi, S. R. "
- published_display:
+ published_ssim:
- Bangalore
- author_display: Nārāyaṇa Paṇḍitācārya, 13th cent
- lc_callnum_display:
+ author_tsim: Nārāyaṇa Paṇḍitācārya, 13th cent
+ lc_callnum_ssim:
- PK3798.N313 S87 2000
- title_t:
+ title_tsim:
- Sumadhvavijayaḥ /
- pub_date:
+ pub_date_ssim:
- '2000'
- pub_date_sort: 2000
+ pub_date_si: 2000
format: Book
- material_type_display:
+ material_type_ssim:
- v. <1 >
- lc_b4cutter_facet:
+ lc_b4cutter_ssim:
- PK3798.N313
- title_display: Sumadhvavijayaḥ
- subject_addl_t:
+ title_tsim: Sumadhvavijayaḥ
+ subject_addl_ssim:
- Poetry
- subject_t:
+ subject_tsim:
- Madhva, 13th cent
- title_sort: sumadhvavijayaḥ
+ title_si: sumadhvavijayaḥ
id: '2001417245'
- author_sort: Nārāyaṇa Paṇḍitācārya 13th cent Sumadhvavijayaḥ
- title_addl_t:
+ author_si: Nārāyaṇa Paṇḍitācārya 13th cent Sumadhvavijayaḥ
+ title_addl_tsim:
- Sumadhvavijayaḥ /
- subject_topic_facet:
+ subject_ssim:
- Madhva, 13th cent
- author_addl_t:
+ author_addl_tsim:
- Nārāyaṇa Paṇḍitācārya,
- Viśvapatitīrtha,
- Chalāriśeṣācārya.
- Shyamachar, A. B.
- Pandurangi, S. R.
- title_added_entry_t:
+ title_added_entry_tsim:
- Bhāvaprakāśikā
- Padārthadīpikodbodhikā
- Mandopakāriṇī
- lc_alpha_facet:
+ lc_alpha_ssim:
- PK
- language_facet:
+ language_ssim:
- Sanskrit
timestamp: '2014-02-03T18:42:53.056Z'
-- lc_1letter_facet:
+- lc_1letter_ssim:
- U - Military Science
- author_t:
+ author_tsim:
- Wuld Mawlāy al-Zayn, Sayyid Muḥammad wuld Sayyid.
- "ولد مولاي الزين، سيد محمد ولد سيد"
- marc_display: "01197cam
+ marc_ss: "01197cam
a22003014a 4500 2003546302 DLC 20090123173626.0 030922s2003 mu 000 0 ara 260-03/(3/r نواكشوط
: [s.n.]، 2003. "
- published_display:
+ published_ssim:
- Nuwākshūṭ
- title_vern_display: "الحرب في الألفية الثالثة"
- author_display: Wuld Mawlāy al-Zayn, Sayyid Muḥammad wuld Sayyid
- lc_callnum_display:
+ title_vern_ssim: "الحرب في الألفية الثالثة"
+ author_tsim: Wuld Mawlāy al-Zayn, Sayyid Muḥammad wuld Sayyid
+ lc_callnum_ssim:
- U21.2 .W85 2003
- title_t:
+ title_tsim:
- al-Ḥarb fī al-alfīyah al-thālithah /
- "الحرب في الألفية الثالثة"
- pub_date:
+ pub_date_ssim:
- '2003'
- pub_date_sort: 2003
- published_vern_display:
+ pub_date_si: 2003
+ published_vern_ssim:
- "نواكشوط"
format: Book
- author_vern_display: "ولد مولاي الزين، سيد محمد ولد سيد"
- material_type_display:
+ author_vern_ssim: "ولد مولاي الزين، سيد محمد ولد سيد"
+ material_type_ssim:
- 128 p.
- lc_b4cutter_facet:
+ lc_b4cutter_ssim:
- U21.2
- title_display: al-Ḥarb fī al-alfīyah al-thālithah
- subject_addl_t:
+ title_tsim: al-Ḥarb fī al-alfīyah al-thālithah
+ subject_addl_ssim:
- History 21st century
- Forecasting
- subject_t:
+ subject_tsim:
- War
- Military art and science
- Warfare, Conventional
- Military weapons
- subject_era_facet:
+ subject_era_ssim:
- 21st century
- title_sort: ḥarb fī al-alfīyah al-thālithah
+ title_si: ḥarb fī al-alfīyah al-thālithah
id: '2003546302'
- author_sort: Wuld Mawlāy alZayn Sayyid Muḥammad wuld Sayyid Ḥarb fī alalfīyah
+ author_si: Wuld Mawlāy alZayn Sayyid Muḥammad wuld Sayyid Ḥarb fī alalfīyah
althālithah
- title_addl_t:
+ title_addl_tsim:
- al-Ḥarb fī al-alfīyah al-thālithah /
- "الحرب في الألفية الثالثة"
- subject_topic_facet:
+ subject_ssim:
- War
- Military art and science
- Warfare, Conventional
- Military weapons
- lc_alpha_facet:
+ lc_alpha_ssim:
- U
- language_facet:
+ language_ssim:
- Arabic
timestamp: '2014-02-03T18:42:53.056Z'
-- lc_1letter_facet:
+- lc_1letter_ssim:
- D - World History
- author_t:
+ author_tsim:
- Bstan-ʼdzin-mkhas-grub,
- marc_display: "00875cam
+ marc_ss: "00875cam
a22002534a 4500 2004310986 DLC 20090123105515.0 040812s2004 cc a 000 0 tibo Bon-brgya (China) History. Bon-brgya (China) Kings and rulers. "
- published_display:
+ published_ssim:
- Lha-sa
- author_display: Bstan-ʼdzin-mkhas-grub, 1967-
- lc_callnum_display:
+ author_tsim: Bstan-ʼdzin-mkhas-grub, 1967-
+ lc_callnum_ssim:
- DS797.82.B663 B75 2004
- title_t:
+ title_tsim:
- Bon-brgyaʼi lo rgyus lugs gñis gsal baʼi me loṅ źes bya ba bźugs so /
- pub_date:
+ pub_date_ssim:
- '2004'
- pub_date_sort: 2004
+ pub_date_si: 2004
format: Book
- material_type_display:
+ material_type_ssim:
- 149 p.
- lc_b4cutter_facet:
+ lc_b4cutter_ssim:
- DS797.82.B663
- title_display: Bon-brgyaʼi lo rgyus lugs gñis gsal baʼi me loṅ źes bya ba bźugs
+ title_tsim: Bon-brgyaʼi lo rgyus lugs gñis gsal baʼi me loṅ źes bya ba bźugs
so
- subject_addl_t:
+ subject_addl_ssim:
- History
- Kings and rulers
- subject_t:
+ subject_tsim:
- Bon-brgya (China)
- title_sort: bon-brgyaʼi lo rgyus lugs gñis gsal baʼi me loṅ źes bya ba bźugs
+ title_si: bon-brgyaʼi lo rgyus lugs gñis gsal baʼi me loṅ źes bya ba bźugs
so
id: '2004310986'
- author_sort: Bstanʼdzinmkhasgrub 1967 Bonbrgyaʼi lo rgyus lugs gñis gsal baʼi me
+ author_si: Bstanʼdzinmkhasgrub 1967 Bonbrgyaʼi lo rgyus lugs gñis gsal baʼi me
loṅ źes bya ba bźugs so
- title_addl_t:
+ title_addl_tsim:
- Bon-brgyaʼi lo rgyus lugs gñis gsal baʼi me loṅ źes bya ba bźugs so /
- subject_geo_facet:
+ subject_geo_ssim:
- Bon-brgya (China)
- lc_alpha_facet:
+ lc_alpha_ssim:
- DS
- language_facet:
+ language_ssim:
- Tibetan
timestamp: '2014-02-03T18:42:53.056Z'
-- subtitle_display: min jald al-dhāt ilá ṣidq al-sharḥ
- author_vern_display: "أبو الخير، علي عبد الحميد"
- subject_addl_t:
+- subtitle_tsim: min jald al-dhāt ilá ṣidq al-sharḥ
+ author_vern_ssim: "أبو الخير، علي عبد الحميد"
+ subject_addl_ssim:
- 20th century
- 21st century
- title_display: Thuqūb fī ʻaql al-ummah
- subject_era_facet:
+ title_tsim: Thuqūb fī ʻaql al-ummah
+ subject_era_ssim:
- 20th century
- 21st century
id: '2005461726'
- subject_topic_facet:
+ subject_ssim:
- Islam
- lc_alpha_facet:
+ lc_alpha_ssim:
- BP
- subtitle_t:
+ subtitle_tsim:
- min jald al-dhāt ilá ṣidq al-sharḥ.
- "من جلد الذات إلى صدق الشرح"
- author_t:
+ author_tsim:
- Abū al-Khayr, ʻAlī ʻAbd al-Ḥamīd.
- "أبو الخير، علي عبد الحميد"
- lc_1letter_facet:
+ lc_1letter_ssim:
- B - Philosophy, Psychology, Religion
- marc_display: "01127nam
+ marc_ss: "01127nam
a2200277 a 4500 2005461726 DLC 20090126155550.0 070712s2006 ua 000 0 ara d 260-04/(3/r المعادي، القاهرة
: مركز يافا للدراسات والأبحاث، 2006. "
- published_display:
+ published_ssim:
- al-Maʻādī, al-Qāhirah
- author_display: Abū al-Khayr, ʻAlī ʻAbd al-Ḥamīd
- title_vern_display: "ثقوب في عقل الأمة"
- lc_callnum_display:
+ author_tsim: Abū al-Khayr, ʻAlī ʻAbd al-Ḥamīd
+ title_vern_ssim: "ثقوب في عقل الأمة"
+ lc_callnum_ssim:
- BP161.3 .A27 2006
- title_t:
+ title_tsim:
- 'Thuqūb fī ʻaql al-ummah :'
- "ثقوب في عقل الأمة"
- pub_date:
+ pub_date_ssim:
- '2006'
- pub_date_sort: 2006
- published_vern_display:
+ pub_date_si: 2006
+ published_vern_ssim:
- "المعادي، القاهرة"
format: Book
- subtitle_vern_display: "من جلد الذات إلى صدق الشرح"
- lc_b4cutter_facet:
+ subtitle_vern_ssim: "من جلد الذات إلى صدق الشرح"
+ lc_b4cutter_ssim:
- BP161.3
- material_type_display:
+ material_type_ssim:
- 85 p.
- subject_t:
+ subject_tsim:
- Islam
- title_sort: thuqūb fī ʻaql al-ummah :min jald al-dhāt ilá ṣidq al-sharḥ
- author_sort: Abū alKhayr ʻAlī ʻAbd alḤamīd Thuqūb fī ʻaql alummah min jald
+ title_si: thuqūb fī ʻaql al-ummah :min jald al-dhāt ilá ṣidq al-sharḥ
+ author_si: Abū alKhayr ʻAlī ʻAbd alḤamīd Thuqūb fī ʻaql alummah min jald
aldhāt ilá ṣidq alsharḥ
- title_addl_t:
+ title_addl_tsim:
- 'Thuqūb fī ʻaql al-ummah : min jald al-dhāt ilá ṣidq al-sharḥ.'
- "ثقوب في عقل الأمة : من جلد الذات إلى صدق الشرح"
- language_facet:
+ language_ssim:
- Arabic
timestamp: '2014-02-03T18:42:53.056Z'
-- lc_1letter_facet:
+- lc_1letter_ssim:
- H - Social Sciences
- marc_display: "03730cam
+ marc_ss: "03730cam
a22006257a 4500 2005553155 DLC 20090121104139.0 051007m19659999is | l 000 0 heb 740-14/(2/r מומחים
בינלאומיים על מדוכת הביטחון הסוציאלי. "
- published_display:
+ published_ssim:
- Israel
- title_vern_display: "ביטוח וביטחון סוציאלי"
- lc_callnum_display:
+ title_vern_ssim: "ביטוח וביטחון סוציאלי"
+ lc_callnum_ssim:
- HG8695.2 .B57 1962
- title_t:
+ title_tsim:
- "[Bituaḥ u-viṭaḥon sotsyali]."
- "ביטוח וביטחון סוציאלי"
- pub_date:
+ pub_date_ssim:
- '1962'
- pub_date_sort: 1962
+ pub_date_si: 1962
format: Book
- material_type_display:
+ material_type_ssim:
- items 1-<13> of <13>
- lc_b4cutter_facet:
+ lc_b4cutter_ssim:
- HG8695.2
- title_display: Bituaḥ u-viṭaḥon sotsyali
- subject_addl_t:
+ title_tsim: Bituaḥ u-viṭaḥon sotsyali
+ subject_addl_ssim:
- Israel
- Economic aspects
- Law and legislation Israel
- Social policy
- Armed Forces Reserves Pay, allowances, etc. Law and legislation
- subject_t:
+ subject_tsim:
- Insurance
- Social security
- Family allowances
@@ -1943,22 +1943,22 @@
- Accident insurance
- Old age
- Israel
- title_sort: bituaḥ u-viṭaḥon sotsyali
+ title_si: bituaḥ u-viṭaḥon sotsyali
id: '2005553155'
- author_sort: "\U0010FFFF Bituaḥ uviṭaḥon sotsyali"
- title_addl_t:
+ author_si: "\U0010FFFF Bituaḥ uviṭaḥon sotsyali"
+ title_addl_tsim:
- "[Bituaḥ u-viṭaḥon sotsyali]."
- "ביטוח וביטחון סוציאלי"
- subject_geo_facet:
+ subject_geo_ssim:
- Israel
- subject_topic_facet:
+ subject_ssim:
- Insurance
- Social security
- Family allowances
- Maternity insurance
- Accident insurance
- Old age
- title_added_entry_t:
+ title_added_entry_tsim:
- Megamot be-mesheḳ ha-biṭuaḥ ṿeha-piḳuaḥ ʻal ʻisḳe biṭuaḥ bi-shenat 1965.
- Biṭuaḥ ziḳnah.
- Biṭuaḥ sheʼirim.
@@ -1985,22 +1985,22 @@
- "שירות מילואים"
- "קצבה לשירותים מיוחדים לנכים קשים"
- "מומחים בינלאומיים על מדוכת הביטחון הסוציאלי"
- lc_alpha_facet:
+ lc_alpha_ssim:
- HG
- language_facet:
+ language_ssim:
- Hebrew
timestamp: '2014-02-03T18:42:53.056Z'
- geojson:
+ geojson_ssim:
- "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[34.851612, 31.046051]},\"properties\":{\"placename\":\"Israel\"}}"
- "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Polygon\",\"coordinates\":[[[34.267387, 29.47969999999999], [35.896244, 29.47969999999999], [35.896244, 33.33280500000001], [34.267387, 33.33280500000001], [34.267387, 29.47969999999999]]]},\"bbox\":[34.267387, 29.47969999999999, 35.896244, 33.33280500000001]}"
- coordinates:
- - 34.267387 29.47969999999999 35.896244 33.33280500000001
- - 34.851612 31.046051
-- lc_1letter_facet:
+ coordinates_srpt:
+ - ENVELOPE(34.267387, 35.896244, 33.33280500000001, 29.47969999999999)
+ - 31.046051,34.851612
+- lc_1letter_ssim:
- E - History of the Americas (General)
- author_t:
+ author_tsim:
- Hearth, Amy Hill,
- marc_display: "01490cam
+ marc_ss: "01490cam
a2200361 a 4500 2007020969 DLC 20090126093447.0 070522s2008 nyua b 000 0beng http://www.loc.gov/catdir/enhancements/fy0808/2007020969-d.html Sample text http://www.loc.gov/catdir/enhancements/fy0808/2007020969-s.html "
- published_display:
+ published_ssim:
- New York
- author_display: Hearth, Amy Hill, 1958-
- lc_callnum_display:
+ author_tsim: Hearth, Amy Hill, 1958-
+ lc_callnum_ssim:
- E99.D2 H437 2008
- title_t:
+ title_tsim:
- "\"Strong Medicine speaks\" :"
- pub_date:
+ pub_date_ssim:
- '2008'
- pub_date_sort: 2008
- subtitle_display: 'a Native American elder has her say : an oral history'
+ pub_date_si: 2008
+ subtitle_tsim: 'a Native American elder has her say : an oral history'
format: Book
- url_suppl_display:
+ url_suppl_ssim:
- http://www.loc.gov/catdir/toc/ecip0719/2007020969.html
- http://www.loc.gov/catdir/enhancements/fy0808/2007020969-d.html
- http://www.loc.gov/catdir/enhancements/fy0808/2007020969-s.html
- material_type_display:
+ material_type_ssim:
- xvii, 267 p.
- lc_b4cutter_facet:
+ lc_b4cutter_ssim:
- E99.D2
- title_display: "\"Strong Medicine speaks\""
- subject_addl_t:
+ title_tsim: "\"Strong Medicine speaks\""
+ subject_addl_ssim:
- New Jersey Bridgeton Biography
- New Jersey Bridgeton History
- subject_t:
+ subject_tsim:
- Strong Medicine, 1922-
- Delaware women
- Indian women shamans
- Delaware Indians
- title_sort: "\"strong medicine speaks\" :a native american elder has her say : an
+ title_si: "\"strong medicine speaks\" :a native american elder has her say : an
oral history"
- isbn_t:
+ isbn_ssim:
- '9780743297790'
- 0743297792
id: '2007020969'
- author_sort: Hearth Amy Hill 1958 Strong Medicine speaks a Native American elder
+ author_si: Hearth Amy Hill 1958 Strong Medicine speaks a Native American elder
has her say an oral history
- title_addl_t:
+ title_addl_tsim:
- "\"Strong Medicine speaks\" : a Native American elder has her say : an oral history
/"
- subject_geo_facet:
+ subject_geo_ssim:
- New Jersey
- Bridgeton
- subject_topic_facet:
+ subject_ssim:
- Strong Medicine, 1922-
- Delaware women
- Indian women shamans
- Delaware Indians
- author_addl_t:
+ author_addl_tsim:
- Strong Medicine,
- lc_alpha_facet:
+ lc_alpha_ssim:
- E
- language_facet:
+ language_ssim:
- English
- subtitle_t:
+ subtitle_tsim:
- 'a Native American elder has her say : an oral history /'
timestamp: '2014-02-03T18:42:53.056Z'
- geojson:
+ geojson_ssim:
- "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[74.4056612,40.0583238]},\"properties\":{\"placename\":\"New Jersey\"}}"
- "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[75.2340768,39.427337]},\"properties\":{\"placename\":\"Bridgeton\"}}"
- coordinates:
- - 74.4056612 40.0583238
- - 75.2340768 39.427337
-- lc_1letter_facet:
+ coordinates_srpt:
+ - 40.0583238,74.4056612
+ - 39.427337,75.2340768
+- lc_1letter_ssim:
- B - Philosophy, Psychology, Religion
- author_t:
+ author_tsim:
- Dkon-mchog-rgya-mtsho, Ra-se,
- marc_display: "01099cam
+ marc_ss: "01099cam
a22002534a 4500 2008305903 DLC 20090122162012.0 080602s2008 ii a 000 0 tibo ʼBri-guṅ-pa (Sect) Doctrines Miscellanea. Sroṅ-btsan dpe mdzod khaṅ. "
- published_display:
+ published_ssim:
- "ʼPhags-yul Dhe-ra-dhun"
- author_display: Dkon-mchog-rgya-mtsho, Ra-se, 1968-
- lc_callnum_display:
+ author_tsim: Dkon-mchog-rgya-mtsho, Ra-se, 1968-
+ lc_callnum_ssim:
- BQ7684.4 .D564 2008
- title_t:
+ title_tsim:
- 'Dris lan don gcig ma :'
- pub_date:
+ pub_date_ssim:
- '2008'
- pub_date_sort: 2008
- subtitle_display: dam paʼi chos dgoṅs pa gcig paʼi dri ba legs bśad bsu baʼi pho
+ pub_date_si: 2008
+ subtitle_tsim: dam paʼi chos dgoṅs pa gcig paʼi dri ba legs bśad bsu baʼi pho
ñaʼi dris lan Dgoṅs-gcig smra baʼi mdzes rgyan źes bya ba bźugs so
format: Book
- material_type_display:
+ material_type_ssim:
- 208 p.
- lc_b4cutter_facet:
+ lc_b4cutter_ssim:
- BQ7684.4
- title_display: Dris lan don gcig ma
- subject_addl_t:
+ title_tsim: Dris lan don gcig ma
+ subject_addl_ssim:
- Doctrines Miscellanea
- subject_t:
+ subject_tsim:
- "ʼBri-guṅ-pa (Sect)"
- title_sort: dris lan don gcig ma :dam paʼi chos dgoṅs pa gcig paʼi dri ba legs
+ title_si: dris lan don gcig ma :dam paʼi chos dgoṅs pa gcig paʼi dri ba legs
bśad bsu baʼi pho ñaʼi dris lan dgoṅs-gcig smra baʼi mdzes rgyan źes bya ba
bźugs so
id: '2008305903'
- author_sort: Dkonmchogrgyamtsho Rase 1968 Dris lan don gcig ma dam paʼi chos dgoṅs
+ author_si: Dkonmchogrgyamtsho Rase 1968 Dris lan don gcig ma dam paʼi chos dgoṅs
pa gcig paʼi dri ba legs bśad bsu baʼi pho ñaʼi dris lan Dgoṅsgcig smra baʼi
mdzes rgyan źes bya ba bźugs so
- title_addl_t:
+ title_addl_tsim:
- 'Dris lan don gcig ma : dam paʼi chos dgoṅs pa gcig paʼi dri ba legs bśad bsu
baʼi pho ñaʼi dris lan Dgoṅs-gcig smra baʼi mdzes rgyan źes bya ba bźugs so
/'
- subject_topic_facet:
+ subject_ssim:
- "ʼBri-guṅ-pa (Sect)"
- author_addl_t:
+ author_addl_tsim:
- Sroṅ-btsan dpe mdzod khaṅ.
- lc_alpha_facet:
+ lc_alpha_ssim:
- BQ
- language_facet:
+ language_ssim:
- Tibetan
- subtitle_t:
+ subtitle_tsim:
- dam paʼi chos dgoṅs pa gcig paʼi dri ba legs bśad bsu baʼi pho ñaʼi dris lan
Dgoṅs-gcig smra baʼi mdzes rgyan źes bya ba bźugs so /
timestamp: '2014-02-03T18:42:53.056Z'
-- subtitle_display: a supplication to the noble Lama Mahaguru Padmasambhava
- subject_addl_t:
+- subtitle_tsim: a supplication to the noble Lama Mahaguru Padmasambhava
+ subject_addl_ssim:
- Prayers and devotions
- India Prayers and devotions
- title_display: Pluvial nectar of blessings
+ title_tsim: Pluvial nectar of blessings
id: '2008308175'
- isbn_t:
+ isbn_ssim:
- '8186470336'
- subject_geo_facet:
+ subject_geo_ssim:
- India
- subject_topic_facet:
+ subject_ssim:
- Padma Sambhava, ca. 717-ca. 762
- Priests, Buddhist
- lc_alpha_facet:
+ lc_alpha_ssim:
- BQ
- subtitle_t:
+ subtitle_tsim:
- a supplication to the noble Lama Mahaguru Padmasambhava /
- author_t:
+ author_tsim:
- Ṅag-dbaṅ-blo-bzaṅ-rgya-mtsho, Dalai Lama V,
- lc_1letter_facet:
+ lc_1letter_ssim:
- B - Philosophy, Psychology, Religion
- marc_display: "01582cam
+ marc_ss: "01582cam
a2200325 a 4500 2008308175 DLC 20090123091532.0 080718s2002 ii b 000 0 eng 2002 Library of Tibetan Works
& Archives. "
- published_display:
+ published_ssim:
- Dharamsala
- author_display: Ṅag-dbaṅ-blo-bzaṅ-rgya-mtsho, Dalai Lama V, 1617-1682
- lc_callnum_display:
+ author_tsim: Ṅag-dbaṅ-blo-bzaṅ-rgya-mtsho, Dalai Lama V, 1617-1682
+ lc_callnum_ssim:
- BQ5593.P3 N3313 2002
- title_t:
+ title_tsim:
- 'Pluvial nectar of blessings :'
- pub_date:
+ pub_date_ssim:
- '2002'
- pub_date_sort: 2002
+ pub_date_si: 2002
format: Book
- lc_b4cutter_facet:
+ lc_b4cutter_ssim:
- BQ5593.P3
- material_type_display:
+ material_type_ssim:
- viii, 101 p.
- subject_t:
+ subject_tsim:
- Padma Sambhava, ca. 717-ca. 762
- Priests, Buddhist
- title_sort: pluvial nectar of blessings :a supplication to the noble lama mahaguru
+ title_si: pluvial nectar of blessings :a supplication to the noble lama mahaguru
padmasambhava
- author_sort: Ṅagdbaṅblobzaṅrgyamtsho Dalai Lama V 16171682 Rje btsun bla ma ma
+ author_si: Ṅagdbaṅblobzaṅrgyamtsho Dalai Lama V 16171682 Rje btsun bla ma ma
hā gu ru Padmaʼbyuṅgnas la gsol ba ʼdebs pa byin rlabs bdud rtsiʼi char rgyun
English Tibetan Pluvial nectar of blessings a supplication to the noble Lama
Mahaguru Padmasambhava
- title_addl_t:
+ title_addl_tsim:
- 'Pluvial nectar of blessings : a supplication to the noble Lama Mahaguru Padmasambhava
/'
- Rje btsun bla ma ma hā gu ru Padma-ʼbyuṅ-gnas la gsol ba ʼdebs pa byin rlabs
bdud rtsiʼi char rgyun. English & Tibetan
- author_addl_t:
+ author_addl_tsim:
- Cordell, Dennis.
- Ṅag-dbaṅ-blo-bzaṅ-rgya-mtsho, Dalai Lama V,
- Library of Tibetan Works & Archives.
- title_added_entry_t:
+ title_added_entry_tsim:
- Rje btsun bla ma ma hā gu ru Padma-ʼbyuṅ-gnas la gsol ba ʼdebs pa byin rlabs
bdud rtsiʼi char rgyun
- language_facet:
+ language_ssim:
- English
- Tibetan
timestamp: '2014-02-03T18:42:53.056Z'
- geojson:
+ geojson_ssim:
- "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[78.96288,20.593684]},\"properties\":{\"placename\":\"India\"}}"
- "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Polygon\",\"coordinates\":[[[68.162386, 6.7535159], [97.395555, 6.7535159], [97.395555, 35.5044752], [68.162386, 35.5044752], [68.162386, 6.7535159]]]},\"bbox\":[68.162386, 6.7535159, 97.395555, 35.5044752]}"
- coordinates:
- - 68.162386 6.7535159 97.395555 35.5044752
- - 78.96288 20.593684
-- lc_1letter_facet:
+ coordinates_srpt:
+ - ENVELOPE(68.162386, 97.395555, 35.5044752, 6.7535159)
+ - 20.593684,78.96288
+- lc_1letter_ssim:
- B - Philosophy, Psychology, Religion
- author_t:
+ author_tsim:
- Bstan-ʼdzin-rgya-mtsho, Dalai Lama XIV,
- marc_display: "01221cam
+ marc_ss: "01221cam
a22002534a 4500 2008308201 DLC 20090122162646.0 080721s2008 ii 000 0 tibo Rnam-rgyal Grwa-tshaṅ. Śes-yon
Lhan-tshogs. "
- published_display:
+ published_ssim:
- Dharamsala, H.P.
- author_display: Bstan-ʼdzin-rgya-mtsho, Dalai Lama XIV, 1935-
- lc_callnum_display:
+ author_tsim: Bstan-ʼdzin-rgya-mtsho, Dalai Lama XIV, 1935-
+ lc_callnum_ssim:
- BQ4036 .B78 2008
- title_t:
+ title_tsim:
- 'Bod kyi naṅ chos ṅo sprod sñiṅ bsdus :'
- pub_date:
+ pub_date_ssim:
- '2008'
- pub_date_sort: 2008
- subtitle_display: goṅ sa skyabs mgon chen po mchog nas deṅ dus Bod rigs na gźon
+ pub_date_si: 2008
+ subtitle_tsim: goṅ sa skyabs mgon chen po mchog nas deṅ dus Bod rigs na gźon
rnams la naṅ chos ṅo sprod bstsal ba bźugs so
format: Book
- material_type_display:
+ material_type_ssim:
- 4, iv, 254 p.
- lc_b4cutter_facet:
+ lc_b4cutter_ssim:
- BQ4036
- title_display: Bod kyi naṅ chos ṅo sprod sñiṅ bsdus
- subject_addl_t:
+ title_tsim: Bod kyi naṅ chos ṅo sprod sñiṅ bsdus
+ subject_addl_ssim:
- Essence, genius, nature
- subject_t:
+ subject_tsim:
- Buddhism
- title_sort: bod kyi naṅ chos ṅo sprod sñiṅ bsdus :goṅ sa skyabs mgon chen po
+ title_si: bod kyi naṅ chos ṅo sprod sñiṅ bsdus :goṅ sa skyabs mgon chen po
mchog nas deṅ dus bod rigs na gźon rnams la naṅ chos ṅo sprod bstsal ba bźugs
so
id: '2008308201'
- author_sort: Bstanʼdzinrgyamtsho Dalai Lama XIV 1935 Bod kyi naṅ chos ṅo sprod
+ author_si: Bstanʼdzinrgyamtsho Dalai Lama XIV 1935 Bod kyi naṅ chos ṅo sprod
sñiṅ bsdus goṅ sa skyabs mgon chen po mchog nas deṅ dus Bod rigs na gźon
rnams la naṅ chos ṅo sprod bstsal ba bźugs so
- title_addl_t:
+ title_addl_tsim:
- 'Bod kyi naṅ chos ṅo sprod sñiṅ bsdus : goṅ sa skyabs mgon chen po mchog
nas deṅ dus Bod rigs na gźon rnams la naṅ chos ṅo sprod bstsal ba bźugs so.'
- subject_topic_facet:
+ subject_ssim:
- Buddhism
- author_addl_t:
+ author_addl_tsim:
- Rnam-rgyal Grwa-tshaṅ. Śes-yon Lhan-tshogs.
- lc_alpha_facet:
+ lc_alpha_ssim:
- BQ
- language_facet:
+ language_ssim:
- Tibetan
- subtitle_t:
+ subtitle_tsim:
- goṅ sa skyabs mgon chen po mchog nas deṅ dus Bod rigs na gźon rnams la naṅ
chos ṅo sprod bstsal ba bźugs so.
timestamp: '2014-02-03T18:42:53.056Z'
-- lc_1letter_facet:
+- lc_1letter_ssim:
- D - World History
- author_t:
+ author_tsim:
- Thub-bstan-yar-ʼphel, Rnam-grwa.
- marc_display: "01111cam
+ marc_ss: "01111cam
a2200289 a 4500 2008308202 DLC 20090121092141.0 080721s2005 ii b b 000 0 tibo History of Tibet in questions/answers
format. Includes bibliographical references (p. 406-407). Tibet Tibet (China) History Miscellanea. Rnam-rgyal Grwa-tshaṅ. "
- published_display:
+ published_ssim:
- Dharamsala, H.P.
- author_display: Thub-bstan-yar-ʼphel, Rnam-grwa
- lc_callnum_display:
+ author_tsim: Thub-bstan-yar-ʼphel, Rnam-grwa
+ lc_callnum_ssim:
- DS785 .T475 2005
- title_t:
+ title_tsim:
- Bod gaṅs can gyi rgyal rabs mdor bsdus dris lan brgya pa rab gsal śel gyi me
loṅ źes bya ba bźugs so /
- pub_date:
+ pub_date_ssim:
- '2005'
- pub_date_sort: 2005
+ pub_date_si: 2005
format: Book
- material_type_display:
+ material_type_ssim:
- a-e, iv, ii, 407 p.
- lc_b4cutter_facet:
+ lc_b4cutter_ssim:
- DS785
- title_display: Bod gaṅs can gyi rgyal rabs mdor bsdus dris lan brgya pa rab gsal
+ title_tsim: Bod gaṅs can gyi rgyal rabs mdor bsdus dris lan brgya pa rab gsal
śel gyi me loṅ źes bya ba bźugs so
- subject_addl_t:
+ subject_addl_ssim:
- History Miscellanea
- subject_t:
- - Tibet
- title_sort: bod gaṅs can gyi rgyal rabs mdor bsdus dris lan brgya pa rab gsal śel
+ subject_tsim:
+ - Tibet (China)
+ title_si: bod gaṅs can gyi rgyal rabs mdor bsdus dris lan brgya pa rab gsal śel
gyi me loṅ źes bya ba bźugs so
id: '2008308202'
- author_sort: Thubbstanyarʼphel Rnamgrwa Bod gaṅs can gyi rgyal rabs mdor bsdus
+ author_si: Thubbstanyarʼphel Rnamgrwa Bod gaṅs can gyi rgyal rabs mdor bsdus
dris lan brgya pa rab gsal śel gyi me loṅ źes bya ba bźugs so
- title_addl_t:
+ title_addl_tsim:
- Bod gaṅs can gyi rgyal rabs mdor bsdus dris lan brgya pa rab gsal śel gyi me
loṅ źes bya ba bźugs so /
- Rgyal rabs dris lan brgya pa rab gsal śel gyi me loṅ
- subject_geo_facet:
- - Tibet
- author_addl_t:
+ subject_geo_ssim:
+ - Tibet (China)
+ author_addl_tsim:
- Rnam-rgyal Grwa-tshaṅ.
- lc_alpha_facet:
+ lc_alpha_ssim:
- DS
- language_facet:
+ language_ssim:
- Tibetan
timestamp: '2014-02-03T18:42:53.056Z'
- geojson: "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[91.117212,29.646923]},\"properties\":{\"placename\":\"Tibet\"}}"
- coordinates: 91.117212 29.646923
-- marc_display: "01127cam
+ geojson_ssim:
+ - "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[91.117212,29.646923]},\"properties\":{\"placename\":\"Tibet\"}}"
+ coordinates_srpt: 29.646923,91.117212
+- marc_ss: "01127cam
a22002895a 4500 2008308478 DLC 20090123131001.0 080728s2007 ii 000 0 tibo TeachingMethodology. Sa-rā Bod kyi mtho rim
slob gñer khaṅ. "
- published_display:
+ published_ssim:
- Dharamsala, Distt. Kangra, H.P.
- title_t:
+ title_tsim:
- Śes yon.
- pub_date:
+ pub_date_ssim:
- '2007'
- pub_date_sort: 2007
+ pub_date_si: 2007
format: Book
- title_display: Śes yon
- subject_addl_t:
+ title_tsim: Śes yon
+ subject_addl_ssim:
- China Tibet
- Education India
- Study and teaching India
- Methodology
- material_type_display:
+ - Education Policy
+ material_type_ssim:
- xii, 419 p.
- subject_t:
+ subject_tsim:
- Education and state
- Tibetans
- Tibetan language
- Teaching
- title_sort: śes yon
+ title_si: śes yon
id: '2008308478'
- author_sort: "\U0010FFFF Śes yon"
- title_addl_t:
+ author_si: "\U0010FFFF Śes yon"
+ title_addl_tsim:
- Śes yon.
- subject_geo_facet:
+ subject_geo_ssim:
- China
- Tibet
- India
- subject_topic_facet:
+ subject_ssim:
- Education and state
- Tibetans
- Tibetan language
- Teaching
- author_addl_t:
+ author_addl_tsim:
- Sa-rā Bod kyi mtho rim slob gñer khaṅ.
- language_facet:
+ language_ssim:
- Tibetan
timestamp: '2014-02-03T18:42:53.056Z'
- geojson:
+ geojson_ssim:
- "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[104.195397,35.86166]},\"properties\":{\"placename\":\"China\"}}"
- "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[91.117212,29.646923]},\"properties\":{\"placename\":\"Tibet\"}}"
- "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[78.96288,20.593684]},\"properties\":{\"placename\":\"India\"}}"
- coordinates:
- - 104.195397 35.86166
- - 91.117212 29.646923
- - 78.96288 20.593684
-- author_vern_display: "吉田一, 1934-"
- subject_addl_t:
+ coordinates_srpt:
+ - 35.86166,104.195397
+ - 29.646923,91.117212
+ - 20.593684,78.96288
+- author_vern_ssim: "吉田一, 1934-"
+ subject_addl_ssim:
- 20th century History and criticism
- History and criticism
- Japan History
- title_display: Kubo Sakae 'Kazanbaichi' o yomu
- subject_era_facet:
+ title_tsim: Kubo Sakae 'Kazanbaichi' o yomu
+ subject_era_ssim:
- 20th century
id: '2008543486'
- isbn_t:
+ isbn_ssim:
- '9784588460050'
- '4588460056'
- subject_geo_facet:
+ subject_geo_ssim:
- Japan
- subject_topic_facet:
+ subject_ssim:
- Kubo, Sakae, 1901-1958
- Japanese drama
- Political plays, Japanese
- Theater
- lc_alpha_facet:
+ lc_alpha_ssim:
- PL
- author_t:
+ author_tsim:
- Yoshida, Hajime,
- "吉田一"
- lc_1letter_facet:
+ lc_1letter_ssim:
- P - Language & Literature
- marc_display: "01230nam
+ marc_ss: "01230nam
a22003494a 4500 2008543486 DLC 20090126101044.0 081217s1997 ja 000 0 jpn d 600-05/$1 久保栄, 1901-1958. Kazanbaichi. "
- published_display:
+ published_ssim:
- Tōkyō
- author_display: Yoshida, Hajime, 1934-
- title_vern_display: "久保栄「火山灰地」を読む"
- lc_callnum_display:
+ author_tsim: Yoshida, Hajime, 1934-
+ title_vern_ssim: "久保栄「火山灰地」を読む"
+ lc_callnum_ssim:
- PL832.U25 Z96 1997
- title_t:
+ title_tsim:
- Kubo Sakae 'Kazanbaichi' o yomu /
- "久保栄「火山灰地」を読む"
- pub_date:
+ pub_date_ssim:
- '1997'
- pub_date_sort: 1997
- published_vern_display:
+ pub_date_si: 1997
+ published_vern_ssim:
- "東京"
format: Book
- lc_b4cutter_facet:
+ lc_b4cutter_ssim:
- PL832.U25
- material_type_display:
+ material_type_ssim:
- 480 p.
- subject_t:
+ subject_tsim:
- Kubo, Sakae, 1901-1958. Kazanbaichi
- Japanese drama
- Political plays, Japanese
- Theater
- "久保栄, 1901-1958. Kazanbaichi"
- title_sort: kubo sakae 'kazanbaichi' o yomu
- author_sort: Yoshida Hajime 1934 Kubo Sakae Kazanbaichi o yomu
- title_addl_t:
+ title_si: kubo sakae 'kazanbaichi' o yomu
+ author_si: Yoshida Hajime 1934 Kubo Sakae Kazanbaichi o yomu
+ title_addl_tsim:
- Kubo Sakae 'Kazanbaichi' o yomu /
- "久保栄「火山灰地」を読む"
- language_facet:
+ language_ssim:
- Japanese
timestamp: '2014-02-03T18:42:53.056Z'
- geojson: "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[138.252924,36.204824]},\"properties\":{\"placename\":\"Japan\"}}"
- coordinates: 138.252924 36.204824
-- author_vern_display: "林行止"
- subject_addl_t:
+ geojson_ssim:
+ - "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[138.252924,36.204824]},\"properties\":{\"placename\":\"Japan\"}}"
+ coordinates_srpt: 36.204824,138.252924
+- author_vern_ssim: "林行止"
+ subject_addl_ssim:
- 1990-
- 2005-2015
- Economic conditions 1997-
- Politics and government 1997-
- title_display: Ci an zhou bian
- subject_era_facet:
+ title_tsim: Ci an zhou bian
+ subject_era_ssim:
- 1990-
- 2005-2015
- 1997-
id: '2009373513'
- isbn_t:
+ isbn_ssim:
- '9789573908678'
- '9573908670'
- subject_geo_facet:
+ subject_geo_ssim:
- Economic history
- World politics
- Hong Kong (China)
- lc_alpha_facet:
+ lc_alpha_ssim:
- HC
- title_series_t:
+ title_series_tsim:
- Lin Xingzhi zuo pin ji ; 51
- "林行止作品集 ; 51"
- author_t:
+ author_tsim:
- Lin, Xingzhi.
- "林行止"
- lc_1letter_facet:
+ lc_1letter_ssim:
- H - Social Sciences
- marc_display: "01213nam
+ marc_ss: "01213nam
a22003614a 4500 2009373513 DLC 20090121153231.0 090114s2008 ch 000 0 chi d 2008. 490-05/$1 林行止作品集 ; 51 "
- published_display:
+ published_ssim:
- Taibei Xian Banqiao Shi
- author_display: Lin, Xingzhi
- title_vern_display: "次按驟變"
- lc_callnum_display:
+ author_tsim: Lin, Xingzhi
+ title_vern_ssim: "次按驟變"
+ lc_callnum_ssim:
- HC59.15 .L533 2008
- title_t:
+ title_tsim:
- Ci an zhou bian /
- "次按驟變"
- pub_date:
+ pub_date_ssim:
- '2008'
- pub_date_sort: 2008
- published_vern_display:
+ pub_date_si: 2008
+ published_vern_ssim:
- "臺北縣板橋市"
format: Book
- lc_b4cutter_facet:
+ lc_b4cutter_ssim:
- HC59.15
- material_type_display:
+ material_type_ssim:
- 5, 300 p.
- subject_t:
+ subject_tsim:
- Economic history
- World politics
- Hong Kong (China)
- title_sort: ci an zhou bian
- author_sort: Lin Xingzhi Ci an zhou bian
- title_addl_t:
+ title_si: ci an zhou bian
+ author_si: Lin Xingzhi Ci an zhou bian
+ title_addl_tsim:
- Ci an zhou bian /
- "次按驟變"
- language_facet:
+ language_ssim:
- Chinese
timestamp: '2014-02-03T18:42:53.056Z'
- geojson:
+ geojson_ssim:
- "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[114.109497,22.396428]},\"properties\":{\"placename\":\"Hong Kong (China)\"}}"
- "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Polygon\",\"coordinates\":[[[113.835078, 22.1533884], [114.4069561, 22.1533884], [114.4069561, 22.561968], [113.835078, 22.561968], [113.835078, 22.1533884]]]},\"bbox\":[113.835078, 22.1533884, 114.4069561, 22.561968]}"
- coordinates:
- - 113.835078 22.1533884 114.4069561 22.561968
- - 114.109497 22.396428
-- subject_addl_t:
- - 1990-
- - 2005-2015
- - Economic conditions 1997-
- - Politics and government 1997-
- title_display: Test item with bounding box only
- subject_era_facet:
- - 1990-
- - 2005-2015
- - 1997-
+ coordinates_srpt:
+ - ENVELOPE(113.835078, 114.4069561, 22.561968, 22.1533884)
+ - 22.396428,114.109497
+- subject_addl_ssim:
+ - 1990-
+ - 2005-2015
+ - Economic conditions 1997-
+ - Politics and government 1997-
+ title_tsim: Test item with bounding box only
+ subject_era_ssim:
+ - 1990-
+ - 2005-2015
+ - 1997-
id: '2009373514'
- isbn_t:
- - '9789573908678'
- - '9573908670'
- subject_geo_facet:
- - Economic history
- - World politics
- - Hong Kong (China)
- lc_alpha_facet:
- - HC
- title_series_t:
- - Lin Xingzhi zuo pin ji ; 51
- author_t:
- - Lin, Xingzhi.
- lc_1letter_facet:
- - H - Social Sciences
- marc_display: "01213nam
+ isbn_ssim:
+ - '9789573908678'
+ - '9573908670'
+ subject_geo_ssim:
+ - Economic history
+ - World politics
+ - Hong Kong (China)
+ lc_alpha_ssim:
+ - HC
+ title_series_tsim:
+ - Lin Xingzhi zuo pin ji ; 51
+ author_tsim:
+ - Lin, Xingzhi.
+ lc_1letter_ssim:
+ - H - Social Sciences
+ marc_ss: "01213nam
a22003614a 4500 2009373513 DLC 20090121153231.0 090114s2008 ch 000 0 chi d 2008. 490-05/$1 林行止作品集 ; 51 "
- published_display:
- - Taibei Xian Banqiao Shi
- author_display: Lin, Xingzhi
- lc_callnum_display:
- - HC59.15 .L533 2008
- title_t:
- - Test item with bounding box only /
- pub_date:
- - '2008'
- pub_date_sort: 2008
+ published_ssim:
+ - Taibei Xian Banqiao Shi
+ author_tsim: Lin, Xingzhi
+ lc_callnum_ssim:
+ - HC59.15 .L533 2008
+ title_tsim:
+ - Test item with bounding box only /
+ pub_date_ssim:
+ - '2008'
+ pub_date_si: 2008
format: Book
- lc_b4cutter_facet:
- - HC59.15
- material_type_display:
- - 5, 300 p.
- subject_t:
- - Economic history
- - World politics
- - Hong Kong (China)
- title_sort: test item with bounding box only
- author_sort: Lin Xingzhi Ci an zhou bian
- title_addl_t:
- - Ci an zhou bian /
- language_facet:
- - Chinese
+ lc_b4cutter_ssim:
+ - HC59.15
+ material_type_ssim:
+ - 5, 300 p.
+ subject_tsim:
+ - Economic history
+ - World politics
+ - Hong Kong (China)
+ title_si: test item with bounding box only
+ author_si: Lin Xingzhi Ci an zhou bian
+ title_addl_tsim:
+ - Ci an zhou bian /
+ language_ssim:
+ - Chinese
timestamp: '2014-02-03T18:42:53.056Z'
- geojson:
- - "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Polygon\",\"coordinates\":[[[115.1, 20.1], [118.1, 20.1], [118.1, 21.1], [115.1, 21.1], [115.1, 20.1]]]},\"bbox\":[115.1, 20.1, 118.1, 21.1]}"
- coordinates:
- - 115.1 20.1 118.1 21.1
+ geojson_ssim:
+ - "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Polygon\",\"coordinates\":[[[115.1, 20.1], [118.1, 20.1], [118.1, 21.1], [115.1, 21.1], [115.1, 20.1]]]},\"bbox\":[115.1, 20.1, 118.1, 21.1]}"
+ coordinates_srpt:
+ - ENVELOPE(115.1, 118.1, 21.1, 20.1)
\ No newline at end of file
diff --git a/spec/helpers/blacklight_maps_helper_spec.rb b/spec/helpers/blacklight_maps_helper_spec.rb
index d496484..f8fd1b2 100644
--- a/spec/helpers/blacklight_maps_helper_spec.rb
+++ b/spec/helpers/blacklight_maps_helper_spec.rb
@@ -1,170 +1,122 @@
-# -*- encoding : utf-8 -*-
+# frozen_string_literal: true
+
require 'spec_helper'
describe BlacklightMapsHelper do
-
+ let(:query_term) { 'Tibet' }
+ let(:mock_controller) { CatalogController.new }
let(:blacklight_config) { Blacklight::Configuration.new }
- let(:search_state) { Blacklight::SearchState.new({}, blacklight_config) }
-
- def create_response
- raw_response = eval(mock_query_response)
- Blacklight::Solr::Response.new(raw_response, raw_response['params'])
+ let(:maps_config) { blacklight_config.view.maps }
+ let(:search_service) do
+ Blacklight::SearchService.new(config: blacklight_config, user_params: { q: query_term })
end
-
- let(:r) { create_response }
- let(:geojson_hash) { { type: 'Feature', geometry: { type: 'Point', coordinates: [91.117212, 29.646923] }, properties: { placename: 'Tibet' } } }
+ let(:response) { search_service.search_results[0] }
+ let(:docs) { response.aggregations[maps_config.geojson_field].items }
let(:coords) { [91.117212, 29.646923] }
+ let(:geojson_hash) do
+ { type: 'Feature', geometry: { type: 'Point', coordinates: coords }, properties: { placename: query_term } }
+ end
let(:bbox) { [78.3955448, 26.8548157, 99.116241, 36.4833345] }
- before :each do
+ before do
+ mock_controller.request = ActionDispatch::TestRequest.create
+ allow(helper).to receive_messages(controller: mock_controller, action_name: 'index')
allow(helper).to receive_messages(blacklight_config: blacklight_config)
- CatalogController.blacklight_config = Blacklight::Configuration.new
- @request = ActionDispatch::TestRequest.new
- @catalog = CatalogController.new
- allow(helper).to receive_messages(blacklight_configuration_context: Blacklight::Configuration::Context.new(@catalog))
- allow(helper).to receive(:search_state).and_return(search_state)
- @catalog.request = @request
- @catalog.action_name = "index"
- helper.instance_variable_set(:@_controller, @catalog)
- @docs = r.aggregations[blacklight_config.view.maps.geojson_field].items
+ allow(helper).to receive_messages(blacklight_configuration_context: Blacklight::Configuration::Context.new(mock_controller))
+ allow(helper).to receive(:search_state).and_return Blacklight::SearchState.new({}, blacklight_config, mock_controller)
+ blacklight_config.add_facet_field 'geojson_ssim', limit: -2, label: 'GeoJSON', show: false
+ blacklight_config.add_facet_fields_to_solr_request!
end
- describe "blacklight_map_tag" do
-
- context "with default values" do
+ describe 'blacklight_map_tag' do
+ context 'with default values' do
subject { helper.blacklight_map_tag('blacklight-map') }
- it { should have_selector "div#blacklight-map" }
- it { should have_selector "div[data-maxzoom='#{blacklight_config.view.maps.maxzoom}']" }
- it { should have_selector "div[data-tileurl='#{blacklight_config.view.maps.tileurl}']" }
- it { should have_selector "div[data-mapattribution='#{blacklight_config.view.maps.mapattribution}']" }
+
+ it { is_expected.to have_selector 'div#blacklight-map' }
+ it { is_expected.to have_selector "div[data-maxzoom='#{maps_config.maxzoom}']" }
+ it { is_expected.to have_selector "div[data-tileurl='#{maps_config.tileurl}']" }
+ it { is_expected.to have_selector "div[data-mapattribution='#{maps_config.mapattribution}']" }
end
- context "with custom values" do
- subject { helper.blacklight_map_tag('blacklight-map', data: {maxzoom: 6, tileurl: 'http://example.com/', mapattribution: 'hello world' }) }
- it { should have_selector "div[data-maxzoom='6'][data-tileurl='http://example.com/'][data-mapattribution='hello world']" }
+ context 'with custom values' do
+ subject { helper.blacklight_map_tag('blacklight-map', data: { maxzoom: 6, tileurl: 'http://example.com/', mapattribution: 'hello world' }) }
+
+ it { is_expected.to have_selector "div[data-maxzoom='6'][data-tileurl='http://example.com/'][data-mapattribution='hello world']" }
end
- context "when a block is provided" do
+ context 'when a block is provided' do
subject { helper.blacklight_map_tag('foo') { content_tag(:span, 'bar') } }
- it { should have_selector('div > span', text: 'bar') }
- end
+ it { is_expected.to have_selector('div > span', text: 'bar') }
+ end
end
- describe "serialize_geojson" do
-
- it "should return geojson of documents" do
- expect(helper.serialize_geojson(@docs)).to include('{"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point"')
+ describe 'serialize_geojson' do
+ it 'returns geojson of documents' do
+ expect(helper.serialize_geojson(docs)).to include('{"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point"')
end
-
end
- describe "placename_value" do
-
- it "should return the placename value" do
- expect(helper.placename_value(geojson_hash)).to eq('Tibet')
+ describe 'placename_value' do
+ it 'returns the placename value' do
+ expect(helper.placename_value(geojson_hash)).to eq(query_term)
end
-
end
- describe "link_to_bbox_search" do
-
- it "should create a spatial search link" do
+ describe 'link_to_bbox_search' do
+ it 'creates a spatial search link' do
expect(helper.link_to_bbox_search(bbox)).to include('catalog?coordinates')
expect(helper.link_to_bbox_search(bbox)).to include('spatial_search_type=bbox')
end
- it "should include the default_document_index_view_type in the params" do
+ it 'includes the default_document_index_view_type in the params' do
expect(helper.link_to_bbox_search(bbox)).to include('view=list')
end
-
end
- describe "link_to_placename_field" do
+ describe 'link_to_placename_field' do
+ subject { helper.link_to_placename_field(query_term, maps_config.placename_field) }
- it "should create a link to the placename field" do
- expect(helper.link_to_placename_field('Tibet', blacklight_config.view.maps.placename_field)).to include("catalog?f%5B#{blacklight_config.view.maps.placename_field}%5D%5B%5D=Tibet")
- end
+ it { is_expected.to include("catalog?f%5B#{maps_config.placename_field}%5D%5B%5D=Tibet") }
+ it { is_expected.to include('view=list') }
- it "should create a link to the placename field using the display value" do
- expect(helper.link_to_placename_field('Tibet', blacklight_config.view.maps.placename_field, 'foo')).to include('">foo')
+ it 'creates a link to the placename field using the display value' do
+ expect(helper.link_to_placename_field(query_term, maps_config.placename_field, 'foo')).to include('">foo')
end
-
- it "should include the default_document_index_view_type in the params" do
- expect(helper.link_to_placename_field('Tibet', blacklight_config.view.maps.placename_field)).to include('view=list')
- end
-
end
- describe "link_to_point_search" do
-
- it "should create a link to a coordinate point" do
+ describe 'link_to_point_search' do
+ it 'creates a link to a coordinate point' do
expect(helper.link_to_point_search(coords)).to include('catalog?coordinates')
expect(helper.link_to_point_search(coords)).to include('spatial_search_type=point')
end
- it "should include the default_document_index_view_type in the params" do
+ it 'includes the default_document_index_view_type in the params' do
expect(helper.link_to_point_search(coords)).to include('view=list')
end
-
- end
-
- describe "map_facet_field" do
-
- it "should return the correct facet field" do
- expect(helper.map_facet_field).to eq(blacklight_config.view.maps.geojson_field)
- end
-
- end
-
- describe "map_facet_values" do
-
- before do
- @response = r
- end
-
- it "should return an array of Blacklight::Solr::Response::Facets::FacetItem items" do
- expect(helper.map_facet_values.class).to eq(Array)
- expect(helper.map_facet_values.first.class).to eq(Blacklight::Solr::Response::Facets::FacetItem)
- expect(helper.map_facet_values.length).to eq(5)
- end
-
end
- describe "render_placename_heading" do
-
- it "should return the placename heading" do
- expect(helper.render_placename_heading(geojson_hash)).to eq('Tibet')
+ describe 'render_placename_heading' do
+ it 'returns the placename heading' do
+ expect(helper.render_placename_heading(geojson_hash)).to eq(query_term)
end
-
end
- describe "render_index_mapview" do
+ describe 'render_index_mapview' do
+ before { helper.instance_variable_set(:@response, response) }
- before do
- @response = r
- end
-
- it "should render the 'catalog/index_mapview' partial" do
+ it 'renders the "catalog/index_mapview" partial' do
expect(helper.render_index_mapview).to include("$('#blacklight-index-map').blacklight_leaflet_map")
end
-
end
- describe "render_spatial_search_link" do
-
- it "should return link_to_bbox_search if bbox coordinates are passed" do
+ describe 'render_spatial_search_link' do
+ it 'returns link_to_bbox_search if bbox coordinates are passed' do
expect(helper.render_spatial_search_link(bbox)).to include('spatial_search_type=bbox')
end
- it "should return link_to_point_search if point coordinates are passed" do
+ it 'returns link_to_point_search if point coordinates are passed' do
expect(helper.render_spatial_search_link(coords)).to include('spatial_search_type=point')
end
-
end
-
- def mock_query_response
- %({"responseHeader"=>{"status"=>0, "QTime"=>14, "params"=>{"q"=>"tibet", "spellcheck.q"=>"tibet", "qt"=>"search", "wt"=>"ruby", "rows"=>"10"}}, "response"=>{"numFound"=>2, "start"=>0, "maxScore"=>0.016135123, "docs"=>[{"published_display"=>["Dharamsala, H.P."], "author_display"=>"Thub-bstan-yar-ʼphel, Rnam-grwa", "lc_callnum_display"=>["DS785 .T475 2005"], "pub_date"=>["2005"], "format"=>"Book", "material_type_display"=>["a-e, iv, ii, 407 p."], "title_display"=>"Bod gaṅs can gyi rgyal rabs mdor bsdus dris lan brgya pa rab gsal śel gyi me loṅ źes bya ba bźugs so", "id"=>"2008308202", "subject_geo_facet"=>["Tibet"], "language_facet"=>["Tibetan"], "geojson"=>["{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Point\\",\\"coordinates\\":[91.117212, 29.646923]},\\"properties\\":{\\"placename\\":\\"Tibet\\"}}", "{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Polygon\\",\\"coordinates\\":[[[78.3955448, 26.8548157], [99.116241, 26.8548157], [99.116241, 36.4833345], [78.3955448, 36.4833345], [78.3955448, 26.8548157]]]},\\"bbox\\":[78.3955448,26.8548157,99.116241,36.4833345]}"], "coordinates"=>["91.117212 29.646923", "78.3955448 26.8548157 99.116241 36.4833345"], "score"=>0.016135123}, {"published_display"=>["Dharamsala, Distt. Kangra, H.P."], "pub_date"=>["2007"], "format"=>"Book", "title_display"=>"Ses yon", "material_type_display"=>["xii, 419 p."], "id"=>"2008308478", "subject_geo_facet"=>["China", "Tibet", "India"], "subject_topic_facet"=>["Education and state", "Tibetans", "Tibetan language", "Teaching"], "language_facet"=>["Tibetan"], "geojson"=>["{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Point\\",\\"coordinates\\":[104.195397,35.86166]},\\"properties\\":{\\"placename\\":\\"China\\"}}", "{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Point\\",\\"coordinates\\":[91.117212,29.646923]},\\"properties\\":{\\"placename\\":\\"Tibet\\"}}", "{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Point\\",\\"coordinates\\":[78.96288,20.593684]},\\"properties\\":{\\"placename\\":\\"India\\"}}","{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Polygon\\",\\"coordinates\\":[[[68.162386, 6.7535159], [97.395555, 6.7535159], [97.395555, 35.5044752], [68.162386, 35.5044752], [68.162386, 6.7535159]]]},\\"bbox\\":[68.162386,6.7535159,97.395555,35.5044752]}"], "coordinates"=>["68.162386 6.7535159 97.395555 35.5044752", "104.195397 35.86166", "91.117212 29.646923", "78.96288 20.593684"], "score"=>0.0026767207}]}, "facet_counts"=>{"facet_queries"=>{}, "facet_fields"=>{"format"=>["Book", 2], "lc_1letter_facet"=>["D - World History", 1], "lc_alpha_facet"=>["DS", 1], "lc_b4cutter_facet"=>["DS785", 1], "language_facet"=>["Tibetan", 2], "pub_date"=>["2005", 1, "2007", 1], "subject_era_facet"=>[], "subject_geo_facet"=>["China", 1, "India", 1, "Tibet", 1, "Tibet (China)", 1], "coordinates"=>["91.117212 29.646923", 2, "78.3955448 26.8548157 99.116241 36.4833345", 1, "68.162386 6.7535159 97.395555 35.5044752", 1, "104.195397 35.86166", 1, "78.96288 20.593684", 1], "geojson"=>["{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Point\\",\\"coordinates\\":[91.117212, 29.646923]},\\"properties\\":{\\"placename\\":\\"Tibet\\"}}", 2, "{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Polygon\\",\\"coordinates\\":[[[78.3955448, 26.8548157], [99.116241, 26.8548157], [99.116241, 36.4833345], [78.3955448, 36.4833345], [78.3955448, 26.8548157]]]},\\"bbox\\":[78.3955448,26.8548157,99.116241,36.4833345]}", 1, "{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Point\\",\\"coordinates\\":[104.195397,35.86166]},\\"properties\\":{\\"placename\\":\\"China\\"}}", 1, "{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Point\\",\\"coordinates\\":[78.96288,20.593684]},\\"properties\\":{\\"placename\\":\\"India\\"}}", 1, "{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Polygon\\",\\"coordinates\\":[[[68.162386, 6.7535159], [97.395555, 6.7535159], [97.395555, 35.5044752], [68.162386, 35.5044752], [68.162386, 6.7535159]]]},\\"bbox\\":[68.162386,6.7535159,97.395555,35.5044752]}", 1], "subject_topic_facet"=>["Education and state", 1, "Teaching", 1, "Tibetan language", 1, "Tibetans", 1]}, "facet_dates"=>{}, "facet_ranges"=>{}}, "spellcheck"=>{"suggestions"=>["tibet", {"numFound"=>1, "startOffset"=>0, "endOffset"=>5, "origFreq"=>2, "suggestion"=>[{"word"=>"tibetan", "freq"=>6}]}, "correctlySpelled", true]}})
- end
-
end
diff --git a/spec/lib/blacklight/maps/export_spec.rb b/spec/lib/blacklight/maps/export_spec.rb
index 3b09769..35b4156 100644
--- a/spec/lib/blacklight/maps/export_spec.rb
+++ b/spec/lib/blacklight/maps/export_spec.rb
@@ -1,228 +1,194 @@
-require 'spec_helper'
+# frozen_string_literal: true
-describe "BlacklightMaps::GeojsonExport" do
+require 'spec_helper'
- before do
- CatalogController.blacklight_config = Blacklight::Configuration.new
- @controller = CatalogController.new
- @action = "index"
- @request = ActionDispatch::TestRequest.new
- @controller.request = @request
- @response = ActionDispatch::TestResponse.new
- expect(@response).to receive(:docs).and_return([{ "published_display"=>["Dharamsala, Distt. Kangra, H.P."], "pub_date"=>["2007"], "format"=>"Book", "title_display"=>"Ses yon", "material_type_display"=>["xii, 419 p."], "id"=>"2008308478", "placename_field"=>["China", "Tibet", "India"], "subject_topic_facet"=>["Education and state", "Tibetans", "Tibetan language", "Teaching"], "language_facet"=>["Tibetan"], "geojson"=>["{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[104.195397,35.86166]},\"properties\":{\"placename\":\"China\"}}", "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[91.117212,29.646923]},\"properties\":{\"placename\":\"Tibet\"}}", "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[78.96288,20.593684]},\"properties\":{\"placename\":\"India\"}}"], "coordinates"=>["68.162386 6.7535159 97.395555 35.5044752", "104.195397 35.86166", "91.117212 29.646923", "20.593684,78.96288"], "score"=>0.0026767207 }])
+describe BlacklightMaps::GeojsonExport do
+ let(:controller) { CatalogController.new }
+ let(:action) { :index }
+ let(:response_docs) do
+ YAML.safe_load(File.open(File.join(fixture_path, 'sample_solr_documents.yml')))
end
+ let(:export) { described_class.new(controller, action, response_docs, foo: 'bar') }
- # TODO: use @response.facet_by_field_name('geojson').items instead of @response
- # then refactor build_geojson_features and to_geojson specs
- subject {BlacklightMaps::GeojsonExport.new(@controller, @action, @response.docs, {foo:'bar'})}
+ before { controller.request = ActionDispatch::TestRequest.create }
- it "should instantiate GeojsonExport" do
- expect(subject.class).to eq(::BlacklightMaps::GeojsonExport)
+ it 'instantiates a GeojsonExport instance' do
+ expect(export.class).to eq(::BlacklightMaps::GeojsonExport)
end
- describe "return config settings" do
-
- it "should return maps config" do
- expect(subject.send(:blacklight_maps_config).class).to eq(::Blacklight::Configuration::ViewConfig)
- end
-
- it "should return geojson_field" do
- expect(subject.send(:geojson_field)).to eq('geojson')
- end
-
- it "should return coordinates_field" do
- expect(subject.send(:coordinates_field)).to eq('coordinates')
- end
-
- it "should return search_mode" do
- expect(subject.send(:search_mode)).to eq('placename')
+ describe 'return config settings' do
+ it 'returns maps config' do
+ expect(export.send(:maps_config).class).to eq(::Blacklight::Configuration::ViewConfig)
end
- it "should return facet_mode" do
- expect(subject.send(:facet_mode)).to eq('geojson')
+ it 'returns geojson_field' do
+ expect(export.send(:geojson_field)).to eq('geojson_ssim')
end
- it "should return placename_property" do
- expect(subject.send(:placename_property)).to eq('placename')
+ it 'returns coordinates_field' do
+ expect(export.send(:coordinates_field)).to eq('coordinates_srpt')
end
- it "should create an @options instance variable" do
- expect(subject.instance_variable_get("@options")[:foo]).to eq('bar')
+ it 'creates an @options instance variable' do
+ expect(export.instance_variable_get('@options')[:foo]).to eq('bar')
end
-
end
- describe "build_feature_from_geojson" do
-
- describe "point feature" do
-
- before do
- @output = subject.send(:build_feature_from_geojson, '{"type":"Feature","geometry":{"type":"Point","coordinates":[104.195397,35.86166]},"properties":{"placename":"China"}}', 1)
- end
+ describe 'build_feature_from_geojson' do
+ describe 'point feature' do
+ let(:geojson) { '{"type":"Feature","geometry":{"type":"Point","coordinates":[104.195397,35.86166]},"properties":{"placename":"China"}}' }
+ let(:point_feature) { export.send(:build_feature_from_geojson, geojson, 1) }
- it "should have a hits property with the right value" do
- expect(@output[:properties]).to have_key(:hits)
- expect(@output[:properties][:hits]).to eq(1)
+ it 'has a hits property with the right value' do
+ expect(point_feature[:properties][:hits]).to eq(1)
end
- it "should have a popup property" do
- expect(@output[:properties]).to have_key(:popup)
+ it 'has a popup property' do
+ expect(point_feature[:properties]).to have_key(:popup)
end
-
end
- describe "bbox feature" do
-
- describe "catalog#index view" do
-
- before do
- @output = subject.send(:build_feature_from_geojson, '{"type":"Feature","geometry":{"type":"Polygon","coordinates":[[[68.162386, 6.7535159], [97.395555, 6.7535159], [97.395555, 35.5044752], [68.162386, 35.5044752], [68.162386, 6.7535159]]]},"bbox":[68.162386, 6.7535159, 97.395555, 35.5044752]}', 1)
- end
+ describe 'bbox feature' do
+ describe 'catalog#index view' do
+ let(:geojson) { '{"type":"Feature","geometry":{"type":"Polygon","coordinates":[[[68.162386, 6.7535159], [97.395555, 6.7535159], [97.395555, 35.5044752], [68.162386, 35.5044752], [68.162386, 6.7535159]]]},"bbox":[68.162386, 6.7535159, 97.395555, 35.5044752]}' }
+ let(:bbox_feature) { export.send(:build_feature_from_geojson, geojson, 1) }
- it "should set the center point as the coordinates" do
- expect(@output[:geometry][:coordinates]).to eq([82.7789705, 21.12899555])
+ it 'sets the center point as the coordinates' do
+ expect(bbox_feature[:geometry][:coordinates]).to eq([82.7789705, 21.12899555])
end
- it "should change the geometry type to 'Point'" do
- expect(@output[:geometry][:type]).to eq("Point")
- expect(@output[:bbox]).to be_nil
+ it "changes the geometry type to 'Point'" do
+ expect(bbox_feature[:geometry][:type]).to eq('Point')
+ expect(bbox_feature[:bbox]).to be_nil
end
-
end
-
end
-
end
- describe "build_feature_from_coords" do
-
- describe "point feature" do
-
- before do
- @output = subject.send(:build_feature_from_coords, '35.86166,104.195397', 1)
- end
+ describe 'build_feature_from_coords' do
+ describe 'point feature' do
+ let(:point_feature) { export.send(:build_feature_from_coords, '35.86166,104.195397', 1) }
- it "should create a GeoJSON feature hash" do
- expect(@output.class).to eq(Hash)
- expect(@output[:type]).to eq("Feature")
+ it 'creates a GeoJSON feature hash' do
+ expect(point_feature.class).to eq(Hash)
+ expect(point_feature[:type]).to eq('Feature')
end
- it "should have the right coordinates" do
- expect(@output[:geometry][:coordinates]).to eq([104.195397, 35.86166])
+ it 'has the right coordinates' do
+ expect(point_feature[:geometry][:coordinates]).to eq([104.195397, 35.86166])
end
- it "should have a hits property with the right value" do
- expect(@output[:properties]).to have_key(:hits)
- expect(@output[:properties][:hits]).to eq(1)
+ it 'has a hits property with the right value' do
+ expect(point_feature[:properties][:hits]).to eq(1)
end
- it "should have a popup property" do
- expect(@output[:properties]).to have_key(:popup)
+ it 'has a popup property' do
+ expect(point_feature[:properties]).to have_key(:popup)
end
-
end
- describe "bbox feature" do
-
- describe "catalog#index view" do
+ describe 'bbox feature' do
+ let(:basic_bbox) { 'ENVELOPE(68.162386, 97.395555, 35.5044752, 6.7535159)' }
- before do
- @output = subject.send(:build_feature_from_coords, '68.162386 6.7535159 97.395555 35.5044752', 1)
- end
+ describe 'catalog#index view' do
+ let(:bbox_feature) { export.send(:build_feature_from_coords, basic_bbox, 1) }
- it "should set the center point as the coordinates" do
- expect(@output[:geometry][:type]).to eq("Point")
- expect(@output[:geometry][:coordinates]).to eq([82.7789705, 21.12899555])
+ it 'sets the center point as the coordinates' do
+ expect(bbox_feature[:geometry][:type]).to eq('Point')
+ expect(bbox_feature[:geometry][:coordinates]).to eq([82.7789705, 21.12899555])
end
- describe "bounding box that crosses the dateline" do
-
- before do
- @output = subject.send(:build_feature_from_coords, '1.162386 6.7535159 -179.395555 35.5044752', 1)
+ describe 'bounding box that crosses the dateline' do
+ let(:bbox_feature) do
+ export.send(:build_feature_from_coords,
+ 'ENVELOPE(1.162386, -179.395555, 35.5044752, 6.7535159)', 1)
end
- it "should set a center point with a long value between -180 and 180" do
- expect(@output[:geometry][:coordinates]).to eq([90.88341550000001,21.12899555])
+ it 'sets a center point with a long value between -180 and 180' do
+ expect(bbox_feature[:geometry][:coordinates]).to eq([90.88341550000001, 21.12899555])
end
-
end
-
end
- describe "catalog#show view" do
-
- before do
- @action = "show"
- @output = subject.send(:build_feature_from_coords, '68.162386 6.7535159 97.395555 35.5044752', 1)
- end
+ describe 'catalog#show view' do
+ let(:action) { :show }
+ let(:show_feature) { export.send(:build_feature_from_coords, basic_bbox, 1) }
- it "should convert the bbox string to a polygon coordinate array" do
- expect(@output[:geometry][:type]).to eq("Polygon")
- expect(@output[:geometry][:coordinates]).to eq([[[68.162386, 6.7535159], [97.395555, 6.7535159], [97.395555, 35.5044752], [68.162386, 35.5044752], [68.162386, 6.7535159]]])
+ it 'converts the bbox string to a polygon coordinate array' do
+ expect(show_feature[:geometry][:type]).to eq('Polygon')
+ expect(show_feature[:geometry][:coordinates]).to eq(
+ [[[68.162386, 6.7535159], [97.395555, 6.7535159], [97.395555, 35.5044752], [68.162386, 35.5044752], [68.162386, 6.7535159]]]
+ )
end
- it "should set the bbox member" do
- expect(@output[:bbox]).to eq([68.162386, 6.7535159, 97.395555, 35.5044752])
+ it 'sets the bbox member' do
+ expect(show_feature[:bbox]).to eq([68.162386, 6.7535159, 97.395555, 35.5044752])
end
-
end
-
end
-
end
- describe "render_leaflet_popup_content" do
-
- describe "placename_facet search_mode" do
-
- it "should render the map_placename_search partial if the placename is present" do
- expect(subject.send(:render_leaflet_popup_content, {type:"Feature",geometry:{type:"Point",coordinates:[104.195397,35.86166]},properties:{placename:"China", hits:1}})).to include('href="/catalog?f%5Bplacename_field%5D%5B%5D=China')
+ describe 'render_leaflet_popup_content' do
+ describe 'placename_facet search_mode' do
+ let(:placename_popup) do
+ export.send(:render_leaflet_popup_content,
+ { type: 'Feature',
+ geometry: { type: 'Point', coordinates: [104.195397, 35.86166] },
+ properties: { placename: 'China', hits: 1 } })
+ end
+ let(:spatial_popup) do
+ export.send(:render_leaflet_popup_content,
+ { type: 'Feature',
+ geometry: { type: 'Point', coordinates: [104.195397, 35.86166] },
+ properties: { hits: 1 } })
end
- it "should render the map_spatial_search partial if the placename is not present" do
- expect(subject.send(:render_leaflet_popup_content, {type:"Feature",geometry:{type:"Point",coordinates:[104.195397,35.86166]},properties:{hits:1}})).to include('href="/catalog?coordinates=35.86166%2C104.195397&spatial_search_type=point')
+ it 'renders the map_placename_search partial if the placename is present' do
+ expect(placename_popup).to include('href="/catalog?f%5Bsubject_geo_ssim%5D%5B%5D=China')
end
+ it 'renders the map_spatial_search partial if the placename is not present' do
+ expect(spatial_popup).to include('href="/catalog?coordinates=35.86166%2C104.195397&spatial_search_type=point')
+ end
end
- describe "coordinates search_mode" do
-
+ describe 'coordinates search_mode' do
before do
CatalogController.configure_blacklight do |config|
config.view.maps.search_mode = 'coordinates'
end
end
- it "should render the map_spatial_search partial" do
- expect(subject.send(:render_leaflet_popup_content, {type:"Feature",geometry:{type:"Point",coordinates:[104.195397,35.86166]},properties:{hits:1}})).to include('href="/catalog?coordinates=35.86166%2C104.195397&spatial_search_type=point')
+ let(:spatial_popup) do
+ export.send(:render_leaflet_popup_content,
+ { type: 'Feature',
+ geometry: { type: 'Point', coordinates: [104.195397, 35.86166] },
+ properties: { hits: 1 } })
end
+ it 'renders the map_spatial_search partial' do
+ expect(spatial_popup).to include('href="/catalog?coordinates=35.86166%2C104.195397&spatial_search_type=point')
+ end
end
-
end
- describe "build_geojson_features" do
-
- before do
- @action = "show"
+ describe 'build_geojson_features' do
+ let(:geojson_features) do
+ described_class.new(controller, :show, response_docs.first).send(:build_geojson_features)
end
- it "should create an array of features" do
- expect(BlacklightMaps::GeojsonExport.new(@controller, @action, @response.docs[0]).send(:build_geojson_features).blank?).to be false
+ it 'creates an array of system' do
+ expect(geojson_features).not_to be_blank
end
-
end
- describe "to_geojson" do
-
- before do
- @action = "show"
+ describe 'to_geojson' do
+ let(:feature_collection) do
+ described_class.new(controller, :show, response_docs.first).send(:to_geojson)
end
- it "should render feature collection as json" do
- expect(BlacklightMaps::GeojsonExport.new(@controller, @action, @response.docs[0]).send(:to_geojson)).to include('{"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point"')
+ it 'renders feature collection as json' do
+ expect(feature_collection).to include('{"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point"')
end
-
end
-
end
diff --git a/spec/lib/blacklight/maps/geometry_spec.rb b/spec/lib/blacklight/maps/geometry_spec.rb
index f5b3335..a3ac47f 100644
--- a/spec/lib/blacklight/maps/geometry_spec.rb
+++ b/spec/lib/blacklight/maps/geometry_spec.rb
@@ -1,43 +1,56 @@
+# frozen_string_literal: true
+
require 'spec_helper'
describe BlacklightMaps::Geometry do
+ describe BlacklightMaps::Geometry::BoundingBox do
+ let(:bbox) { described_class.from_lon_lat_string('-100 -50 100 50') }
+ let(:bbox_california) { described_class.from_wkt_envelope('ENVELOPE(-124, -114, 42, 32)') }
+ let(:bbox_dateline) { described_class.from_lon_lat_string('165 30 -172 -20') }
- describe "BlacklightMaps::Geometry::BoundingBox" do
+ it 'instantiates Geometry::BoundingBox' do
+ expect(bbox.class).to eq(described_class)
+ end
- let(:bbox) { BlacklightMaps::Geometry::BoundingBox.from_lon_lat_string('-100 -50 100 50') }
- let(:bbox_california) { BlacklightMaps::Geometry::BoundingBox.from_lon_lat_string('-124.4096196 32.5342321 -114.131211 42.0095169') }
- let(:bbox_dateline) {BlacklightMaps::Geometry::BoundingBox.from_lon_lat_string('165 30 -172 -20') }
+ describe '#find_center' do
+ it 'returns center of simple bounding box' do
+ expect(bbox.find_center).to eq([0.0, 0.0])
+ end
+ end
- it "should instantiate Geometry::BoundingBox" do
- expect(bbox.class).to eq(::BlacklightMaps::Geometry::BoundingBox)
+ describe '#to_a' do
+ it 'returns the coordinates as an array' do
+ expect(bbox.to_a).to eq([-100, -50, 100, 50])
+ end
end
- it "should return center of simple bounding box" do
- expect(bbox.find_center).to eq([0.0, 0.0])
+ describe '#geojson_geometry_array' do
+ it 'returns the coordinates as a multi dimensional array' do
+ expect(bbox.geojson_geometry_array).to eq(
+ [[[-100, -50], [100, -50], [100, 50], [-100, 50], [-100, -50]]]
+ )
+ end
end
- it "should return center of California bounding box" do
- expect(bbox_california.find_center).to eq([-119.2704153, 37.271874499999996])
+ it 'returns center of California bounding box' do
+ expect(bbox_california.find_center).to eq([-119.0, 37.0])
end
- it "should return correct dateline bounding box" do
+ it 'returns correct dateline bounding box' do
expect(bbox_dateline.find_center).to eq([-183.5, 5])
end
end
- describe "BlacklightMaps::Geometry::Point" do
+ describe BlacklightMaps::Geometry::Point do
+ let(:point) { described_class.from_lat_lon_string('20,120') }
+ let(:unparseable_point) { described_class.from_lat_lon_string('35.86166,-184.195397') }
- let(:point) { BlacklightMaps::Geometry::Point.from_lat_lon_string('20,120') }
- let(:unparseable_point) { BlacklightMaps::Geometry::Point.from_lat_lon_string('35.86166,-184.195397') }
-
- it "should instantiate Geometry::Point" do
- expect(point.class).to eq(::BlacklightMaps::Geometry::Point)
+ it 'instantiates Geometry::Point' do
+ expect(point.class).to eq(described_class)
end
- it "should return a Solr-parseable coordinate if @long is > 180 or < -180" do
- expect(unparseable_point.normalize_for_search).to eq([175.804603,35.86166])
+ it 'returns a Solr-parseable coordinate if @long is > 180 or < -180' do
+ expect(unparseable_point.normalize_for_search).to eq([175.804603, 35.86166])
end
-
end
-
end
diff --git a/spec/lib/blacklight/maps/maps_search_builder_spec.rb b/spec/lib/blacklight/maps/maps_search_builder_spec.rb
index cba85a2..893b84c 100644
--- a/spec/lib/blacklight/maps/maps_search_builder_spec.rb
+++ b/spec/lib/blacklight/maps/maps_search_builder_spec.rb
@@ -1,46 +1,42 @@
+# frozen_string_literal: true
+
require 'spec_helper'
describe BlacklightMaps::MapsSearchBuilderBehavior do
-
let(:blacklight_config) { CatalogController.blacklight_config.deep_copy }
- let(:user_params) { Hash.new }
+ let(:user_params) { {} }
let(:context) { CatalogController.new }
-
- before { allow(context).to receive(:blacklight_config).and_return(blacklight_config) }
-
let(:search_builder_class) do
Class.new(Blacklight::SearchBuilder) do
include Blacklight::Solr::SearchBuilderBehavior
include BlacklightMaps::MapsSearchBuilderBehavior
end
end
-
let(:search_builder) { search_builder_class.new(context) }
- describe 'add_spatial_search_to_solr' do
+ before { allow(context).to receive(:blacklight_config).and_return(blacklight_config) }
+ describe 'add_spatial_search_to_solr' do
describe 'coordinate search' do
-
- subject { search_builder.with({coordinates: '35.86166,104.195397', spatial_search_type: 'point'}) }
-
- it 'should return a coordinate point spatial search if coordinates are given' do
- expect(subject[:fq].first).to include('geofilt')
- expect(subject[:pt]).to eq('35.86166,104.195397')
+ let(:coordinate_search) do
+ search_builder.with(coordinates: '35.86166,104.195397', spatial_search_type: 'point')
end
+ it 'returns a coordinate point spatial search if coordinates are given' do
+ expect(coordinate_search[:fq].first).to include('geofilt')
+ expect(coordinate_search[:pt]).to eq('35.86166,104.195397')
+ end
end
describe 'bbox search' do
-
- subject { search_builder.with({coordinates: '[6.7535159,68.162386 TO 35.5044752,97.395555]',
- spatial_search_type: 'bbox'}) }
-
- it 'should return a bbox spatial search if a bbox is given' do
- expect(subject[:fq].first).to include(blacklight_config.view.maps.coordinates_field)
+ let(:bbox_search) do
+ search_builder.with(coordinates: '[6.7535159,68.162386 TO 35.5044752,97.395555]',
+ spatial_search_type: 'bbox')
end
+ it 'returns a bbox spatial search if a bbox is given' do
+ expect(bbox_search[:fq].first).to include(blacklight_config.view.maps.coordinates_field)
+ end
end
-
end
-
end
diff --git a/spec/lib/blacklight/maps/render_constraints_override_spec.rb b/spec/lib/blacklight/maps/render_constraints_override_spec.rb
index 7f9edb5..74f01f6 100644
--- a/spec/lib/blacklight/maps/render_constraints_override_spec.rb
+++ b/spec/lib/blacklight/maps/render_constraints_override_spec.rb
@@ -1,95 +1,68 @@
-require 'spec_helper'
-
-describe BlacklightMaps::RenderConstraintsOverride do
+# frozen_string_literal: true
- class BlacklightMapsControllerTestClass < CatalogController
- attr_accessor :params
- end
+require 'spec_helper'
- before(:each) do
- @fake_controller = BlacklightMapsControllerTestClass.new
- @fake_controller.extend(BlacklightMaps::RenderConstraintsOverride)
- @fake_controller.params = { coordinates: "35.86166,104.195397", spatial_search_type: "point" }
+describe BlacklightMaps::RenderConstraintsOverride, type: :helper do
+ let(:mock_controller) { CatalogController.new }
+ let(:blacklight_config) { Blacklight::Configuration.new }
+ let(:test_params) { { coordinates: '35.86166,104.195397', spatial_search_type: 'point' } }
+ let(:test_search_state) do
+ Blacklight::SearchState.new(test_params, blacklight_config, mock_controller)
end
- describe "testing for spatial parameters" do
-
- describe "has_spatial_parameters?" do
-
- it "should be true if coordinate params are present" do
- expect(@fake_controller.has_spatial_parameters?).to be true
- end
+ describe 'has_search_parameters?' do
+ before { mock_controller.params = test_params }
+ it 'returns true if coordinate params are present' do
+ expect(mock_controller.has_search_parameters?).to be_truthy
end
+ end
- describe "has_search_parameters?" do
-
- it "should be true if coordinate params are present" do
- expect(@fake_controller.has_search_parameters?).to be true
- end
-
+ describe 'has_spatial_parameters?' do
+ it 'returns true if coordinate params are present' do
+ expect(helper.has_spatial_parameters?(test_search_state)).to be_truthy
end
-
end
- describe "render spatial constraints" do
-
- before do
- @test_params = @fake_controller.params
+ describe 'query_has_constraints?' do
+ it 'returns true if there are coordinate params' do
+ expect(helper.query_has_constraints?(test_search_state)).to be_truthy
end
+ end
- describe "query_has_constraints?" do
-
- it "should be true if there are coordinate params" do
- expect(@fake_controller.query_has_constraints?).to be true
- end
+ describe 'spatial_constraint_label' do
+ let(:bbox_params) { { spatial_search_type: 'bbox' } }
+ it 'returns the point label' do
+ expect(helper.spatial_constraint_label(test_search_state)).to eq(I18n.t('blacklight.search.filters.coordinates.point'))
end
- describe "spatial_constraint_label" do
+ it 'returns the bbox label' do
+ expect(helper.spatial_constraint_label(bbox_params)).to eq(I18n.t('blacklight.search.filters.coordinates.bbox'))
+ end
+ end
- it "should return the point label" do
- expect(@fake_controller.spatial_constraint_label(@test_params)).to eq(I18n.t('blacklight.search.filters.coordinates.point'))
+ describe 'render spatial constraints' do
+ describe 'render_spatial_query' do
+ before do
+ allow(helper).to receive_messages(search_action_path: search_catalog_path)
end
- it "should return the bbox label" do
- @test_params = { spatial_search_type: "bbox" }
- expect(@fake_controller.spatial_constraint_label(@test_params)).to eq(I18n.t('blacklight.search.filters.coordinates.bbox'))
+ it 'renders the coordinates' do
+ expect(helper.render_spatial_query(test_search_state)).to have_content(test_params[:coordinates])
end
- end
-
- describe "render_spatial_query" do
-
- before :each do
- # have to create a request or call to 'url _for' returns an error
- @fake_controller.request = ActionDispatch::Request.new(params:{controller: 'catalog', action: 'index'})
- @fake_controller.request.path_parameters[:controller] = 'catalog'
+ it 'removes the spatial params' do
+ expect(helper.remove_spatial_params(test_search_state)).not_to have_content('spatial_search_type')
end
-
- # TODO: can't get these specs to pass, getting error:
- # NoMethodError: undefined method `render_constraint_element'
-
- it "should render the coordinates" #do
- #expect(@fake_controller.render_spatial_query(@test_params)).to have_content(@fake_controller.params[:coordinates])
- #end
-
- it "should remove spatial params in the 'remove' link" #do
- #expect(@fake_controller.render_spatial_query(@test_params)).to_not have_content("spatial_search_type")
- #end
-
end
- describe "render_search_to_s_coord" do
-
- it "should return render_search_to_s_element when coordinates are present" do
- expect(@fake_controller).to receive(:render_search_to_s_element)
- expect(@fake_controller).to receive(:render_filter_value)
- @fake_controller.render_search_to_s_coord(@test_params)
+ describe 'render_search_to_s_coord' do
+ it 'returns render_search_to_s_element when coordinates are present' do
+ expect(helper).to receive(:render_search_to_s_element)
+ expect(helper).to receive(:render_filter_value)
+ helper.render_search_to_s_coord(test_params)
end
-
end
-
end
-
-end
\ No newline at end of file
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 16e4ef8..c172383 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,36 +1,34 @@
-ENV["RAILS_ENV"] ||= 'test'
+# frozen_string_literal: true
-require 'engine_cart'
+# testing environent:
+ENV['RAILS_ENV'] ||= 'test'
+
+require 'simplecov'
require 'coveralls'
Coveralls.wear!('rails')
-EngineCart.load_application!
-
-require 'capybara/poltergeist'
-Capybara.javascript_driver = :poltergeist
-Capybara.register_driver :poltergeist do |app|
- options = {}
-
- options[:timeout] = 120 if RUBY_PLATFORM == "java"
-
- Capybara::Poltergeist::Driver.new(app, options)
+SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+SimpleCov.start do
+ add_filter '/spec/'
end
-if ENV["COVERAGE"] or ENV["CI"]
- require 'simplecov'
-
- SimpleCov.formatter = Coveralls::SimpleCov::Formatter
- SimpleCov.start do
- add_filter "/spec/"
- end
-end
+# engine_cart:
+require 'bundler/setup'
+require 'engine_cart'
+EngineCart.load_application!
require 'blacklight/maps'
require 'rspec/rails'
require 'capybara/rspec'
-
+require 'selenium-webdriver'
+require 'webdrivers'
RSpec.configure do |config|
config.infer_spec_type_from_file_location!
+ config.fixture_path = "#{Blacklight::Maps.root}/spec/fixtures"
+
+ config.before(:each, type: :system, js: true) do
+ driven_by :selenium, using: :headless_chrome, screen_size: [1024, 768]
+ end
end
diff --git a/spec/system/index_view_spec.rb b/spec/system/index_view_spec.rb
new file mode 100644
index 0000000..5c1faad
--- /dev/null
+++ b/spec/system/index_view_spec.rb
@@ -0,0 +1,127 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'catalog#index map view', js: true do
+ before do
+ CatalogController.blacklight_config = Blacklight::Configuration.new
+ CatalogController.configure_blacklight do |config|
+ # use geojson facet for blacklight-maps catalog#index map view specs
+ config.add_facet_field 'geojson_ssim', limit: -2, label: 'GeoJSON', show: false
+ config.add_facet_fields_to_solr_request!
+ end
+ visit search_catalog_path q: 'korea', view: 'maps'
+ end
+
+ it 'displays map elements' do
+ expect(page).to have_selector('#documents.map')
+ expect(page).to have_selector('#blacklight-index-map')
+ end
+
+ it 'displays tile layer attribution' do
+ expect(find('div.leaflet-control-container')).to have_content('OpenStreetMap contributors, CC-BY-SA')
+ end
+
+ describe '#sortAndPerPage' do
+ it 'shows the mapped item count' do
+ expect(page).to have_selector('.mapped-count .badge', text: '4')
+ end
+
+ it 'shows the mapped item caveat' do
+ expect(page).to have_selector('.mapped-caveat')
+ end
+
+ # TODO: placeholder spec: #sortAndPerPage > .view-type > .view-type-group
+ # shows active map icon. however, this spec doesn't work because
+ # Blacklight::ConfigurationHelperBehavior#has_alternative_views? returns false,
+ # so catalog/_view_type_group partial renders no content, can't figure out why
+ it 'shows the map view icon' do
+ pending("expect(page).to have_selector('.view-type-maps.active')")
+ fail
+ end
+ end
+
+ describe 'data attributes' do
+ let(:maxzoom) { CatalogController.blacklight_config.view.maps.maxzoom }
+ let(:tileurl) { CatalogController.blacklight_config.view.maps.tileurl }
+
+ it 'has maxzoom value from config' do
+ expect(page).to have_selector("#blacklight-index-map[data-maxzoom='#{maxzoom}']")
+ end
+
+ it 'has tileurl value from config' do
+ expect(page).to have_selector("#blacklight-index-map[data-tileurl='#{tileurl}']")
+ end
+ end
+
+ describe 'marker clusters' do
+ before do
+ 3.times do # zoom out to create cluster
+ find('a.leaflet-control-zoom-out').click
+ sleep(1) # give Leaflet time to combine clusters or spec can fail
+ end
+ end
+
+ it 'has one marker cluster' do
+ expect(page).to have_selector('div.marker-cluster', count: 1)
+ end
+
+ it 'shows the result count' do
+ expect(find('div.marker-cluster')).to have_content(4)
+ end
+
+ describe 'click marker cluster' do
+ before { find('div.marker-cluster').click }
+
+ it 'splits into two marker clusters' do
+ expect(page).to have_selector('div.marker-cluster', count: 2)
+ end
+ end
+ end
+
+ describe 'marker popups' do
+ before do
+ find('.marker-cluster', text: '1', match: :first).click
+ end
+
+ it 'shows a popup with correct content' do
+ expect(page).to have_selector('div.leaflet-popup-content-wrapper')
+ expect(page).to have_css('.geo_popup_heading', text: 'Seoul (Korea)')
+ end
+
+ describe 'click search link' do
+ before { find('div.leaflet-popup-content a').click }
+
+ it 'runs a new search' do
+ expect(page).to have_selector('.constraint-value .filter-value', text: 'Seoul (Korea)')
+ end
+
+ it 'uses the default view type' do
+ expect(current_url).to include('view=list')
+ end
+ end
+ end
+
+ describe 'map search control' do
+ it 'has a search control' do
+ expect(page).to have_selector('.leaflet-control .search-control')
+ end
+
+ describe 'search control hover' do
+ before { find('.search-control').hover }
+
+ it 'adds a border to the map' do
+ expect(page).to have_selector('.leaflet-overlay-pane path')
+ end
+ end
+
+ describe 'search control click' do
+ before { find('.search-control').click }
+
+ it 'runs a new search' do
+ expect(page).to have_selector('.constraint.coordinates')
+ expect(current_url).to include('view=list')
+ end
+ end
+ end
+end
diff --git a/spec/system/initial_view_spec.rb b/spec/system/initial_view_spec.rb
new file mode 100644
index 0000000..5e3cca1
--- /dev/null
+++ b/spec/system/initial_view_spec.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Initial map bounds view parameter', js: true do
+ before(:all) do
+ CatalogController.configure_blacklight do |config|
+ config.view.maps.facet_mode = 'coordinates'
+ config.view.maps.coordinates_facet_field = 'coordinates_ssim'
+ config.add_facet_field 'coordinates_ssim', limit: -2, label: 'Coordinates', show: false
+ end
+ end
+
+ it 'defaults to zoom area of markers' do
+ visit search_catalog_path f: { format: ['Book'] }, view: 'maps'
+ expect(page).to have_selector('.leaflet-marker-icon.marker-cluster', count: 9)
+ end
+
+ describe 'with provided initialview' do
+ let(:map_tag) { '
'.html_safe }
+
+ it 'sets map to correct bounds when initialview provided' do
+ expect_any_instance_of(Blacklight::BlacklightMapsHelperBehavior).to receive(:blacklight_map_tag).and_return(map_tag)
+ visit search_catalog_path f: { format: ['Book'] }, view: 'maps'
+ expect(page).not_to have_selector('.leaflet-marker-icon.marker-cluster')
+ end
+ end
+end
diff --git a/spec/system/map_view_spec.rb b/spec/system/map_view_spec.rb
new file mode 100644
index 0000000..b714dff
--- /dev/null
+++ b/spec/system/map_view_spec.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'catalog#map view', js: true do
+ before do
+ CatalogController.blacklight_config = Blacklight::Configuration.new
+ CatalogController.configure_blacklight do |config|
+ # use coordinates_facet facet for blacklight-maps catalog#map view specs
+ config.view.maps.facet_mode = 'coordinates'
+ config.view.maps.coordinates_facet_field = 'coordinates_ssim'
+ config.add_facet_field 'coordinates_ssim', limit: -2, label: 'Coordinates', show: false
+ config.add_facet_fields_to_solr_request!
+ end
+ visit map_path
+ end
+
+ it 'displays map elements' do
+ expect(page).to have_selector('#documents.map')
+ expect(page).to have_selector('#blacklight-index-map')
+ end
+
+ it 'displays some markers' do
+ expect(page).to have_selector('div.marker-cluster')
+ end
+
+ describe 'marker popups' do
+ before do
+ 2.times do # zoom out to create cluster
+ find('a.leaflet-control-zoom-in').click
+ sleep(1) # give Leaflet time to split clusters or spec can fail
+ end
+ find('.marker-cluster:first-child').click
+ end
+
+ it 'shows a popup with correct content' do
+ expect(page).to have_selector('.leaflet-popup-content-wrapper')
+ expect(page).to have_css('.geo_popup_heading', text: '[35.86166, 104.195397]')
+ end
+
+ describe 'click search link' do
+ before { find('div.leaflet-popup-content a').click }
+
+ it 'runs a new search' do
+ expect(page).to have_selector('.constraint-value .filter-value', text: '35.86166,104.195397')
+ expect(current_url).to include('view=list')
+ end
+ end
+ end
+end
diff --git a/spec/system/show_view_maplet_spec.rb b/spec/system/show_view_maplet_spec.rb
new file mode 100644
index 0000000..5ed3d20
--- /dev/null
+++ b/spec/system/show_view_maplet_spec.rb
@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'catalog#show view', js: true do
+ before(:all) do
+ CatalogController.blacklight_config = Blacklight::Configuration.new
+ CatalogController.configure_blacklight do |config|
+ config.show.partials << :show_maplet # add maplet to show view partials
+ end
+ end
+
+ describe 'item with point feature' do
+ before { visit solr_document_path('00314247') }
+
+ it 'displays the maplet' do
+ expect(page).to have_selector('#blacklight-show-map-container')
+ end
+
+ it 'has a single marker icon' do
+ expect(page).to have_selector('.leaflet-marker-icon', count: 1)
+ end
+
+ describe 'click marker icon' do
+ before { find('.leaflet-marker-icon').click }
+
+ it 'shows a popup with correct content' do
+ expect(page).to have_selector('div.leaflet-popup-content-wrapper')
+ expect(page).to have_content('Japan')
+ end
+ end
+ end
+
+ describe 'item with point and bbox system' do
+ before { visit solr_document_path('2008308175') }
+
+ it 'shows the correct mapped item count' do
+ expect(page).to have_selector('.mapped-count .badge', text: '2')
+ end
+
+ it 'shows a bounding box and a point marker' do
+ expect(page).to have_selector('.leaflet-overlay-pane path.leaflet-interactive')
+ expect(page).to have_selector('.leaflet-marker-icon')
+ end
+
+ describe 'click bbox path' do
+ before do
+ 0.upto(4) { find('a.leaflet-control-zoom-in').click } # so bbox not covered by point
+ find('.leaflet-overlay-pane svg').click
+ end
+
+ it 'shows a popup with correct content' do
+ expect(page).to have_selector('div.leaflet-popup-content-wrapper')
+ expect(page).to have_content('[68.162386, 6.7535159, 97.395555, 35.5044752]')
+ end
+ end
+ end
+
+ describe 'item with bbox feature' do
+ before do
+ CatalogController.configure_blacklight do |config|
+ # set zoom config so we can test whether setMapBounds() is correct
+ config.view.maps.maxzoom = 8
+ config.view.maps.show_initial_zoom = 10
+ end
+ visit solr_document_path('2009373514')
+ end
+
+ it 'displays a bounding box' do
+ expect(page).to have_selector('.leaflet-overlay-pane path.leaflet-interactive')
+ end
+
+ it 'zooms to the correct map bounds' do
+ # if setMapBounds() zoom >= maxzoom, zoom-in control will be disabled
+ expect(page).to have_selector('a.leaflet-control-zoom-in.leaflet-disabled')
+ end
+ end
+end
diff --git a/spec/test_app_templates/Gemfile.extra b/spec/test_app_templates/Gemfile.extra
deleted file mode 100644
index 58ac3fe..0000000
--- a/spec/test_app_templates/Gemfile.extra
+++ /dev/null
@@ -1,5 +0,0 @@
-# extra gems to load into the test app go here
-
-gem 'leaflet-rails'
-
-gem 'leaflet-markercluster-rails'
diff --git a/spec/test_app_templates/lib/generators/test_app_generator.rb b/spec/test_app_templates/lib/generators/test_app_generator.rb
index e8cc672..c835f22 100644
--- a/spec/test_app_templates/lib/generators/test_app_generator.rb
+++ b/spec/test_app_templates/lib/generators/test_app_generator.rb
@@ -1,32 +1,17 @@
+# frozen_string_literal: true
+
require 'rails/generators'
class TestAppGenerator < Rails::Generators::Base
- source_root "../../spec/test_app_templates"
-
- def remove_index
- remove_file "public/index.html"
- end
+ source_root './spec/test_app_templates'
- def run_blacklight_generator
- say_status("warning", "GENERATING BL", :yellow)
-
- Bundler.with_clean_env do
- run "bundle install"
- end
-
- generate 'blacklight:install'
- end
-
- def run_gallery_install
+ def install_engine
generate 'blacklight_maps:install'
end
def configure_test_assets
- insert_into_file 'config/environments/test.rb', :after => 'Rails.application.configure do' do
- %q{
- config.assets.digest = false
-}
+ insert_into_file 'config/environments/test.rb', after: 'Rails.application.configure do' do
+ "\nconfig.assets.digest = false"
end
end
-
end
diff --git a/vendor/assets/images/layers-2x.png b/vendor/assets/images/layers-2x.png
new file mode 100644
index 0000000..200c333
Binary files /dev/null and b/vendor/assets/images/layers-2x.png differ
diff --git a/vendor/assets/images/layers.png b/vendor/assets/images/layers.png
new file mode 100644
index 0000000..1a72e57
Binary files /dev/null and b/vendor/assets/images/layers.png differ
diff --git a/vendor/assets/images/marker-icon-2x.png b/vendor/assets/images/marker-icon-2x.png
new file mode 100644
index 0000000..88f9e50
Binary files /dev/null and b/vendor/assets/images/marker-icon-2x.png differ
diff --git a/vendor/assets/images/marker-icon.png b/vendor/assets/images/marker-icon.png
new file mode 100644
index 0000000..950edf2
Binary files /dev/null and b/vendor/assets/images/marker-icon.png differ
diff --git a/vendor/assets/images/marker-shadow.png b/vendor/assets/images/marker-shadow.png
new file mode 100644
index 0000000..9fd2979
Binary files /dev/null and b/vendor/assets/images/marker-shadow.png differ
diff --git a/vendor/assets/javascripts/leaflet.js.erb b/vendor/assets/javascripts/leaflet.js.erb
new file mode 100644
index 0000000..3f14e40
--- /dev/null
+++ b/vendor/assets/javascripts/leaflet.js.erb
@@ -0,0 +1,13922 @@
+//= depend_on_asset "marker-icon-2x.png"
+//= depend_on_asset "marker-shadow.png"
+//= depend_on_asset "marker-icon.png"
+
+/* @preserve
+ * Leaflet 1.4.0+Detached: 3337f36d2a2d2b33946779057619b31f674ff5dc.3337f36, a JS library for interactive maps. http://leafletjs.com
+ * (c) 2010-2018 Vladimir Agafonkin, (c) 2010-2011 CloudMade
+ */
+
+(function (global, factory) {
+ typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+ typeof define === 'function' && define.amd ? define(['exports'], factory) :
+ (factory((global.L = {})));
+}(this, (function (exports) { 'use strict';
+
+ var version = "1.4.0+HEAD.3337f36";
+
+ /*
+ * @namespace Util
+ *
+ * Various utility functions, used by Leaflet internally.
+ */
+
+ var freeze = Object.freeze;
+ Object.freeze = function (obj) { return obj; };
+
+// @function extend(dest: Object, src?: Object): Object
+// Merges the properties of the `src` object (or multiple objects) into `dest` object and returns the latter. Has an `L.extend` shortcut.
+ function extend(dest) {
+ var i, j, len, src;
+
+ for (j = 1, len = arguments.length; j < len; j++) {
+ src = arguments[j];
+ for (i in src) {
+ dest[i] = src[i];
+ }
+ }
+ return dest;
+ }
+
+// @function create(proto: Object, properties?: Object): Object
+// Compatibility polyfill for [Object.create](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/create)
+ var create = Object.create || (function () {
+ function F() {}
+ return function (proto) {
+ F.prototype = proto;
+ return new F();
+ };
+ })();
+
+// @function bind(fn: Function, …): Function
+// Returns a new function bound to the arguments passed, like [Function.prototype.bind](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Function/bind).
+// Has a `L.bind()` shortcut.
+ function bind(fn, obj) {
+ var slice = Array.prototype.slice;
+
+ if (fn.bind) {
+ return fn.bind.apply(fn, slice.call(arguments, 1));
+ }
+
+ var args = slice.call(arguments, 2);
+
+ return function () {
+ return fn.apply(obj, args.length ? args.concat(slice.call(arguments)) : arguments);
+ };
+ }
+
+// @property lastId: Number
+// Last unique ID used by [`stamp()`](#util-stamp)
+ var lastId = 0;
+
+// @function stamp(obj: Object): Number
+// Returns the unique ID of an object, assigning it one if it doesn't have it.
+ function stamp(obj) {
+ /*eslint-disable */
+ obj._leaflet_id = obj._leaflet_id || ++lastId;
+ return obj._leaflet_id;
+ /* eslint-enable */
+ }
+
+// @function throttle(fn: Function, time: Number, context: Object): Function
+// Returns a function which executes function `fn` with the given scope `context`
+// (so that the `this` keyword refers to `context` inside `fn`'s code). The function
+// `fn` will be called no more than one time per given amount of `time`. The arguments
+// received by the bound function will be any arguments passed when binding the
+// function, followed by any arguments passed when invoking the bound function.
+// Has an `L.throttle` shortcut.
+ function throttle(fn, time, context) {
+ var lock, args, wrapperFn, later;
+
+ later = function () {
+ // reset lock and call if queued
+ lock = false;
+ if (args) {
+ wrapperFn.apply(context, args);
+ args = false;
+ }
+ };
+
+ wrapperFn = function () {
+ if (lock) {
+ // called too soon, queue to call later
+ args = arguments;
+
+ } else {
+ // call and lock until later
+ fn.apply(context, arguments);
+ setTimeout(later, time);
+ lock = true;
+ }
+ };
+
+ return wrapperFn;
+ }
+
+// @function wrapNum(num: Number, range: Number[], includeMax?: Boolean): Number
+// Returns the number `num` modulo `range` in such a way so it lies within
+// `range[0]` and `range[1]`. The returned value will be always smaller than
+// `range[1]` unless `includeMax` is set to `true`.
+ function wrapNum(x, range, includeMax) {
+ var max = range[1],
+ min = range[0],
+ d = max - min;
+ return x === max && includeMax ? x : ((x - min) % d + d) % d + min;
+ }
+
+// @function falseFn(): Function
+// Returns a function which always returns `false`.
+ function falseFn() { return false; }
+
+// @function formatNum(num: Number, digits?: Number): Number
+// Returns the number `num` rounded to `digits` decimals, or to 6 decimals by default.
+ function formatNum(num, digits) {
+ var pow = Math.pow(10, (digits === undefined ? 6 : digits));
+ return Math.round(num * pow) / pow;
+ }
+
+// @function trim(str: String): String
+// Compatibility polyfill for [String.prototype.trim](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String/Trim)
+ function trim(str) {
+ return str.trim ? str.trim() : str.replace(/^\s+|\s+$/g, '');
+ }
+
+// @function splitWords(str: String): String[]
+// Trims and splits the string on whitespace and returns the array of parts.
+ function splitWords(str) {
+ return trim(str).split(/\s+/);
+ }
+
+// @function setOptions(obj: Object, options: Object): Object
+// Merges the given properties to the `options` of the `obj` object, returning the resulting options. See `Class options`. Has an `L.setOptions` shortcut.
+ function setOptions(obj, options) {
+ if (!obj.hasOwnProperty('options')) {
+ obj.options = obj.options ? create(obj.options) : {};
+ }
+ for (var i in options) {
+ obj.options[i] = options[i];
+ }
+ return obj.options;
+ }
+
+// @function getParamString(obj: Object, existingUrl?: String, uppercase?: Boolean): String
+// Converts an object into a parameter URL string, e.g. `{a: "foo", b: "bar"}`
+// translates to `'?a=foo&b=bar'`. If `existingUrl` is set, the parameters will
+// be appended at the end. If `uppercase` is `true`, the parameter names will
+// be uppercased (e.g. `'?A=foo&B=bar'`)
+ function getParamString(obj, existingUrl, uppercase) {
+ var params = [];
+ for (var i in obj) {
+ params.push(encodeURIComponent(uppercase ? i.toUpperCase() : i) + '=' + encodeURIComponent(obj[i]));
+ }
+ return ((!existingUrl || existingUrl.indexOf('?') === -1) ? '?' : '&') + params.join('&');
+ }
+
+ var templateRe = /\{ *([\w_-]+) *\}/g;
+
+// @function template(str: String, data: Object): String
+// Simple templating facility, accepts a template string of the form `'Hello {a}, {b}'`
+// and a data object like `{a: 'foo', b: 'bar'}`, returns evaluated string
+// `('Hello foo, bar')`. You can also specify functions instead of strings for
+// data values — they will be evaluated passing `data` as an argument.
+ function template(str, data) {
+ return str.replace(templateRe, function (str, key) {
+ var value = data[key];
+
+ if (value === undefined) {
+ throw new Error('No value provided for variable ' + str);
+
+ } else if (typeof value === 'function') {
+ value = value(data);
+ }
+ return value;
+ });
+ }
+
+// @function isArray(obj): Boolean
+// Compatibility polyfill for [Array.isArray](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array/isArray)
+ var isArray = Array.isArray || function (obj) {
+ return (Object.prototype.toString.call(obj) === '[object Array]');
+ };
+
+// @function indexOf(array: Array, el: Object): Number
+// Compatibility polyfill for [Array.prototype.indexOf](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf)
+ function indexOf(array, el) {
+ for (var i = 0; i < array.length; i++) {
+ if (array[i] === el) { return i; }
+ }
+ return -1;
+ }
+
+// @property emptyImageUrl: String
+// Data URI string containing a base64-encoded empty GIF image.
+// Used as a hack to free memory from unused images on WebKit-powered
+// mobile devices (by setting image `src` to this string).
+ var emptyImageUrl = 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=';
+
+// inspired by http://paulirish.com/2011/requestanimationframe-for-smart-animating/
+
+ function getPrefixed(name) {
+ return window['webkit' + name] || window['moz' + name] || window['ms' + name];
+ }
+
+ var lastTime = 0;
+
+// fallback for IE 7-8
+ function timeoutDefer(fn) {
+ var time = +new Date(),
+ timeToCall = Math.max(0, 16 - (time - lastTime));
+
+ lastTime = time + timeToCall;
+ return window.setTimeout(fn, timeToCall);
+ }
+
+ var requestFn = window.requestAnimationFrame || getPrefixed('RequestAnimationFrame') || timeoutDefer;
+ var cancelFn = window.cancelAnimationFrame || getPrefixed('CancelAnimationFrame') ||
+ getPrefixed('CancelRequestAnimationFrame') || function (id) { window.clearTimeout(id); };
+
+// @function requestAnimFrame(fn: Function, context?: Object, immediate?: Boolean): Number
+// Schedules `fn` to be executed when the browser repaints. `fn` is bound to
+// `context` if given. When `immediate` is set, `fn` is called immediately if
+// the browser doesn't have native support for
+// [`window.requestAnimationFrame`](https://developer.mozilla.org/docs/Web/API/window/requestAnimationFrame),
+// otherwise it's delayed. Returns a request ID that can be used to cancel the request.
+ function requestAnimFrame(fn, context, immediate) {
+ if (immediate && requestFn === timeoutDefer) {
+ fn.call(context);
+ } else {
+ return requestFn.call(window, bind(fn, context));
+ }
+ }
+
+// @function cancelAnimFrame(id: Number): undefined
+// Cancels a previous `requestAnimFrame`. See also [window.cancelAnimationFrame](https://developer.mozilla.org/docs/Web/API/window/cancelAnimationFrame).
+ function cancelAnimFrame(id) {
+ if (id) {
+ cancelFn.call(window, id);
+ }
+ }
+
+
+ var Util = (Object.freeze || Object)({
+ freeze: freeze,
+ extend: extend,
+ create: create,
+ bind: bind,
+ lastId: lastId,
+ stamp: stamp,
+ throttle: throttle,
+ wrapNum: wrapNum,
+ falseFn: falseFn,
+ formatNum: formatNum,
+ trim: trim,
+ splitWords: splitWords,
+ setOptions: setOptions,
+ getParamString: getParamString,
+ template: template,
+ isArray: isArray,
+ indexOf: indexOf,
+ emptyImageUrl: emptyImageUrl,
+ requestFn: requestFn,
+ cancelFn: cancelFn,
+ requestAnimFrame: requestAnimFrame,
+ cancelAnimFrame: cancelAnimFrame
+ });
+
+// @class Class
+// @aka L.Class
+
+// @section
+// @uninheritable
+
+// Thanks to John Resig and Dean Edwards for inspiration!
+
+ function Class() {}
+
+ Class.extend = function (props) {
+
+ // @function extend(props: Object): Function
+ // [Extends the current class](#class-inheritance) given the properties to be included.
+ // Returns a Javascript function that is a class constructor (to be called with `new`).
+ var NewClass = function () {
+
+ // call the constructor
+ if (this.initialize) {
+ this.initialize.apply(this, arguments);
+ }
+
+ // call all constructor hooks
+ this.callInitHooks();
+ };
+
+ var parentProto = NewClass.__super__ = this.prototype;
+
+ var proto = create(parentProto);
+ proto.constructor = NewClass;
+
+ NewClass.prototype = proto;
+
+ // inherit parent's statics
+ for (var i in this) {
+ if (this.hasOwnProperty(i) && i !== 'prototype' && i !== '__super__') {
+ NewClass[i] = this[i];
+ }
+ }
+
+ // mix static properties into the class
+ if (props.statics) {
+ extend(NewClass, props.statics);
+ delete props.statics;
+ }
+
+ // mix includes into the prototype
+ if (props.includes) {
+ checkDeprecatedMixinEvents(props.includes);
+ extend.apply(null, [proto].concat(props.includes));
+ delete props.includes;
+ }
+
+ // merge options
+ if (proto.options) {
+ props.options = extend(create(proto.options), props.options);
+ }
+
+ // mix given properties into the prototype
+ extend(proto, props);
+
+ proto._initHooks = [];
+
+ // add method for calling all hooks
+ proto.callInitHooks = function () {
+
+ if (this._initHooksCalled) { return; }
+
+ if (parentProto.callInitHooks) {
+ parentProto.callInitHooks.call(this);
+ }
+
+ this._initHooksCalled = true;
+
+ for (var i = 0, len = proto._initHooks.length; i < len; i++) {
+ proto._initHooks[i].call(this);
+ }
+ };
+
+ return NewClass;
+ };
+
+
+// @function include(properties: Object): this
+// [Includes a mixin](#class-includes) into the current class.
+ Class.include = function (props) {
+ extend(this.prototype, props);
+ return this;
+ };
+
+// @function mergeOptions(options: Object): this
+// [Merges `options`](#class-options) into the defaults of the class.
+ Class.mergeOptions = function (options) {
+ extend(this.prototype.options, options);
+ return this;
+ };
+
+// @function addInitHook(fn: Function): this
+// Adds a [constructor hook](#class-constructor-hooks) to the class.
+ Class.addInitHook = function (fn) { // (Function) || (String, args...)
+ var args = Array.prototype.slice.call(arguments, 1);
+
+ var init = typeof fn === 'function' ? fn : function () {
+ this[fn].apply(this, args);
+ };
+
+ this.prototype._initHooks = this.prototype._initHooks || [];
+ this.prototype._initHooks.push(init);
+ return this;
+ };
+
+ function checkDeprecatedMixinEvents(includes) {
+ if (typeof L === 'undefined' || !L || !L.Mixin) { return; }
+
+ includes = isArray(includes) ? includes : [includes];
+
+ for (var i = 0; i < includes.length; i++) {
+ if (includes[i] === L.Mixin.Events) {
+ console.warn('Deprecated include of L.Mixin.Events: ' +
+ 'this property will be removed in future releases, ' +
+ 'please inherit from L.Evented instead.', new Error().stack);
+ }
+ }
+ }
+
+ /*
+ * @class Evented
+ * @aka L.Evented
+ * @inherits Class
+ *
+ * A set of methods shared between event-powered classes (like `Map` and `Marker`). Generally, events allow you to execute some function when something happens with an object (e.g. the user clicks on the map, causing the map to fire `'click'` event).
+ *
+ * @example
+ *
+ * ```js
+ * map.on('click', function(e) {
+ * alert(e.latlng);
+ * } );
+ * ```
+ *
+ * Leaflet deals with event listeners by reference, so if you want to add a listener and then remove it, define it as a function:
+ *
+ * ```js
+ * function onClick(e) { ... }
+ *
+ * map.on('click', onClick);
+ * map.off('click', onClick);
+ * ```
+ */
+
+ var Events = {
+ /* @method on(type: String, fn: Function, context?: Object): this
+ * Adds a listener function (`fn`) to a particular event type of the object. You can optionally specify the context of the listener (object the this keyword will point to). You can also pass several space-separated types (e.g. `'click dblclick'`).
+ *
+ * @alternative
+ * @method on(eventMap: Object): this
+ * Adds a set of type/listener pairs, e.g. `{click: onClick, mousemove: onMouseMove}`
+ */
+ on: function (types, fn, context) {
+
+ // types can be a map of types/handlers
+ if (typeof types === 'object') {
+ for (var type in types) {
+ // we don't process space-separated events here for performance;
+ // it's a hot path since Layer uses the on(obj) syntax
+ this._on(type, types[type], fn);
+ }
+
+ } else {
+ // types can be a string of space-separated words
+ types = splitWords(types);
+
+ for (var i = 0, len = types.length; i < len; i++) {
+ this._on(types[i], fn, context);
+ }
+ }
+
+ return this;
+ },
+
+ /* @method off(type: String, fn?: Function, context?: Object): this
+ * Removes a previously added listener function. If no function is specified, it will remove all the listeners of that particular event from the object. Note that if you passed a custom context to `on`, you must pass the same context to `off` in order to remove the listener.
+ *
+ * @alternative
+ * @method off(eventMap: Object): this
+ * Removes a set of type/listener pairs.
+ *
+ * @alternative
+ * @method off: this
+ * Removes all listeners to all events on the object.
+ */
+ off: function (types, fn, context) {
+
+ if (!types) {
+ // clear all listeners if called without arguments
+ delete this._events;
+
+ } else if (typeof types === 'object') {
+ for (var type in types) {
+ this._off(type, types[type], fn);
+ }
+
+ } else {
+ types = splitWords(types);
+
+ for (var i = 0, len = types.length; i < len; i++) {
+ this._off(types[i], fn, context);
+ }
+ }
+
+ return this;
+ },
+
+ // attach listener (without syntactic sugar now)
+ _on: function (type, fn, context) {
+ this._events = this._events || {};
+
+ /* get/init listeners for type */
+ var typeListeners = this._events[type];
+ if (!typeListeners) {
+ typeListeners = [];
+ this._events[type] = typeListeners;
+ }
+
+ if (context === this) {
+ // Less memory footprint.
+ context = undefined;
+ }
+ var newListener = {fn: fn, ctx: context},
+ listeners = typeListeners;
+
+ // check if fn already there
+ for (var i = 0, len = listeners.length; i < len; i++) {
+ if (listeners[i].fn === fn && listeners[i].ctx === context) {
+ return;
+ }
+ }
+
+ listeners.push(newListener);
+ },
+
+ _off: function (type, fn, context) {
+ var listeners,
+ i,
+ len;
+
+ if (!this._events) { return; }
+
+ listeners = this._events[type];
+
+ if (!listeners) {
+ return;
+ }
+
+ if (!fn) {
+ // Set all removed listeners to noop so they are not called if remove happens in fire
+ for (i = 0, len = listeners.length; i < len; i++) {
+ listeners[i].fn = falseFn;
+ }
+ // clear all listeners for a type if function isn't specified
+ delete this._events[type];
+ return;
+ }
+
+ if (context === this) {
+ context = undefined;
+ }
+
+ if (listeners) {
+
+ // find fn and remove it
+ for (i = 0, len = listeners.length; i < len; i++) {
+ var l = listeners[i];
+ if (l.ctx !== context) { continue; }
+ if (l.fn === fn) {
+
+ // set the removed listener to noop so that's not called if remove happens in fire
+ l.fn = falseFn;
+
+ if (this._firingCount) {
+ /* copy array in case events are being fired */
+ this._events[type] = listeners = listeners.slice();
+ }
+ listeners.splice(i, 1);
+
+ return;
+ }
+ }
+ }
+ },
+
+ // @method fire(type: String, data?: Object, propagate?: Boolean): this
+ // Fires an event of the specified type. You can optionally provide an data
+ // object — the first argument of the listener function will contain its
+ // properties. The event can optionally be propagated to event parents.
+ fire: function (type, data, propagate) {
+ if (!this.listens(type, propagate)) { return this; }
+
+ var event = extend({}, data, {
+ type: type,
+ target: this,
+ sourceTarget: data && data.sourceTarget || this
+ });
+
+ if (this._events) {
+ var listeners = this._events[type];
+
+ if (listeners) {
+ this._firingCount = (this._firingCount + 1) || 1;
+ for (var i = 0, len = listeners.length; i < len; i++) {
+ var l = listeners[i];
+ l.fn.call(l.ctx || this, event);
+ }
+
+ this._firingCount--;
+ }
+ }
+
+ if (propagate) {
+ // propagate the event to parents (set with addEventParent)
+ this._propagateEvent(event);
+ }
+
+ return this;
+ },
+
+ // @method listens(type: String): Boolean
+ // Returns `true` if a particular event type has any listeners attached to it.
+ listens: function (type, propagate) {
+ var listeners = this._events && this._events[type];
+ if (listeners && listeners.length) { return true; }
+
+ if (propagate) {
+ // also check parents for listeners if event propagates
+ for (var id in this._eventParents) {
+ if (this._eventParents[id].listens(type, propagate)) { return true; }
+ }
+ }
+ return false;
+ },
+
+ // @method once(…): this
+ // Behaves as [`on(…)`](#evented-on), except the listener will only get fired once and then removed.
+ once: function (types, fn, context) {
+
+ if (typeof types === 'object') {
+ for (var type in types) {
+ this.once(type, types[type], fn);
+ }
+ return this;
+ }
+
+ var handler = bind(function () {
+ this
+ .off(types, fn, context)
+ .off(types, handler, context);
+ }, this);
+
+ // add a listener that's executed once and removed after that
+ return this
+ .on(types, fn, context)
+ .on(types, handler, context);
+ },
+
+ // @method addEventParent(obj: Evented): this
+ // Adds an event parent - an `Evented` that will receive propagated events
+ addEventParent: function (obj) {
+ this._eventParents = this._eventParents || {};
+ this._eventParents[stamp(obj)] = obj;
+ return this;
+ },
+
+ // @method removeEventParent(obj: Evented): this
+ // Removes an event parent, so it will stop receiving propagated events
+ removeEventParent: function (obj) {
+ if (this._eventParents) {
+ delete this._eventParents[stamp(obj)];
+ }
+ return this;
+ },
+
+ _propagateEvent: function (e) {
+ for (var id in this._eventParents) {
+ this._eventParents[id].fire(e.type, extend({
+ layer: e.target,
+ propagatedFrom: e.target
+ }, e), true);
+ }
+ }
+ };
+
+// aliases; we should ditch those eventually
+
+// @method addEventListener(…): this
+// Alias to [`on(…)`](#evented-on)
+ Events.addEventListener = Events.on;
+
+// @method removeEventListener(…): this
+// Alias to [`off(…)`](#evented-off)
+
+// @method clearAllEventListeners(…): this
+// Alias to [`off()`](#evented-off)
+ Events.removeEventListener = Events.clearAllEventListeners = Events.off;
+
+// @method addOneTimeEventListener(…): this
+// Alias to [`once(…)`](#evented-once)
+ Events.addOneTimeEventListener = Events.once;
+
+// @method fireEvent(…): this
+// Alias to [`fire(…)`](#evented-fire)
+ Events.fireEvent = Events.fire;
+
+// @method hasEventListeners(…): Boolean
+// Alias to [`listens(…)`](#evented-listens)
+ Events.hasEventListeners = Events.listens;
+
+ var Evented = Class.extend(Events);
+
+ /*
+ * @class Point
+ * @aka L.Point
+ *
+ * Represents a point with `x` and `y` coordinates in pixels.
+ *
+ * @example
+ *
+ * ```js
+ * var point = L.point(200, 300);
+ * ```
+ *
+ * All Leaflet methods and options that accept `Point` objects also accept them in a simple Array form (unless noted otherwise), so these lines are equivalent:
+ *
+ * ```js
+ * map.panBy([200, 300]);
+ * map.panBy(L.point(200, 300));
+ * ```
+ *
+ * Note that `Point` does not inherit from Leafet's `Class` object,
+ * which means new classes can't inherit from it, and new methods
+ * can't be added to it with the `include` function.
+ */
+
+ function Point(x, y, round) {
+ // @property x: Number; The `x` coordinate of the point
+ this.x = (round ? Math.round(x) : x);
+ // @property y: Number; The `y` coordinate of the point
+ this.y = (round ? Math.round(y) : y);
+ }
+
+ var trunc = Math.trunc || function (v) {
+ return v > 0 ? Math.floor(v) : Math.ceil(v);
+ };
+
+ Point.prototype = {
+
+ // @method clone(): Point
+ // Returns a copy of the current point.
+ clone: function () {
+ return new Point(this.x, this.y);
+ },
+
+ // @method add(otherPoint: Point): Point
+ // Returns the result of addition of the current and the given points.
+ add: function (point) {
+ // non-destructive, returns a new point
+ return this.clone()._add(toPoint(point));
+ },
+
+ _add: function (point) {
+ // destructive, used directly for performance in situations where it's safe to modify existing point
+ this.x += point.x;
+ this.y += point.y;
+ return this;
+ },
+
+ // @method subtract(otherPoint: Point): Point
+ // Returns the result of subtraction of the given point from the current.
+ subtract: function (point) {
+ return this.clone()._subtract(toPoint(point));
+ },
+
+ _subtract: function (point) {
+ this.x -= point.x;
+ this.y -= point.y;
+ return this;
+ },
+
+ // @method divideBy(num: Number): Point
+ // Returns the result of division of the current point by the given number.
+ divideBy: function (num) {
+ return this.clone()._divideBy(num);
+ },
+
+ _divideBy: function (num) {
+ this.x /= num;
+ this.y /= num;
+ return this;
+ },
+
+ // @method multiplyBy(num: Number): Point
+ // Returns the result of multiplication of the current point by the given number.
+ multiplyBy: function (num) {
+ return this.clone()._multiplyBy(num);
+ },
+
+ _multiplyBy: function (num) {
+ this.x *= num;
+ this.y *= num;
+ return this;
+ },
+
+ // @method scaleBy(scale: Point): Point
+ // Multiply each coordinate of the current point by each coordinate of
+ // `scale`. In linear algebra terms, multiply the point by the
+ // [scaling matrix](https://en.wikipedia.org/wiki/Scaling_%28geometry%29#Matrix_representation)
+ // defined by `scale`.
+ scaleBy: function (point) {
+ return new Point(this.x * point.x, this.y * point.y);
+ },
+
+ // @method unscaleBy(scale: Point): Point
+ // Inverse of `scaleBy`. Divide each coordinate of the current point by
+ // each coordinate of `scale`.
+ unscaleBy: function (point) {
+ return new Point(this.x / point.x, this.y / point.y);
+ },
+
+ // @method round(): Point
+ // Returns a copy of the current point with rounded coordinates.
+ round: function () {
+ return this.clone()._round();
+ },
+
+ _round: function () {
+ this.x = Math.round(this.x);
+ this.y = Math.round(this.y);
+ return this;
+ },
+
+ // @method floor(): Point
+ // Returns a copy of the current point with floored coordinates (rounded down).
+ floor: function () {
+ return this.clone()._floor();
+ },
+
+ _floor: function () {
+ this.x = Math.floor(this.x);
+ this.y = Math.floor(this.y);
+ return this;
+ },
+
+ // @method ceil(): Point
+ // Returns a copy of the current point with ceiled coordinates (rounded up).
+ ceil: function () {
+ return this.clone()._ceil();
+ },
+
+ _ceil: function () {
+ this.x = Math.ceil(this.x);
+ this.y = Math.ceil(this.y);
+ return this;
+ },
+
+ // @method trunc(): Point
+ // Returns a copy of the current point with truncated coordinates (rounded towards zero).
+ trunc: function () {
+ return this.clone()._trunc();
+ },
+
+ _trunc: function () {
+ this.x = trunc(this.x);
+ this.y = trunc(this.y);
+ return this;
+ },
+
+ // @method distanceTo(otherPoint: Point): Number
+ // Returns the cartesian distance between the current and the given points.
+ distanceTo: function (point) {
+ point = toPoint(point);
+
+ var x = point.x - this.x,
+ y = point.y - this.y;
+
+ return Math.sqrt(x * x + y * y);
+ },
+
+ // @method equals(otherPoint: Point): Boolean
+ // Returns `true` if the given point has the same coordinates.
+ equals: function (point) {
+ point = toPoint(point);
+
+ return point.x === this.x &&
+ point.y === this.y;
+ },
+
+ // @method contains(otherPoint: Point): Boolean
+ // Returns `true` if both coordinates of the given point are less than the corresponding current point coordinates (in absolute values).
+ contains: function (point) {
+ point = toPoint(point);
+
+ return Math.abs(point.x) <= Math.abs(this.x) &&
+ Math.abs(point.y) <= Math.abs(this.y);
+ },
+
+ // @method toString(): String
+ // Returns a string representation of the point for debugging purposes.
+ toString: function () {
+ return 'Point(' +
+ formatNum(this.x) + ', ' +
+ formatNum(this.y) + ')';
+ }
+ };
+
+// @factory L.point(x: Number, y: Number, round?: Boolean)
+// Creates a Point object with the given `x` and `y` coordinates. If optional `round` is set to true, rounds the `x` and `y` values.
+
+// @alternative
+// @factory L.point(coords: Number[])
+// Expects an array of the form `[x, y]` instead.
+
+// @alternative
+// @factory L.point(coords: Object)
+// Expects a plain object of the form `{x: Number, y: Number}` instead.
+ function toPoint(x, y, round) {
+ if (x instanceof Point) {
+ return x;
+ }
+ if (isArray(x)) {
+ return new Point(x[0], x[1]);
+ }
+ if (x === undefined || x === null) {
+ return x;
+ }
+ if (typeof x === 'object' && 'x' in x && 'y' in x) {
+ return new Point(x.x, x.y);
+ }
+ return new Point(x, y, round);
+ }
+
+ /*
+ * @class Bounds
+ * @aka L.Bounds
+ *
+ * Represents a rectangular area in pixel coordinates.
+ *
+ * @example
+ *
+ * ```js
+ * var p1 = L.point(10, 10),
+ * p2 = L.point(40, 60),
+ * bounds = L.bounds(p1, p2);
+ * ```
+ *
+ * All Leaflet methods that accept `Bounds` objects also accept them in a simple Array form (unless noted otherwise), so the bounds example above can be passed like this:
+ *
+ * ```js
+ * otherBounds.intersects([[10, 10], [40, 60]]);
+ * ```
+ *
+ * Note that `Bounds` does not inherit from Leafet's `Class` object,
+ * which means new classes can't inherit from it, and new methods
+ * can't be added to it with the `include` function.
+ */
+
+ function Bounds(a, b) {
+ if (!a) { return; }
+
+ var points = b ? [a, b] : a;
+
+ for (var i = 0, len = points.length; i < len; i++) {
+ this.extend(points[i]);
+ }
+ }
+
+ Bounds.prototype = {
+ // @method extend(point: Point): this
+ // Extends the bounds to contain the given point.
+ extend: function (point) { // (Point)
+ point = toPoint(point);
+
+ // @property min: Point
+ // The top left corner of the rectangle.
+ // @property max: Point
+ // The bottom right corner of the rectangle.
+ if (!this.min && !this.max) {
+ this.min = point.clone();
+ this.max = point.clone();
+ } else {
+ this.min.x = Math.min(point.x, this.min.x);
+ this.max.x = Math.max(point.x, this.max.x);
+ this.min.y = Math.min(point.y, this.min.y);
+ this.max.y = Math.max(point.y, this.max.y);
+ }
+ return this;
+ },
+
+ // @method getCenter(round?: Boolean): Point
+ // Returns the center point of the bounds.
+ getCenter: function (round) {
+ return new Point(
+ (this.min.x + this.max.x) / 2,
+ (this.min.y + this.max.y) / 2, round);
+ },
+
+ // @method getBottomLeft(): Point
+ // Returns the bottom-left point of the bounds.
+ getBottomLeft: function () {
+ return new Point(this.min.x, this.max.y);
+ },
+
+ // @method getTopRight(): Point
+ // Returns the top-right point of the bounds.
+ getTopRight: function () { // -> Point
+ return new Point(this.max.x, this.min.y);
+ },
+
+ // @method getTopLeft(): Point
+ // Returns the top-left point of the bounds (i.e. [`this.min`](#bounds-min)).
+ getTopLeft: function () {
+ return this.min; // left, top
+ },
+
+ // @method getBottomRight(): Point
+ // Returns the bottom-right point of the bounds (i.e. [`this.max`](#bounds-max)).
+ getBottomRight: function () {
+ return this.max; // right, bottom
+ },
+
+ // @method getSize(): Point
+ // Returns the size of the given bounds
+ getSize: function () {
+ return this.max.subtract(this.min);
+ },
+
+ // @method contains(otherBounds: Bounds): Boolean
+ // Returns `true` if the rectangle contains the given one.
+ // @alternative
+ // @method contains(point: Point): Boolean
+ // Returns `true` if the rectangle contains the given point.
+ contains: function (obj) {
+ var min, max;
+
+ if (typeof obj[0] === 'number' || obj instanceof Point) {
+ obj = toPoint(obj);
+ } else {
+ obj = toBounds(obj);
+ }
+
+ if (obj instanceof Bounds) {
+ min = obj.min;
+ max = obj.max;
+ } else {
+ min = max = obj;
+ }
+
+ return (min.x >= this.min.x) &&
+ (max.x <= this.max.x) &&
+ (min.y >= this.min.y) &&
+ (max.y <= this.max.y);
+ },
+
+ // @method intersects(otherBounds: Bounds): Boolean
+ // Returns `true` if the rectangle intersects the given bounds. Two bounds
+ // intersect if they have at least one point in common.
+ intersects: function (bounds) { // (Bounds) -> Boolean
+ bounds = toBounds(bounds);
+
+ var min = this.min,
+ max = this.max,
+ min2 = bounds.min,
+ max2 = bounds.max,
+ xIntersects = (max2.x >= min.x) && (min2.x <= max.x),
+ yIntersects = (max2.y >= min.y) && (min2.y <= max.y);
+
+ return xIntersects && yIntersects;
+ },
+
+ // @method overlaps(otherBounds: Bounds): Boolean
+ // Returns `true` if the rectangle overlaps the given bounds. Two bounds
+ // overlap if their intersection is an area.
+ overlaps: function (bounds) { // (Bounds) -> Boolean
+ bounds = toBounds(bounds);
+
+ var min = this.min,
+ max = this.max,
+ min2 = bounds.min,
+ max2 = bounds.max,
+ xOverlaps = (max2.x > min.x) && (min2.x < max.x),
+ yOverlaps = (max2.y > min.y) && (min2.y < max.y);
+
+ return xOverlaps && yOverlaps;
+ },
+
+ isValid: function () {
+ return !!(this.min && this.max);
+ }
+ };
+
+
+// @factory L.bounds(corner1: Point, corner2: Point)
+// Creates a Bounds object from two corners coordinate pairs.
+// @alternative
+// @factory L.bounds(points: Point[])
+// Creates a Bounds object from the given array of points.
+ function toBounds(a, b) {
+ if (!a || a instanceof Bounds) {
+ return a;
+ }
+ return new Bounds(a, b);
+ }
+
+ /*
+ * @class LatLngBounds
+ * @aka L.LatLngBounds
+ *
+ * Represents a rectangular geographical area on a map.
+ *
+ * @example
+ *
+ * ```js
+ * var corner1 = L.latLng(40.712, -74.227),
+ * corner2 = L.latLng(40.774, -74.125),
+ * bounds = L.latLngBounds(corner1, corner2);
+ * ```
+ *
+ * All Leaflet methods that accept LatLngBounds objects also accept them in a simple Array form (unless noted otherwise), so the bounds example above can be passed like this:
+ *
+ * ```js
+ * map.fitBounds([
+ * [40.712, -74.227],
+ * [40.774, -74.125]
+ * ]);
+ * ```
+ *
+ * Caution: if the area crosses the antimeridian (often confused with the International Date Line), you must specify corners _outside_ the [-180, 180] degrees longitude range.
+ *
+ * Note that `LatLngBounds` does not inherit from Leafet's `Class` object,
+ * which means new classes can't inherit from it, and new methods
+ * can't be added to it with the `include` function.
+ */
+
+ function LatLngBounds(corner1, corner2) { // (LatLng, LatLng) or (LatLng[])
+ if (!corner1) { return; }
+
+ var latlngs = corner2 ? [corner1, corner2] : corner1;
+
+ for (var i = 0, len = latlngs.length; i < len; i++) {
+ this.extend(latlngs[i]);
+ }
+ }
+
+ LatLngBounds.prototype = {
+
+ // @method extend(latlng: LatLng): this
+ // Extend the bounds to contain the given point
+
+ // @alternative
+ // @method extend(otherBounds: LatLngBounds): this
+ // Extend the bounds to contain the given bounds
+ extend: function (obj) {
+ var sw = this._southWest,
+ ne = this._northEast,
+ sw2, ne2;
+
+ if (obj instanceof LatLng) {
+ sw2 = obj;
+ ne2 = obj;
+
+ } else if (obj instanceof LatLngBounds) {
+ sw2 = obj._southWest;
+ ne2 = obj._northEast;
+
+ if (!sw2 || !ne2) { return this; }
+
+ } else {
+ return obj ? this.extend(toLatLng(obj) || toLatLngBounds(obj)) : this;
+ }
+
+ if (!sw && !ne) {
+ this._southWest = new LatLng(sw2.lat, sw2.lng);
+ this._northEast = new LatLng(ne2.lat, ne2.lng);
+ } else {
+ sw.lat = Math.min(sw2.lat, sw.lat);
+ sw.lng = Math.min(sw2.lng, sw.lng);
+ ne.lat = Math.max(ne2.lat, ne.lat);
+ ne.lng = Math.max(ne2.lng, ne.lng);
+ }
+
+ return this;
+ },
+
+ // @method pad(bufferRatio: Number): LatLngBounds
+ // Returns bounds created by extending or retracting the current bounds by a given ratio in each direction.
+ // For example, a ratio of 0.5 extends the bounds by 50% in each direction.
+ // Negative values will retract the bounds.
+ pad: function (bufferRatio) {
+ var sw = this._southWest,
+ ne = this._northEast,
+ heightBuffer = Math.abs(sw.lat - ne.lat) * bufferRatio,
+ widthBuffer = Math.abs(sw.lng - ne.lng) * bufferRatio;
+
+ return new LatLngBounds(
+ new LatLng(sw.lat - heightBuffer, sw.lng - widthBuffer),
+ new LatLng(ne.lat + heightBuffer, ne.lng + widthBuffer));
+ },
+
+ // @method getCenter(): LatLng
+ // Returns the center point of the bounds.
+ getCenter: function () {
+ return new LatLng(
+ (this._southWest.lat + this._northEast.lat) / 2,
+ (this._southWest.lng + this._northEast.lng) / 2);
+ },
+
+ // @method getSouthWest(): LatLng
+ // Returns the south-west point of the bounds.
+ getSouthWest: function () {
+ return this._southWest;
+ },
+
+ // @method getNorthEast(): LatLng
+ // Returns the north-east point of the bounds.
+ getNorthEast: function () {
+ return this._northEast;
+ },
+
+ // @method getNorthWest(): LatLng
+ // Returns the north-west point of the bounds.
+ getNorthWest: function () {
+ return new LatLng(this.getNorth(), this.getWest());
+ },
+
+ // @method getSouthEast(): LatLng
+ // Returns the south-east point of the bounds.
+ getSouthEast: function () {
+ return new LatLng(this.getSouth(), this.getEast());
+ },
+
+ // @method getWest(): Number
+ // Returns the west longitude of the bounds
+ getWest: function () {
+ return this._southWest.lng;
+ },
+
+ // @method getSouth(): Number
+ // Returns the south latitude of the bounds
+ getSouth: function () {
+ return this._southWest.lat;
+ },
+
+ // @method getEast(): Number
+ // Returns the east longitude of the bounds
+ getEast: function () {
+ return this._northEast.lng;
+ },
+
+ // @method getNorth(): Number
+ // Returns the north latitude of the bounds
+ getNorth: function () {
+ return this._northEast.lat;
+ },
+
+ // @method contains(otherBounds: LatLngBounds): Boolean
+ // Returns `true` if the rectangle contains the given one.
+
+ // @alternative
+ // @method contains (latlng: LatLng): Boolean
+ // Returns `true` if the rectangle contains the given point.
+ contains: function (obj) { // (LatLngBounds) or (LatLng) -> Boolean
+ if (typeof obj[0] === 'number' || obj instanceof LatLng || 'lat' in obj) {
+ obj = toLatLng(obj);
+ } else {
+ obj = toLatLngBounds(obj);
+ }
+
+ var sw = this._southWest,
+ ne = this._northEast,
+ sw2, ne2;
+
+ if (obj instanceof LatLngBounds) {
+ sw2 = obj.getSouthWest();
+ ne2 = obj.getNorthEast();
+ } else {
+ sw2 = ne2 = obj;
+ }
+
+ return (sw2.lat >= sw.lat) && (ne2.lat <= ne.lat) &&
+ (sw2.lng >= sw.lng) && (ne2.lng <= ne.lng);
+ },
+
+ // @method intersects(otherBounds: LatLngBounds): Boolean
+ // Returns `true` if the rectangle intersects the given bounds. Two bounds intersect if they have at least one point in common.
+ intersects: function (bounds) {
+ bounds = toLatLngBounds(bounds);
+
+ var sw = this._southWest,
+ ne = this._northEast,
+ sw2 = bounds.getSouthWest(),
+ ne2 = bounds.getNorthEast(),
+
+ latIntersects = (ne2.lat >= sw.lat) && (sw2.lat <= ne.lat),
+ lngIntersects = (ne2.lng >= sw.lng) && (sw2.lng <= ne.lng);
+
+ return latIntersects && lngIntersects;
+ },
+
+ // @method overlaps(otherBounds: Bounds): Boolean
+ // Returns `true` if the rectangle overlaps the given bounds. Two bounds overlap if their intersection is an area.
+ overlaps: function (bounds) {
+ bounds = toLatLngBounds(bounds);
+
+ var sw = this._southWest,
+ ne = this._northEast,
+ sw2 = bounds.getSouthWest(),
+ ne2 = bounds.getNorthEast(),
+
+ latOverlaps = (ne2.lat > sw.lat) && (sw2.lat < ne.lat),
+ lngOverlaps = (ne2.lng > sw.lng) && (sw2.lng < ne.lng);
+
+ return latOverlaps && lngOverlaps;
+ },
+
+ // @method toBBoxString(): String
+ // Returns a string with bounding box coordinates in a 'southwest_lng,southwest_lat,northeast_lng,northeast_lat' format. Useful for sending requests to web services that return geo data.
+ toBBoxString: function () {
+ return [this.getWest(), this.getSouth(), this.getEast(), this.getNorth()].join(',');
+ },
+
+ // @method equals(otherBounds: LatLngBounds, maxMargin?: Number): Boolean
+ // Returns `true` if the rectangle is equivalent (within a small margin of error) to the given bounds. The margin of error can be overridden by setting `maxMargin` to a small number.
+ equals: function (bounds, maxMargin) {
+ if (!bounds) { return false; }
+
+ bounds = toLatLngBounds(bounds);
+
+ return this._southWest.equals(bounds.getSouthWest(), maxMargin) &&
+ this._northEast.equals(bounds.getNorthEast(), maxMargin);
+ },
+
+ // @method isValid(): Boolean
+ // Returns `true` if the bounds are properly initialized.
+ isValid: function () {
+ return !!(this._southWest && this._northEast);
+ }
+ };
+
+// TODO International date line?
+
+// @factory L.latLngBounds(corner1: LatLng, corner2: LatLng)
+// Creates a `LatLngBounds` object by defining two diagonally opposite corners of the rectangle.
+
+// @alternative
+// @factory L.latLngBounds(latlngs: LatLng[])
+// Creates a `LatLngBounds` object defined by the geographical points it contains. Very useful for zooming the map to fit a particular set of locations with [`fitBounds`](#map-fitbounds).
+ function toLatLngBounds(a, b) {
+ if (a instanceof LatLngBounds) {
+ return a;
+ }
+ return new LatLngBounds(a, b);
+ }
+
+ /* @class LatLng
+ * @aka L.LatLng
+ *
+ * Represents a geographical point with a certain latitude and longitude.
+ *
+ * @example
+ *
+ * ```
+ * var latlng = L.latLng(50.5, 30.5);
+ * ```
+ *
+ * All Leaflet methods that accept LatLng objects also accept them in a simple Array form and simple object form (unless noted otherwise), so these lines are equivalent:
+ *
+ * ```
+ * map.panTo([50, 30]);
+ * map.panTo({lon: 30, lat: 50});
+ * map.panTo({lat: 50, lng: 30});
+ * map.panTo(L.latLng(50, 30));
+ * ```
+ *
+ * Note that `LatLng` does not inherit from Leaflet's `Class` object,
+ * which means new classes can't inherit from it, and new methods
+ * can't be added to it with the `include` function.
+ */
+
+ function LatLng(lat, lng, alt) {
+ if (isNaN(lat) || isNaN(lng)) {
+ throw new Error('Invalid LatLng object: (' + lat + ', ' + lng + ')');
+ }
+
+ // @property lat: Number
+ // Latitude in degrees
+ this.lat = +lat;
+
+ // @property lng: Number
+ // Longitude in degrees
+ this.lng = +lng;
+
+ // @property alt: Number
+ // Altitude in meters (optional)
+ if (alt !== undefined) {
+ this.alt = +alt;
+ }
+ }
+
+ LatLng.prototype = {
+ // @method equals(otherLatLng: LatLng, maxMargin?: Number): Boolean
+ // Returns `true` if the given `LatLng` point is at the same position (within a small margin of error). The margin of error can be overridden by setting `maxMargin` to a small number.
+ equals: function (obj, maxMargin) {
+ if (!obj) { return false; }
+
+ obj = toLatLng(obj);
+
+ var margin = Math.max(
+ Math.abs(this.lat - obj.lat),
+ Math.abs(this.lng - obj.lng));
+
+ return margin <= (maxMargin === undefined ? 1.0E-9 : maxMargin);
+ },
+
+ // @method toString(): String
+ // Returns a string representation of the point (for debugging purposes).
+ toString: function (precision) {
+ return 'LatLng(' +
+ formatNum(this.lat, precision) + ', ' +
+ formatNum(this.lng, precision) + ')';
+ },
+
+ // @method distanceTo(otherLatLng: LatLng): Number
+ // Returns the distance (in meters) to the given `LatLng` calculated using the [Spherical Law of Cosines](https://en.wikipedia.org/wiki/Spherical_law_of_cosines).
+ distanceTo: function (other) {
+ return Earth.distance(this, toLatLng(other));
+ },
+
+ // @method wrap(): LatLng
+ // Returns a new `LatLng` object with the longitude wrapped so it's always between -180 and +180 degrees.
+ wrap: function () {
+ return Earth.wrapLatLng(this);
+ },
+
+ // @method toBounds(sizeInMeters: Number): LatLngBounds
+ // Returns a new `LatLngBounds` object in which each boundary is `sizeInMeters/2` meters apart from the `LatLng`.
+ toBounds: function (sizeInMeters) {
+ var latAccuracy = 180 * sizeInMeters / 40075017,
+ lngAccuracy = latAccuracy / Math.cos((Math.PI / 180) * this.lat);
+
+ return toLatLngBounds(
+ [this.lat - latAccuracy, this.lng - lngAccuracy],
+ [this.lat + latAccuracy, this.lng + lngAccuracy]);
+ },
+
+ clone: function () {
+ return new LatLng(this.lat, this.lng, this.alt);
+ }
+ };
+
+
+
+// @factory L.latLng(latitude: Number, longitude: Number, altitude?: Number): LatLng
+// Creates an object representing a geographical point with the given latitude and longitude (and optionally altitude).
+
+// @alternative
+// @factory L.latLng(coords: Array): LatLng
+// Expects an array of the form `[Number, Number]` or `[Number, Number, Number]` instead.
+
+// @alternative
+// @factory L.latLng(coords: Object): LatLng
+// Expects an plain object of the form `{lat: Number, lng: Number}` or `{lat: Number, lng: Number, alt: Number}` instead.
+
+ function toLatLng(a, b, c) {
+ if (a instanceof LatLng) {
+ return a;
+ }
+ if (isArray(a) && typeof a[0] !== 'object') {
+ if (a.length === 3) {
+ return new LatLng(a[0], a[1], a[2]);
+ }
+ if (a.length === 2) {
+ return new LatLng(a[0], a[1]);
+ }
+ return null;
+ }
+ if (a === undefined || a === null) {
+ return a;
+ }
+ if (typeof a === 'object' && 'lat' in a) {
+ return new LatLng(a.lat, 'lng' in a ? a.lng : a.lon, a.alt);
+ }
+ if (b === undefined) {
+ return null;
+ }
+ return new LatLng(a, b, c);
+ }
+
+ /*
+ * @namespace CRS
+ * @crs L.CRS.Base
+ * Object that defines coordinate reference systems for projecting
+ * geographical points into pixel (screen) coordinates and back (and to
+ * coordinates in other units for [WMS](https://en.wikipedia.org/wiki/Web_Map_Service) services). See
+ * [spatial reference system](http://en.wikipedia.org/wiki/Coordinate_reference_system).
+ *
+ * Leaflet defines the most usual CRSs by default. If you want to use a
+ * CRS not defined by default, take a look at the
+ * [Proj4Leaflet](https://github.com/kartena/Proj4Leaflet) plugin.
+ *
+ * Note that the CRS instances do not inherit from Leafet's `Class` object,
+ * and can't be instantiated. Also, new classes can't inherit from them,
+ * and methods can't be added to them with the `include` function.
+ */
+
+ var CRS = {
+ // @method latLngToPoint(latlng: LatLng, zoom: Number): Point
+ // Projects geographical coordinates into pixel coordinates for a given zoom.
+ latLngToPoint: function (latlng, zoom) {
+ var projectedPoint = this.projection.project(latlng),
+ scale = this.scale(zoom);
+
+ return this.transformation._transform(projectedPoint, scale);
+ },
+
+ // @method pointToLatLng(point: Point, zoom: Number): LatLng
+ // The inverse of `latLngToPoint`. Projects pixel coordinates on a given
+ // zoom into geographical coordinates.
+ pointToLatLng: function (point, zoom) {
+ var scale = this.scale(zoom),
+ untransformedPoint = this.transformation.untransform(point, scale);
+
+ return this.projection.unproject(untransformedPoint);
+ },
+
+ // @method project(latlng: LatLng): Point
+ // Projects geographical coordinates into coordinates in units accepted for
+ // this CRS (e.g. meters for EPSG:3857, for passing it to WMS services).
+ project: function (latlng) {
+ return this.projection.project(latlng);
+ },
+
+ // @method unproject(point: Point): LatLng
+ // Given a projected coordinate returns the corresponding LatLng.
+ // The inverse of `project`.
+ unproject: function (point) {
+ return this.projection.unproject(point);
+ },
+
+ // @method scale(zoom: Number): Number
+ // Returns the scale used when transforming projected coordinates into
+ // pixel coordinates for a particular zoom. For example, it returns
+ // `256 * 2^zoom` for Mercator-based CRS.
+ scale: function (zoom) {
+ return 256 * Math.pow(2, zoom);
+ },
+
+ // @method zoom(scale: Number): Number
+ // Inverse of `scale()`, returns the zoom level corresponding to a scale
+ // factor of `scale`.
+ zoom: function (scale) {
+ return Math.log(scale / 256) / Math.LN2;
+ },
+
+ // @method getProjectedBounds(zoom: Number): Bounds
+ // Returns the projection's bounds scaled and transformed for the provided `zoom`.
+ getProjectedBounds: function (zoom) {
+ if (this.infinite) { return null; }
+
+ var b = this.projection.bounds,
+ s = this.scale(zoom),
+ min = this.transformation.transform(b.min, s),
+ max = this.transformation.transform(b.max, s);
+
+ return new Bounds(min, max);
+ },
+
+ // @method distance(latlng1: LatLng, latlng2: LatLng): Number
+ // Returns the distance between two geographical coordinates.
+
+ // @property code: String
+ // Standard code name of the CRS passed into WMS services (e.g. `'EPSG:3857'`)
+ //
+ // @property wrapLng: Number[]
+ // An array of two numbers defining whether the longitude (horizontal) coordinate
+ // axis wraps around a given range and how. Defaults to `[-180, 180]` in most
+ // geographical CRSs. If `undefined`, the longitude axis does not wrap around.
+ //
+ // @property wrapLat: Number[]
+ // Like `wrapLng`, but for the latitude (vertical) axis.
+
+ // wrapLng: [min, max],
+ // wrapLat: [min, max],
+
+ // @property infinite: Boolean
+ // If true, the coordinate space will be unbounded (infinite in both axes)
+ infinite: false,
+
+ // @method wrapLatLng(latlng: LatLng): LatLng
+ // Returns a `LatLng` where lat and lng has been wrapped according to the
+ // CRS's `wrapLat` and `wrapLng` properties, if they are outside the CRS's bounds.
+ wrapLatLng: function (latlng) {
+ var lng = this.wrapLng ? wrapNum(latlng.lng, this.wrapLng, true) : latlng.lng,
+ lat = this.wrapLat ? wrapNum(latlng.lat, this.wrapLat, true) : latlng.lat,
+ alt = latlng.alt;
+
+ return new LatLng(lat, lng, alt);
+ },
+
+ // @method wrapLatLngBounds(bounds: LatLngBounds): LatLngBounds
+ // Returns a `LatLngBounds` with the same size as the given one, ensuring
+ // that its center is within the CRS's bounds.
+ // Only accepts actual `L.LatLngBounds` instances, not arrays.
+ wrapLatLngBounds: function (bounds) {
+ var center = bounds.getCenter(),
+ newCenter = this.wrapLatLng(center),
+ latShift = center.lat - newCenter.lat,
+ lngShift = center.lng - newCenter.lng;
+
+ if (latShift === 0 && lngShift === 0) {
+ return bounds;
+ }
+
+ var sw = bounds.getSouthWest(),
+ ne = bounds.getNorthEast(),
+ newSw = new LatLng(sw.lat - latShift, sw.lng - lngShift),
+ newNe = new LatLng(ne.lat - latShift, ne.lng - lngShift);
+
+ return new LatLngBounds(newSw, newNe);
+ }
+ };
+
+ /*
+ * @namespace CRS
+ * @crs L.CRS.Earth
+ *
+ * Serves as the base for CRS that are global such that they cover the earth.
+ * Can only be used as the base for other CRS and cannot be used directly,
+ * since it does not have a `code`, `projection` or `transformation`. `distance()` returns
+ * meters.
+ */
+
+ var Earth = extend({}, CRS, {
+ wrapLng: [-180, 180],
+
+ // Mean Earth Radius, as recommended for use by
+ // the International Union of Geodesy and Geophysics,
+ // see http://rosettacode.org/wiki/Haversine_formula
+ R: 6371000,
+
+ // distance between two geographical points using spherical law of cosines approximation
+ distance: function (latlng1, latlng2) {
+ var rad = Math.PI / 180,
+ lat1 = latlng1.lat * rad,
+ lat2 = latlng2.lat * rad,
+ sinDLat = Math.sin((latlng2.lat - latlng1.lat) * rad / 2),
+ sinDLon = Math.sin((latlng2.lng - latlng1.lng) * rad / 2),
+ a = sinDLat * sinDLat + Math.cos(lat1) * Math.cos(lat2) * sinDLon * sinDLon,
+ c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+ return this.R * c;
+ }
+ });
+
+ /*
+ * @namespace Projection
+ * @projection L.Projection.SphericalMercator
+ *
+ * Spherical Mercator projection — the most common projection for online maps,
+ * used by almost all free and commercial tile providers. Assumes that Earth is
+ * a sphere. Used by the `EPSG:3857` CRS.
+ */
+
+ var SphericalMercator = {
+
+ R: 6378137,
+ MAX_LATITUDE: 85.0511287798,
+
+ project: function (latlng) {
+ var d = Math.PI / 180,
+ max = this.MAX_LATITUDE,
+ lat = Math.max(Math.min(max, latlng.lat), -max),
+ sin = Math.sin(lat * d);
+
+ return new Point(
+ this.R * latlng.lng * d,
+ this.R * Math.log((1 + sin) / (1 - sin)) / 2);
+ },
+
+ unproject: function (point) {
+ var d = 180 / Math.PI;
+
+ return new LatLng(
+ (2 * Math.atan(Math.exp(point.y / this.R)) - (Math.PI / 2)) * d,
+ point.x * d / this.R);
+ },
+
+ bounds: (function () {
+ var d = 6378137 * Math.PI;
+ return new Bounds([-d, -d], [d, d]);
+ })()
+ };
+
+ /*
+ * @class Transformation
+ * @aka L.Transformation
+ *
+ * Represents an affine transformation: a set of coefficients `a`, `b`, `c`, `d`
+ * for transforming a point of a form `(x, y)` into `(a*x + b, c*y + d)` and doing
+ * the reverse. Used by Leaflet in its projections code.
+ *
+ * @example
+ *
+ * ```js
+ * var transformation = L.transformation(2, 5, -1, 10),
+ * p = L.point(1, 2),
+ * p2 = transformation.transform(p), // L.point(7, 8)
+ * p3 = transformation.untransform(p2); // L.point(1, 2)
+ * ```
+ */
+
+
+// factory new L.Transformation(a: Number, b: Number, c: Number, d: Number)
+// Creates a `Transformation` object with the given coefficients.
+ function Transformation(a, b, c, d) {
+ if (isArray(a)) {
+ // use array properties
+ this._a = a[0];
+ this._b = a[1];
+ this._c = a[2];
+ this._d = a[3];
+ return;
+ }
+ this._a = a;
+ this._b = b;
+ this._c = c;
+ this._d = d;
+ }
+
+ Transformation.prototype = {
+ // @method transform(point: Point, scale?: Number): Point
+ // Returns a transformed point, optionally multiplied by the given scale.
+ // Only accepts actual `L.Point` instances, not arrays.
+ transform: function (point, scale) { // (Point, Number) -> Point
+ return this._transform(point.clone(), scale);
+ },
+
+ // destructive transform (faster)
+ _transform: function (point, scale) {
+ scale = scale || 1;
+ point.x = scale * (this._a * point.x + this._b);
+ point.y = scale * (this._c * point.y + this._d);
+ return point;
+ },
+
+ // @method untransform(point: Point, scale?: Number): Point
+ // Returns the reverse transformation of the given point, optionally divided
+ // by the given scale. Only accepts actual `L.Point` instances, not arrays.
+ untransform: function (point, scale) {
+ scale = scale || 1;
+ return new Point(
+ (point.x / scale - this._b) / this._a,
+ (point.y / scale - this._d) / this._c);
+ }
+ };
+
+// factory L.transformation(a: Number, b: Number, c: Number, d: Number)
+
+// @factory L.transformation(a: Number, b: Number, c: Number, d: Number)
+// Instantiates a Transformation object with the given coefficients.
+
+// @alternative
+// @factory L.transformation(coefficients: Array): Transformation
+// Expects an coefficients array of the form
+// `[a: Number, b: Number, c: Number, d: Number]`.
+
+ function toTransformation(a, b, c, d) {
+ return new Transformation(a, b, c, d);
+ }
+
+ /*
+ * @namespace CRS
+ * @crs L.CRS.EPSG3857
+ *
+ * The most common CRS for online maps, used by almost all free and commercial
+ * tile providers. Uses Spherical Mercator projection. Set in by default in
+ * Map's `crs` option.
+ */
+
+ var EPSG3857 = extend({}, Earth, {
+ code: 'EPSG:3857',
+ projection: SphericalMercator,
+
+ transformation: (function () {
+ var scale = 0.5 / (Math.PI * SphericalMercator.R);
+ return toTransformation(scale, 0.5, -scale, 0.5);
+ }())
+ });
+
+ var EPSG900913 = extend({}, EPSG3857, {
+ code: 'EPSG:900913'
+ });
+
+// @namespace SVG; @section
+// There are several static functions which can be called without instantiating L.SVG:
+
+// @function create(name: String): SVGElement
+// Returns a instance of [SVGElement](https://developer.mozilla.org/docs/Web/API/SVGElement),
+// corresponding to the class name passed. For example, using 'line' will return
+// an instance of [SVGLineElement](https://developer.mozilla.org/docs/Web/API/SVGLineElement).
+ function svgCreate(name) {
+ return document.createElementNS('http://www.w3.org/2000/svg', name);
+ }
+
+// @function pointsToPath(rings: Point[], closed: Boolean): String
+// Generates a SVG path string for multiple rings, with each ring turning
+// into "M..L..L.." instructions
+ function pointsToPath(rings, closed) {
+ var str = '',
+ i, j, len, len2, points, p;
+
+ for (i = 0, len = rings.length; i < len; i++) {
+ points = rings[i];
+
+ for (j = 0, len2 = points.length; j < len2; j++) {
+ p = points[j];
+ str += (j ? 'L' : 'M') + p.x + ' ' + p.y;
+ }
+
+ // closes the ring for polygons; "x" is VML syntax
+ str += closed ? (svg ? 'z' : 'x') : '';
+ }
+
+ // SVG complains about empty path strings
+ return str || 'M0 0';
+ }
+
+ /*
+ * @namespace Browser
+ * @aka L.Browser
+ *
+ * A namespace with static properties for browser/feature detection used by Leaflet internally.
+ *
+ * @example
+ *
+ * ```js
+ * if (L.Browser.ielt9) {
+ * alert('Upgrade your browser, dude!');
+ * }
+ * ```
+ */
+
+ var style$1 = document.documentElement.style;
+
+// @property ie: Boolean; `true` for all Internet Explorer versions (not Edge).
+ var ie = 'ActiveXObject' in window;
+
+// @property ielt9: Boolean; `true` for Internet Explorer versions less than 9.
+ var ielt9 = ie && !document.addEventListener;
+
+// @property edge: Boolean; `true` for the Edge web browser.
+ var edge = 'msLaunchUri' in navigator && !('documentMode' in document);
+
+// @property webkit: Boolean;
+// `true` for webkit-based browsers like Chrome and Safari (including mobile versions).
+ var webkit = userAgentContains('webkit');
+
+// @property android: Boolean
+// `true` for any browser running on an Android platform.
+ var android = userAgentContains('android');
+
+// @property android23: Boolean; `true` for browsers running on Android 2 or Android 3.
+ var android23 = userAgentContains('android 2') || userAgentContains('android 3');
+
+ /* See https://stackoverflow.com/a/17961266 for details on detecting stock Android */
+ var webkitVer = parseInt(/WebKit\/([0-9]+)|$/.exec(navigator.userAgent)[1], 10); // also matches AppleWebKit
+// @property androidStock: Boolean; `true` for the Android stock browser (i.e. not Chrome)
+ var androidStock = android && userAgentContains('Google') && webkitVer < 537 && !('AudioNode' in window);
+
+// @property opera: Boolean; `true` for the Opera browser
+ var opera = !!window.opera;
+
+// @property chrome: Boolean; `true` for the Chrome browser.
+ var chrome = userAgentContains('chrome');
+
+// @property gecko: Boolean; `true` for gecko-based browsers like Firefox.
+ var gecko = userAgentContains('gecko') && !webkit && !opera && !ie;
+
+// @property safari: Boolean; `true` for the Safari browser.
+ var safari = !chrome && userAgentContains('safari');
+
+ var phantom = userAgentContains('phantom');
+
+// @property opera12: Boolean
+// `true` for the Opera browser supporting CSS transforms (version 12 or later).
+ var opera12 = 'OTransition' in style$1;
+
+// @property win: Boolean; `true` when the browser is running in a Windows platform
+ var win = navigator.platform.indexOf('Win') === 0;
+
+// @property ie3d: Boolean; `true` for all Internet Explorer versions supporting CSS transforms.
+ var ie3d = ie && ('transition' in style$1);
+
+// @property webkit3d: Boolean; `true` for webkit-based browsers supporting CSS transforms.
+ var webkit3d = ('WebKitCSSMatrix' in window) && ('m11' in new window.WebKitCSSMatrix()) && !android23;
+
+// @property gecko3d: Boolean; `true` for gecko-based browsers supporting CSS transforms.
+ var gecko3d = 'MozPerspective' in style$1;
+
+// @property any3d: Boolean
+// `true` for all browsers supporting CSS transforms.
+ var any3d = !window.L_DISABLE_3D && (ie3d || webkit3d || gecko3d) && !opera12 && !phantom;
+
+// @property mobile: Boolean; `true` for all browsers running in a mobile device.
+ var mobile = typeof orientation !== 'undefined' || userAgentContains('mobile');
+
+// @property mobileWebkit: Boolean; `true` for all webkit-based browsers in a mobile device.
+ var mobileWebkit = mobile && webkit;
+
+// @property mobileWebkit3d: Boolean
+// `true` for all webkit-based browsers in a mobile device supporting CSS transforms.
+ var mobileWebkit3d = mobile && webkit3d;
+
+// @property msPointer: Boolean
+// `true` for browsers implementing the Microsoft touch events model (notably IE10).
+ var msPointer = !window.PointerEvent && window.MSPointerEvent;
+
+// @property pointer: Boolean
+// `true` for all browsers supporting [pointer events](https://msdn.microsoft.com/en-us/library/dn433244%28v=vs.85%29.aspx).
+ var pointer = !!(window.PointerEvent || msPointer);
+
+// @property touch: Boolean
+// `true` for all browsers supporting [touch events](https://developer.mozilla.org/docs/Web/API/Touch_events).
+// This does not necessarily mean that the browser is running in a computer with
+// a touchscreen, it only means that the browser is capable of understanding
+// touch events.
+ var touch = !window.L_NO_TOUCH && (pointer || 'ontouchstart' in window ||
+ (window.DocumentTouch && document instanceof window.DocumentTouch));
+
+// @property mobileOpera: Boolean; `true` for the Opera browser in a mobile device.
+ var mobileOpera = mobile && opera;
+
+// @property mobileGecko: Boolean
+// `true` for gecko-based browsers running in a mobile device.
+ var mobileGecko = mobile && gecko;
+
+// @property retina: Boolean
+// `true` for browsers on a high-resolution "retina" screen or on any screen when browser's display zoom is more than 100%.
+ var retina = (window.devicePixelRatio || (window.screen.deviceXDPI / window.screen.logicalXDPI)) > 1;
+
+
+// @property canvas: Boolean
+// `true` when the browser supports [``](https://developer.mozilla.org/docs/Web/API/Canvas_API).
+ var canvas = (function () {
+ return !!document.createElement('canvas').getContext;
+ }());
+
+// @property svg: Boolean
+// `true` when the browser supports [SVG](https://developer.mozilla.org/docs/Web/SVG).
+ var svg = !!(document.createElementNS && svgCreate('svg').createSVGRect);
+
+// @property vml: Boolean
+// `true` if the browser supports [VML](https://en.wikipedia.org/wiki/Vector_Markup_Language).
+ var vml = !svg && (function () {
+ try {
+ var div = document.createElement('div');
+ div.innerHTML = ' ';
+
+ var shape = div.firstChild;
+ shape.style.behavior = 'url(#default#VML)';
+
+ return shape && (typeof shape.adj === 'object');
+
+ } catch (e) {
+ return false;
+ }
+ }());
+
+
+ function userAgentContains(str) {
+ return navigator.userAgent.toLowerCase().indexOf(str) >= 0;
+ }
+
+
+ var Browser = (Object.freeze || Object)({
+ ie: ie,
+ ielt9: ielt9,
+ edge: edge,
+ webkit: webkit,
+ android: android,
+ android23: android23,
+ androidStock: androidStock,
+ opera: opera,
+ chrome: chrome,
+ gecko: gecko,
+ safari: safari,
+ phantom: phantom,
+ opera12: opera12,
+ win: win,
+ ie3d: ie3d,
+ webkit3d: webkit3d,
+ gecko3d: gecko3d,
+ any3d: any3d,
+ mobile: mobile,
+ mobileWebkit: mobileWebkit,
+ mobileWebkit3d: mobileWebkit3d,
+ msPointer: msPointer,
+ pointer: pointer,
+ touch: touch,
+ mobileOpera: mobileOpera,
+ mobileGecko: mobileGecko,
+ retina: retina,
+ canvas: canvas,
+ svg: svg,
+ vml: vml
+ });
+
+ /*
+ * Extends L.DomEvent to provide touch support for Internet Explorer and Windows-based devices.
+ */
+
+
+ var POINTER_DOWN = msPointer ? 'MSPointerDown' : 'pointerdown';
+ var POINTER_MOVE = msPointer ? 'MSPointerMove' : 'pointermove';
+ var POINTER_UP = msPointer ? 'MSPointerUp' : 'pointerup';
+ var POINTER_CANCEL = msPointer ? 'MSPointerCancel' : 'pointercancel';
+ var TAG_WHITE_LIST = ['INPUT', 'SELECT', 'OPTION'];
+
+ var _pointers = {};
+ var _pointerDocListener = false;
+
+// DomEvent.DoubleTap needs to know about this
+ var _pointersCount = 0;
+
+// Provides a touch events wrapper for (ms)pointer events.
+// ref http://www.w3.org/TR/pointerevents/ https://www.w3.org/Bugs/Public/show_bug.cgi?id=22890
+
+ function addPointerListener(obj, type, handler, id) {
+ if (type === 'touchstart') {
+ _addPointerStart(obj, handler, id);
+
+ } else if (type === 'touchmove') {
+ _addPointerMove(obj, handler, id);
+
+ } else if (type === 'touchend') {
+ _addPointerEnd(obj, handler, id);
+ }
+
+ return this;
+ }
+
+ function removePointerListener(obj, type, id) {
+ var handler = obj['_leaflet_' + type + id];
+
+ if (type === 'touchstart') {
+ obj.removeEventListener(POINTER_DOWN, handler, false);
+
+ } else if (type === 'touchmove') {
+ obj.removeEventListener(POINTER_MOVE, handler, false);
+
+ } else if (type === 'touchend') {
+ obj.removeEventListener(POINTER_UP, handler, false);
+ obj.removeEventListener(POINTER_CANCEL, handler, false);
+ }
+
+ return this;
+ }
+
+ function _addPointerStart(obj, handler, id) {
+ var onDown = bind(function (e) {
+ if (e.pointerType !== 'mouse' && e.MSPOINTER_TYPE_MOUSE && e.pointerType !== e.MSPOINTER_TYPE_MOUSE) {
+ // In IE11, some touch events needs to fire for form controls, or
+ // the controls will stop working. We keep a whitelist of tag names that
+ // need these events. For other target tags, we prevent default on the event.
+ if (TAG_WHITE_LIST.indexOf(e.target.tagName) < 0) {
+ preventDefault(e);
+ } else {
+ return;
+ }
+ }
+
+ _handlePointer(e, handler);
+ });
+
+ obj['_leaflet_touchstart' + id] = onDown;
+ obj.addEventListener(POINTER_DOWN, onDown, false);
+
+ // need to keep track of what pointers and how many are active to provide e.touches emulation
+ if (!_pointerDocListener) {
+ // we listen documentElement as any drags that end by moving the touch off the screen get fired there
+ document.documentElement.addEventListener(POINTER_DOWN, _globalPointerDown, true);
+ document.documentElement.addEventListener(POINTER_MOVE, _globalPointerMove, true);
+ document.documentElement.addEventListener(POINTER_UP, _globalPointerUp, true);
+ document.documentElement.addEventListener(POINTER_CANCEL, _globalPointerUp, true);
+
+ _pointerDocListener = true;
+ }
+ }
+
+ function _globalPointerDown(e) {
+ _pointers[e.pointerId] = e;
+ _pointersCount++;
+ }
+
+ function _globalPointerMove(e) {
+ if (_pointers[e.pointerId]) {
+ _pointers[e.pointerId] = e;
+ }
+ }
+
+ function _globalPointerUp(e) {
+ delete _pointers[e.pointerId];
+ _pointersCount--;
+ }
+
+ function _handlePointer(e, handler) {
+ e.touches = [];
+ for (var i in _pointers) {
+ e.touches.push(_pointers[i]);
+ }
+ e.changedTouches = [e];
+
+ handler(e);
+ }
+
+ function _addPointerMove(obj, handler, id) {
+ var onMove = function (e) {
+ // don't fire touch moves when mouse isn't down
+ if ((e.pointerType === e.MSPOINTER_TYPE_MOUSE || e.pointerType === 'mouse') && e.buttons === 0) { return; }
+
+ _handlePointer(e, handler);
+ };
+
+ obj['_leaflet_touchmove' + id] = onMove;
+ obj.addEventListener(POINTER_MOVE, onMove, false);
+ }
+
+ function _addPointerEnd(obj, handler, id) {
+ var onUp = function (e) {
+ _handlePointer(e, handler);
+ };
+
+ obj['_leaflet_touchend' + id] = onUp;
+ obj.addEventListener(POINTER_UP, onUp, false);
+ obj.addEventListener(POINTER_CANCEL, onUp, false);
+ }
+
+ /*
+ * Extends the event handling code with double tap support for mobile browsers.
+ */
+
+ var _touchstart = msPointer ? 'MSPointerDown' : pointer ? 'pointerdown' : 'touchstart';
+ var _touchend = msPointer ? 'MSPointerUp' : pointer ? 'pointerup' : 'touchend';
+ var _pre = '_leaflet_';
+
+// inspired by Zepto touch code by Thomas Fuchs
+ function addDoubleTapListener(obj, handler, id) {
+ var last, touch$$1,
+ doubleTap = false,
+ delay = 250;
+
+ function onTouchStart(e) {
+ var count;
+
+ if (pointer) {
+ if ((!edge) || e.pointerType === 'mouse') { return; }
+ count = _pointersCount;
+ } else {
+ count = e.touches.length;
+ }
+
+ if (count > 1) { return; }
+
+ var now = Date.now(),
+ delta = now - (last || now);
+
+ touch$$1 = e.touches ? e.touches[0] : e;
+ doubleTap = (delta > 0 && delta <= delay);
+ last = now;
+ }
+
+ function onTouchEnd(e) {
+ if (doubleTap && !touch$$1.cancelBubble) {
+ if (pointer) {
+ if ((!edge) || e.pointerType === 'mouse') { return; }
+ // work around .type being readonly with MSPointer* events
+ var newTouch = {},
+ prop, i;
+
+ for (i in touch$$1) {
+ prop = touch$$1[i];
+ newTouch[i] = prop && prop.bind ? prop.bind(touch$$1) : prop;
+ }
+ touch$$1 = newTouch;
+ }
+ touch$$1.type = 'dblclick';
+ handler(touch$$1);
+ last = null;
+ }
+ }
+
+ obj[_pre + _touchstart + id] = onTouchStart;
+ obj[_pre + _touchend + id] = onTouchEnd;
+ obj[_pre + 'dblclick' + id] = handler;
+
+ obj.addEventListener(_touchstart, onTouchStart, false);
+ obj.addEventListener(_touchend, onTouchEnd, false);
+
+ // On some platforms (notably, chrome<55 on win10 + touchscreen + mouse),
+ // the browser doesn't fire touchend/pointerup events but does fire
+ // native dblclicks. See #4127.
+ // Edge 14 also fires native dblclicks, but only for pointerType mouse, see #5180.
+ obj.addEventListener('dblclick', handler, false);
+
+ return this;
+ }
+
+ function removeDoubleTapListener(obj, id) {
+ var touchstart = obj[_pre + _touchstart + id],
+ touchend = obj[_pre + _touchend + id],
+ dblclick = obj[_pre + 'dblclick' + id];
+
+ obj.removeEventListener(_touchstart, touchstart, false);
+ obj.removeEventListener(_touchend, touchend, false);
+ if (!edge) {
+ obj.removeEventListener('dblclick', dblclick, false);
+ }
+
+ return this;
+ }
+
+ /*
+ * @namespace DomUtil
+ *
+ * Utility functions to work with the [DOM](https://developer.mozilla.org/docs/Web/API/Document_Object_Model)
+ * tree, used by Leaflet internally.
+ *
+ * Most functions expecting or returning a `HTMLElement` also work for
+ * SVG elements. The only difference is that classes refer to CSS classes
+ * in HTML and SVG classes in SVG.
+ */
+
+
+// @property TRANSFORM: String
+// Vendor-prefixed transform style name (e.g. `'webkitTransform'` for WebKit).
+ var TRANSFORM = testProp(
+ ['transform', 'webkitTransform', 'OTransform', 'MozTransform', 'msTransform']);
+
+// webkitTransition comes first because some browser versions that drop vendor prefix don't do
+// the same for the transitionend event, in particular the Android 4.1 stock browser
+
+// @property TRANSITION: String
+// Vendor-prefixed transition style name.
+ var TRANSITION = testProp(
+ ['webkitTransition', 'transition', 'OTransition', 'MozTransition', 'msTransition']);
+
+// @property TRANSITION_END: String
+// Vendor-prefixed transitionend event name.
+ var TRANSITION_END =
+ TRANSITION === 'webkitTransition' || TRANSITION === 'OTransition' ? TRANSITION + 'End' : 'transitionend';
+
+
+// @function get(id: String|HTMLElement): HTMLElement
+// Returns an element given its DOM id, or returns the element itself
+// if it was passed directly.
+ function get(id) {
+ return typeof id === 'string' ? document.getElementById(id) : id;
+ }
+
+// @function getStyle(el: HTMLElement, styleAttrib: String): String
+// Returns the value for a certain style attribute on an element,
+// including computed values or values set through CSS.
+ function getStyle(el, style) {
+ var value = el.style[style] || (el.currentStyle && el.currentStyle[style]);
+
+ if ((!value || value === 'auto') && document.defaultView) {
+ var css = document.defaultView.getComputedStyle(el, null);
+ value = css ? css[style] : null;
+ }
+ return value === 'auto' ? null : value;
+ }
+
+// @function create(tagName: String, className?: String, container?: HTMLElement): HTMLElement
+// Creates an HTML element with `tagName`, sets its class to `className`, and optionally appends it to `container` element.
+ function create$1(tagName, className, container) {
+ var el = document.createElement(tagName);
+ el.className = className || '';
+
+ if (container) {
+ container.appendChild(el);
+ }
+ return el;
+ }
+
+// @function remove(el: HTMLElement)
+// Removes `el` from its parent element
+ function remove(el) {
+ var parent = el.parentNode;
+ if (parent) {
+ parent.removeChild(el);
+ }
+ }
+
+// @function empty(el: HTMLElement)
+// Removes all of `el`'s children elements from `el`
+ function empty(el) {
+ while (el.firstChild) {
+ el.removeChild(el.firstChild);
+ }
+ }
+
+// @function toFront(el: HTMLElement)
+// Makes `el` the last child of its parent, so it renders in front of the other children.
+ function toFront(el) {
+ var parent = el.parentNode;
+ if (parent && parent.lastChild !== el) {
+ parent.appendChild(el);
+ }
+ }
+
+// @function toBack(el: HTMLElement)
+// Makes `el` the first child of its parent, so it renders behind the other children.
+ function toBack(el) {
+ var parent = el.parentNode;
+ if (parent && parent.firstChild !== el) {
+ parent.insertBefore(el, parent.firstChild);
+ }
+ }
+
+// @function hasClass(el: HTMLElement, name: String): Boolean
+// Returns `true` if the element's class attribute contains `name`.
+ function hasClass(el, name) {
+ if (el.classList !== undefined) {
+ return el.classList.contains(name);
+ }
+ var className = getClass(el);
+ return className.length > 0 && new RegExp('(^|\\s)' + name + '(\\s|$)').test(className);
+ }
+
+// @function addClass(el: HTMLElement, name: String)
+// Adds `name` to the element's class attribute.
+ function addClass(el, name) {
+ if (el.classList !== undefined) {
+ var classes = splitWords(name);
+ for (var i = 0, len = classes.length; i < len; i++) {
+ el.classList.add(classes[i]);
+ }
+ } else if (!hasClass(el, name)) {
+ var className = getClass(el);
+ setClass(el, (className ? className + ' ' : '') + name);
+ }
+ }
+
+// @function removeClass(el: HTMLElement, name: String)
+// Removes `name` from the element's class attribute.
+ function removeClass(el, name) {
+ if (el.classList !== undefined) {
+ el.classList.remove(name);
+ } else {
+ setClass(el, trim((' ' + getClass(el) + ' ').replace(' ' + name + ' ', ' ')));
+ }
+ }
+
+// @function setClass(el: HTMLElement, name: String)
+// Sets the element's class.
+ function setClass(el, name) {
+ if (el.className.baseVal === undefined) {
+ el.className = name;
+ } else {
+ // in case of SVG element
+ el.className.baseVal = name;
+ }
+ }
+
+// @function getClass(el: HTMLElement): String
+// Returns the element's class.
+ function getClass(el) {
+ // Check if the element is an SVGElementInstance and use the correspondingElement instead
+ // (Required for linked SVG elements in IE11.)
+ if (el.correspondingElement) {
+ el = el.correspondingElement;
+ }
+ return el.className.baseVal === undefined ? el.className : el.className.baseVal;
+ }
+
+// @function setOpacity(el: HTMLElement, opacity: Number)
+// Set the opacity of an element (including old IE support).
+// `opacity` must be a number from `0` to `1`.
+ function setOpacity(el, value) {
+ if ('opacity' in el.style) {
+ el.style.opacity = value;
+ } else if ('filter' in el.style) {
+ _setOpacityIE(el, value);
+ }
+ }
+
+ function _setOpacityIE(el, value) {
+ var filter = false,
+ filterName = 'DXImageTransform.Microsoft.Alpha';
+
+ // filters collection throws an error if we try to retrieve a filter that doesn't exist
+ try {
+ filter = el.filters.item(filterName);
+ } catch (e) {
+ // don't set opacity to 1 if we haven't already set an opacity,
+ // it isn't needed and breaks transparent pngs.
+ if (value === 1) { return; }
+ }
+
+ value = Math.round(value * 100);
+
+ if (filter) {
+ filter.Enabled = (value !== 100);
+ filter.Opacity = value;
+ } else {
+ el.style.filter += ' progid:' + filterName + '(opacity=' + value + ')';
+ }
+ }
+
+// @function testProp(props: String[]): String|false
+// Goes through the array of style names and returns the first name
+// that is a valid style name for an element. If no such name is found,
+// it returns false. Useful for vendor-prefixed styles like `transform`.
+ function testProp(props) {
+ var style = document.documentElement.style;
+
+ for (var i = 0; i < props.length; i++) {
+ if (props[i] in style) {
+ return props[i];
+ }
+ }
+ return false;
+ }
+
+// @function setTransform(el: HTMLElement, offset: Point, scale?: Number)
+// Resets the 3D CSS transform of `el` so it is translated by `offset` pixels
+// and optionally scaled by `scale`. Does not have an effect if the
+// browser doesn't support 3D CSS transforms.
+ function setTransform(el, offset, scale) {
+ var pos = offset || new Point(0, 0);
+
+ el.style[TRANSFORM] =
+ (ie3d ?
+ 'translate(' + pos.x + 'px,' + pos.y + 'px)' :
+ 'translate3d(' + pos.x + 'px,' + pos.y + 'px,0)') +
+ (scale ? ' scale(' + scale + ')' : '');
+ }
+
+// @function setPosition(el: HTMLElement, position: Point)
+// Sets the position of `el` to coordinates specified by `position`,
+// using CSS translate or top/left positioning depending on the browser
+// (used by Leaflet internally to position its layers).
+ function setPosition(el, point) {
+
+ /*eslint-disable */
+ el._leaflet_pos = point;
+ /* eslint-enable */
+
+ if (any3d) {
+ setTransform(el, point);
+ } else {
+ el.style.left = point.x + 'px';
+ el.style.top = point.y + 'px';
+ }
+ }
+
+// @function getPosition(el: HTMLElement): Point
+// Returns the coordinates of an element previously positioned with setPosition.
+ function getPosition(el) {
+ // this method is only used for elements previously positioned using setPosition,
+ // so it's safe to cache the position for performance
+
+ return el._leaflet_pos || new Point(0, 0);
+ }
+
+// @function disableTextSelection()
+// Prevents the user from generating `selectstart` DOM events, usually generated
+// when the user drags the mouse through a page with text. Used internally
+// by Leaflet to override the behaviour of any click-and-drag interaction on
+// the map. Affects drag interactions on the whole document.
+
+// @function enableTextSelection()
+// Cancels the effects of a previous [`L.DomUtil.disableTextSelection`](#domutil-disabletextselection).
+ var disableTextSelection;
+ var enableTextSelection;
+ var _userSelect;
+ if ('onselectstart' in document) {
+ disableTextSelection = function () {
+ on(window, 'selectstart', preventDefault);
+ };
+ enableTextSelection = function () {
+ off(window, 'selectstart', preventDefault);
+ };
+ } else {
+ var userSelectProperty = testProp(
+ ['userSelect', 'WebkitUserSelect', 'OUserSelect', 'MozUserSelect', 'msUserSelect']);
+
+ disableTextSelection = function () {
+ if (userSelectProperty) {
+ var style = document.documentElement.style;
+ _userSelect = style[userSelectProperty];
+ style[userSelectProperty] = 'none';
+ }
+ };
+ enableTextSelection = function () {
+ if (userSelectProperty) {
+ document.documentElement.style[userSelectProperty] = _userSelect;
+ _userSelect = undefined;
+ }
+ };
+ }
+
+// @function disableImageDrag()
+// As [`L.DomUtil.disableTextSelection`](#domutil-disabletextselection), but
+// for `dragstart` DOM events, usually generated when the user drags an image.
+ function disableImageDrag() {
+ on(window, 'dragstart', preventDefault);
+ }
+
+// @function enableImageDrag()
+// Cancels the effects of a previous [`L.DomUtil.disableImageDrag`](#domutil-disabletextselection).
+ function enableImageDrag() {
+ off(window, 'dragstart', preventDefault);
+ }
+
+ var _outlineElement;
+ var _outlineStyle;
+// @function preventOutline(el: HTMLElement)
+// Makes the [outline](https://developer.mozilla.org/docs/Web/CSS/outline)
+// of the element `el` invisible. Used internally by Leaflet to prevent
+// focusable elements from displaying an outline when the user performs a
+// drag interaction on them.
+ function preventOutline(element) {
+ while (element.tabIndex === -1) {
+ element = element.parentNode;
+ }
+ if (!element.style) { return; }
+ restoreOutline();
+ _outlineElement = element;
+ _outlineStyle = element.style.outline;
+ element.style.outline = 'none';
+ on(window, 'keydown', restoreOutline);
+ }
+
+// @function restoreOutline()
+// Cancels the effects of a previous [`L.DomUtil.preventOutline`]().
+ function restoreOutline() {
+ if (!_outlineElement) { return; }
+ _outlineElement.style.outline = _outlineStyle;
+ _outlineElement = undefined;
+ _outlineStyle = undefined;
+ off(window, 'keydown', restoreOutline);
+ }
+
+// @function getSizedParentNode(el: HTMLElement): HTMLElement
+// Finds the closest parent node which size (width and height) is not null.
+ function getSizedParentNode(element) {
+ do {
+ element = element.parentNode;
+ } while ((!element.offsetWidth || !element.offsetHeight) && element !== document.body);
+ return element;
+ }
+
+// @function getScale(el: HTMLElement): Object
+// Computes the CSS scale currently applied on the element.
+// Returns an object with `x` and `y` members as horizontal and vertical scales respectively,
+// and `boundingClientRect` as the result of [`getBoundingClientRect()`](https://developer.mozilla.org/en-US/docs/Web/API/Element/getBoundingClientRect).
+ function getScale(element) {
+ var rect = element.getBoundingClientRect(); // Read-only in old browsers.
+
+ return {
+ x: rect.width / element.offsetWidth || 1,
+ y: rect.height / element.offsetHeight || 1,
+ boundingClientRect: rect
+ };
+ }
+
+
+ var DomUtil = (Object.freeze || Object)({
+ TRANSFORM: TRANSFORM,
+ TRANSITION: TRANSITION,
+ TRANSITION_END: TRANSITION_END,
+ get: get,
+ getStyle: getStyle,
+ create: create$1,
+ remove: remove,
+ empty: empty,
+ toFront: toFront,
+ toBack: toBack,
+ hasClass: hasClass,
+ addClass: addClass,
+ removeClass: removeClass,
+ setClass: setClass,
+ getClass: getClass,
+ setOpacity: setOpacity,
+ testProp: testProp,
+ setTransform: setTransform,
+ setPosition: setPosition,
+ getPosition: getPosition,
+ disableTextSelection: disableTextSelection,
+ enableTextSelection: enableTextSelection,
+ disableImageDrag: disableImageDrag,
+ enableImageDrag: enableImageDrag,
+ preventOutline: preventOutline,
+ restoreOutline: restoreOutline,
+ getSizedParentNode: getSizedParentNode,
+ getScale: getScale
+ });
+
+ /*
+ * @namespace DomEvent
+ * Utility functions to work with the [DOM events](https://developer.mozilla.org/docs/Web/API/Event), used by Leaflet internally.
+ */
+
+// Inspired by John Resig, Dean Edwards and YUI addEvent implementations.
+
+// @function on(el: HTMLElement, types: String, fn: Function, context?: Object): this
+// Adds a listener function (`fn`) to a particular DOM event type of the
+// element `el`. You can optionally specify the context of the listener
+// (object the `this` keyword will point to). You can also pass several
+// space-separated types (e.g. `'click dblclick'`).
+
+// @alternative
+// @function on(el: HTMLElement, eventMap: Object, context?: Object): this
+// Adds a set of type/listener pairs, e.g. `{click: onClick, mousemove: onMouseMove}`
+ function on(obj, types, fn, context) {
+
+ if (typeof types === 'object') {
+ for (var type in types) {
+ addOne(obj, type, types[type], fn);
+ }
+ } else {
+ types = splitWords(types);
+
+ for (var i = 0, len = types.length; i < len; i++) {
+ addOne(obj, types[i], fn, context);
+ }
+ }
+
+ return this;
+ }
+
+ var eventsKey = '_leaflet_events';
+
+// @function off(el: HTMLElement, types: String, fn: Function, context?: Object): this
+// Removes a previously added listener function.
+// Note that if you passed a custom context to on, you must pass the same
+// context to `off` in order to remove the listener.
+
+// @alternative
+// @function off(el: HTMLElement, eventMap: Object, context?: Object): this
+// Removes a set of type/listener pairs, e.g. `{click: onClick, mousemove: onMouseMove}`
+ function off(obj, types, fn, context) {
+
+ if (typeof types === 'object') {
+ for (var type in types) {
+ removeOne(obj, type, types[type], fn);
+ }
+ } else if (types) {
+ types = splitWords(types);
+
+ for (var i = 0, len = types.length; i < len; i++) {
+ removeOne(obj, types[i], fn, context);
+ }
+ } else {
+ for (var j in obj[eventsKey]) {
+ removeOne(obj, j, obj[eventsKey][j]);
+ }
+ delete obj[eventsKey];
+ }
+
+ return this;
+ }
+
+ function addOne(obj, type, fn, context) {
+ var id = type + stamp(fn) + (context ? '_' + stamp(context) : '');
+
+ if (obj[eventsKey] && obj[eventsKey][id]) { return this; }
+
+ var handler = function (e) {
+ return fn.call(context || obj, e || window.event);
+ };
+
+ var originalHandler = handler;
+
+ if (pointer && type.indexOf('touch') === 0) {
+ // Needs DomEvent.Pointer.js
+ addPointerListener(obj, type, handler, id);
+
+ } else if (touch && (type === 'dblclick') && addDoubleTapListener &&
+ !(pointer && chrome)) {
+ // Chrome >55 does not need the synthetic dblclicks from addDoubleTapListener
+ // See #5180
+ addDoubleTapListener(obj, handler, id);
+
+ } else if ('addEventListener' in obj) {
+
+ if (type === 'mousewheel') {
+ obj.addEventListener('onwheel' in obj ? 'wheel' : 'mousewheel', handler, false);
+
+ } else if ((type === 'mouseenter') || (type === 'mouseleave')) {
+ handler = function (e) {
+ e = e || window.event;
+ if (isExternalTarget(obj, e)) {
+ originalHandler(e);
+ }
+ };
+ obj.addEventListener(type === 'mouseenter' ? 'mouseover' : 'mouseout', handler, false);
+
+ } else {
+ if (type === 'click' && android) {
+ handler = function (e) {
+ filterClick(e, originalHandler);
+ };
+ }
+ obj.addEventListener(type, handler, false);
+ }
+
+ } else if ('attachEvent' in obj) {
+ obj.attachEvent('on' + type, handler);
+ }
+
+ obj[eventsKey] = obj[eventsKey] || {};
+ obj[eventsKey][id] = handler;
+ }
+
+ function removeOne(obj, type, fn, context) {
+
+ var id = type + stamp(fn) + (context ? '_' + stamp(context) : ''),
+ handler = obj[eventsKey] && obj[eventsKey][id];
+
+ if (!handler) { return this; }
+
+ if (pointer && type.indexOf('touch') === 0) {
+ removePointerListener(obj, type, id);
+
+ } else if (touch && (type === 'dblclick') && removeDoubleTapListener &&
+ !(pointer && chrome)) {
+ removeDoubleTapListener(obj, id);
+
+ } else if ('removeEventListener' in obj) {
+
+ if (type === 'mousewheel') {
+ obj.removeEventListener('onwheel' in obj ? 'wheel' : 'mousewheel', handler, false);
+
+ } else {
+ obj.removeEventListener(
+ type === 'mouseenter' ? 'mouseover' :
+ type === 'mouseleave' ? 'mouseout' : type, handler, false);
+ }
+
+ } else if ('detachEvent' in obj) {
+ obj.detachEvent('on' + type, handler);
+ }
+
+ obj[eventsKey][id] = null;
+ }
+
+// @function stopPropagation(ev: DOMEvent): this
+// Stop the given event from propagation to parent elements. Used inside the listener functions:
+// ```js
+// L.DomEvent.on(div, 'click', function (ev) {
+// L.DomEvent.stopPropagation(ev);
+// });
+// ```
+ function stopPropagation(e) {
+
+ if (e.stopPropagation) {
+ e.stopPropagation();
+ } else if (e.originalEvent) { // In case of Leaflet event.
+ e.originalEvent._stopped = true;
+ } else {
+ e.cancelBubble = true;
+ }
+ skipped(e);
+
+ return this;
+ }
+
+// @function disableScrollPropagation(el: HTMLElement): this
+// Adds `stopPropagation` to the element's `'mousewheel'` events (plus browser variants).
+ function disableScrollPropagation(el) {
+ addOne(el, 'mousewheel', stopPropagation);
+ return this;
+ }
+
+// @function disableClickPropagation(el: HTMLElement): this
+// Adds `stopPropagation` to the element's `'click'`, `'doubleclick'`,
+// `'mousedown'` and `'touchstart'` events (plus browser variants).
+ function disableClickPropagation(el) {
+ on(el, 'mousedown touchstart dblclick', stopPropagation);
+ addOne(el, 'click', fakeStop);
+ return this;
+ }
+
+// @function preventDefault(ev: DOMEvent): this
+// Prevents the default action of the DOM Event `ev` from happening (such as
+// following a link in the href of the a element, or doing a POST request
+// with page reload when a `