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 DLC20090121100001.0010611s2000 ir b 001 0dper d 00313831 9645625963(CStRLIN)DCLN01-B3014MHMHCStRLINDLC-Rlccopycatlcodea-ir---DS318.84.N87N87 + 2000(3(4880-01Nūrī, ʻAbd Allāh,1949-880-02Naqdī 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 Nuri880-03Chāp-i 1.880-04Tihrān + :Ṭarḥ-i Naw,2000.245 p. ;22 cm.880-05Farhang-i ʻumūmīIncludes bibliographical + references and index.880-06Nūrī, + ʻAbd Allāh,1949-Interviews.Iran.Vizārat-i KishvarOfficials and employeesInterviews.880-07Nūrī, + ʻAbd Allāh,1949-Trials, + litigation, etc.IranPolitics and government1997-880-08Ganjī, 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 DLC20090120022042.0000417s1998 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 DLC20090120021204.0000509s1986 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 DLC20090121100001.0010611s2000 ir b 001 0dper d 00313831 9645625963(CStRLIN)DCLN01-B3014MHMHCStRLINDLC-Rlccopycatlcodea-ir---DS318.84.N87N87 - 2000(3(4880-01Nūrī, ʻAbd Allāh,1949-880-02Naqdī 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 Nuri880-03Chāp-i 1.880-04Tihrān - :Ṭarḥ-i Naw,2000.245 p. ;22 cm.880-05Farhang-i ʻumūmīIncludes bibliographical - references and index.880-06Nūrī, - ʻAbd Allāh,1949-Interviews.Iran.Vizārat-i KishvarOfficials and employeesInterviews.880-07Nūrī, - ʻAbd Allāh,1949-Trials, - litigation, etc.IranPolitics and government1997-880-08Ganjī, 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 DLC20090126095911.0000214s1997 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 DLC20090126171234.0810731m19419999ru 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 DLC20090126171326.0860911s1952 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 DLC20090122103906.0070816s1976 ko 000 0ckor 瑞文 文庫 ;237700-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 DLC20090121104206.0790619s1976 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 DLC20090123080110.0791203r19781950pk 000 0 urdo Pakistan.WomenPakistanSocial 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 DLC20090121023106.0heuamb---bacaheubmb---baaaWashington, 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 DLC20090123161900.0930810s1984 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 DLC20090121115059.0060428m19869999ir ah b 000 0 per d260-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 DLC20090126150928.0900409s1975 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 DLC20090126171556.0920805s1990 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 DLC20090122150744.0921008m19929999is 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 DLC20090123075708.0940328s1990 ko 000 0 kor d260-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 DLC20090121112252.0040115s1994 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 2001417245DLC20090121030347.0011001m20009999ii 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 2003546302DLC20090123173626.0030922s2003 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 2004310986DLC20090123105515.0040812s2004 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 2005461726DLC20090126155550.0070712s2006 ua 000 0 ara d260-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 2005553155DLC20090121104139.0051007m19659999is | 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 2007020969DLC20090126093447.0070522s2008 nyua b 000 0beng http://www.loc.gov/catdir/enhancements/fy0808/2007020969-d.htmlSample texthttp://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 2008305903DLC20090122162012.0080602s2008 ii a 000 0 tibo ʼBri-guṅ-pa (Sect)DoctrinesMiscellanea.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 2008308175DLC20090123091532.0080718s2002 ii b 000 0 eng 2002Library 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 2008308201DLC20090122162646.0080721s2008 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 2008308202DLC20090121092141.0080721s2005 ii b b 000 0 tibo History of Tibet in questions/answers format.Includes bibliographical references (p. 406-407).TibetTibet (China)HistoryMiscellanea.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 2008308478DLC20090123131001.0080728s2007 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 2008543486DLC20090126101044.0081217s1997 ja 000 0 jpn d600-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 2009373513DLC20090121153231.0090114s2008 ch 000 0 chi d2008.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 2009373513DLC20090121153231.0090114s2008 ch 000 0 chi d2008.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 `
` is submitted). +// Use it inside listener functions. + function preventDefault(e) { + if (e.preventDefault) { + e.preventDefault(); + } else { + e.returnValue = false; + } + return this; + } + +// @function stop(ev: DOMEvent): this +// Does `stopPropagation` and `preventDefault` at the same time. + function stop(e) { + preventDefault(e); + stopPropagation(e); + return this; + } + +// @function getMousePosition(ev: DOMEvent, container?: HTMLElement): Point +// Gets normalized mouse position from a DOM event relative to the +// `container` (border excluded) or to the whole page if not specified. + function getMousePosition(e, container) { + if (!container) { + return new Point(e.clientX, e.clientY); + } + + var scale = getScale(container), + offset = scale.boundingClientRect; // left and top values are in page scale (like the event clientX/Y) + + return new Point( + // offset.left/top values are in page scale (like clientX/Y), + // whereas clientLeft/Top (border width) values are the original values (before CSS scale applies). + (e.clientX - offset.left) / scale.x - container.clientLeft, + (e.clientY - offset.top) / scale.y - container.clientTop + ); + } + +// Chrome on Win scrolls double the pixels as in other platforms (see #4538), +// and Firefox scrolls device pixels, not CSS pixels + var wheelPxFactor = + (win && chrome) ? 2 * window.devicePixelRatio : + gecko ? window.devicePixelRatio : 1; + +// @function getWheelDelta(ev: DOMEvent): Number +// Gets normalized wheel delta from a mousewheel DOM event, in vertical +// pixels scrolled (negative if scrolling down). +// Events from pointing devices without precise scrolling are mapped to +// a best guess of 60 pixels. + function getWheelDelta(e) { + return (edge) ? e.wheelDeltaY / 2 : // Don't trust window-geometry-based delta + (e.deltaY && e.deltaMode === 0) ? -e.deltaY / wheelPxFactor : // Pixels + (e.deltaY && e.deltaMode === 1) ? -e.deltaY * 20 : // Lines + (e.deltaY && e.deltaMode === 2) ? -e.deltaY * 60 : // Pages + (e.deltaX || e.deltaZ) ? 0 : // Skip horizontal/depth wheel events + e.wheelDelta ? (e.wheelDeltaY || e.wheelDelta) / 2 : // Legacy IE pixels + (e.detail && Math.abs(e.detail) < 32765) ? -e.detail * 20 : // Legacy Moz lines + e.detail ? e.detail / -32765 * 60 : // Legacy Moz pages + 0; + } + + var skipEvents = {}; + + function fakeStop(e) { + // fakes stopPropagation by setting a special event flag, checked/reset with skipped(e) + skipEvents[e.type] = true; + } + + function skipped(e) { + var events = skipEvents[e.type]; + // reset when checking, as it's only used in map container and propagates outside of the map + skipEvents[e.type] = false; + return events; + } + +// check if element really left/entered the event target (for mouseenter/mouseleave) + function isExternalTarget(el, e) { + + var related = e.relatedTarget; + + if (!related) { return true; } + + try { + while (related && (related !== el)) { + related = related.parentNode; + } + } catch (err) { + return false; + } + return (related !== el); + } + + var lastClick; + +// this is a horrible workaround for a bug in Android where a single touch triggers two click events + function filterClick(e, handler) { + var timeStamp = (e.timeStamp || (e.originalEvent && e.originalEvent.timeStamp)), + elapsed = lastClick && (timeStamp - lastClick); + + // are they closer together than 500ms yet more than 100ms? + // Android typically triggers them ~300ms apart while multiple listeners + // on the same event should be triggered far faster; + // or check if click is simulated on the element, and if it is, reject any non-simulated events + + if ((elapsed && elapsed > 100 && elapsed < 500) || (e.target._simulatedClick && !e._simulated)) { + stop(e); + return; + } + lastClick = timeStamp; + + handler(e); + } + + + + + var DomEvent = (Object.freeze || Object)({ + on: on, + off: off, + stopPropagation: stopPropagation, + disableScrollPropagation: disableScrollPropagation, + disableClickPropagation: disableClickPropagation, + preventDefault: preventDefault, + stop: stop, + getMousePosition: getMousePosition, + getWheelDelta: getWheelDelta, + fakeStop: fakeStop, + skipped: skipped, + isExternalTarget: isExternalTarget, + addListener: on, + removeListener: off + }); + + /* + * @class PosAnimation + * @aka L.PosAnimation + * @inherits Evented + * Used internally for panning animations, utilizing CSS3 Transitions for modern browsers and a timer fallback for IE6-9. + * + * @example + * ```js + * var fx = new L.PosAnimation(); + * fx.run(el, [300, 500], 0.5); + * ``` + * + * @constructor L.PosAnimation() + * Creates a `PosAnimation` object. + * + */ + + var PosAnimation = Evented.extend({ + + // @method run(el: HTMLElement, newPos: Point, duration?: Number, easeLinearity?: Number) + // Run an animation of a given element to a new position, optionally setting + // duration in seconds (`0.25` by default) and easing linearity factor (3rd + // argument of the [cubic bezier curve](http://cubic-bezier.com/#0,0,.5,1), + // `0.5` by default). + run: function (el, newPos, duration, easeLinearity) { + this.stop(); + + this._el = el; + this._inProgress = true; + this._duration = duration || 0.25; + this._easeOutPower = 1 / Math.max(easeLinearity || 0.5, 0.2); + + this._startPos = getPosition(el); + this._offset = newPos.subtract(this._startPos); + this._startTime = +new Date(); + + // @event start: Event + // Fired when the animation starts + this.fire('start'); + + this._animate(); + }, + + // @method stop() + // Stops the animation (if currently running). + stop: function () { + if (!this._inProgress) { return; } + + this._step(true); + this._complete(); + }, + + _animate: function () { + // animation loop + this._animId = requestAnimFrame(this._animate, this); + this._step(); + }, + + _step: function (round) { + var elapsed = (+new Date()) - this._startTime, + duration = this._duration * 1000; + + if (elapsed < duration) { + this._runFrame(this._easeOut(elapsed / duration), round); + } else { + this._runFrame(1); + this._complete(); + } + }, + + _runFrame: function (progress, round) { + var pos = this._startPos.add(this._offset.multiplyBy(progress)); + if (round) { + pos._round(); + } + setPosition(this._el, pos); + + // @event step: Event + // Fired continuously during the animation. + this.fire('step'); + }, + + _complete: function () { + cancelAnimFrame(this._animId); + + this._inProgress = false; + // @event end: Event + // Fired when the animation ends. + this.fire('end'); + }, + + _easeOut: function (t) { + return 1 - Math.pow(1 - t, this._easeOutPower); + } + }); + + /* + * @class Map + * @aka L.Map + * @inherits Evented + * + * The central class of the API — it is used to create a map on a page and manipulate it. + * + * @example + * + * ```js + * // initialize the map on the "map" div with a given center and zoom + * var map = L.map('map', { + * center: [51.505, -0.09], + * zoom: 13 + * }); + * ``` + * + */ + + var Map = Evented.extend({ + + options: { + // @section Map State Options + // @option crs: CRS = L.CRS.EPSG3857 + // The [Coordinate Reference System](#crs) to use. Don't change this if you're not + // sure what it means. + crs: EPSG3857, + + // @option center: LatLng = undefined + // Initial geographic center of the map + center: undefined, + + // @option zoom: Number = undefined + // Initial map zoom level + zoom: undefined, + + // @option minZoom: Number = * + // Minimum zoom level of the map. + // If not specified and at least one `GridLayer` or `TileLayer` is in the map, + // the lowest of their `minZoom` options will be used instead. + minZoom: undefined, + + // @option maxZoom: Number = * + // Maximum zoom level of the map. + // If not specified and at least one `GridLayer` or `TileLayer` is in the map, + // the highest of their `maxZoom` options will be used instead. + maxZoom: undefined, + + // @option layers: Layer[] = [] + // Array of layers that will be added to the map initially + layers: [], + + // @option maxBounds: LatLngBounds = null + // When this option is set, the map restricts the view to the given + // geographical bounds, bouncing the user back if the user tries to pan + // outside the view. To set the restriction dynamically, use + // [`setMaxBounds`](#map-setmaxbounds) method. + maxBounds: undefined, + + // @option renderer: Renderer = * + // The default method for drawing vector layers on the map. `L.SVG` + // or `L.Canvas` by default depending on browser support. + renderer: undefined, + + + // @section Animation Options + // @option zoomAnimation: Boolean = true + // Whether the map zoom animation is enabled. By default it's enabled + // in all browsers that support CSS3 Transitions except Android. + zoomAnimation: true, + + // @option zoomAnimationThreshold: Number = 4 + // Won't animate zoom if the zoom difference exceeds this value. + zoomAnimationThreshold: 4, + + // @option fadeAnimation: Boolean = true + // Whether the tile fade animation is enabled. By default it's enabled + // in all browsers that support CSS3 Transitions except Android. + fadeAnimation: true, + + // @option markerZoomAnimation: Boolean = true + // Whether markers animate their zoom with the zoom animation, if disabled + // they will disappear for the length of the animation. By default it's + // enabled in all browsers that support CSS3 Transitions except Android. + markerZoomAnimation: true, + + // @option transform3DLimit: Number = 2^23 + // Defines the maximum size of a CSS translation transform. The default + // value should not be changed unless a web browser positions layers in + // the wrong place after doing a large `panBy`. + transform3DLimit: 8388608, // Precision limit of a 32-bit float + + // @section Interaction Options + // @option zoomSnap: Number = 1 + // Forces the map's zoom level to always be a multiple of this, particularly + // right after a [`fitBounds()`](#map-fitbounds) or a pinch-zoom. + // By default, the zoom level snaps to the nearest integer; lower values + // (e.g. `0.5` or `0.1`) allow for greater granularity. A value of `0` + // means the zoom level will not be snapped after `fitBounds` or a pinch-zoom. + zoomSnap: 1, + + // @option zoomDelta: Number = 1 + // Controls how much the map's zoom level will change after a + // [`zoomIn()`](#map-zoomin), [`zoomOut()`](#map-zoomout), pressing `+` + // or `-` on the keyboard, or using the [zoom controls](#control-zoom). + // Values smaller than `1` (e.g. `0.5`) allow for greater granularity. + zoomDelta: 1, + + // @option trackResize: Boolean = true + // Whether the map automatically handles browser window resize to update itself. + trackResize: true + }, + + initialize: function (id, options) { // (HTMLElement or String, Object) + options = setOptions(this, options); + + // Make sure to assign internal flags at the beginning, + // to avoid inconsistent state in some edge cases. + this._handlers = []; + this._layers = {}; + this._zoomBoundLayers = {}; + this._sizeChanged = true; + + this._initContainer(id); + this._initLayout(); + + // hack for https://github.com/Leaflet/Leaflet/issues/1980 + this._onResize = bind(this._onResize, this); + + this._initEvents(); + + if (options.maxBounds) { + this.setMaxBounds(options.maxBounds); + } + + if (options.zoom !== undefined) { + this._zoom = this._limitZoom(options.zoom); + } + + if (options.center && options.zoom !== undefined) { + this.setView(toLatLng(options.center), options.zoom, {reset: true}); + } + + this.callInitHooks(); + + // don't animate on browsers without hardware-accelerated transitions or old Android/Opera + this._zoomAnimated = TRANSITION && any3d && !mobileOpera && + this.options.zoomAnimation; + + // zoom transitions run with the same duration for all layers, so if one of transitionend events + // happens after starting zoom animation (propagating to the map pane), we know that it ended globally + if (this._zoomAnimated) { + this._createAnimProxy(); + on(this._proxy, TRANSITION_END, this._catchTransitionEnd, this); + } + + this._addLayers(this.options.layers); + }, + + + // @section Methods for modifying map state + + // @method setView(center: LatLng, zoom: Number, options?: Zoom/pan options): this + // Sets the view of the map (geographical center and zoom) with the given + // animation options. + setView: function (center, zoom, options) { + + zoom = zoom === undefined ? this._zoom : this._limitZoom(zoom); + center = this._limitCenter(toLatLng(center), zoom, this.options.maxBounds); + options = options || {}; + + this._stop(); + + if (this._loaded && !options.reset && options !== true) { + + if (options.animate !== undefined) { + options.zoom = extend({animate: options.animate}, options.zoom); + options.pan = extend({animate: options.animate, duration: options.duration}, options.pan); + } + + // try animating pan or zoom + var moved = (this._zoom !== zoom) ? + this._tryAnimatedZoom && this._tryAnimatedZoom(center, zoom, options.zoom) : + this._tryAnimatedPan(center, options.pan); + + if (moved) { + // prevent resize handler call, the view will refresh after animation anyway + clearTimeout(this._sizeTimer); + return this; + } + } + + // animation didn't start, just reset the map view + this._resetView(center, zoom); + + return this; + }, + + // @method setZoom(zoom: Number, options?: Zoom/pan options): this + // Sets the zoom of the map. + setZoom: function (zoom, options) { + if (!this._loaded) { + this._zoom = zoom; + return this; + } + return this.setView(this.getCenter(), zoom, {zoom: options}); + }, + + // @method zoomIn(delta?: Number, options?: Zoom options): this + // Increases the zoom of the map by `delta` ([`zoomDelta`](#map-zoomdelta) by default). + zoomIn: function (delta, options) { + delta = delta || (any3d ? this.options.zoomDelta : 1); + return this.setZoom(this._zoom + delta, options); + }, + + // @method zoomOut(delta?: Number, options?: Zoom options): this + // Decreases the zoom of the map by `delta` ([`zoomDelta`](#map-zoomdelta) by default). + zoomOut: function (delta, options) { + delta = delta || (any3d ? this.options.zoomDelta : 1); + return this.setZoom(this._zoom - delta, options); + }, + + // @method setZoomAround(latlng: LatLng, zoom: Number, options: Zoom options): this + // Zooms the map while keeping a specified geographical point on the map + // stationary (e.g. used internally for scroll zoom and double-click zoom). + // @alternative + // @method setZoomAround(offset: Point, zoom: Number, options: Zoom options): this + // Zooms the map while keeping a specified pixel on the map (relative to the top-left corner) stationary. + setZoomAround: function (latlng, zoom, options) { + var scale = this.getZoomScale(zoom), + viewHalf = this.getSize().divideBy(2), + containerPoint = latlng instanceof Point ? latlng : this.latLngToContainerPoint(latlng), + + centerOffset = containerPoint.subtract(viewHalf).multiplyBy(1 - 1 / scale), + newCenter = this.containerPointToLatLng(viewHalf.add(centerOffset)); + + return this.setView(newCenter, zoom, {zoom: options}); + }, + + _getBoundsCenterZoom: function (bounds, options) { + + options = options || {}; + bounds = bounds.getBounds ? bounds.getBounds() : toLatLngBounds(bounds); + + var paddingTL = toPoint(options.paddingTopLeft || options.padding || [0, 0]), + paddingBR = toPoint(options.paddingBottomRight || options.padding || [0, 0]), + + zoom = this.getBoundsZoom(bounds, false, paddingTL.add(paddingBR)); + + zoom = (typeof options.maxZoom === 'number') ? Math.min(options.maxZoom, zoom) : zoom; + + if (zoom === Infinity) { + return { + center: bounds.getCenter(), + zoom: zoom + }; + } + + var paddingOffset = paddingBR.subtract(paddingTL).divideBy(2), + + swPoint = this.project(bounds.getSouthWest(), zoom), + nePoint = this.project(bounds.getNorthEast(), zoom), + center = this.unproject(swPoint.add(nePoint).divideBy(2).add(paddingOffset), zoom); + + return { + center: center, + zoom: zoom + }; + }, + + // @method fitBounds(bounds: LatLngBounds, options?: fitBounds options): this + // Sets a map view that contains the given geographical bounds with the + // maximum zoom level possible. + fitBounds: function (bounds, options) { + + bounds = toLatLngBounds(bounds); + + if (!bounds.isValid()) { + throw new Error('Bounds are not valid.'); + } + + var target = this._getBoundsCenterZoom(bounds, options); + return this.setView(target.center, target.zoom, options); + }, + + // @method fitWorld(options?: fitBounds options): this + // Sets a map view that mostly contains the whole world with the maximum + // zoom level possible. + fitWorld: function (options) { + return this.fitBounds([[-90, -180], [90, 180]], options); + }, + + // @method panTo(latlng: LatLng, options?: Pan options): this + // Pans the map to a given center. + panTo: function (center, options) { // (LatLng) + return this.setView(center, this._zoom, {pan: options}); + }, + + // @method panBy(offset: Point, options?: Pan options): this + // Pans the map by a given number of pixels (animated). + panBy: function (offset, options) { + offset = toPoint(offset).round(); + options = options || {}; + + if (!offset.x && !offset.y) { + return this.fire('moveend'); + } + // If we pan too far, Chrome gets issues with tiles + // and makes them disappear or appear in the wrong place (slightly offset) #2602 + if (options.animate !== true && !this.getSize().contains(offset)) { + this._resetView(this.unproject(this.project(this.getCenter()).add(offset)), this.getZoom()); + return this; + } + + if (!this._panAnim) { + this._panAnim = new PosAnimation(); + + this._panAnim.on({ + 'step': this._onPanTransitionStep, + 'end': this._onPanTransitionEnd + }, this); + } + + // don't fire movestart if animating inertia + if (!options.noMoveStart) { + this.fire('movestart'); + } + + // animate pan unless animate: false specified + if (options.animate !== false) { + addClass(this._mapPane, 'leaflet-pan-anim'); + + var newPos = this._getMapPanePos().subtract(offset).round(); + this._panAnim.run(this._mapPane, newPos, options.duration || 0.25, options.easeLinearity); + } else { + this._rawPanBy(offset); + this.fire('move').fire('moveend'); + } + + return this; + }, + + // @method flyTo(latlng: LatLng, zoom?: Number, options?: Zoom/pan options): this + // Sets the view of the map (geographical center and zoom) performing a smooth + // pan-zoom animation. + flyTo: function (targetCenter, targetZoom, options) { + + options = options || {}; + if (options.animate === false || !any3d) { + return this.setView(targetCenter, targetZoom, options); + } + + this._stop(); + + var from = this.project(this.getCenter()), + to = this.project(targetCenter), + size = this.getSize(), + startZoom = this._zoom; + + targetCenter = toLatLng(targetCenter); + targetZoom = targetZoom === undefined ? startZoom : targetZoom; + + var w0 = Math.max(size.x, size.y), + w1 = w0 * this.getZoomScale(startZoom, targetZoom), + u1 = (to.distanceTo(from)) || 1, + rho = 1.42, + rho2 = rho * rho; + + function r(i) { + var s1 = i ? -1 : 1, + s2 = i ? w1 : w0, + t1 = w1 * w1 - w0 * w0 + s1 * rho2 * rho2 * u1 * u1, + b1 = 2 * s2 * rho2 * u1, + b = t1 / b1, + sq = Math.sqrt(b * b + 1) - b; + + // workaround for floating point precision bug when sq = 0, log = -Infinite, + // thus triggering an infinite loop in flyTo + var log = sq < 0.000000001 ? -18 : Math.log(sq); + + return log; + } + + function sinh(n) { return (Math.exp(n) - Math.exp(-n)) / 2; } + function cosh(n) { return (Math.exp(n) + Math.exp(-n)) / 2; } + function tanh(n) { return sinh(n) / cosh(n); } + + var r0 = r(0); + + function w(s) { return w0 * (cosh(r0) / cosh(r0 + rho * s)); } + function u(s) { return w0 * (cosh(r0) * tanh(r0 + rho * s) - sinh(r0)) / rho2; } + + function easeOut(t) { return 1 - Math.pow(1 - t, 1.5); } + + var start = Date.now(), + S = (r(1) - r0) / rho, + duration = options.duration ? 1000 * options.duration : 1000 * S * 0.8; + + function frame() { + var t = (Date.now() - start) / duration, + s = easeOut(t) * S; + + if (t <= 1) { + this._flyToFrame = requestAnimFrame(frame, this); + + this._move( + this.unproject(from.add(to.subtract(from).multiplyBy(u(s) / u1)), startZoom), + this.getScaleZoom(w0 / w(s), startZoom), + {flyTo: true}); + + } else { + this + ._move(targetCenter, targetZoom) + ._moveEnd(true); + } + } + + this._moveStart(true, options.noMoveStart); + + frame.call(this); + return this; + }, + + // @method flyToBounds(bounds: LatLngBounds, options?: fitBounds options): this + // Sets the view of the map with a smooth animation like [`flyTo`](#map-flyto), + // but takes a bounds parameter like [`fitBounds`](#map-fitbounds). + flyToBounds: function (bounds, options) { + var target = this._getBoundsCenterZoom(bounds, options); + return this.flyTo(target.center, target.zoom, options); + }, + + // @method setMaxBounds(bounds: Bounds): this + // Restricts the map view to the given bounds (see the [maxBounds](#map-maxbounds) option). + setMaxBounds: function (bounds) { + bounds = toLatLngBounds(bounds); + + if (!bounds.isValid()) { + this.options.maxBounds = null; + return this.off('moveend', this._panInsideMaxBounds); + } else if (this.options.maxBounds) { + this.off('moveend', this._panInsideMaxBounds); + } + + this.options.maxBounds = bounds; + + if (this._loaded) { + this._panInsideMaxBounds(); + } + + return this.on('moveend', this._panInsideMaxBounds); + }, + + // @method setMinZoom(zoom: Number): this + // Sets the lower limit for the available zoom levels (see the [minZoom](#map-minzoom) option). + setMinZoom: function (zoom) { + var oldZoom = this.options.minZoom; + this.options.minZoom = zoom; + + if (this._loaded && oldZoom !== zoom) { + this.fire('zoomlevelschange'); + + if (this.getZoom() < this.options.minZoom) { + return this.setZoom(zoom); + } + } + + return this; + }, + + // @method setMaxZoom(zoom: Number): this + // Sets the upper limit for the available zoom levels (see the [maxZoom](#map-maxzoom) option). + setMaxZoom: function (zoom) { + var oldZoom = this.options.maxZoom; + this.options.maxZoom = zoom; + + if (this._loaded && oldZoom !== zoom) { + this.fire('zoomlevelschange'); + + if (this.getZoom() > this.options.maxZoom) { + return this.setZoom(zoom); + } + } + + return this; + }, + + // @method panInsideBounds(bounds: LatLngBounds, options?: Pan options): this + // Pans the map to the closest view that would lie inside the given bounds (if it's not already), controlling the animation using the options specific, if any. + panInsideBounds: function (bounds, options) { + this._enforcingBounds = true; + var center = this.getCenter(), + newCenter = this._limitCenter(center, this._zoom, toLatLngBounds(bounds)); + + if (!center.equals(newCenter)) { + this.panTo(newCenter, options); + } + + this._enforcingBounds = false; + return this; + }, + + // @method panInside(latlng: LatLng, options?: options): this + // Pans the map the minimum amount to make the `latlng` visible. Use + // `padding`, `paddingTopLeft` and `paddingTopRight` options to fit + // the display to more restricted bounds, like [`fitBounds`](#map-fitbounds). + // If `latlng` is already within the (optionally padded) display bounds, + // the map will not be panned. + panInside: function (latlng, options) { + options = options || {}; + + var paddingTL = toPoint(options.paddingTopLeft || options.padding || [0, 0]), + paddingBR = toPoint(options.paddingBottomRight || options.padding || [0, 0]), + center = this.getCenter(), + pixelCenter = this.project(center), + pixelPoint = this.project(latlng), + pixelBounds = this.getPixelBounds(), + halfPixelBounds = pixelBounds.getSize().divideBy(2), + paddedBounds = toBounds([pixelBounds.min.add(paddingTL), pixelBounds.max.subtract(paddingBR)]); + + if (!paddedBounds.contains(pixelPoint)) { + this._enforcingBounds = true; + var diff = pixelCenter.subtract(pixelPoint), + newCenter = toPoint(pixelPoint.x + diff.x, pixelPoint.y + diff.y); + + if (pixelPoint.x < paddedBounds.min.x || pixelPoint.x > paddedBounds.max.x) { + newCenter.x = pixelCenter.x - diff.x; + if (diff.x > 0) { + newCenter.x += halfPixelBounds.x - paddingTL.x; + } else { + newCenter.x -= halfPixelBounds.x - paddingBR.x; + } + } + if (pixelPoint.y < paddedBounds.min.y || pixelPoint.y > paddedBounds.max.y) { + newCenter.y = pixelCenter.y - diff.y; + if (diff.y > 0) { + newCenter.y += halfPixelBounds.y - paddingTL.y; + } else { + newCenter.y -= halfPixelBounds.y - paddingBR.y; + } + } + this.panTo(this.unproject(newCenter), options); + this._enforcingBounds = false; + } + return this; + }, + + // @method invalidateSize(options: Zoom/pan options): this + // Checks if the map container size changed and updates the map if so — + // call it after you've changed the map size dynamically, also animating + // pan by default. If `options.pan` is `false`, panning will not occur. + // If `options.debounceMoveend` is `true`, it will delay `moveend` event so + // that it doesn't happen often even if the method is called many + // times in a row. + + // @alternative + // @method invalidateSize(animate: Boolean): this + // Checks if the map container size changed and updates the map if so — + // call it after you've changed the map size dynamically, also animating + // pan by default. + invalidateSize: function (options) { + if (!this._loaded) { return this; } + + options = extend({ + animate: false, + pan: true + }, options === true ? {animate: true} : options); + + var oldSize = this.getSize(); + this._sizeChanged = true; + this._lastCenter = null; + + var newSize = this.getSize(), + oldCenter = oldSize.divideBy(2).round(), + newCenter = newSize.divideBy(2).round(), + offset = oldCenter.subtract(newCenter); + + if (!offset.x && !offset.y) { return this; } + + if (options.animate && options.pan) { + this.panBy(offset); + + } else { + if (options.pan) { + this._rawPanBy(offset); + } + + this.fire('move'); + + if (options.debounceMoveend) { + clearTimeout(this._sizeTimer); + this._sizeTimer = setTimeout(bind(this.fire, this, 'moveend'), 200); + } else { + this.fire('moveend'); + } + } + + // @section Map state change events + // @event resize: ResizeEvent + // Fired when the map is resized. + return this.fire('resize', { + oldSize: oldSize, + newSize: newSize + }); + }, + + // @section Methods for modifying map state + // @method stop(): this + // Stops the currently running `panTo` or `flyTo` animation, if any. + stop: function () { + this.setZoom(this._limitZoom(this._zoom)); + if (!this.options.zoomSnap) { + this.fire('viewreset'); + } + return this._stop(); + }, + + // @section Geolocation methods + // @method locate(options?: Locate options): this + // Tries to locate the user using the Geolocation API, firing a [`locationfound`](#map-locationfound) + // event with location data on success or a [`locationerror`](#map-locationerror) event on failure, + // and optionally sets the map view to the user's location with respect to + // detection accuracy (or to the world view if geolocation failed). + // Note that, if your page doesn't use HTTPS, this method will fail in + // modern browsers ([Chrome 50 and newer](https://sites.google.com/a/chromium.org/dev/Home/chromium-security/deprecating-powerful-features-on-insecure-origins)) + // See `Locate options` for more details. + locate: function (options) { + + options = this._locateOptions = extend({ + timeout: 10000, + watch: false + // setView: false + // maxZoom: + // maximumAge: 0 + // enableHighAccuracy: false + }, options); + + if (!('geolocation' in navigator)) { + this._handleGeolocationError({ + code: 0, + message: 'Geolocation not supported.' + }); + return this; + } + + var onResponse = bind(this._handleGeolocationResponse, this), + onError = bind(this._handleGeolocationError, this); + + if (options.watch) { + this._locationWatchId = + navigator.geolocation.watchPosition(onResponse, onError, options); + } else { + navigator.geolocation.getCurrentPosition(onResponse, onError, options); + } + return this; + }, + + // @method stopLocate(): this + // Stops watching location previously initiated by `map.locate({watch: true})` + // and aborts resetting the map view if map.locate was called with + // `{setView: true}`. + stopLocate: function () { + if (navigator.geolocation && navigator.geolocation.clearWatch) { + navigator.geolocation.clearWatch(this._locationWatchId); + } + if (this._locateOptions) { + this._locateOptions.setView = false; + } + return this; + }, + + _handleGeolocationError: function (error) { + var c = error.code, + message = error.message || + (c === 1 ? 'permission denied' : + (c === 2 ? 'position unavailable' : 'timeout')); + + if (this._locateOptions.setView && !this._loaded) { + this.fitWorld(); + } + + // @section Location events + // @event locationerror: ErrorEvent + // Fired when geolocation (using the [`locate`](#map-locate) method) failed. + this.fire('locationerror', { + code: c, + message: 'Geolocation error: ' + message + '.' + }); + }, + + _handleGeolocationResponse: function (pos) { + var lat = pos.coords.latitude, + lng = pos.coords.longitude, + latlng = new LatLng(lat, lng), + bounds = latlng.toBounds(pos.coords.accuracy * 2), + options = this._locateOptions; + + if (options.setView) { + var zoom = this.getBoundsZoom(bounds); + this.setView(latlng, options.maxZoom ? Math.min(zoom, options.maxZoom) : zoom); + } + + var data = { + latlng: latlng, + bounds: bounds, + timestamp: pos.timestamp + }; + + for (var i in pos.coords) { + if (typeof pos.coords[i] === 'number') { + data[i] = pos.coords[i]; + } + } + + // @event locationfound: LocationEvent + // Fired when geolocation (using the [`locate`](#map-locate) method) + // went successfully. + this.fire('locationfound', data); + }, + + // TODO Appropriate docs section? + // @section Other Methods + // @method addHandler(name: String, HandlerClass: Function): this + // Adds a new `Handler` to the map, given its name and constructor function. + addHandler: function (name, HandlerClass) { + if (!HandlerClass) { return this; } + + var handler = this[name] = new HandlerClass(this); + + this._handlers.push(handler); + + if (this.options[name]) { + handler.enable(); + } + + return this; + }, + + // @method remove(): this + // Destroys the map and clears all related event listeners. + remove: function () { + + this._initEvents(true); + + if (this._containerId !== this._container._leaflet_id) { + throw new Error('Map container is being reused by another instance'); + } + + try { + // throws error in IE6-8 + delete this._container._leaflet_id; + delete this._containerId; + } catch (e) { + /*eslint-disable */ + this._container._leaflet_id = undefined; + /* eslint-enable */ + this._containerId = undefined; + } + + if (this._locationWatchId !== undefined) { + this.stopLocate(); + } + + this._stop(); + + remove(this._mapPane); + + if (this._clearControlPos) { + this._clearControlPos(); + } + if (this._resizeRequest) { + cancelAnimFrame(this._resizeRequest); + this._resizeRequest = null; + } + + this._clearHandlers(); + + if (this._loaded) { + // @section Map state change events + // @event unload: Event + // Fired when the map is destroyed with [remove](#map-remove) method. + this.fire('unload'); + } + + var i; + for (i in this._layers) { + this._layers[i].remove(); + } + for (i in this._panes) { + remove(this._panes[i]); + } + + this._layers = []; + this._panes = []; + delete this._mapPane; + delete this._renderer; + + return this; + }, + + // @section Other Methods + // @method createPane(name: String, container?: HTMLElement): HTMLElement + // Creates a new [map pane](#map-pane) with the given name if it doesn't exist already, + // then returns it. The pane is created as a child of `container`, or + // as a child of the main map pane if not set. + createPane: function (name, container) { + var className = 'leaflet-pane' + (name ? ' leaflet-' + name.replace('Pane', '') + '-pane' : ''), + pane = create$1('div', className, container || this._mapPane); + + if (name) { + this._panes[name] = pane; + } + return pane; + }, + + // @section Methods for Getting Map State + + // @method getCenter(): LatLng + // Returns the geographical center of the map view + getCenter: function () { + this._checkIfLoaded(); + + if (this._lastCenter && !this._moved()) { + return this._lastCenter; + } + return this.layerPointToLatLng(this._getCenterLayerPoint()); + }, + + // @method getZoom(): Number + // Returns the current zoom level of the map view + getZoom: function () { + return this._zoom; + }, + + // @method getBounds(): LatLngBounds + // Returns the geographical bounds visible in the current map view + getBounds: function () { + var bounds = this.getPixelBounds(), + sw = this.unproject(bounds.getBottomLeft()), + ne = this.unproject(bounds.getTopRight()); + + return new LatLngBounds(sw, ne); + }, + + // @method getMinZoom(): Number + // Returns the minimum zoom level of the map (if set in the `minZoom` option of the map or of any layers), or `0` by default. + getMinZoom: function () { + return this.options.minZoom === undefined ? this._layersMinZoom || 0 : this.options.minZoom; + }, + + // @method getMaxZoom(): Number + // Returns the maximum zoom level of the map (if set in the `maxZoom` option of the map or of any layers). + getMaxZoom: function () { + return this.options.maxZoom === undefined ? + (this._layersMaxZoom === undefined ? Infinity : this._layersMaxZoom) : + this.options.maxZoom; + }, + + // @method getBoundsZoom(bounds: LatLngBounds, inside?: Boolean, padding?: Point): Number + // Returns the maximum zoom level on which the given bounds fit to the map + // view in its entirety. If `inside` (optional) is set to `true`, the method + // instead returns the minimum zoom level on which the map view fits into + // the given bounds in its entirety. + getBoundsZoom: function (bounds, inside, padding) { // (LatLngBounds[, Boolean, Point]) -> Number + bounds = toLatLngBounds(bounds); + padding = toPoint(padding || [0, 0]); + + var zoom = this.getZoom() || 0, + min = this.getMinZoom(), + max = this.getMaxZoom(), + nw = bounds.getNorthWest(), + se = bounds.getSouthEast(), + size = this.getSize().subtract(padding), + boundsSize = toBounds(this.project(se, zoom), this.project(nw, zoom)).getSize(), + snap = any3d ? this.options.zoomSnap : 1, + scalex = size.x / boundsSize.x, + scaley = size.y / boundsSize.y, + scale = inside ? Math.max(scalex, scaley) : Math.min(scalex, scaley); + + zoom = this.getScaleZoom(scale, zoom); + + if (snap) { + zoom = Math.round(zoom / (snap / 100)) * (snap / 100); // don't jump if within 1% of a snap level + zoom = inside ? Math.ceil(zoom / snap) * snap : Math.floor(zoom / snap) * snap; + } + + return Math.max(min, Math.min(max, zoom)); + }, + + // @method getSize(): Point + // Returns the current size of the map container (in pixels). + getSize: function () { + if (!this._size || this._sizeChanged) { + this._size = new Point( + this._container.clientWidth || 0, + this._container.clientHeight || 0); + + this._sizeChanged = false; + } + return this._size.clone(); + }, + + // @method getPixelBounds(): Bounds + // Returns the bounds of the current map view in projected pixel + // coordinates (sometimes useful in layer and overlay implementations). + getPixelBounds: function (center, zoom) { + var topLeftPoint = this._getTopLeftPoint(center, zoom); + return new Bounds(topLeftPoint, topLeftPoint.add(this.getSize())); + }, + + // TODO: Check semantics - isn't the pixel origin the 0,0 coord relative to + // the map pane? "left point of the map layer" can be confusing, specially + // since there can be negative offsets. + // @method getPixelOrigin(): Point + // Returns the projected pixel coordinates of the top left point of + // the map layer (useful in custom layer and overlay implementations). + getPixelOrigin: function () { + this._checkIfLoaded(); + return this._pixelOrigin; + }, + + // @method getPixelWorldBounds(zoom?: Number): Bounds + // Returns the world's bounds in pixel coordinates for zoom level `zoom`. + // If `zoom` is omitted, the map's current zoom level is used. + getPixelWorldBounds: function (zoom) { + return this.options.crs.getProjectedBounds(zoom === undefined ? this.getZoom() : zoom); + }, + + // @section Other Methods + + // @method getPane(pane: String|HTMLElement): HTMLElement + // Returns a [map pane](#map-pane), given its name or its HTML element (its identity). + getPane: function (pane) { + return typeof pane === 'string' ? this._panes[pane] : pane; + }, + + // @method getPanes(): Object + // Returns a plain object containing the names of all [panes](#map-pane) as keys and + // the panes as values. + getPanes: function () { + return this._panes; + }, + + // @method getContainer: HTMLElement + // Returns the HTML element that contains the map. + getContainer: function () { + return this._container; + }, + + + // @section Conversion Methods + + // @method getZoomScale(toZoom: Number, fromZoom: Number): Number + // Returns the scale factor to be applied to a map transition from zoom level + // `fromZoom` to `toZoom`. Used internally to help with zoom animations. + getZoomScale: function (toZoom, fromZoom) { + // TODO replace with universal implementation after refactoring projections + var crs = this.options.crs; + fromZoom = fromZoom === undefined ? this._zoom : fromZoom; + return crs.scale(toZoom) / crs.scale(fromZoom); + }, + + // @method getScaleZoom(scale: Number, fromZoom: Number): Number + // Returns the zoom level that the map would end up at, if it is at `fromZoom` + // level and everything is scaled by a factor of `scale`. Inverse of + // [`getZoomScale`](#map-getZoomScale). + getScaleZoom: function (scale, fromZoom) { + var crs = this.options.crs; + fromZoom = fromZoom === undefined ? this._zoom : fromZoom; + var zoom = crs.zoom(scale * crs.scale(fromZoom)); + return isNaN(zoom) ? Infinity : zoom; + }, + + // @method project(latlng: LatLng, zoom: Number): Point + // Projects a geographical coordinate `LatLng` according to the projection + // of the map's CRS, then scales it according to `zoom` and the CRS's + // `Transformation`. The result is pixel coordinate relative to + // the CRS origin. + project: function (latlng, zoom) { + zoom = zoom === undefined ? this._zoom : zoom; + return this.options.crs.latLngToPoint(toLatLng(latlng), zoom); + }, + + // @method unproject(point: Point, zoom: Number): LatLng + // Inverse of [`project`](#map-project). + unproject: function (point, zoom) { + zoom = zoom === undefined ? this._zoom : zoom; + return this.options.crs.pointToLatLng(toPoint(point), zoom); + }, + + // @method layerPointToLatLng(point: Point): LatLng + // Given a pixel coordinate relative to the [origin pixel](#map-getpixelorigin), + // returns the corresponding geographical coordinate (for the current zoom level). + layerPointToLatLng: function (point) { + var projectedPoint = toPoint(point).add(this.getPixelOrigin()); + return this.unproject(projectedPoint); + }, + + // @method latLngToLayerPoint(latlng: LatLng): Point + // Given a geographical coordinate, returns the corresponding pixel coordinate + // relative to the [origin pixel](#map-getpixelorigin). + latLngToLayerPoint: function (latlng) { + var projectedPoint = this.project(toLatLng(latlng))._round(); + return projectedPoint._subtract(this.getPixelOrigin()); + }, + + // @method wrapLatLng(latlng: LatLng): LatLng + // Returns a `LatLng` where `lat` and `lng` has been wrapped according to the + // map's CRS's `wrapLat` and `wrapLng` properties, if they are outside the + // CRS's bounds. + // By default this means longitude is wrapped around the dateline so its + // value is between -180 and +180 degrees. + wrapLatLng: function (latlng) { + return this.options.crs.wrapLatLng(toLatLng(latlng)); + }, + + // @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. + // By default this means the center longitude is wrapped around the dateline so its + // value is between -180 and +180 degrees, and the majority of the bounds + // overlaps the CRS's bounds. + wrapLatLngBounds: function (latlng) { + return this.options.crs.wrapLatLngBounds(toLatLngBounds(latlng)); + }, + + // @method distance(latlng1: LatLng, latlng2: LatLng): Number + // Returns the distance between two geographical coordinates according to + // the map's CRS. By default this measures distance in meters. + distance: function (latlng1, latlng2) { + return this.options.crs.distance(toLatLng(latlng1), toLatLng(latlng2)); + }, + + // @method containerPointToLayerPoint(point: Point): Point + // Given a pixel coordinate relative to the map container, returns the corresponding + // pixel coordinate relative to the [origin pixel](#map-getpixelorigin). + containerPointToLayerPoint: function (point) { // (Point) + return toPoint(point).subtract(this._getMapPanePos()); + }, + + // @method layerPointToContainerPoint(point: Point): Point + // Given a pixel coordinate relative to the [origin pixel](#map-getpixelorigin), + // returns the corresponding pixel coordinate relative to the map container. + layerPointToContainerPoint: function (point) { // (Point) + return toPoint(point).add(this._getMapPanePos()); + }, + + // @method containerPointToLatLng(point: Point): LatLng + // Given a pixel coordinate relative to the map container, returns + // the corresponding geographical coordinate (for the current zoom level). + containerPointToLatLng: function (point) { + var layerPoint = this.containerPointToLayerPoint(toPoint(point)); + return this.layerPointToLatLng(layerPoint); + }, + + // @method latLngToContainerPoint(latlng: LatLng): Point + // Given a geographical coordinate, returns the corresponding pixel coordinate + // relative to the map container. + latLngToContainerPoint: function (latlng) { + return this.layerPointToContainerPoint(this.latLngToLayerPoint(toLatLng(latlng))); + }, + + // @method mouseEventToContainerPoint(ev: MouseEvent): Point + // Given a MouseEvent object, returns the pixel coordinate relative to the + // map container where the event took place. + mouseEventToContainerPoint: function (e) { + return getMousePosition(e, this._container); + }, + + // @method mouseEventToLayerPoint(ev: MouseEvent): Point + // Given a MouseEvent object, returns the pixel coordinate relative to + // the [origin pixel](#map-getpixelorigin) where the event took place. + mouseEventToLayerPoint: function (e) { + return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(e)); + }, + + // @method mouseEventToLatLng(ev: MouseEvent): LatLng + // Given a MouseEvent object, returns geographical coordinate where the + // event took place. + mouseEventToLatLng: function (e) { // (MouseEvent) + return this.layerPointToLatLng(this.mouseEventToLayerPoint(e)); + }, + + + // map initialization methods + + _initContainer: function (id) { + var container = this._container = get(id); + + if (!container) { + throw new Error('Map container not found.'); + } else if (container._leaflet_id) { + throw new Error('Map container is already initialized.'); + } + + on(container, 'scroll', this._onScroll, this); + this._containerId = stamp(container); + }, + + _initLayout: function () { + var container = this._container; + + this._fadeAnimated = this.options.fadeAnimation && any3d; + + addClass(container, 'leaflet-container' + + (touch ? ' leaflet-touch' : '') + + (retina ? ' leaflet-retina' : '') + + (ielt9 ? ' leaflet-oldie' : '') + + (safari ? ' leaflet-safari' : '') + + (this._fadeAnimated ? ' leaflet-fade-anim' : '')); + + var position = getStyle(container, 'position'); + + if (position !== 'absolute' && position !== 'relative' && position !== 'fixed') { + container.style.position = 'relative'; + } + + this._initPanes(); + + if (this._initControlPos) { + this._initControlPos(); + } + }, + + _initPanes: function () { + var panes = this._panes = {}; + this._paneRenderers = {}; + + // @section + // + // Panes are DOM elements used to control the ordering of layers on the map. You + // can access panes with [`map.getPane`](#map-getpane) or + // [`map.getPanes`](#map-getpanes) methods. New panes can be created with the + // [`map.createPane`](#map-createpane) method. + // + // Every map has the following default panes that differ only in zIndex. + // + // @pane mapPane: HTMLElement = 'auto' + // Pane that contains all other map panes + + this._mapPane = this.createPane('mapPane', this._container); + setPosition(this._mapPane, new Point(0, 0)); + + // @pane tilePane: HTMLElement = 200 + // Pane for `GridLayer`s and `TileLayer`s + this.createPane('tilePane'); + // @pane overlayPane: HTMLElement = 400 + // Pane for vectors (`Path`s, like `Polyline`s and `Polygon`s), `ImageOverlay`s and `VideoOverlay`s + this.createPane('shadowPane'); + // @pane shadowPane: HTMLElement = 500 + // Pane for overlay shadows (e.g. `Marker` shadows) + this.createPane('overlayPane'); + // @pane markerPane: HTMLElement = 600 + // Pane for `Icon`s of `Marker`s + this.createPane('markerPane'); + // @pane tooltipPane: HTMLElement = 650 + // Pane for `Tooltip`s. + this.createPane('tooltipPane'); + // @pane popupPane: HTMLElement = 700 + // Pane for `Popup`s. + this.createPane('popupPane'); + + if (!this.options.markerZoomAnimation) { + addClass(panes.markerPane, 'leaflet-zoom-hide'); + addClass(panes.shadowPane, 'leaflet-zoom-hide'); + } + }, + + + // private methods that modify map state + + // @section Map state change events + _resetView: function (center, zoom) { + setPosition(this._mapPane, new Point(0, 0)); + + var loading = !this._loaded; + this._loaded = true; + zoom = this._limitZoom(zoom); + + this.fire('viewprereset'); + + var zoomChanged = this._zoom !== zoom; + this + ._moveStart(zoomChanged, false) + ._move(center, zoom) + ._moveEnd(zoomChanged); + + // @event viewreset: Event + // Fired when the map needs to redraw its content (this usually happens + // on map zoom or load). Very useful for creating custom overlays. + this.fire('viewreset'); + + // @event load: Event + // Fired when the map is initialized (when its center and zoom are set + // for the first time). + if (loading) { + this.fire('load'); + } + }, + + _moveStart: function (zoomChanged, noMoveStart) { + // @event zoomstart: Event + // Fired when the map zoom is about to change (e.g. before zoom animation). + // @event movestart: Event + // Fired when the view of the map starts changing (e.g. user starts dragging the map). + if (zoomChanged) { + this.fire('zoomstart'); + } + if (!noMoveStart) { + this.fire('movestart'); + } + return this; + }, + + _move: function (center, zoom, data) { + if (zoom === undefined) { + zoom = this._zoom; + } + var zoomChanged = this._zoom !== zoom; + + this._zoom = zoom; + this._lastCenter = center; + this._pixelOrigin = this._getNewPixelOrigin(center); + + // @event zoom: Event + // Fired repeatedly during any change in zoom level, including zoom + // and fly animations. + if (zoomChanged || (data && data.pinch)) { // Always fire 'zoom' if pinching because #3530 + this.fire('zoom', data); + } + + // @event move: Event + // Fired repeatedly during any movement of the map, including pan and + // fly animations. + return this.fire('move', data); + }, + + _moveEnd: function (zoomChanged) { + // @event zoomend: Event + // Fired when the map has changed, after any animations. + if (zoomChanged) { + this.fire('zoomend'); + } + + // @event moveend: Event + // Fired when the center of the map stops changing (e.g. user stopped + // dragging the map). + return this.fire('moveend'); + }, + + _stop: function () { + cancelAnimFrame(this._flyToFrame); + if (this._panAnim) { + this._panAnim.stop(); + } + return this; + }, + + _rawPanBy: function (offset) { + setPosition(this._mapPane, this._getMapPanePos().subtract(offset)); + }, + + _getZoomSpan: function () { + return this.getMaxZoom() - this.getMinZoom(); + }, + + _panInsideMaxBounds: function () { + if (!this._enforcingBounds) { + this.panInsideBounds(this.options.maxBounds); + } + }, + + _checkIfLoaded: function () { + if (!this._loaded) { + throw new Error('Set map center and zoom first.'); + } + }, + + // DOM event handling + + // @section Interaction events + _initEvents: function (remove$$1) { + this._targets = {}; + this._targets[stamp(this._container)] = this; + + var onOff = remove$$1 ? off : on; + + // @event click: MouseEvent + // Fired when the user clicks (or taps) the map. + // @event dblclick: MouseEvent + // Fired when the user double-clicks (or double-taps) the map. + // @event mousedown: MouseEvent + // Fired when the user pushes the mouse button on the map. + // @event mouseup: MouseEvent + // Fired when the user releases the mouse button on the map. + // @event mouseover: MouseEvent + // Fired when the mouse enters the map. + // @event mouseout: MouseEvent + // Fired when the mouse leaves the map. + // @event mousemove: MouseEvent + // Fired while the mouse moves over the map. + // @event contextmenu: MouseEvent + // Fired when the user pushes the right mouse button on the map, prevents + // default browser context menu from showing if there are listeners on + // this event. Also fired on mobile when the user holds a single touch + // for a second (also called long press). + // @event keypress: KeyboardEvent + // Fired when the user presses a key from the keyboard while the map is focused. + onOff(this._container, 'click dblclick mousedown mouseup ' + + 'mouseover mouseout mousemove contextmenu keypress', this._handleDOMEvent, this); + + if (this.options.trackResize) { + onOff(window, 'resize', this._onResize, this); + } + + if (any3d && this.options.transform3DLimit) { + (remove$$1 ? this.off : this.on).call(this, 'moveend', this._onMoveEnd); + } + }, + + _onResize: function () { + cancelAnimFrame(this._resizeRequest); + this._resizeRequest = requestAnimFrame( + function () { this.invalidateSize({debounceMoveend: true}); }, this); + }, + + _onScroll: function () { + this._container.scrollTop = 0; + this._container.scrollLeft = 0; + }, + + _onMoveEnd: function () { + var pos = this._getMapPanePos(); + if (Math.max(Math.abs(pos.x), Math.abs(pos.y)) >= this.options.transform3DLimit) { + // https://bugzilla.mozilla.org/show_bug.cgi?id=1203873 but Webkit also have + // a pixel offset on very high values, see: http://jsfiddle.net/dg6r5hhb/ + this._resetView(this.getCenter(), this.getZoom()); + } + }, + + _findEventTargets: function (e, type) { + var targets = [], + target, + isHover = type === 'mouseout' || type === 'mouseover', + src = e.target || e.srcElement, + dragging = false; + + while (src) { + target = this._targets[stamp(src)]; + if (target && (type === 'click' || type === 'preclick') && !e._simulated && this._draggableMoved(target)) { + // Prevent firing click after you just dragged an object. + dragging = true; + break; + } + if (target && target.listens(type, true)) { + if (isHover && !isExternalTarget(src, e)) { break; } + targets.push(target); + if (isHover) { break; } + } + if (src === this._container) { break; } + src = src.parentNode; + } + if (!targets.length && !dragging && !isHover && isExternalTarget(src, e)) { + targets = [this]; + } + return targets; + }, + + _handleDOMEvent: function (e) { + if (!this._loaded || skipped(e)) { return; } + + var type = e.type; + + if (type === 'mousedown' || type === 'keypress') { + // prevents outline when clicking on keyboard-focusable element + preventOutline(e.target || e.srcElement); + } + + this._fireDOMEvent(e, type); + }, + + _mouseEvents: ['click', 'dblclick', 'mouseover', 'mouseout', 'contextmenu'], + + _fireDOMEvent: function (e, type, targets) { + + if (e.type === 'click') { + // Fire a synthetic 'preclick' event which propagates up (mainly for closing popups). + // @event preclick: MouseEvent + // Fired before mouse click on the map (sometimes useful when you + // want something to happen on click before any existing click + // handlers start running). + var synth = extend({}, e); + synth.type = 'preclick'; + this._fireDOMEvent(synth, synth.type, targets); + } + + if (e._stopped) { return; } + + // Find the layer the event is propagating from and its parents. + targets = (targets || []).concat(this._findEventTargets(e, type)); + + if (!targets.length) { return; } + + var target = targets[0]; + if (type === 'contextmenu' && target.listens(type, true)) { + preventDefault(e); + } + + var data = { + originalEvent: e + }; + + if (e.type !== 'keypress') { + var isMarker = target.getLatLng && (!target._radius || target._radius <= 10); + data.containerPoint = isMarker ? + this.latLngToContainerPoint(target.getLatLng()) : this.mouseEventToContainerPoint(e); + data.layerPoint = this.containerPointToLayerPoint(data.containerPoint); + data.latlng = isMarker ? target.getLatLng() : this.layerPointToLatLng(data.layerPoint); + } + + for (var i = 0; i < targets.length; i++) { + targets[i].fire(type, data, true); + if (data.originalEvent._stopped || + (targets[i].options.bubblingMouseEvents === false && indexOf(this._mouseEvents, type) !== -1)) { return; } + } + }, + + _draggableMoved: function (obj) { + obj = obj.dragging && obj.dragging.enabled() ? obj : this; + return (obj.dragging && obj.dragging.moved()) || (this.boxZoom && this.boxZoom.moved()); + }, + + _clearHandlers: function () { + for (var i = 0, len = this._handlers.length; i < len; i++) { + this._handlers[i].disable(); + } + }, + + // @section Other Methods + + // @method whenReady(fn: Function, context?: Object): this + // Runs the given function `fn` when the map gets initialized with + // a view (center and zoom) and at least one layer, or immediately + // if it's already initialized, optionally passing a function context. + whenReady: function (callback, context) { + if (this._loaded) { + callback.call(context || this, {target: this}); + } else { + this.on('load', callback, context); + } + return this; + }, + + + // private methods for getting map state + + _getMapPanePos: function () { + return getPosition(this._mapPane) || new Point(0, 0); + }, + + _moved: function () { + var pos = this._getMapPanePos(); + return pos && !pos.equals([0, 0]); + }, + + _getTopLeftPoint: function (center, zoom) { + var pixelOrigin = center && zoom !== undefined ? + this._getNewPixelOrigin(center, zoom) : + this.getPixelOrigin(); + return pixelOrigin.subtract(this._getMapPanePos()); + }, + + _getNewPixelOrigin: function (center, zoom) { + var viewHalf = this.getSize()._divideBy(2); + return this.project(center, zoom)._subtract(viewHalf)._add(this._getMapPanePos())._round(); + }, + + _latLngToNewLayerPoint: function (latlng, zoom, center) { + var topLeft = this._getNewPixelOrigin(center, zoom); + return this.project(latlng, zoom)._subtract(topLeft); + }, + + _latLngBoundsToNewLayerBounds: function (latLngBounds, zoom, center) { + var topLeft = this._getNewPixelOrigin(center, zoom); + return toBounds([ + this.project(latLngBounds.getSouthWest(), zoom)._subtract(topLeft), + this.project(latLngBounds.getNorthWest(), zoom)._subtract(topLeft), + this.project(latLngBounds.getSouthEast(), zoom)._subtract(topLeft), + this.project(latLngBounds.getNorthEast(), zoom)._subtract(topLeft) + ]); + }, + + // layer point of the current center + _getCenterLayerPoint: function () { + return this.containerPointToLayerPoint(this.getSize()._divideBy(2)); + }, + + // offset of the specified place to the current center in pixels + _getCenterOffset: function (latlng) { + return this.latLngToLayerPoint(latlng).subtract(this._getCenterLayerPoint()); + }, + + // adjust center for view to get inside bounds + _limitCenter: function (center, zoom, bounds) { + + if (!bounds) { return center; } + + var centerPoint = this.project(center, zoom), + viewHalf = this.getSize().divideBy(2), + viewBounds = new Bounds(centerPoint.subtract(viewHalf), centerPoint.add(viewHalf)), + offset = this._getBoundsOffset(viewBounds, bounds, zoom); + + // If offset is less than a pixel, ignore. + // This prevents unstable projections from getting into + // an infinite loop of tiny offsets. + if (offset.round().equals([0, 0])) { + return center; + } + + return this.unproject(centerPoint.add(offset), zoom); + }, + + // adjust offset for view to get inside bounds + _limitOffset: function (offset, bounds) { + if (!bounds) { return offset; } + + var viewBounds = this.getPixelBounds(), + newBounds = new Bounds(viewBounds.min.add(offset), viewBounds.max.add(offset)); + + return offset.add(this._getBoundsOffset(newBounds, bounds)); + }, + + // returns offset needed for pxBounds to get inside maxBounds at a specified zoom + _getBoundsOffset: function (pxBounds, maxBounds, zoom) { + var projectedMaxBounds = toBounds( + this.project(maxBounds.getNorthEast(), zoom), + this.project(maxBounds.getSouthWest(), zoom) + ), + minOffset = projectedMaxBounds.min.subtract(pxBounds.min), + maxOffset = projectedMaxBounds.max.subtract(pxBounds.max), + + dx = this._rebound(minOffset.x, -maxOffset.x), + dy = this._rebound(minOffset.y, -maxOffset.y); + + return new Point(dx, dy); + }, + + _rebound: function (left, right) { + return left + right > 0 ? + Math.round(left - right) / 2 : + Math.max(0, Math.ceil(left)) - Math.max(0, Math.floor(right)); + }, + + _limitZoom: function (zoom) { + var min = this.getMinZoom(), + max = this.getMaxZoom(), + snap = any3d ? this.options.zoomSnap : 1; + if (snap) { + zoom = Math.round(zoom / snap) * snap; + } + return Math.max(min, Math.min(max, zoom)); + }, + + _onPanTransitionStep: function () { + this.fire('move'); + }, + + _onPanTransitionEnd: function () { + removeClass(this._mapPane, 'leaflet-pan-anim'); + this.fire('moveend'); + }, + + _tryAnimatedPan: function (center, options) { + // difference between the new and current centers in pixels + var offset = this._getCenterOffset(center)._trunc(); + + // don't animate too far unless animate: true specified in options + if ((options && options.animate) !== true && !this.getSize().contains(offset)) { return false; } + + this.panBy(offset, options); + + return true; + }, + + _createAnimProxy: function () { + + var proxy = this._proxy = create$1('div', 'leaflet-proxy leaflet-zoom-animated'); + this._panes.mapPane.appendChild(proxy); + + this.on('zoomanim', function (e) { + var prop = TRANSFORM, + transform = this._proxy.style[prop]; + + setTransform(this._proxy, this.project(e.center, e.zoom), this.getZoomScale(e.zoom, 1)); + + // workaround for case when transform is the same and so transitionend event is not fired + if (transform === this._proxy.style[prop] && this._animatingZoom) { + this._onZoomTransitionEnd(); + } + }, this); + + this.on('load moveend', function () { + var c = this.getCenter(), + z = this.getZoom(); + setTransform(this._proxy, this.project(c, z), this.getZoomScale(z, 1)); + }, this); + + this._on('unload', this._destroyAnimProxy, this); + }, + + _destroyAnimProxy: function () { + remove(this._proxy); + delete this._proxy; + }, + + _catchTransitionEnd: function (e) { + if (this._animatingZoom && e.propertyName.indexOf('transform') >= 0) { + this._onZoomTransitionEnd(); + } + }, + + _nothingToAnimate: function () { + return !this._container.getElementsByClassName('leaflet-zoom-animated').length; + }, + + _tryAnimatedZoom: function (center, zoom, options) { + + if (this._animatingZoom) { return true; } + + options = options || {}; + + // don't animate if disabled, not supported or zoom difference is too large + if (!this._zoomAnimated || options.animate === false || this._nothingToAnimate() || + Math.abs(zoom - this._zoom) > this.options.zoomAnimationThreshold) { return false; } + + // offset is the pixel coords of the zoom origin relative to the current center + var scale = this.getZoomScale(zoom), + offset = this._getCenterOffset(center)._divideBy(1 - 1 / scale); + + // don't animate if the zoom origin isn't within one screen from the current center, unless forced + if (options.animate !== true && !this.getSize().contains(offset)) { return false; } + + requestAnimFrame(function () { + this + ._moveStart(true, false) + ._animateZoom(center, zoom, true); + }, this); + + return true; + }, + + _animateZoom: function (center, zoom, startAnim, noUpdate) { + if (!this._mapPane) { return; } + + if (startAnim) { + this._animatingZoom = true; + + // remember what center/zoom to set after animation + this._animateToCenter = center; + this._animateToZoom = zoom; + + addClass(this._mapPane, 'leaflet-zoom-anim'); + } + + // @event zoomanim: ZoomAnimEvent + // Fired at least once per zoom animation. For continous zoom, like pinch zooming, fired once per frame during zoom. + this.fire('zoomanim', { + center: center, + zoom: zoom, + noUpdate: noUpdate + }); + + // Work around webkit not firing 'transitionend', see https://github.com/Leaflet/Leaflet/issues/3689, 2693 + setTimeout(bind(this._onZoomTransitionEnd, this), 250); + }, + + _onZoomTransitionEnd: function () { + if (!this._animatingZoom) { return; } + + if (this._mapPane) { + removeClass(this._mapPane, 'leaflet-zoom-anim'); + } + + this._animatingZoom = false; + + this._move(this._animateToCenter, this._animateToZoom); + + // This anim frame should prevent an obscure iOS webkit tile loading race condition. + requestAnimFrame(function () { + this._moveEnd(true); + }, this); + } + }); + +// @section + +// @factory L.map(id: String, options?: Map options) +// Instantiates a map object given the DOM ID of a `
` element +// and optionally an object literal with `Map options`. +// +// @alternative +// @factory L.map(el: HTMLElement, options?: Map options) +// Instantiates a map object given an instance of a `
` HTML element +// and optionally an object literal with `Map options`. + function createMap(id, options) { + return new Map(id, options); + } + + /* + * @class Control + * @aka L.Control + * @inherits Class + * + * L.Control is a base class for implementing map controls. Handles positioning. + * All other controls extend from this class. + */ + + var Control = Class.extend({ + // @section + // @aka Control options + options: { + // @option position: String = 'topright' + // The position of the control (one of the map corners). Possible values are `'topleft'`, + // `'topright'`, `'bottomleft'` or `'bottomright'` + position: 'topright' + }, + + initialize: function (options) { + setOptions(this, options); + }, + + /* @section + * Classes extending L.Control will inherit the following methods: + * + * @method getPosition: string + * Returns the position of the control. + */ + getPosition: function () { + return this.options.position; + }, + + // @method setPosition(position: string): this + // Sets the position of the control. + setPosition: function (position) { + var map = this._map; + + if (map) { + map.removeControl(this); + } + + this.options.position = position; + + if (map) { + map.addControl(this); + } + + return this; + }, + + // @method getContainer: HTMLElement + // Returns the HTMLElement that contains the control. + getContainer: function () { + return this._container; + }, + + // @method addTo(map: Map): this + // Adds the control to the given map. + addTo: function (map) { + this.remove(); + this._map = map; + + var container = this._container = this.onAdd(map), + pos = this.getPosition(), + corner = map._controlCorners[pos]; + + addClass(container, 'leaflet-control'); + + if (pos.indexOf('bottom') !== -1) { + corner.insertBefore(container, corner.firstChild); + } else { + corner.appendChild(container); + } + + return this; + }, + + // @method remove: this + // Removes the control from the map it is currently active on. + remove: function () { + if (!this._map) { + return this; + } + + remove(this._container); + + if (this.onRemove) { + this.onRemove(this._map); + } + + this._map = null; + + return this; + }, + + _refocusOnMap: function (e) { + // if map exists and event is not a keyboard event + if (this._map && e && e.screenX > 0 && e.screenY > 0) { + this._map.getContainer().focus(); + } + } + }); + + var control = function (options) { + return new Control(options); + }; + + /* @section Extension methods + * @uninheritable + * + * Every control should extend from `L.Control` and (re-)implement the following methods. + * + * @method onAdd(map: Map): HTMLElement + * Should return the container DOM element for the control and add listeners on relevant map events. Called on [`control.addTo(map)`](#control-addTo). + * + * @method onRemove(map: Map) + * Optional method. Should contain all clean up code that removes the listeners previously added in [`onAdd`](#control-onadd). Called on [`control.remove()`](#control-remove). + */ + + /* @namespace Map + * @section Methods for Layers and Controls + */ + Map.include({ + // @method addControl(control: Control): this + // Adds the given control to the map + addControl: function (control) { + control.addTo(this); + return this; + }, + + // @method removeControl(control: Control): this + // Removes the given control from the map + removeControl: function (control) { + control.remove(); + return this; + }, + + _initControlPos: function () { + var corners = this._controlCorners = {}, + l = 'leaflet-', + container = this._controlContainer = + create$1('div', l + 'control-container', this._container); + + function createCorner(vSide, hSide) { + var className = l + vSide + ' ' + l + hSide; + + corners[vSide + hSide] = create$1('div', className, container); + } + + createCorner('top', 'left'); + createCorner('top', 'right'); + createCorner('bottom', 'left'); + createCorner('bottom', 'right'); + }, + + _clearControlPos: function () { + for (var i in this._controlCorners) { + remove(this._controlCorners[i]); + } + remove(this._controlContainer); + delete this._controlCorners; + delete this._controlContainer; + } + }); + + /* + * @class Control.Layers + * @aka L.Control.Layers + * @inherits Control + * + * The layers control gives users the ability to switch between different base layers and switch overlays on/off (check out the [detailed example](http://leafletjs.com/examples/layers-control/)). Extends `Control`. + * + * @example + * + * ```js + * var baseLayers = { + * "Mapbox": mapbox, + * "OpenStreetMap": osm + * }; + * + * var overlays = { + * "Marker": marker, + * "Roads": roadsLayer + * }; + * + * L.control.layers(baseLayers, overlays).addTo(map); + * ``` + * + * The `baseLayers` and `overlays` parameters are object literals with layer names as keys and `Layer` objects as values: + * + * ```js + * { + * "": layer1, + * "": layer2 + * } + * ``` + * + * The layer names can contain HTML, which allows you to add additional styling to the items: + * + * ```js + * {" My Layer": myLayer} + * ``` + */ + + var Layers = Control.extend({ + // @section + // @aka Control.Layers options + options: { + // @option collapsed: Boolean = true + // If `true`, the control will be collapsed into an icon and expanded on mouse hover or touch. + collapsed: true, + position: 'topright', + + // @option autoZIndex: Boolean = true + // If `true`, the control will assign zIndexes in increasing order to all of its layers so that the order is preserved when switching them on/off. + autoZIndex: true, + + // @option hideSingleBase: Boolean = false + // If `true`, the base layers in the control will be hidden when there is only one. + hideSingleBase: false, + + // @option sortLayers: Boolean = false + // Whether to sort the layers. When `false`, layers will keep the order + // in which they were added to the control. + sortLayers: false, + + // @option sortFunction: Function = * + // A [compare function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array/sort) + // that will be used for sorting the layers, when `sortLayers` is `true`. + // The function receives both the `L.Layer` instances and their names, as in + // `sortFunction(layerA, layerB, nameA, nameB)`. + // By default, it sorts layers alphabetically by their name. + sortFunction: function (layerA, layerB, nameA, nameB) { + return nameA < nameB ? -1 : (nameB < nameA ? 1 : 0); + } + }, + + initialize: function (baseLayers, overlays, options) { + setOptions(this, options); + + this._layerControlInputs = []; + this._layers = []; + this._lastZIndex = 0; + this._handlingClick = false; + + for (var i in baseLayers) { + this._addLayer(baseLayers[i], i); + } + + for (i in overlays) { + this._addLayer(overlays[i], i, true); + } + }, + + onAdd: function (map) { + this._initLayout(); + this._update(); + + this._map = map; + map.on('zoomend', this._checkDisabledLayers, this); + + for (var i = 0; i < this._layers.length; i++) { + this._layers[i].layer.on('add remove', this._onLayerChange, this); + } + + return this._container; + }, + + addTo: function (map) { + Control.prototype.addTo.call(this, map); + // Trigger expand after Layers Control has been inserted into DOM so that is now has an actual height. + return this._expandIfNotCollapsed(); + }, + + onRemove: function () { + this._map.off('zoomend', this._checkDisabledLayers, this); + + for (var i = 0; i < this._layers.length; i++) { + this._layers[i].layer.off('add remove', this._onLayerChange, this); + } + }, + + // @method addBaseLayer(layer: Layer, name: String): this + // Adds a base layer (radio button entry) with the given name to the control. + addBaseLayer: function (layer, name) { + this._addLayer(layer, name); + return (this._map) ? this._update() : this; + }, + + // @method addOverlay(layer: Layer, name: String): this + // Adds an overlay (checkbox entry) with the given name to the control. + addOverlay: function (layer, name) { + this._addLayer(layer, name, true); + return (this._map) ? this._update() : this; + }, + + // @method removeLayer(layer: Layer): this + // Remove the given layer from the control. + removeLayer: function (layer) { + layer.off('add remove', this._onLayerChange, this); + + var obj = this._getLayer(stamp(layer)); + if (obj) { + this._layers.splice(this._layers.indexOf(obj), 1); + } + return (this._map) ? this._update() : this; + }, + + // @method expand(): this + // Expand the control container if collapsed. + expand: function () { + addClass(this._container, 'leaflet-control-layers-expanded'); + this._section.style.height = null; + var acceptableHeight = this._map.getSize().y - (this._container.offsetTop + 50); + if (acceptableHeight < this._section.clientHeight) { + addClass(this._section, 'leaflet-control-layers-scrollbar'); + this._section.style.height = acceptableHeight + 'px'; + } else { + removeClass(this._section, 'leaflet-control-layers-scrollbar'); + } + this._checkDisabledLayers(); + return this; + }, + + // @method collapse(): this + // Collapse the control container if expanded. + collapse: function () { + removeClass(this._container, 'leaflet-control-layers-expanded'); + return this; + }, + + _initLayout: function () { + var className = 'leaflet-control-layers', + container = this._container = create$1('div', className), + collapsed = this.options.collapsed; + + // makes this work on IE touch devices by stopping it from firing a mouseout event when the touch is released + container.setAttribute('aria-haspopup', true); + + disableClickPropagation(container); + disableScrollPropagation(container); + + var section = this._section = create$1('section', className + '-list'); + + if (collapsed) { + this._map.on('click', this.collapse, this); + + if (!android) { + on(container, { + mouseenter: this.expand, + mouseleave: this.collapse + }, this); + } + } + + var link = this._layersLink = create$1('a', className + '-toggle', container); + link.href = '#'; + link.title = 'Layers'; + + if (touch) { + on(link, 'click', stop); + on(link, 'click', this.expand, this); + } else { + on(link, 'focus', this.expand, this); + } + + if (!collapsed) { + this.expand(); + } + + this._baseLayersList = create$1('div', className + '-base', section); + this._separator = create$1('div', className + '-separator', section); + this._overlaysList = create$1('div', className + '-overlays', section); + + container.appendChild(section); + }, + + _getLayer: function (id) { + for (var i = 0; i < this._layers.length; i++) { + + if (this._layers[i] && stamp(this._layers[i].layer) === id) { + return this._layers[i]; + } + } + }, + + _addLayer: function (layer, name, overlay) { + if (this._map) { + layer.on('add remove', this._onLayerChange, this); + } + + this._layers.push({ + layer: layer, + name: name, + overlay: overlay + }); + + if (this.options.sortLayers) { + this._layers.sort(bind(function (a, b) { + return this.options.sortFunction(a.layer, b.layer, a.name, b.name); + }, this)); + } + + if (this.options.autoZIndex && layer.setZIndex) { + this._lastZIndex++; + layer.setZIndex(this._lastZIndex); + } + + this._expandIfNotCollapsed(); + }, + + _update: function () { + if (!this._container) { return this; } + + empty(this._baseLayersList); + empty(this._overlaysList); + + this._layerControlInputs = []; + var baseLayersPresent, overlaysPresent, i, obj, baseLayersCount = 0; + + for (i = 0; i < this._layers.length; i++) { + obj = this._layers[i]; + this._addItem(obj); + overlaysPresent = overlaysPresent || obj.overlay; + baseLayersPresent = baseLayersPresent || !obj.overlay; + baseLayersCount += !obj.overlay ? 1 : 0; + } + + // Hide base layers section if there's only one layer. + if (this.options.hideSingleBase) { + baseLayersPresent = baseLayersPresent && baseLayersCount > 1; + this._baseLayersList.style.display = baseLayersPresent ? '' : 'none'; + } + + this._separator.style.display = overlaysPresent && baseLayersPresent ? '' : 'none'; + + return this; + }, + + _onLayerChange: function (e) { + if (!this._handlingClick) { + this._update(); + } + + var obj = this._getLayer(stamp(e.target)); + + // @namespace Map + // @section Layer events + // @event baselayerchange: LayersControlEvent + // Fired when the base layer is changed through the [layer control](#control-layers). + // @event overlayadd: LayersControlEvent + // Fired when an overlay is selected through the [layer control](#control-layers). + // @event overlayremove: LayersControlEvent + // Fired when an overlay is deselected through the [layer control](#control-layers). + // @namespace Control.Layers + var type = obj.overlay ? + (e.type === 'add' ? 'overlayadd' : 'overlayremove') : + (e.type === 'add' ? 'baselayerchange' : null); + + if (type) { + this._map.fire(type, obj); + } + }, + + // IE7 bugs out if you create a radio dynamically, so you have to do it this hacky way (see http://bit.ly/PqYLBe) + _createRadioElement: function (name, checked) { + + var radioHtml = ''; + + var radioFragment = document.createElement('div'); + radioFragment.innerHTML = radioHtml; + + return radioFragment.firstChild; + }, + + _addItem: function (obj) { + var label = document.createElement('label'), + checked = this._map.hasLayer(obj.layer), + input; + + if (obj.overlay) { + input = document.createElement('input'); + input.type = 'checkbox'; + input.className = 'leaflet-control-layers-selector'; + input.defaultChecked = checked; + } else { + input = this._createRadioElement('leaflet-base-layers', checked); + } + + this._layerControlInputs.push(input); + input.layerId = stamp(obj.layer); + + on(input, 'click', this._onInputClick, this); + + var name = document.createElement('span'); + name.innerHTML = ' ' + obj.name; + + // Helps from preventing layer control flicker when checkboxes are disabled + // https://github.com/Leaflet/Leaflet/issues/2771 + var holder = document.createElement('div'); + + label.appendChild(holder); + holder.appendChild(input); + holder.appendChild(name); + + var container = obj.overlay ? this._overlaysList : this._baseLayersList; + container.appendChild(label); + + this._checkDisabledLayers(); + return label; + }, + + _onInputClick: function () { + var inputs = this._layerControlInputs, + input, layer; + var addedLayers = [], + removedLayers = []; + + this._handlingClick = true; + + for (var i = inputs.length - 1; i >= 0; i--) { + input = inputs[i]; + layer = this._getLayer(input.layerId).layer; + + if (input.checked) { + addedLayers.push(layer); + } else if (!input.checked) { + removedLayers.push(layer); + } + } + + // Bugfix issue 2318: Should remove all old layers before readding new ones + for (i = 0; i < removedLayers.length; i++) { + if (this._map.hasLayer(removedLayers[i])) { + this._map.removeLayer(removedLayers[i]); + } + } + for (i = 0; i < addedLayers.length; i++) { + if (!this._map.hasLayer(addedLayers[i])) { + this._map.addLayer(addedLayers[i]); + } + } + + this._handlingClick = false; + + this._refocusOnMap(); + }, + + _checkDisabledLayers: function () { + var inputs = this._layerControlInputs, + input, + layer, + zoom = this._map.getZoom(); + + for (var i = inputs.length - 1; i >= 0; i--) { + input = inputs[i]; + layer = this._getLayer(input.layerId).layer; + input.disabled = (layer.options.minZoom !== undefined && zoom < layer.options.minZoom) || + (layer.options.maxZoom !== undefined && zoom > layer.options.maxZoom); + + } + }, + + _expandIfNotCollapsed: function () { + if (this._map && !this.options.collapsed) { + this.expand(); + } + return this; + }, + + _expand: function () { + // Backward compatibility, remove me in 1.1. + return this.expand(); + }, + + _collapse: function () { + // Backward compatibility, remove me in 1.1. + return this.collapse(); + } + + }); + + +// @factory L.control.layers(baselayers?: Object, overlays?: Object, options?: Control.Layers options) +// Creates an attribution control with the given layers. Base layers will be switched with radio buttons, while overlays will be switched with checkboxes. Note that all base layers should be passed in the base layers object, but only one should be added to the map during map instantiation. + var layers = function (baseLayers, overlays, options) { + return new Layers(baseLayers, overlays, options); + }; + + /* + * @class Control.Zoom + * @aka L.Control.Zoom + * @inherits Control + * + * A basic zoom control with two buttons (zoom in and zoom out). It is put on the map by default unless you set its [`zoomControl` option](#map-zoomcontrol) to `false`. Extends `Control`. + */ + + var Zoom = Control.extend({ + // @section + // @aka Control.Zoom options + options: { + position: 'topleft', + + // @option zoomInText: String = '+' + // The text set on the 'zoom in' button. + zoomInText: '+', + + // @option zoomInTitle: String = 'Zoom in' + // The title set on the 'zoom in' button. + zoomInTitle: 'Zoom in', + + // @option zoomOutText: String = '−' + // The text set on the 'zoom out' button. + zoomOutText: '−', + + // @option zoomOutTitle: String = 'Zoom out' + // The title set on the 'zoom out' button. + zoomOutTitle: 'Zoom out' + }, + + onAdd: function (map) { + var zoomName = 'leaflet-control-zoom', + container = create$1('div', zoomName + ' leaflet-bar'), + options = this.options; + + this._zoomInButton = this._createButton(options.zoomInText, options.zoomInTitle, + zoomName + '-in', container, this._zoomIn); + this._zoomOutButton = this._createButton(options.zoomOutText, options.zoomOutTitle, + zoomName + '-out', container, this._zoomOut); + + this._updateDisabled(); + map.on('zoomend zoomlevelschange', this._updateDisabled, this); + + return container; + }, + + onRemove: function (map) { + map.off('zoomend zoomlevelschange', this._updateDisabled, this); + }, + + disable: function () { + this._disabled = true; + this._updateDisabled(); + return this; + }, + + enable: function () { + this._disabled = false; + this._updateDisabled(); + return this; + }, + + _zoomIn: function (e) { + if (!this._disabled && this._map._zoom < this._map.getMaxZoom()) { + this._map.zoomIn(this._map.options.zoomDelta * (e.shiftKey ? 3 : 1)); + } + }, + + _zoomOut: function (e) { + if (!this._disabled && this._map._zoom > this._map.getMinZoom()) { + this._map.zoomOut(this._map.options.zoomDelta * (e.shiftKey ? 3 : 1)); + } + }, + + _createButton: function (html, title, className, container, fn) { + var link = create$1('a', className, container); + link.innerHTML = html; + link.href = '#'; + link.title = title; + + /* + * Will force screen readers like VoiceOver to read this as "Zoom in - button" + */ + link.setAttribute('role', 'button'); + link.setAttribute('aria-label', title); + + disableClickPropagation(link); + on(link, 'click', stop); + on(link, 'click', fn, this); + on(link, 'click', this._refocusOnMap, this); + + return link; + }, + + _updateDisabled: function () { + var map = this._map, + className = 'leaflet-disabled'; + + removeClass(this._zoomInButton, className); + removeClass(this._zoomOutButton, className); + + if (this._disabled || map._zoom === map.getMinZoom()) { + addClass(this._zoomOutButton, className); + } + if (this._disabled || map._zoom === map.getMaxZoom()) { + addClass(this._zoomInButton, className); + } + } + }); + +// @namespace Map +// @section Control options +// @option zoomControl: Boolean = true +// Whether a [zoom control](#control-zoom) is added to the map by default. + Map.mergeOptions({ + zoomControl: true + }); + + Map.addInitHook(function () { + if (this.options.zoomControl) { + // @section Controls + // @property zoomControl: Control.Zoom + // The default zoom control (only available if the + // [`zoomControl` option](#map-zoomcontrol) was `true` when creating the map). + this.zoomControl = new Zoom(); + this.addControl(this.zoomControl); + } + }); + +// @namespace Control.Zoom +// @factory L.control.zoom(options: Control.Zoom options) +// Creates a zoom control + var zoom = function (options) { + return new Zoom(options); + }; + + /* + * @class Control.Scale + * @aka L.Control.Scale + * @inherits Control + * + * A simple scale control that shows the scale of the current center of screen in metric (m/km) and imperial (mi/ft) systems. Extends `Control`. + * + * @example + * + * ```js + * L.control.scale().addTo(map); + * ``` + */ + + var Scale = Control.extend({ + // @section + // @aka Control.Scale options + options: { + position: 'bottomleft', + + // @option maxWidth: Number = 100 + // Maximum width of the control in pixels. The width is set dynamically to show round values (e.g. 100, 200, 500). + maxWidth: 100, + + // @option metric: Boolean = True + // Whether to show the metric scale line (m/km). + metric: true, + + // @option imperial: Boolean = True + // Whether to show the imperial scale line (mi/ft). + imperial: true + + // @option updateWhenIdle: Boolean = false + // If `true`, the control is updated on [`moveend`](#map-moveend), otherwise it's always up-to-date (updated on [`move`](#map-move)). + }, + + onAdd: function (map) { + var className = 'leaflet-control-scale', + container = create$1('div', className), + options = this.options; + + this._addScales(options, className + '-line', container); + + map.on(options.updateWhenIdle ? 'moveend' : 'move', this._update, this); + map.whenReady(this._update, this); + + return container; + }, + + onRemove: function (map) { + map.off(this.options.updateWhenIdle ? 'moveend' : 'move', this._update, this); + }, + + _addScales: function (options, className, container) { + if (options.metric) { + this._mScale = create$1('div', className, container); + } + if (options.imperial) { + this._iScale = create$1('div', className, container); + } + }, + + _update: function () { + var map = this._map, + y = map.getSize().y / 2; + + var maxMeters = map.distance( + map.containerPointToLatLng([0, y]), + map.containerPointToLatLng([this.options.maxWidth, y])); + + this._updateScales(maxMeters); + }, + + _updateScales: function (maxMeters) { + if (this.options.metric && maxMeters) { + this._updateMetric(maxMeters); + } + if (this.options.imperial && maxMeters) { + this._updateImperial(maxMeters); + } + }, + + _updateMetric: function (maxMeters) { + var meters = this._getRoundNum(maxMeters), + label = meters < 1000 ? meters + ' m' : (meters / 1000) + ' km'; + + this._updateScale(this._mScale, label, meters / maxMeters); + }, + + _updateImperial: function (maxMeters) { + var maxFeet = maxMeters * 3.2808399, + maxMiles, miles, feet; + + if (maxFeet > 5280) { + maxMiles = maxFeet / 5280; + miles = this._getRoundNum(maxMiles); + this._updateScale(this._iScale, miles + ' mi', miles / maxMiles); + + } else { + feet = this._getRoundNum(maxFeet); + this._updateScale(this._iScale, feet + ' ft', feet / maxFeet); + } + }, + + _updateScale: function (scale, text, ratio) { + scale.style.width = Math.round(this.options.maxWidth * ratio) + 'px'; + scale.innerHTML = text; + }, + + _getRoundNum: function (num) { + var pow10 = Math.pow(10, (Math.floor(num) + '').length - 1), + d = num / pow10; + + d = d >= 10 ? 10 : + d >= 5 ? 5 : + d >= 3 ? 3 : + d >= 2 ? 2 : 1; + + return pow10 * d; + } + }); + + +// @factory L.control.scale(options?: Control.Scale options) +// Creates an scale control with the given options. + var scale = function (options) { + return new Scale(options); + }; + + /* + * @class Control.Attribution + * @aka L.Control.Attribution + * @inherits Control + * + * The attribution control allows you to display attribution data in a small text box on a map. It is put on the map by default unless you set its [`attributionControl` option](#map-attributioncontrol) to `false`, and it fetches attribution texts from layers with the [`getAttribution` method](#layer-getattribution) automatically. Extends Control. + */ + + var Attribution = Control.extend({ + // @section + // @aka Control.Attribution options + options: { + position: 'bottomright', + + // @option prefix: String = 'Leaflet' + // The HTML text shown before the attributions. Pass `false` to disable. + prefix: 'Leaflet' + }, + + initialize: function (options) { + setOptions(this, options); + + this._attributions = {}; + }, + + onAdd: function (map) { + map.attributionControl = this; + this._container = create$1('div', 'leaflet-control-attribution'); + disableClickPropagation(this._container); + + // TODO ugly, refactor + for (var i in map._layers) { + if (map._layers[i].getAttribution) { + this.addAttribution(map._layers[i].getAttribution()); + } + } + + this._update(); + + return this._container; + }, + + // @method setPrefix(prefix: String): this + // Sets the text before the attributions. + setPrefix: function (prefix) { + this.options.prefix = prefix; + this._update(); + return this; + }, + + // @method addAttribution(text: String): this + // Adds an attribution text (e.g. `'Vector data © Mapbox'`). + addAttribution: function (text) { + if (!text) { return this; } + + if (!this._attributions[text]) { + this._attributions[text] = 0; + } + this._attributions[text]++; + + this._update(); + + return this; + }, + + // @method removeAttribution(text: String): this + // Removes an attribution text. + removeAttribution: function (text) { + if (!text) { return this; } + + if (this._attributions[text]) { + this._attributions[text]--; + this._update(); + } + + return this; + }, + + _update: function () { + if (!this._map) { return; } + + var attribs = []; + + for (var i in this._attributions) { + if (this._attributions[i]) { + attribs.push(i); + } + } + + var prefixAndAttribs = []; + + if (this.options.prefix) { + prefixAndAttribs.push(this.options.prefix); + } + if (attribs.length) { + prefixAndAttribs.push(attribs.join(', ')); + } + + this._container.innerHTML = prefixAndAttribs.join(' | '); + } + }); + +// @namespace Map +// @section Control options +// @option attributionControl: Boolean = true +// Whether a [attribution control](#control-attribution) is added to the map by default. + Map.mergeOptions({ + attributionControl: true + }); + + Map.addInitHook(function () { + if (this.options.attributionControl) { + new Attribution().addTo(this); + } + }); + +// @namespace Control.Attribution +// @factory L.control.attribution(options: Control.Attribution options) +// Creates an attribution control. + var attribution = function (options) { + return new Attribution(options); + }; + + Control.Layers = Layers; + Control.Zoom = Zoom; + Control.Scale = Scale; + Control.Attribution = Attribution; + + control.layers = layers; + control.zoom = zoom; + control.scale = scale; + control.attribution = attribution; + + /* + L.Handler is a base class for handler classes that are used internally to inject + interaction features like dragging to classes like Map and Marker. +*/ + +// @class Handler +// @aka L.Handler +// Abstract class for map interaction handlers + + var Handler = Class.extend({ + initialize: function (map) { + this._map = map; + }, + + // @method enable(): this + // Enables the handler + enable: function () { + if (this._enabled) { return this; } + + this._enabled = true; + this.addHooks(); + return this; + }, + + // @method disable(): this + // Disables the handler + disable: function () { + if (!this._enabled) { return this; } + + this._enabled = false; + this.removeHooks(); + return this; + }, + + // @method enabled(): Boolean + // Returns `true` if the handler is enabled + enabled: function () { + return !!this._enabled; + } + + // @section Extension methods + // Classes inheriting from `Handler` must implement the two following methods: + // @method addHooks() + // Called when the handler is enabled, should add event hooks. + // @method removeHooks() + // Called when the handler is disabled, should remove the event hooks added previously. + }); + +// @section There is static function which can be called without instantiating L.Handler: +// @function addTo(map: Map, name: String): this +// Adds a new Handler to the given map with the given name. + Handler.addTo = function (map, name) { + map.addHandler(name, this); + return this; + }; + + var Mixin = {Events: Events}; + + /* + * @class Draggable + * @aka L.Draggable + * @inherits Evented + * + * A class for making DOM elements draggable (including touch support). + * Used internally for map and marker dragging. Only works for elements + * that were positioned with [`L.DomUtil.setPosition`](#domutil-setposition). + * + * @example + * ```js + * var draggable = new L.Draggable(elementToDrag); + * draggable.enable(); + * ``` + */ + + var START = touch ? 'touchstart mousedown' : 'mousedown'; + var END = { + mousedown: 'mouseup', + touchstart: 'touchend', + pointerdown: 'touchend', + MSPointerDown: 'touchend' + }; + var MOVE = { + mousedown: 'mousemove', + touchstart: 'touchmove', + pointerdown: 'touchmove', + MSPointerDown: 'touchmove' + }; + + + var Draggable = Evented.extend({ + + options: { + // @section + // @aka Draggable options + // @option clickTolerance: Number = 3 + // The max number of pixels a user can shift the mouse pointer during a click + // for it to be considered a valid click (as opposed to a mouse drag). + clickTolerance: 3 + }, + + // @constructor L.Draggable(el: HTMLElement, dragHandle?: HTMLElement, preventOutline?: Boolean, options?: Draggable options) + // Creates a `Draggable` object for moving `el` when you start dragging the `dragHandle` element (equals `el` itself by default). + initialize: function (element, dragStartTarget, preventOutline$$1, options) { + setOptions(this, options); + + this._element = element; + this._dragStartTarget = dragStartTarget || element; + this._preventOutline = preventOutline$$1; + }, + + // @method enable() + // Enables the dragging ability + enable: function () { + if (this._enabled) { return; } + + on(this._dragStartTarget, START, this._onDown, this); + + this._enabled = true; + }, + + // @method disable() + // Disables the dragging ability + disable: function () { + if (!this._enabled) { return; } + + // If we're currently dragging this draggable, + // disabling it counts as first ending the drag. + if (Draggable._dragging === this) { + this.finishDrag(); + } + + off(this._dragStartTarget, START, this._onDown, this); + + this._enabled = false; + this._moved = false; + }, + + _onDown: function (e) { + // Ignore simulated events, since we handle both touch and + // mouse explicitly; otherwise we risk getting duplicates of + // touch events, see #4315. + // Also ignore the event if disabled; this happens in IE11 + // under some circumstances, see #3666. + if (e._simulated || !this._enabled) { return; } + + this._moved = false; + + if (hasClass(this._element, 'leaflet-zoom-anim')) { return; } + + if (Draggable._dragging || e.shiftKey || ((e.which !== 1) && (e.button !== 1) && !e.touches)) { return; } + Draggable._dragging = this; // Prevent dragging multiple objects at once. + + if (this._preventOutline) { + preventOutline(this._element); + } + + disableImageDrag(); + disableTextSelection(); + + if (this._moving) { return; } + + // @event down: Event + // Fired when a drag is about to start. + this.fire('down'); + + var first = e.touches ? e.touches[0] : e, + sizedParent = getSizedParentNode(this._element); + + this._startPoint = new Point(first.clientX, first.clientY); + + // Cache the scale, so that we can continuously compensate for it during drag (_onMove). + this._parentScale = getScale(sizedParent); + + on(document, MOVE[e.type], this._onMove, this); + on(document, END[e.type], this._onUp, this); + }, + + _onMove: function (e) { + // Ignore simulated events, since we handle both touch and + // mouse explicitly; otherwise we risk getting duplicates of + // touch events, see #4315. + // Also ignore the event if disabled; this happens in IE11 + // under some circumstances, see #3666. + if (e._simulated || !this._enabled) { return; } + + if (e.touches && e.touches.length > 1) { + this._moved = true; + return; + } + + var first = (e.touches && e.touches.length === 1 ? e.touches[0] : e), + offset = new Point(first.clientX, first.clientY)._subtract(this._startPoint); + + if (!offset.x && !offset.y) { return; } + if (Math.abs(offset.x) + Math.abs(offset.y) < this.options.clickTolerance) { return; } + + // We assume that the parent container's position, border and scale do not change for the duration of the drag. + // Therefore there is no need to account for the position and border (they are eliminated by the subtraction) + // and we can use the cached value for the scale. + offset.x /= this._parentScale.x; + offset.y /= this._parentScale.y; + + preventDefault(e); + + if (!this._moved) { + // @event dragstart: Event + // Fired when a drag starts + this.fire('dragstart'); + + this._moved = true; + this._startPos = getPosition(this._element).subtract(offset); + + addClass(document.body, 'leaflet-dragging'); + + this._lastTarget = e.target || e.srcElement; + // IE and Edge do not give the element, so fetch it + // if necessary + if ((window.SVGElementInstance) && (this._lastTarget instanceof SVGElementInstance)) { + this._lastTarget = this._lastTarget.correspondingUseElement; + } + addClass(this._lastTarget, 'leaflet-drag-target'); + } + + this._newPos = this._startPos.add(offset); + this._moving = true; + + cancelAnimFrame(this._animRequest); + this._lastEvent = e; + this._animRequest = requestAnimFrame(this._updatePosition, this, true); + }, + + _updatePosition: function () { + var e = {originalEvent: this._lastEvent}; + + // @event predrag: Event + // Fired continuously during dragging *before* each corresponding + // update of the element's position. + this.fire('predrag', e); + setPosition(this._element, this._newPos); + + // @event drag: Event + // Fired continuously during dragging. + this.fire('drag', e); + }, + + _onUp: function (e) { + // Ignore simulated events, since we handle both touch and + // mouse explicitly; otherwise we risk getting duplicates of + // touch events, see #4315. + // Also ignore the event if disabled; this happens in IE11 + // under some circumstances, see #3666. + if (e._simulated || !this._enabled) { return; } + this.finishDrag(); + }, + + finishDrag: function () { + removeClass(document.body, 'leaflet-dragging'); + + if (this._lastTarget) { + removeClass(this._lastTarget, 'leaflet-drag-target'); + this._lastTarget = null; + } + + for (var i in MOVE) { + off(document, MOVE[i], this._onMove, this); + off(document, END[i], this._onUp, this); + } + + enableImageDrag(); + enableTextSelection(); + + if (this._moved && this._moving) { + // ensure drag is not fired after dragend + cancelAnimFrame(this._animRequest); + + // @event dragend: DragEndEvent + // Fired when the drag ends. + this.fire('dragend', { + distance: this._newPos.distanceTo(this._startPos) + }); + } + + this._moving = false; + Draggable._dragging = false; + } + + }); + + /* + * @namespace LineUtil + * + * Various utility functions for polyline points processing, used by Leaflet internally to make polylines lightning-fast. + */ + +// Simplify polyline with vertex reduction and Douglas-Peucker simplification. +// Improves rendering performance dramatically by lessening the number of points to draw. + +// @function simplify(points: Point[], tolerance: Number): Point[] +// Dramatically reduces the number of points in a polyline while retaining +// its shape and returns a new array of simplified points, using the +// [Douglas-Peucker algorithm](http://en.wikipedia.org/wiki/Douglas-Peucker_algorithm). +// Used for a huge performance boost when processing/displaying Leaflet polylines for +// each zoom level and also reducing visual noise. tolerance affects the amount of +// simplification (lesser value means higher quality but slower and with more points). +// Also released as a separated micro-library [Simplify.js](http://mourner.github.com/simplify-js/). + function simplify(points, tolerance) { + if (!tolerance || !points.length) { + return points.slice(); + } + + var sqTolerance = tolerance * tolerance; + + // stage 1: vertex reduction + points = _reducePoints(points, sqTolerance); + + // stage 2: Douglas-Peucker simplification + points = _simplifyDP(points, sqTolerance); + + return points; + } + +// @function pointToSegmentDistance(p: Point, p1: Point, p2: Point): Number +// Returns the distance between point `p` and segment `p1` to `p2`. + function pointToSegmentDistance(p, p1, p2) { + return Math.sqrt(_sqClosestPointOnSegment(p, p1, p2, true)); + } + +// @function closestPointOnSegment(p: Point, p1: Point, p2: Point): Number +// Returns the closest point from a point `p` on a segment `p1` to `p2`. + function closestPointOnSegment(p, p1, p2) { + return _sqClosestPointOnSegment(p, p1, p2); + } + +// Douglas-Peucker simplification, see http://en.wikipedia.org/wiki/Douglas-Peucker_algorithm + function _simplifyDP(points, sqTolerance) { + + var len = points.length, + ArrayConstructor = typeof Uint8Array !== undefined + '' ? Uint8Array : Array, + markers = new ArrayConstructor(len); + + markers[0] = markers[len - 1] = 1; + + _simplifyDPStep(points, markers, sqTolerance, 0, len - 1); + + var i, + newPoints = []; + + for (i = 0; i < len; i++) { + if (markers[i]) { + newPoints.push(points[i]); + } + } + + return newPoints; + } + + function _simplifyDPStep(points, markers, sqTolerance, first, last) { + + var maxSqDist = 0, + index, i, sqDist; + + for (i = first + 1; i <= last - 1; i++) { + sqDist = _sqClosestPointOnSegment(points[i], points[first], points[last], true); + + if (sqDist > maxSqDist) { + index = i; + maxSqDist = sqDist; + } + } + + if (maxSqDist > sqTolerance) { + markers[index] = 1; + + _simplifyDPStep(points, markers, sqTolerance, first, index); + _simplifyDPStep(points, markers, sqTolerance, index, last); + } + } + +// reduce points that are too close to each other to a single point + function _reducePoints(points, sqTolerance) { + var reducedPoints = [points[0]]; + + for (var i = 1, prev = 0, len = points.length; i < len; i++) { + if (_sqDist(points[i], points[prev]) > sqTolerance) { + reducedPoints.push(points[i]); + prev = i; + } + } + if (prev < len - 1) { + reducedPoints.push(points[len - 1]); + } + return reducedPoints; + } + + var _lastCode; + +// @function clipSegment(a: Point, b: Point, bounds: Bounds, useLastCode?: Boolean, round?: Boolean): Point[]|Boolean +// Clips the segment a to b by rectangular bounds with the +// [Cohen-Sutherland algorithm](https://en.wikipedia.org/wiki/Cohen%E2%80%93Sutherland_algorithm) +// (modifying the segment points directly!). Used by Leaflet to only show polyline +// points that are on the screen or near, increasing performance. + function clipSegment(a, b, bounds, useLastCode, round) { + var codeA = useLastCode ? _lastCode : _getBitCode(a, bounds), + codeB = _getBitCode(b, bounds), + + codeOut, p, newCode; + + // save 2nd code to avoid calculating it on the next segment + _lastCode = codeB; + + while (true) { + // if a,b is inside the clip window (trivial accept) + if (!(codeA | codeB)) { + return [a, b]; + } + + // if a,b is outside the clip window (trivial reject) + if (codeA & codeB) { + return false; + } + + // other cases + codeOut = codeA || codeB; + p = _getEdgeIntersection(a, b, codeOut, bounds, round); + newCode = _getBitCode(p, bounds); + + if (codeOut === codeA) { + a = p; + codeA = newCode; + } else { + b = p; + codeB = newCode; + } + } + } + + function _getEdgeIntersection(a, b, code, bounds, round) { + var dx = b.x - a.x, + dy = b.y - a.y, + min = bounds.min, + max = bounds.max, + x, y; + + if (code & 8) { // top + x = a.x + dx * (max.y - a.y) / dy; + y = max.y; + + } else if (code & 4) { // bottom + x = a.x + dx * (min.y - a.y) / dy; + y = min.y; + + } else if (code & 2) { // right + x = max.x; + y = a.y + dy * (max.x - a.x) / dx; + + } else if (code & 1) { // left + x = min.x; + y = a.y + dy * (min.x - a.x) / dx; + } + + return new Point(x, y, round); + } + + function _getBitCode(p, bounds) { + var code = 0; + + if (p.x < bounds.min.x) { // left + code |= 1; + } else if (p.x > bounds.max.x) { // right + code |= 2; + } + + if (p.y < bounds.min.y) { // bottom + code |= 4; + } else if (p.y > bounds.max.y) { // top + code |= 8; + } + + return code; + } + +// square distance (to avoid unnecessary Math.sqrt calls) + function _sqDist(p1, p2) { + var dx = p2.x - p1.x, + dy = p2.y - p1.y; + return dx * dx + dy * dy; + } + +// return closest point on segment or distance to that point + function _sqClosestPointOnSegment(p, p1, p2, sqDist) { + var x = p1.x, + y = p1.y, + dx = p2.x - x, + dy = p2.y - y, + dot = dx * dx + dy * dy, + t; + + if (dot > 0) { + t = ((p.x - x) * dx + (p.y - y) * dy) / dot; + + if (t > 1) { + x = p2.x; + y = p2.y; + } else if (t > 0) { + x += dx * t; + y += dy * t; + } + } + + dx = p.x - x; + dy = p.y - y; + + return sqDist ? dx * dx + dy * dy : new Point(x, y); + } + + +// @function isFlat(latlngs: LatLng[]): Boolean +// Returns true if `latlngs` is a flat array, false is nested. + function isFlat(latlngs) { + return !isArray(latlngs[0]) || (typeof latlngs[0][0] !== 'object' && typeof latlngs[0][0] !== 'undefined'); + } + + function _flat(latlngs) { + console.warn('Deprecated use of _flat, please use L.LineUtil.isFlat instead.'); + return isFlat(latlngs); + } + + + var LineUtil = (Object.freeze || Object)({ + simplify: simplify, + pointToSegmentDistance: pointToSegmentDistance, + closestPointOnSegment: closestPointOnSegment, + clipSegment: clipSegment, + _getEdgeIntersection: _getEdgeIntersection, + _getBitCode: _getBitCode, + _sqClosestPointOnSegment: _sqClosestPointOnSegment, + isFlat: isFlat, + _flat: _flat + }); + + /* + * @namespace PolyUtil + * Various utility functions for polygon geometries. + */ + + /* @function clipPolygon(points: Point[], bounds: Bounds, round?: Boolean): Point[] + * Clips the polygon geometry defined by the given `points` by the given bounds (using the [Sutherland-Hodgman algorithm](https://en.wikipedia.org/wiki/Sutherland%E2%80%93Hodgman_algorithm)). + * Used by Leaflet to only show polygon points that are on the screen or near, increasing + * performance. Note that polygon points needs different algorithm for clipping + * than polyline, so there's a separate method for it. + */ + function clipPolygon(points, bounds, round) { + var clippedPoints, + edges = [1, 4, 2, 8], + i, j, k, + a, b, + len, edge, p; + + for (i = 0, len = points.length; i < len; i++) { + points[i]._code = _getBitCode(points[i], bounds); + } + + // for each edge (left, bottom, right, top) + for (k = 0; k < 4; k++) { + edge = edges[k]; + clippedPoints = []; + + for (i = 0, len = points.length, j = len - 1; i < len; j = i++) { + a = points[i]; + b = points[j]; + + // if a is inside the clip window + if (!(a._code & edge)) { + // if b is outside the clip window (a->b goes out of screen) + if (b._code & edge) { + p = _getEdgeIntersection(b, a, edge, bounds, round); + p._code = _getBitCode(p, bounds); + clippedPoints.push(p); + } + clippedPoints.push(a); + + // else if b is inside the clip window (a->b enters the screen) + } else if (!(b._code & edge)) { + p = _getEdgeIntersection(b, a, edge, bounds, round); + p._code = _getBitCode(p, bounds); + clippedPoints.push(p); + } + } + points = clippedPoints; + } + + return points; + } + + + var PolyUtil = (Object.freeze || Object)({ + clipPolygon: clipPolygon + }); + + /* + * @namespace Projection + * @section + * Leaflet comes with a set of already defined Projections out of the box: + * + * @projection L.Projection.LonLat + * + * Equirectangular, or Plate Carree projection — the most simple projection, + * mostly used by GIS enthusiasts. Directly maps `x` as longitude, and `y` as + * latitude. Also suitable for flat worlds, e.g. game maps. Used by the + * `EPSG:4326` and `Simple` CRS. + */ + + var LonLat = { + project: function (latlng) { + return new Point(latlng.lng, latlng.lat); + }, + + unproject: function (point) { + return new LatLng(point.y, point.x); + }, + + bounds: new Bounds([-180, -90], [180, 90]) + }; + + /* + * @namespace Projection + * @projection L.Projection.Mercator + * + * Elliptical Mercator projection — more complex than Spherical Mercator. Takes into account that Earth is a geoid, not a perfect sphere. Used by the EPSG:3395 CRS. + */ + + var Mercator = { + R: 6378137, + R_MINOR: 6356752.314245179, + + bounds: new Bounds([-20037508.34279, -15496570.73972], [20037508.34279, 18764656.23138]), + + project: function (latlng) { + var d = Math.PI / 180, + r = this.R, + y = latlng.lat * d, + tmp = this.R_MINOR / r, + e = Math.sqrt(1 - tmp * tmp), + con = e * Math.sin(y); + + var ts = Math.tan(Math.PI / 4 - y / 2) / Math.pow((1 - con) / (1 + con), e / 2); + y = -r * Math.log(Math.max(ts, 1E-10)); + + return new Point(latlng.lng * d * r, y); + }, + + unproject: function (point) { + var d = 180 / Math.PI, + r = this.R, + tmp = this.R_MINOR / r, + e = Math.sqrt(1 - tmp * tmp), + ts = Math.exp(-point.y / r), + phi = Math.PI / 2 - 2 * Math.atan(ts); + + for (var i = 0, dphi = 0.1, con; i < 15 && Math.abs(dphi) > 1e-7; i++) { + con = e * Math.sin(phi); + con = Math.pow((1 - con) / (1 + con), e / 2); + dphi = Math.PI / 2 - 2 * Math.atan(ts * con) - phi; + phi += dphi; + } + + return new LatLng(phi * d, point.x * d / r); + } + }; + + /* + * @class Projection + + * An object with methods for projecting geographical coordinates of the world onto + * a flat surface (and back). See [Map projection](http://en.wikipedia.org/wiki/Map_projection). + + * @property bounds: Bounds + * The bounds (specified in CRS units) where the projection is valid + + * @method project(latlng: LatLng): Point + * Projects geographical coordinates into a 2D point. + * Only accepts actual `L.LatLng` instances, not arrays. + + * @method unproject(point: Point): LatLng + * The inverse of `project`. Projects a 2D point into a geographical location. + * Only accepts actual `L.Point` instances, not arrays. + + * Note that the projection 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 index = (Object.freeze || Object)({ + LonLat: LonLat, + Mercator: Mercator, + SphericalMercator: SphericalMercator + }); + + /* + * @namespace CRS + * @crs L.CRS.EPSG3395 + * + * Rarely used by some commercial tile providers. Uses Elliptical Mercator projection. + */ + var EPSG3395 = extend({}, Earth, { + code: 'EPSG:3395', + projection: Mercator, + + transformation: (function () { + var scale = 0.5 / (Math.PI * Mercator.R); + return toTransformation(scale, 0.5, -scale, 0.5); + }()) + }); + + /* + * @namespace CRS + * @crs L.CRS.EPSG4326 + * + * A common CRS among GIS enthusiasts. Uses simple Equirectangular projection. + * + * Leaflet 1.0.x complies with the [TMS coordinate scheme for EPSG:4326](https://wiki.osgeo.org/wiki/Tile_Map_Service_Specification#global-geodetic), + * which is a breaking change from 0.7.x behaviour. If you are using a `TileLayer` + * with this CRS, ensure that there are two 256x256 pixel tiles covering the + * whole earth at zoom level zero, and that the tile coordinate origin is (-180,+90), + * or (-180,-90) for `TileLayer`s with [the `tms` option](#tilelayer-tms) set. + */ + + var EPSG4326 = extend({}, Earth, { + code: 'EPSG:4326', + projection: LonLat, + transformation: toTransformation(1 / 180, 1, -1 / 180, 0.5) + }); + + /* + * @namespace CRS + * @crs L.CRS.Simple + * + * A simple CRS that maps longitude and latitude into `x` and `y` directly. + * May be used for maps of flat surfaces (e.g. game maps). Note that the `y` + * axis should still be inverted (going from bottom to top). `distance()` returns + * simple euclidean distance. + */ + + var Simple = extend({}, CRS, { + projection: LonLat, + transformation: toTransformation(1, 0, -1, 0), + + scale: function (zoom) { + return Math.pow(2, zoom); + }, + + zoom: function (scale) { + return Math.log(scale) / Math.LN2; + }, + + distance: function (latlng1, latlng2) { + var dx = latlng2.lng - latlng1.lng, + dy = latlng2.lat - latlng1.lat; + + return Math.sqrt(dx * dx + dy * dy); + }, + + infinite: true + }); + + CRS.Earth = Earth; + CRS.EPSG3395 = EPSG3395; + CRS.EPSG3857 = EPSG3857; + CRS.EPSG900913 = EPSG900913; + CRS.EPSG4326 = EPSG4326; + CRS.Simple = Simple; + + /* + * @class Layer + * @inherits Evented + * @aka L.Layer + * @aka ILayer + * + * A set of methods from the Layer base class that all Leaflet layers use. + * Inherits all methods, options and events from `L.Evented`. + * + * @example + * + * ```js + * var layer = L.Marker(latlng).addTo(map); + * layer.addTo(map); + * layer.remove(); + * ``` + * + * @event add: Event + * Fired after the layer is added to a map + * + * @event remove: Event + * Fired after the layer is removed from a map + */ + + + var Layer = Evented.extend({ + + // Classes extending `L.Layer` will inherit the following options: + options: { + // @option pane: String = 'overlayPane' + // By default the layer will be added to the map's [overlay pane](#map-overlaypane). Overriding this option will cause the layer to be placed on another pane by default. + pane: 'overlayPane', + + // @option attribution: String = null + // String to be shown in the attribution control, e.g. "© OpenStreetMap contributors". It describes the layer data and is often a legal obligation towards copyright holders and tile providers. + attribution: null, + + bubblingMouseEvents: true + }, + + /* @section + * Classes extending `L.Layer` will inherit the following methods: + * + * @method addTo(map: Map|LayerGroup): this + * Adds the layer to the given map or layer group. + */ + addTo: function (map) { + map.addLayer(this); + return this; + }, + + // @method remove: this + // Removes the layer from the map it is currently active on. + remove: function () { + return this.removeFrom(this._map || this._mapToAdd); + }, + + // @method removeFrom(map: Map): this + // Removes the layer from the given map + removeFrom: function (obj) { + if (obj) { + obj.removeLayer(this); + } + return this; + }, + + // @method getPane(name? : String): HTMLElement + // Returns the `HTMLElement` representing the named pane on the map. If `name` is omitted, returns the pane for this layer. + getPane: function (name) { + return this._map.getPane(name ? (this.options[name] || name) : this.options.pane); + }, + + addInteractiveTarget: function (targetEl) { + this._map._targets[stamp(targetEl)] = this; + return this; + }, + + removeInteractiveTarget: function (targetEl) { + delete this._map._targets[stamp(targetEl)]; + return this; + }, + + // @method getAttribution: String + // Used by the `attribution control`, returns the [attribution option](#gridlayer-attribution). + getAttribution: function () { + return this.options.attribution; + }, + + _layerAdd: function (e) { + var map = e.target; + + // check in case layer gets added and then removed before the map is ready + if (!map.hasLayer(this)) { return; } + + this._map = map; + this._zoomAnimated = map._zoomAnimated; + + if (this.getEvents) { + var events = this.getEvents(); + map.on(events, this); + this.once('remove', function () { + map.off(events, this); + }, this); + } + + this.onAdd(map); + + if (this.getAttribution && map.attributionControl) { + map.attributionControl.addAttribution(this.getAttribution()); + } + + this.fire('add'); + map.fire('layeradd', {layer: this}); + } + }); + + /* @section Extension methods + * @uninheritable + * + * Every layer should extend from `L.Layer` and (re-)implement the following methods. + * + * @method onAdd(map: Map): this + * Should contain code that creates DOM elements for the layer, adds them to `map panes` where they should belong and puts listeners on relevant map events. Called on [`map.addLayer(layer)`](#map-addlayer). + * + * @method onRemove(map: Map): this + * Should contain all clean up code that removes the layer's elements from the DOM and removes listeners previously added in [`onAdd`](#layer-onadd). Called on [`map.removeLayer(layer)`](#map-removelayer). + * + * @method getEvents(): Object + * This optional method should return an object like `{ viewreset: this._reset }` for [`addEventListener`](#evented-addeventlistener). The event handlers in this object will be automatically added and removed from the map with your layer. + * + * @method getAttribution(): String + * This optional method should return a string containing HTML to be shown on the `Attribution control` whenever the layer is visible. + * + * @method beforeAdd(map: Map): this + * Optional method. Called on [`map.addLayer(layer)`](#map-addlayer), before the layer is added to the map, before events are initialized, without waiting until the map is in a usable state. Use for early initialization only. + */ + + + /* @namespace Map + * @section Layer events + * + * @event layeradd: LayerEvent + * Fired when a new layer is added to the map. + * + * @event layerremove: LayerEvent + * Fired when some layer is removed from the map + * + * @section Methods for Layers and Controls + */ + Map.include({ + // @method addLayer(layer: Layer): this + // Adds the given layer to the map + addLayer: function (layer) { + if (!layer._layerAdd) { + throw new Error('The provided object is not a Layer.'); + } + + var id = stamp(layer); + if (this._layers[id]) { return this; } + this._layers[id] = layer; + + layer._mapToAdd = this; + + if (layer.beforeAdd) { + layer.beforeAdd(this); + } + + this.whenReady(layer._layerAdd, layer); + + return this; + }, + + // @method removeLayer(layer: Layer): this + // Removes the given layer from the map. + removeLayer: function (layer) { + var id = stamp(layer); + + if (!this._layers[id]) { return this; } + + if (this._loaded) { + layer.onRemove(this); + } + + if (layer.getAttribution && this.attributionControl) { + this.attributionControl.removeAttribution(layer.getAttribution()); + } + + delete this._layers[id]; + + if (this._loaded) { + this.fire('layerremove', {layer: layer}); + layer.fire('remove'); + } + + layer._map = layer._mapToAdd = null; + + return this; + }, + + // @method hasLayer(layer: Layer): Boolean + // Returns `true` if the given layer is currently added to the map + hasLayer: function (layer) { + return !!layer && (stamp(layer) in this._layers); + }, + + /* @method eachLayer(fn: Function, context?: Object): this + * Iterates over the layers of the map, optionally specifying context of the iterator function. + * ``` + * map.eachLayer(function(layer){ + * layer.bindPopup('Hello'); + * }); + * ``` + */ + eachLayer: function (method, context) { + for (var i in this._layers) { + method.call(context, this._layers[i]); + } + return this; + }, + + _addLayers: function (layers) { + layers = layers ? (isArray(layers) ? layers : [layers]) : []; + + for (var i = 0, len = layers.length; i < len; i++) { + this.addLayer(layers[i]); + } + }, + + _addZoomLimit: function (layer) { + if (isNaN(layer.options.maxZoom) || !isNaN(layer.options.minZoom)) { + this._zoomBoundLayers[stamp(layer)] = layer; + this._updateZoomLevels(); + } + }, + + _removeZoomLimit: function (layer) { + var id = stamp(layer); + + if (this._zoomBoundLayers[id]) { + delete this._zoomBoundLayers[id]; + this._updateZoomLevels(); + } + }, + + _updateZoomLevels: function () { + var minZoom = Infinity, + maxZoom = -Infinity, + oldZoomSpan = this._getZoomSpan(); + + for (var i in this._zoomBoundLayers) { + var options = this._zoomBoundLayers[i].options; + + minZoom = options.minZoom === undefined ? minZoom : Math.min(minZoom, options.minZoom); + maxZoom = options.maxZoom === undefined ? maxZoom : Math.max(maxZoom, options.maxZoom); + } + + this._layersMaxZoom = maxZoom === -Infinity ? undefined : maxZoom; + this._layersMinZoom = minZoom === Infinity ? undefined : minZoom; + + // @section Map state change events + // @event zoomlevelschange: Event + // Fired when the number of zoomlevels on the map is changed due + // to adding or removing a layer. + if (oldZoomSpan !== this._getZoomSpan()) { + this.fire('zoomlevelschange'); + } + + if (this.options.maxZoom === undefined && this._layersMaxZoom && this.getZoom() > this._layersMaxZoom) { + this.setZoom(this._layersMaxZoom); + } + if (this.options.minZoom === undefined && this._layersMinZoom && this.getZoom() < this._layersMinZoom) { + this.setZoom(this._layersMinZoom); + } + } + }); + + /* + * @class LayerGroup + * @aka L.LayerGroup + * @inherits Layer + * + * Used to group several layers and handle them as one. If you add it to the map, + * any layers added or removed from the group will be added/removed on the map as + * well. Extends `Layer`. + * + * @example + * + * ```js + * L.layerGroup([marker1, marker2]) + * .addLayer(polyline) + * .addTo(map); + * ``` + */ + + var LayerGroup = Layer.extend({ + + initialize: function (layers, options) { + setOptions(this, options); + + this._layers = {}; + + var i, len; + + if (layers) { + for (i = 0, len = layers.length; i < len; i++) { + this.addLayer(layers[i]); + } + } + }, + + // @method addLayer(layer: Layer): this + // Adds the given layer to the group. + addLayer: function (layer) { + var id = this.getLayerId(layer); + + this._layers[id] = layer; + + if (this._map) { + this._map.addLayer(layer); + } + + return this; + }, + + // @method removeLayer(layer: Layer): this + // Removes the given layer from the group. + // @alternative + // @method removeLayer(id: Number): this + // Removes the layer with the given internal ID from the group. + removeLayer: function (layer) { + var id = layer in this._layers ? layer : this.getLayerId(layer); + + if (this._map && this._layers[id]) { + this._map.removeLayer(this._layers[id]); + } + + delete this._layers[id]; + + return this; + }, + + // @method hasLayer(layer: Layer): Boolean + // Returns `true` if the given layer is currently added to the group. + // @alternative + // @method hasLayer(id: Number): Boolean + // Returns `true` if the given internal ID is currently added to the group. + hasLayer: function (layer) { + return !!layer && (layer in this._layers || this.getLayerId(layer) in this._layers); + }, + + // @method clearLayers(): this + // Removes all the layers from the group. + clearLayers: function () { + return this.eachLayer(this.removeLayer, this); + }, + + // @method invoke(methodName: String, …): this + // Calls `methodName` on every layer contained in this group, passing any + // additional parameters. Has no effect if the layers contained do not + // implement `methodName`. + invoke: function (methodName) { + var args = Array.prototype.slice.call(arguments, 1), + i, layer; + + for (i in this._layers) { + layer = this._layers[i]; + + if (layer[methodName]) { + layer[methodName].apply(layer, args); + } + } + + return this; + }, + + onAdd: function (map) { + this.eachLayer(map.addLayer, map); + }, + + onRemove: function (map) { + this.eachLayer(map.removeLayer, map); + }, + + // @method eachLayer(fn: Function, context?: Object): this + // Iterates over the layers of the group, optionally specifying context of the iterator function. + // ```js + // group.eachLayer(function (layer) { + // layer.bindPopup('Hello'); + // }); + // ``` + eachLayer: function (method, context) { + for (var i in this._layers) { + method.call(context, this._layers[i]); + } + return this; + }, + + // @method getLayer(id: Number): Layer + // Returns the layer with the given internal ID. + getLayer: function (id) { + return this._layers[id]; + }, + + // @method getLayers(): Layer[] + // Returns an array of all the layers added to the group. + getLayers: function () { + var layers = []; + this.eachLayer(layers.push, layers); + return layers; + }, + + // @method setZIndex(zIndex: Number): this + // Calls `setZIndex` on every layer contained in this group, passing the z-index. + setZIndex: function (zIndex) { + return this.invoke('setZIndex', zIndex); + }, + + // @method getLayerId(layer: Layer): Number + // Returns the internal ID for a layer + getLayerId: function (layer) { + return stamp(layer); + } + }); + + +// @factory L.layerGroup(layers?: Layer[], options?: Object) +// Create a layer group, optionally given an initial set of layers and an `options` object. + var layerGroup = function (layers, options) { + return new LayerGroup(layers, options); + }; + + /* + * @class FeatureGroup + * @aka L.FeatureGroup + * @inherits LayerGroup + * + * Extended `LayerGroup` that makes it easier to do the same thing to all its member layers: + * * [`bindPopup`](#layer-bindpopup) binds a popup to all of the layers at once (likewise with [`bindTooltip`](#layer-bindtooltip)) + * * Events are propagated to the `FeatureGroup`, so if the group has an event + * handler, it will handle events from any of the layers. This includes mouse events + * and custom events. + * * Has `layeradd` and `layerremove` events + * + * @example + * + * ```js + * L.featureGroup([marker1, marker2, polyline]) + * .bindPopup('Hello world!') + * .on('click', function() { alert('Clicked on a member of the group!'); }) + * .addTo(map); + * ``` + */ + + var FeatureGroup = LayerGroup.extend({ + + addLayer: function (layer) { + if (this.hasLayer(layer)) { + return this; + } + + layer.addEventParent(this); + + LayerGroup.prototype.addLayer.call(this, layer); + + // @event layeradd: LayerEvent + // Fired when a layer is added to this `FeatureGroup` + return this.fire('layeradd', {layer: layer}); + }, + + removeLayer: function (layer) { + if (!this.hasLayer(layer)) { + return this; + } + if (layer in this._layers) { + layer = this._layers[layer]; + } + + layer.removeEventParent(this); + + LayerGroup.prototype.removeLayer.call(this, layer); + + // @event layerremove: LayerEvent + // Fired when a layer is removed from this `FeatureGroup` + return this.fire('layerremove', {layer: layer}); + }, + + // @method setStyle(style: Path options): this + // Sets the given path options to each layer of the group that has a `setStyle` method. + setStyle: function (style) { + return this.invoke('setStyle', style); + }, + + // @method bringToFront(): this + // Brings the layer group to the top of all other layers + bringToFront: function () { + return this.invoke('bringToFront'); + }, + + // @method bringToBack(): this + // Brings the layer group to the back of all other layers + bringToBack: function () { + return this.invoke('bringToBack'); + }, + + // @method getBounds(): LatLngBounds + // Returns the LatLngBounds of the Feature Group (created from bounds and coordinates of its children). + getBounds: function () { + var bounds = new LatLngBounds(); + + for (var id in this._layers) { + var layer = this._layers[id]; + bounds.extend(layer.getBounds ? layer.getBounds() : layer.getLatLng()); + } + return bounds; + } + }); + +// @factory L.featureGroup(layers: Layer[]) +// Create a feature group, optionally given an initial set of layers. + var featureGroup = function (layers) { + return new FeatureGroup(layers); + }; + + /* + * @class Icon + * @aka L.Icon + * + * Represents an icon to provide when creating a marker. + * + * @example + * + * ```js + * var myIcon = L.icon({ + * iconUrl: 'my-icon.png', + * iconRetinaUrl: 'my-icon@2x.png', + * iconSize: [38, 95], + * iconAnchor: [22, 94], + * popupAnchor: [-3, -76], + * shadowUrl: 'my-icon-shadow.png', + * shadowRetinaUrl: 'my-icon-shadow@2x.png', + * shadowSize: [68, 95], + * shadowAnchor: [22, 94] + * }); + * + * L.marker([50.505, 30.57], {icon: myIcon}).addTo(map); + * ``` + * + * `L.Icon.Default` extends `L.Icon` and is the blue icon Leaflet uses for markers by default. + * + */ + + var Icon = Class.extend({ + + /* @section + * @aka Icon options + * + * @option iconUrl: String = null + * **(required)** The URL to the icon image (absolute or relative to your script path). + * + * @option iconRetinaUrl: String = null + * The URL to a retina sized version of the icon image (absolute or relative to your + * script path). Used for Retina screen devices. + * + * @option iconSize: Point = null + * Size of the icon image in pixels. + * + * @option iconAnchor: Point = null + * The coordinates of the "tip" of the icon (relative to its top left corner). The icon + * will be aligned so that this point is at the marker's geographical location. Centered + * by default if size is specified, also can be set in CSS with negative margins. + * + * @option popupAnchor: Point = [0, 0] + * The coordinates of the point from which popups will "open", relative to the icon anchor. + * + * @option tooltipAnchor: Point = [0, 0] + * The coordinates of the point from which tooltips will "open", relative to the icon anchor. + * + * @option shadowUrl: String = null + * The URL to the icon shadow image. If not specified, no shadow image will be created. + * + * @option shadowRetinaUrl: String = null + * + * @option shadowSize: Point = null + * Size of the shadow image in pixels. + * + * @option shadowAnchor: Point = null + * The coordinates of the "tip" of the shadow (relative to its top left corner) (the same + * as iconAnchor if not specified). + * + * @option className: String = '' + * A custom class name to assign to both icon and shadow images. Empty by default. + */ + + options: { + popupAnchor: [0, 0], + tooltipAnchor: [0, 0] + }, + + initialize: function (options) { + setOptions(this, options); + }, + + // @method createIcon(oldIcon?: HTMLElement): HTMLElement + // Called internally when the icon has to be shown, returns a `` HTML element + // styled according to the options. + createIcon: function (oldIcon) { + return this._createIcon('icon', oldIcon); + }, + + // @method createShadow(oldIcon?: HTMLElement): HTMLElement + // As `createIcon`, but for the shadow beneath it. + createShadow: function (oldIcon) { + return this._createIcon('shadow', oldIcon); + }, + + _createIcon: function (name, oldIcon) { + var src = this._getIconUrl(name); + + if (!src) { + if (name === 'icon') { + throw new Error('iconUrl not set in Icon options (see the docs).'); + } + return null; + } + + var img = this._createImg(src, oldIcon && oldIcon.tagName === 'IMG' ? oldIcon : null); + this._setIconStyles(img, name); + + return img; + }, + + _setIconStyles: function (img, name) { + var options = this.options; + var sizeOption = options[name + 'Size']; + + if (typeof sizeOption === 'number') { + sizeOption = [sizeOption, sizeOption]; + } + + var size = toPoint(sizeOption), + anchor = toPoint(name === 'shadow' && options.shadowAnchor || options.iconAnchor || + size && size.divideBy(2, true)); + + img.className = 'leaflet-marker-' + name + ' ' + (options.className || ''); + + if (anchor) { + img.style.marginLeft = (-anchor.x) + 'px'; + img.style.marginTop = (-anchor.y) + 'px'; + } + + if (size) { + img.style.width = size.x + 'px'; + img.style.height = size.y + 'px'; + } + }, + + _createImg: function (src, el) { + el = el || document.createElement('img'); + el.src = src; + return el; + }, + + _getIconUrl: function (name) { + return retina && this.options[name + 'RetinaUrl'] || this.options[name + 'Url']; + } + }); + + +// @factory L.icon(options: Icon options) +// Creates an icon instance with the given options. + function icon(options) { + return new Icon(options); + } + + /* + * @miniclass Icon.Default (Icon) + * @aka L.Icon.Default + * @section + * + * A trivial subclass of `Icon`, represents the icon to use in `Marker`s when + * no icon is specified. Points to the blue marker image distributed with Leaflet + * releases. + * + * In order to customize the default icon, just change the properties of `L.Icon.Default.prototype.options` + * (which is a set of `Icon options`). + * + * If you want to _completely_ replace the default icon, override the + * `L.Marker.prototype.options.icon` with your own icon instead. + */ + + var IconDefault = Icon.extend({ + + options: { + iconUrl: "<%= asset_url('marker-icon.png') %>", + iconRetinaUrl: "<%= asset_url('marker-icon-2x.png') %>", + shadowUrl: "<%= asset_url('marker-shadow.png') %>", + iconSize: [25, 41], + iconAnchor: [12, 41], + popupAnchor: [1, -34], + tooltipAnchor: [16, -28], + shadowSize: [41, 41] + }, + + _getIconUrl: function (name) { + if (!IconDefault.imagePath) { // Deprecated, backwards-compatibility only + IconDefault.imagePath = this._detectIconPath(); + } + + // @option imagePath: String + // `Icon.Default` will try to auto-detect the location of the + // blue icon images. If you are placing these images in a non-standard + // way, set this option to point to the right path. + return (this.options.imagePath || IconDefault.imagePath) + Icon.prototype._getIconUrl.call(this, name); + }, + + _detectIconPath: function () { + return ''; + } + }); + + /* + * L.Handler.MarkerDrag is used internally by L.Marker to make the markers draggable. + */ + + + /* @namespace Marker + * @section Interaction handlers + * + * Interaction handlers are properties of a marker instance that allow you to control interaction behavior in runtime, enabling or disabling certain features such as dragging (see `Handler` methods). Example: + * + * ```js + * marker.dragging.disable(); + * ``` + * + * @property dragging: Handler + * Marker dragging handler (by both mouse and touch). Only valid when the marker is on the map (Otherwise set [`marker.options.draggable`](#marker-draggable)). + */ + + var MarkerDrag = Handler.extend({ + initialize: function (marker) { + this._marker = marker; + }, + + addHooks: function () { + var icon = this._marker._icon; + + if (!this._draggable) { + this._draggable = new Draggable(icon, icon, true); + } + + this._draggable.on({ + dragstart: this._onDragStart, + predrag: this._onPreDrag, + drag: this._onDrag, + dragend: this._onDragEnd + }, this).enable(); + + addClass(icon, 'leaflet-marker-draggable'); + }, + + removeHooks: function () { + this._draggable.off({ + dragstart: this._onDragStart, + predrag: this._onPreDrag, + drag: this._onDrag, + dragend: this._onDragEnd + }, this).disable(); + + if (this._marker._icon) { + removeClass(this._marker._icon, 'leaflet-marker-draggable'); + } + }, + + moved: function () { + return this._draggable && this._draggable._moved; + }, + + _adjustPan: function (e) { + var marker = this._marker, + map = marker._map, + speed = this._marker.options.autoPanSpeed, + padding = this._marker.options.autoPanPadding, + iconPos = getPosition(marker._icon), + bounds = map.getPixelBounds(), + origin = map.getPixelOrigin(); + + var panBounds = toBounds( + bounds.min._subtract(origin).add(padding), + bounds.max._subtract(origin).subtract(padding) + ); + + if (!panBounds.contains(iconPos)) { + // Compute incremental movement + var movement = toPoint( + (Math.max(panBounds.max.x, iconPos.x) - panBounds.max.x) / (bounds.max.x - panBounds.max.x) - + (Math.min(panBounds.min.x, iconPos.x) - panBounds.min.x) / (bounds.min.x - panBounds.min.x), + + (Math.max(panBounds.max.y, iconPos.y) - panBounds.max.y) / (bounds.max.y - panBounds.max.y) - + (Math.min(panBounds.min.y, iconPos.y) - panBounds.min.y) / (bounds.min.y - panBounds.min.y) + ).multiplyBy(speed); + + map.panBy(movement, {animate: false}); + + this._draggable._newPos._add(movement); + this._draggable._startPos._add(movement); + + setPosition(marker._icon, this._draggable._newPos); + this._onDrag(e); + + this._panRequest = requestAnimFrame(this._adjustPan.bind(this, e)); + } + }, + + _onDragStart: function () { + // @section Dragging events + // @event dragstart: Event + // Fired when the user starts dragging the marker. + + // @event movestart: Event + // Fired when the marker starts moving (because of dragging). + + this._oldLatLng = this._marker.getLatLng(); + this._marker + .closePopup() + .fire('movestart') + .fire('dragstart'); + }, + + _onPreDrag: function (e) { + if (this._marker.options.autoPan) { + cancelAnimFrame(this._panRequest); + this._panRequest = requestAnimFrame(this._adjustPan.bind(this, e)); + } + }, + + _onDrag: function (e) { + var marker = this._marker, + shadow = marker._shadow, + iconPos = getPosition(marker._icon), + latlng = marker._map.layerPointToLatLng(iconPos); + + // update shadow position + if (shadow) { + setPosition(shadow, iconPos); + } + + marker._latlng = latlng; + e.latlng = latlng; + e.oldLatLng = this._oldLatLng; + + // @event drag: Event + // Fired repeatedly while the user drags the marker. + marker + .fire('move', e) + .fire('drag', e); + }, + + _onDragEnd: function (e) { + // @event dragend: DragEndEvent + // Fired when the user stops dragging the marker. + + cancelAnimFrame(this._panRequest); + + // @event moveend: Event + // Fired when the marker stops moving (because of dragging). + delete this._oldLatLng; + this._marker + .fire('moveend') + .fire('dragend', e); + } + }); + + /* + * @class Marker + * @inherits Interactive layer + * @aka L.Marker + * L.Marker is used to display clickable/draggable icons on the map. Extends `Layer`. + * + * @example + * + * ```js + * L.marker([50.5, 30.5]).addTo(map); + * ``` + */ + + var Marker = Layer.extend({ + + // @section + // @aka Marker options + options: { + // @option icon: Icon = * + // Icon instance to use for rendering the marker. + // See [Icon documentation](#L.Icon) for details on how to customize the marker icon. + // If not specified, a common instance of `L.Icon.Default` is used. + icon: new IconDefault(), + + // Option inherited from "Interactive layer" abstract class + interactive: true, + + // @option keyboard: Boolean = true + // Whether the marker can be tabbed to with a keyboard and clicked by pressing enter. + keyboard: true, + + // @option title: String = '' + // Text for the browser tooltip that appear on marker hover (no tooltip by default). + title: '', + + // @option alt: String = '' + // Text for the `alt` attribute of the icon image (useful for accessibility). + alt: '', + + // @option zIndexOffset: Number = 0 + // By default, marker images zIndex is set automatically based on its latitude. Use this option if you want to put the marker on top of all others (or below), specifying a high value like `1000` (or high negative value, respectively). + zIndexOffset: 0, + + // @option opacity: Number = 1.0 + // The opacity of the marker. + opacity: 1, + + // @option riseOnHover: Boolean = false + // If `true`, the marker will get on top of others when you hover the mouse over it. + riseOnHover: false, + + // @option riseOffset: Number = 250 + // The z-index offset used for the `riseOnHover` feature. + riseOffset: 250, + + // @option pane: String = 'markerPane' + // `Map pane` where the markers icon will be added. + pane: 'markerPane', + + // @option bubblingMouseEvents: Boolean = false + // When `true`, a mouse event on this marker will trigger the same event on the map + // (unless [`L.DomEvent.stopPropagation`](#domevent-stoppropagation) is used). + bubblingMouseEvents: false, + + // @section Draggable marker options + // @option draggable: Boolean = false + // Whether the marker is draggable with mouse/touch or not. + draggable: false, + + // @option autoPan: Boolean = false + // Whether to pan the map when dragging this marker near its edge or not. + autoPan: false, + + // @option autoPanPadding: Point = Point(50, 50) + // Distance (in pixels to the left/right and to the top/bottom) of the + // map edge to start panning the map. + autoPanPadding: [50, 50], + + // @option autoPanSpeed: Number = 10 + // Number of pixels the map should pan by. + autoPanSpeed: 10 + }, + + /* @section + * + * In addition to [shared layer methods](#Layer) like `addTo()` and `remove()` and [popup methods](#Popup) like bindPopup() you can also use the following methods: + */ + + initialize: function (latlng, options) { + setOptions(this, options); + this._latlng = toLatLng(latlng); + }, + + onAdd: function (map) { + this._zoomAnimated = this._zoomAnimated && map.options.markerZoomAnimation; + + if (this._zoomAnimated) { + map.on('zoomanim', this._animateZoom, this); + } + + this._initIcon(); + this.update(); + }, + + onRemove: function (map) { + if (this.dragging && this.dragging.enabled()) { + this.options.draggable = true; + this.dragging.removeHooks(); + } + delete this.dragging; + + if (this._zoomAnimated) { + map.off('zoomanim', this._animateZoom, this); + } + + this._removeIcon(); + this._removeShadow(); + }, + + getEvents: function () { + return { + zoom: this.update, + viewreset: this.update + }; + }, + + // @method getLatLng: LatLng + // Returns the current geographical position of the marker. + getLatLng: function () { + return this._latlng; + }, + + // @method setLatLng(latlng: LatLng): this + // Changes the marker position to the given point. + setLatLng: function (latlng) { + var oldLatLng = this._latlng; + this._latlng = toLatLng(latlng); + this.update(); + + // @event move: Event + // Fired when the marker is moved via [`setLatLng`](#marker-setlatlng) or by [dragging](#marker-dragging). Old and new coordinates are included in event arguments as `oldLatLng`, `latlng`. + return this.fire('move', {oldLatLng: oldLatLng, latlng: this._latlng}); + }, + + // @method setZIndexOffset(offset: Number): this + // Changes the [zIndex offset](#marker-zindexoffset) of the marker. + setZIndexOffset: function (offset) { + this.options.zIndexOffset = offset; + return this.update(); + }, + + // @method setIcon(icon: Icon): this + // Changes the marker icon. + setIcon: function (icon) { + + this.options.icon = icon; + + if (this._map) { + this._initIcon(); + this.update(); + } + + if (this._popup) { + this.bindPopup(this._popup, this._popup.options); + } + + return this; + }, + + getElement: function () { + return this._icon; + }, + + update: function () { + + if (this._icon && this._map) { + var pos = this._map.latLngToLayerPoint(this._latlng).round(); + this._setPos(pos); + } + + return this; + }, + + _initIcon: function () { + var options = this.options, + classToAdd = 'leaflet-zoom-' + (this._zoomAnimated ? 'animated' : 'hide'); + + var icon = options.icon.createIcon(this._icon), + addIcon = false; + + // if we're not reusing the icon, remove the old one and init new one + if (icon !== this._icon) { + if (this._icon) { + this._removeIcon(); + } + addIcon = true; + + if (options.title) { + icon.title = options.title; + } + + if (icon.tagName === 'IMG') { + icon.alt = options.alt || ''; + } + } + + addClass(icon, classToAdd); + + if (options.keyboard) { + icon.tabIndex = '0'; + } + + this._icon = icon; + + if (options.riseOnHover) { + this.on({ + mouseover: this._bringToFront, + mouseout: this._resetZIndex + }); + } + + var newShadow = options.icon.createShadow(this._shadow), + addShadow = false; + + if (newShadow !== this._shadow) { + this._removeShadow(); + addShadow = true; + } + + if (newShadow) { + addClass(newShadow, classToAdd); + newShadow.alt = ''; + } + this._shadow = newShadow; + + + if (options.opacity < 1) { + this._updateOpacity(); + } + + + if (addIcon) { + this.getPane().appendChild(this._icon); + } + this._initInteraction(); + if (newShadow && addShadow) { + this.getPane('shadowPane').appendChild(this._shadow); + } + }, + + _removeIcon: function () { + if (this.options.riseOnHover) { + this.off({ + mouseover: this._bringToFront, + mouseout: this._resetZIndex + }); + } + + remove(this._icon); + this.removeInteractiveTarget(this._icon); + + this._icon = null; + }, + + _removeShadow: function () { + if (this._shadow) { + remove(this._shadow); + } + this._shadow = null; + }, + + _setPos: function (pos) { + setPosition(this._icon, pos); + + if (this._shadow) { + setPosition(this._shadow, pos); + } + + this._zIndex = pos.y + this.options.zIndexOffset; + + this._resetZIndex(); + }, + + _updateZIndex: function (offset) { + this._icon.style.zIndex = this._zIndex + offset; + }, + + _animateZoom: function (opt) { + var pos = this._map._latLngToNewLayerPoint(this._latlng, opt.zoom, opt.center).round(); + + this._setPos(pos); + }, + + _initInteraction: function () { + + if (!this.options.interactive) { return; } + + addClass(this._icon, 'leaflet-interactive'); + + this.addInteractiveTarget(this._icon); + + if (MarkerDrag) { + var draggable = this.options.draggable; + if (this.dragging) { + draggable = this.dragging.enabled(); + this.dragging.disable(); + } + + this.dragging = new MarkerDrag(this); + + if (draggable) { + this.dragging.enable(); + } + } + }, + + // @method setOpacity(opacity: Number): this + // Changes the opacity of the marker. + setOpacity: function (opacity) { + this.options.opacity = opacity; + if (this._map) { + this._updateOpacity(); + } + + return this; + }, + + _updateOpacity: function () { + var opacity = this.options.opacity; + + setOpacity(this._icon, opacity); + + if (this._shadow) { + setOpacity(this._shadow, opacity); + } + }, + + _bringToFront: function () { + this._updateZIndex(this.options.riseOffset); + }, + + _resetZIndex: function () { + this._updateZIndex(0); + }, + + _getPopupAnchor: function () { + return this.options.icon.options.popupAnchor; + }, + + _getTooltipAnchor: function () { + return this.options.icon.options.tooltipAnchor; + } + }); + + +// factory L.marker(latlng: LatLng, options? : Marker options) + +// @factory L.marker(latlng: LatLng, options? : Marker options) +// Instantiates a Marker object given a geographical point and optionally an options object. + function marker(latlng, options) { + return new Marker(latlng, options); + } + + /* + * @class Path + * @aka L.Path + * @inherits Interactive layer + * + * An abstract class that contains options and constants shared between vector + * overlays (Polygon, Polyline, Circle). Do not use it directly. Extends `Layer`. + */ + + var Path = Layer.extend({ + + // @section + // @aka Path options + options: { + // @option stroke: Boolean = true + // Whether to draw stroke along the path. Set it to `false` to disable borders on polygons or circles. + stroke: true, + + // @option color: String = '#3388ff' + // Stroke color + color: '#3388ff', + + // @option weight: Number = 3 + // Stroke width in pixels + weight: 3, + + // @option opacity: Number = 1.0 + // Stroke opacity + opacity: 1, + + // @option lineCap: String= 'round' + // A string that defines [shape to be used at the end](https://developer.mozilla.org/docs/Web/SVG/Attribute/stroke-linecap) of the stroke. + lineCap: 'round', + + // @option lineJoin: String = 'round' + // A string that defines [shape to be used at the corners](https://developer.mozilla.org/docs/Web/SVG/Attribute/stroke-linejoin) of the stroke. + lineJoin: 'round', + + // @option dashArray: String = null + // A string that defines the stroke [dash pattern](https://developer.mozilla.org/docs/Web/SVG/Attribute/stroke-dasharray). Doesn't work on `Canvas`-powered layers in [some old browsers](https://developer.mozilla.org/docs/Web/API/CanvasRenderingContext2D/setLineDash#Browser_compatibility). + dashArray: null, + + // @option dashOffset: String = null + // A string that defines the [distance into the dash pattern to start the dash](https://developer.mozilla.org/docs/Web/SVG/Attribute/stroke-dashoffset). Doesn't work on `Canvas`-powered layers in [some old browsers](https://developer.mozilla.org/docs/Web/API/CanvasRenderingContext2D/setLineDash#Browser_compatibility). + dashOffset: null, + + // @option fill: Boolean = depends + // Whether to fill the path with color. Set it to `false` to disable filling on polygons or circles. + fill: false, + + // @option fillColor: String = * + // Fill color. Defaults to the value of the [`color`](#path-color) option + fillColor: null, + + // @option fillOpacity: Number = 0.2 + // Fill opacity. + fillOpacity: 0.2, + + // @option fillRule: String = 'evenodd' + // A string that defines [how the inside of a shape](https://developer.mozilla.org/docs/Web/SVG/Attribute/fill-rule) is determined. + fillRule: 'evenodd', + + // className: '', + + // Option inherited from "Interactive layer" abstract class + interactive: true, + + // @option bubblingMouseEvents: Boolean = true + // When `true`, a mouse event on this path will trigger the same event on the map + // (unless [`L.DomEvent.stopPropagation`](#domevent-stoppropagation) is used). + bubblingMouseEvents: true + }, + + beforeAdd: function (map) { + // Renderer is set here because we need to call renderer.getEvents + // before this.getEvents. + this._renderer = map.getRenderer(this); + }, + + onAdd: function () { + this._renderer._initPath(this); + this._reset(); + this._renderer._addPath(this); + }, + + onRemove: function () { + this._renderer._removePath(this); + }, + + // @method redraw(): this + // Redraws the layer. Sometimes useful after you changed the coordinates that the path uses. + redraw: function () { + if (this._map) { + this._renderer._updatePath(this); + } + return this; + }, + + // @method setStyle(style: Path options): this + // Changes the appearance of a Path based on the options in the `Path options` object. + setStyle: function (style) { + setOptions(this, style); + if (this._renderer) { + this._renderer._updateStyle(this); + } + return this; + }, + + // @method bringToFront(): this + // Brings the layer to the top of all path layers. + bringToFront: function () { + if (this._renderer) { + this._renderer._bringToFront(this); + } + return this; + }, + + // @method bringToBack(): this + // Brings the layer to the bottom of all path layers. + bringToBack: function () { + if (this._renderer) { + this._renderer._bringToBack(this); + } + return this; + }, + + getElement: function () { + return this._path; + }, + + _reset: function () { + // defined in child classes + this._project(); + this._update(); + }, + + _clickTolerance: function () { + // used when doing hit detection for Canvas layers + return (this.options.stroke ? this.options.weight / 2 : 0) + this._renderer.options.tolerance; + } + }); + + /* + * @class CircleMarker + * @aka L.CircleMarker + * @inherits Path + * + * A circle of a fixed size with radius specified in pixels. Extends `Path`. + */ + + var CircleMarker = Path.extend({ + + // @section + // @aka CircleMarker options + options: { + fill: true, + + // @option radius: Number = 10 + // Radius of the circle marker, in pixels + radius: 10 + }, + + initialize: function (latlng, options) { + setOptions(this, options); + this._latlng = toLatLng(latlng); + this._radius = this.options.radius; + }, + + // @method setLatLng(latLng: LatLng): this + // Sets the position of a circle marker to a new location. + setLatLng: function (latlng) { + this._latlng = toLatLng(latlng); + this.redraw(); + return this.fire('move', {latlng: this._latlng}); + }, + + // @method getLatLng(): LatLng + // Returns the current geographical position of the circle marker + getLatLng: function () { + return this._latlng; + }, + + // @method setRadius(radius: Number): this + // Sets the radius of a circle marker. Units are in pixels. + setRadius: function (radius) { + this.options.radius = this._radius = radius; + return this.redraw(); + }, + + // @method getRadius(): Number + // Returns the current radius of the circle + getRadius: function () { + return this._radius; + }, + + setStyle : function (options) { + var radius = options && options.radius || this._radius; + Path.prototype.setStyle.call(this, options); + this.setRadius(radius); + return this; + }, + + _project: function () { + this._point = this._map.latLngToLayerPoint(this._latlng); + this._updateBounds(); + }, + + _updateBounds: function () { + var r = this._radius, + r2 = this._radiusY || r, + w = this._clickTolerance(), + p = [r + w, r2 + w]; + this._pxBounds = new Bounds(this._point.subtract(p), this._point.add(p)); + }, + + _update: function () { + if (this._map) { + this._updatePath(); + } + }, + + _updatePath: function () { + this._renderer._updateCircle(this); + }, + + _empty: function () { + return this._radius && !this._renderer._bounds.intersects(this._pxBounds); + }, + + // Needed by the `Canvas` renderer for interactivity + _containsPoint: function (p) { + return p.distanceTo(this._point) <= this._radius + this._clickTolerance(); + } + }); + + +// @factory L.circleMarker(latlng: LatLng, options?: CircleMarker options) +// Instantiates a circle marker object given a geographical point, and an optional options object. + function circleMarker(latlng, options) { + return new CircleMarker(latlng, options); + } + + /* + * @class Circle + * @aka L.Circle + * @inherits CircleMarker + * + * A class for drawing circle overlays on a map. Extends `CircleMarker`. + * + * It's an approximation and starts to diverge from a real circle closer to poles (due to projection distortion). + * + * @example + * + * ```js + * L.circle([50.5, 30.5], {radius: 200}).addTo(map); + * ``` + */ + + var Circle = CircleMarker.extend({ + + initialize: function (latlng, options, legacyOptions) { + if (typeof options === 'number') { + // Backwards compatibility with 0.7.x factory (latlng, radius, options?) + options = extend({}, legacyOptions, {radius: options}); + } + setOptions(this, options); + this._latlng = toLatLng(latlng); + + if (isNaN(this.options.radius)) { throw new Error('Circle radius cannot be NaN'); } + + // @section + // @aka Circle options + // @option radius: Number; Radius of the circle, in meters. + this._mRadius = this.options.radius; + }, + + // @method setRadius(radius: Number): this + // Sets the radius of a circle. Units are in meters. + setRadius: function (radius) { + this._mRadius = radius; + return this.redraw(); + }, + + // @method getRadius(): Number + // Returns the current radius of a circle. Units are in meters. + getRadius: function () { + return this._mRadius; + }, + + // @method getBounds(): LatLngBounds + // Returns the `LatLngBounds` of the path. + getBounds: function () { + var half = [this._radius, this._radiusY || this._radius]; + + return new LatLngBounds( + this._map.layerPointToLatLng(this._point.subtract(half)), + this._map.layerPointToLatLng(this._point.add(half))); + }, + + setStyle: Path.prototype.setStyle, + + _project: function () { + + var lng = this._latlng.lng, + lat = this._latlng.lat, + map = this._map, + crs = map.options.crs; + + if (crs.distance === Earth.distance) { + var d = Math.PI / 180, + latR = (this._mRadius / Earth.R) / d, + top = map.project([lat + latR, lng]), + bottom = map.project([lat - latR, lng]), + p = top.add(bottom).divideBy(2), + lat2 = map.unproject(p).lat, + lngR = Math.acos((Math.cos(latR * d) - Math.sin(lat * d) * Math.sin(lat2 * d)) / + (Math.cos(lat * d) * Math.cos(lat2 * d))) / d; + + if (isNaN(lngR) || lngR === 0) { + lngR = latR / Math.cos(Math.PI / 180 * lat); // Fallback for edge case, #2425 + } + + this._point = p.subtract(map.getPixelOrigin()); + this._radius = isNaN(lngR) ? 0 : p.x - map.project([lat2, lng - lngR]).x; + this._radiusY = p.y - top.y; + + } else { + var latlng2 = crs.unproject(crs.project(this._latlng).subtract([this._mRadius, 0])); + + this._point = map.latLngToLayerPoint(this._latlng); + this._radius = this._point.x - map.latLngToLayerPoint(latlng2).x; + } + + this._updateBounds(); + } + }); + +// @factory L.circle(latlng: LatLng, options?: Circle options) +// Instantiates a circle object given a geographical point, and an options object +// which contains the circle radius. +// @alternative +// @factory L.circle(latlng: LatLng, radius: Number, options?: Circle options) +// Obsolete way of instantiating a circle, for compatibility with 0.7.x code. +// Do not use in new applications or plugins. + function circle(latlng, options, legacyOptions) { + return new Circle(latlng, options, legacyOptions); + } + + /* + * @class Polyline + * @aka L.Polyline + * @inherits Path + * + * A class for drawing polyline overlays on a map. Extends `Path`. + * + * @example + * + * ```js + * // create a red polyline from an array of LatLng points + * var latlngs = [ + * [45.51, -122.68], + * [37.77, -122.43], + * [34.04, -118.2] + * ]; + * + * var polyline = L.polyline(latlngs, {color: 'red'}).addTo(map); + * + * // zoom the map to the polyline + * map.fitBounds(polyline.getBounds()); + * ``` + * + * You can also pass a multi-dimensional array to represent a `MultiPolyline` shape: + * + * ```js + * // create a red polyline from an array of arrays of LatLng points + * var latlngs = [ + * [[45.51, -122.68], + * [37.77, -122.43], + * [34.04, -118.2]], + * [[40.78, -73.91], + * [41.83, -87.62], + * [32.76, -96.72]] + * ]; + * ``` + */ + + + var Polyline = Path.extend({ + + // @section + // @aka Polyline options + options: { + // @option smoothFactor: Number = 1.0 + // How much to simplify the polyline on each zoom level. More means + // better performance and smoother look, and less means more accurate representation. + smoothFactor: 1.0, + + // @option noClip: Boolean = false + // Disable polyline clipping. + noClip: false + }, + + initialize: function (latlngs, options) { + setOptions(this, options); + this._setLatLngs(latlngs); + }, + + // @method getLatLngs(): LatLng[] + // Returns an array of the points in the path, or nested arrays of points in case of multi-polyline. + getLatLngs: function () { + return this._latlngs; + }, + + // @method setLatLngs(latlngs: LatLng[]): this + // Replaces all the points in the polyline with the given array of geographical points. + setLatLngs: function (latlngs) { + this._setLatLngs(latlngs); + return this.redraw(); + }, + + // @method isEmpty(): Boolean + // Returns `true` if the Polyline has no LatLngs. + isEmpty: function () { + return !this._latlngs.length; + }, + + // @method closestLayerPoint(p: Point): Point + // Returns the point closest to `p` on the Polyline. + closestLayerPoint: function (p) { + var minDistance = Infinity, + minPoint = null, + closest = _sqClosestPointOnSegment, + p1, p2; + + for (var j = 0, jLen = this._parts.length; j < jLen; j++) { + var points = this._parts[j]; + + for (var i = 1, len = points.length; i < len; i++) { + p1 = points[i - 1]; + p2 = points[i]; + + var sqDist = closest(p, p1, p2, true); + + if (sqDist < minDistance) { + minDistance = sqDist; + minPoint = closest(p, p1, p2); + } + } + } + if (minPoint) { + minPoint.distance = Math.sqrt(minDistance); + } + return minPoint; + }, + + // @method getCenter(): LatLng + // Returns the center ([centroid](http://en.wikipedia.org/wiki/Centroid)) of the polyline. + getCenter: function () { + // throws error when not yet added to map as this center calculation requires projected coordinates + if (!this._map) { + throw new Error('Must add layer to map before using getCenter()'); + } + + var i, halfDist, segDist, dist, p1, p2, ratio, + points = this._rings[0], + len = points.length; + + if (!len) { return null; } + + // polyline centroid algorithm; only uses the first ring if there are multiple + + for (i = 0, halfDist = 0; i < len - 1; i++) { + halfDist += points[i].distanceTo(points[i + 1]) / 2; + } + + // The line is so small in the current view that all points are on the same pixel. + if (halfDist === 0) { + return this._map.layerPointToLatLng(points[0]); + } + + for (i = 0, dist = 0; i < len - 1; i++) { + p1 = points[i]; + p2 = points[i + 1]; + segDist = p1.distanceTo(p2); + dist += segDist; + + if (dist > halfDist) { + ratio = (dist - halfDist) / segDist; + return this._map.layerPointToLatLng([ + p2.x - ratio * (p2.x - p1.x), + p2.y - ratio * (p2.y - p1.y) + ]); + } + } + }, + + // @method getBounds(): LatLngBounds + // Returns the `LatLngBounds` of the path. + getBounds: function () { + return this._bounds; + }, + + // @method addLatLng(latlng: LatLng, latlngs? LatLng[]): this + // Adds a given point to the polyline. By default, adds to the first ring of + // the polyline in case of a multi-polyline, but can be overridden by passing + // a specific ring as a LatLng array (that you can earlier access with [`getLatLngs`](#polyline-getlatlngs)). + addLatLng: function (latlng, latlngs) { + latlngs = latlngs || this._defaultShape(); + latlng = toLatLng(latlng); + latlngs.push(latlng); + this._bounds.extend(latlng); + return this.redraw(); + }, + + _setLatLngs: function (latlngs) { + this._bounds = new LatLngBounds(); + this._latlngs = this._convertLatLngs(latlngs); + }, + + _defaultShape: function () { + return isFlat(this._latlngs) ? this._latlngs : this._latlngs[0]; + }, + + // recursively convert latlngs input into actual LatLng instances; calculate bounds along the way + _convertLatLngs: function (latlngs) { + var result = [], + flat = isFlat(latlngs); + + for (var i = 0, len = latlngs.length; i < len; i++) { + if (flat) { + result[i] = toLatLng(latlngs[i]); + this._bounds.extend(result[i]); + } else { + result[i] = this._convertLatLngs(latlngs[i]); + } + } + + return result; + }, + + _project: function () { + var pxBounds = new Bounds(); + this._rings = []; + this._projectLatlngs(this._latlngs, this._rings, pxBounds); + + var w = this._clickTolerance(), + p = new Point(w, w); + + if (this._bounds.isValid() && pxBounds.isValid()) { + pxBounds.min._subtract(p); + pxBounds.max._add(p); + this._pxBounds = pxBounds; + } + }, + + // recursively turns latlngs into a set of rings with projected coordinates + _projectLatlngs: function (latlngs, result, projectedBounds) { + var flat = latlngs[0] instanceof LatLng, + len = latlngs.length, + i, ring; + + if (flat) { + ring = []; + for (i = 0; i < len; i++) { + ring[i] = this._map.latLngToLayerPoint(latlngs[i]); + projectedBounds.extend(ring[i]); + } + result.push(ring); + } else { + for (i = 0; i < len; i++) { + this._projectLatlngs(latlngs[i], result, projectedBounds); + } + } + }, + + // clip polyline by renderer bounds so that we have less to render for performance + _clipPoints: function () { + var bounds = this._renderer._bounds; + + this._parts = []; + if (!this._pxBounds || !this._pxBounds.intersects(bounds)) { + return; + } + + if (this.options.noClip) { + this._parts = this._rings; + return; + } + + var parts = this._parts, + i, j, k, len, len2, segment, points; + + for (i = 0, k = 0, len = this._rings.length; i < len; i++) { + points = this._rings[i]; + + for (j = 0, len2 = points.length; j < len2 - 1; j++) { + segment = clipSegment(points[j], points[j + 1], bounds, j, true); + + if (!segment) { continue; } + + parts[k] = parts[k] || []; + parts[k].push(segment[0]); + + // if segment goes out of screen, or it's the last one, it's the end of the line part + if ((segment[1] !== points[j + 1]) || (j === len2 - 2)) { + parts[k].push(segment[1]); + k++; + } + } + } + }, + + // simplify each clipped part of the polyline for performance + _simplifyPoints: function () { + var parts = this._parts, + tolerance = this.options.smoothFactor; + + for (var i = 0, len = parts.length; i < len; i++) { + parts[i] = simplify(parts[i], tolerance); + } + }, + + _update: function () { + if (!this._map) { return; } + + this._clipPoints(); + this._simplifyPoints(); + this._updatePath(); + }, + + _updatePath: function () { + this._renderer._updatePoly(this); + }, + + // Needed by the `Canvas` renderer for interactivity + _containsPoint: function (p, closed) { + var i, j, k, len, len2, part, + w = this._clickTolerance(); + + if (!this._pxBounds || !this._pxBounds.contains(p)) { return false; } + + // hit detection for polylines + for (i = 0, len = this._parts.length; i < len; i++) { + part = this._parts[i]; + + for (j = 0, len2 = part.length, k = len2 - 1; j < len2; k = j++) { + if (!closed && (j === 0)) { continue; } + + if (pointToSegmentDistance(p, part[k], part[j]) <= w) { + return true; + } + } + } + return false; + } + }); + +// @factory L.polyline(latlngs: LatLng[], options?: Polyline options) +// Instantiates a polyline object given an array of geographical points and +// optionally an options object. You can create a `Polyline` object with +// multiple separate lines (`MultiPolyline`) by passing an array of arrays +// of geographic points. + function polyline(latlngs, options) { + return new Polyline(latlngs, options); + } + +// Retrocompat. Allow plugins to support Leaflet versions before and after 1.1. + Polyline._flat = _flat; + + /* + * @class Polygon + * @aka L.Polygon + * @inherits Polyline + * + * A class for drawing polygon overlays on a map. Extends `Polyline`. + * + * Note that points you pass when creating a polygon shouldn't have an additional last point equal to the first one — it's better to filter out such points. + * + * + * @example + * + * ```js + * // create a red polygon from an array of LatLng points + * var latlngs = [[37, -109.05],[41, -109.03],[41, -102.05],[37, -102.04]]; + * + * var polygon = L.polygon(latlngs, {color: 'red'}).addTo(map); + * + * // zoom the map to the polygon + * map.fitBounds(polygon.getBounds()); + * ``` + * + * You can also pass an array of arrays of latlngs, with the first array representing the outer shape and the other arrays representing holes in the outer shape: + * + * ```js + * var latlngs = [ + * [[37, -109.05],[41, -109.03],[41, -102.05],[37, -102.04]], // outer ring + * [[37.29, -108.58],[40.71, -108.58],[40.71, -102.50],[37.29, -102.50]] // hole + * ]; + * ``` + * + * Additionally, you can pass a multi-dimensional array to represent a MultiPolygon shape. + * + * ```js + * var latlngs = [ + * [ // first polygon + * [[37, -109.05],[41, -109.03],[41, -102.05],[37, -102.04]], // outer ring + * [[37.29, -108.58],[40.71, -108.58],[40.71, -102.50],[37.29, -102.50]] // hole + * ], + * [ // second polygon + * [[41, -111.03],[45, -111.04],[45, -104.05],[41, -104.05]] + * ] + * ]; + * ``` + */ + + var Polygon = Polyline.extend({ + + options: { + fill: true + }, + + isEmpty: function () { + return !this._latlngs.length || !this._latlngs[0].length; + }, + + getCenter: function () { + // throws error when not yet added to map as this center calculation requires projected coordinates + if (!this._map) { + throw new Error('Must add layer to map before using getCenter()'); + } + + var i, j, p1, p2, f, area, x, y, center, + points = this._rings[0], + len = points.length; + + if (!len) { return null; } + + // polygon centroid algorithm; only uses the first ring if there are multiple + + area = x = y = 0; + + for (i = 0, j = len - 1; i < len; j = i++) { + p1 = points[i]; + p2 = points[j]; + + f = p1.y * p2.x - p2.y * p1.x; + x += (p1.x + p2.x) * f; + y += (p1.y + p2.y) * f; + area += f * 3; + } + + if (area === 0) { + // Polygon is so small that all points are on same pixel. + center = points[0]; + } else { + center = [x / area, y / area]; + } + return this._map.layerPointToLatLng(center); + }, + + _convertLatLngs: function (latlngs) { + var result = Polyline.prototype._convertLatLngs.call(this, latlngs), + len = result.length; + + // remove last point if it equals first one + if (len >= 2 && result[0] instanceof LatLng && result[0].equals(result[len - 1])) { + result.pop(); + } + return result; + }, + + _setLatLngs: function (latlngs) { + Polyline.prototype._setLatLngs.call(this, latlngs); + if (isFlat(this._latlngs)) { + this._latlngs = [this._latlngs]; + } + }, + + _defaultShape: function () { + return isFlat(this._latlngs[0]) ? this._latlngs[0] : this._latlngs[0][0]; + }, + + _clipPoints: function () { + // polygons need a different clipping algorithm so we redefine that + + var bounds = this._renderer._bounds, + w = this.options.weight, + p = new Point(w, w); + + // increase clip padding by stroke width to avoid stroke on clip edges + bounds = new Bounds(bounds.min.subtract(p), bounds.max.add(p)); + + this._parts = []; + if (!this._pxBounds || !this._pxBounds.intersects(bounds)) { + return; + } + + if (this.options.noClip) { + this._parts = this._rings; + return; + } + + for (var i = 0, len = this._rings.length, clipped; i < len; i++) { + clipped = clipPolygon(this._rings[i], bounds, true); + if (clipped.length) { + this._parts.push(clipped); + } + } + }, + + _updatePath: function () { + this._renderer._updatePoly(this, true); + }, + + // Needed by the `Canvas` renderer for interactivity + _containsPoint: function (p) { + var inside = false, + part, p1, p2, i, j, k, len, len2; + + if (!this._pxBounds || !this._pxBounds.contains(p)) { return false; } + + // ray casting algorithm for detecting if point is in polygon + for (i = 0, len = this._parts.length; i < len; i++) { + part = this._parts[i]; + + for (j = 0, len2 = part.length, k = len2 - 1; j < len2; k = j++) { + p1 = part[j]; + p2 = part[k]; + + if (((p1.y > p.y) !== (p2.y > p.y)) && (p.x < (p2.x - p1.x) * (p.y - p1.y) / (p2.y - p1.y) + p1.x)) { + inside = !inside; + } + } + } + + // also check if it's on polygon stroke + return inside || Polyline.prototype._containsPoint.call(this, p, true); + } + + }); + + +// @factory L.polygon(latlngs: LatLng[], options?: Polyline options) + function polygon(latlngs, options) { + return new Polygon(latlngs, options); + } + + /* + * @class GeoJSON + * @aka L.GeoJSON + * @inherits FeatureGroup + * + * Represents a GeoJSON object or an array of GeoJSON objects. Allows you to parse + * GeoJSON data and display it on the map. Extends `FeatureGroup`. + * + * @example + * + * ```js + * L.geoJSON(data, { + * style: function (feature) { + * return {color: feature.properties.color}; + * } + * }).bindPopup(function (layer) { + * return layer.feature.properties.description; + * }).addTo(map); + * ``` + */ + + var GeoJSON = FeatureGroup.extend({ + + /* @section + * @aka GeoJSON options + * + * @option pointToLayer: Function = * + * A `Function` defining how GeoJSON points spawn Leaflet layers. It is internally + * called when data is added, passing the GeoJSON point feature and its `LatLng`. + * The default is to spawn a default `Marker`: + * ```js + * function(geoJsonPoint, latlng) { + * return L.marker(latlng); + * } + * ``` + * + * @option style: Function = * + * A `Function` defining the `Path options` for styling GeoJSON lines and polygons, + * called internally when data is added. + * The default value is to not override any defaults: + * ```js + * function (geoJsonFeature) { + * return {} + * } + * ``` + * + * @option onEachFeature: Function = * + * A `Function` that will be called once for each created `Feature`, after it has + * been created and styled. Useful for attaching events and popups to features. + * The default is to do nothing with the newly created layers: + * ```js + * function (feature, layer) {} + * ``` + * + * @option filter: Function = * + * A `Function` that will be used to decide whether to include a feature or not. + * The default is to include all features: + * ```js + * function (geoJsonFeature) { + * return true; + * } + * ``` + * Note: dynamically changing the `filter` option will have effect only on newly + * added data. It will _not_ re-evaluate already included features. + * + * @option coordsToLatLng: Function = * + * A `Function` that will be used for converting GeoJSON coordinates to `LatLng`s. + * The default is the `coordsToLatLng` static method. + */ + + initialize: function (geojson, options) { + setOptions(this, options); + + this._layers = {}; + + if (geojson) { + this.addData(geojson); + } + }, + + // @method addData( data ): this + // Adds a GeoJSON object to the layer. + addData: function (geojson) { + var features = isArray(geojson) ? geojson : geojson.features, + i, len, feature; + + if (features) { + for (i = 0, len = features.length; i < len; i++) { + // only add this if geometry or geometries are set and not null + feature = features[i]; + if (feature.geometries || feature.geometry || feature.features || feature.coordinates) { + this.addData(feature); + } + } + return this; + } + + var options = this.options; + + if (options.filter && !options.filter(geojson)) { return this; } + + var layer = geometryToLayer(geojson, options); + if (!layer) { + return this; + } + layer.feature = asFeature(geojson); + + layer.defaultOptions = layer.options; + this.resetStyle(layer); + + if (options.onEachFeature) { + options.onEachFeature(geojson, layer); + } + + return this.addLayer(layer); + }, + + // @method resetStyle( layer ): this + // Resets the given vector layer's style to the original GeoJSON style, useful for resetting style after hover events. + resetStyle: function (layer) { + // reset any custom styles + layer.options = extend({}, layer.defaultOptions); + this._setLayerStyle(layer, this.options.style); + return this; + }, + + // @method setStyle( style ): this + // Changes styles of GeoJSON vector layers with the given style function. + setStyle: function (style) { + return this.eachLayer(function (layer) { + this._setLayerStyle(layer, style); + }, this); + }, + + _setLayerStyle: function (layer, style) { + if (typeof style === 'function') { + style = style(layer.feature); + } + if (layer.setStyle) { + layer.setStyle(style); + } + } + }); + +// @section +// There are several static functions which can be called without instantiating L.GeoJSON: + +// @function geometryToLayer(featureData: Object, options?: GeoJSON options): Layer +// Creates a `Layer` from a given GeoJSON feature. Can use a custom +// [`pointToLayer`](#geojson-pointtolayer) and/or [`coordsToLatLng`](#geojson-coordstolatlng) +// functions if provided as options. + function geometryToLayer(geojson, options) { + + var geometry = geojson.type === 'Feature' ? geojson.geometry : geojson, + coords = geometry ? geometry.coordinates : null, + layers = [], + pointToLayer = options && options.pointToLayer, + _coordsToLatLng = options && options.coordsToLatLng || coordsToLatLng, + latlng, latlngs, i, len; + + if (!coords && !geometry) { + return null; + } + + switch (geometry.type) { + case 'Point': + latlng = _coordsToLatLng(coords); + return pointToLayer ? pointToLayer(geojson, latlng) : new Marker(latlng); + + case 'MultiPoint': + for (i = 0, len = coords.length; i < len; i++) { + latlng = _coordsToLatLng(coords[i]); + layers.push(pointToLayer ? pointToLayer(geojson, latlng) : new Marker(latlng)); + } + return new FeatureGroup(layers); + + case 'LineString': + case 'MultiLineString': + latlngs = coordsToLatLngs(coords, geometry.type === 'LineString' ? 0 : 1, _coordsToLatLng); + return new Polyline(latlngs, options); + + case 'Polygon': + case 'MultiPolygon': + latlngs = coordsToLatLngs(coords, geometry.type === 'Polygon' ? 1 : 2, _coordsToLatLng); + return new Polygon(latlngs, options); + + case 'GeometryCollection': + for (i = 0, len = geometry.geometries.length; i < len; i++) { + var layer = geometryToLayer({ + geometry: geometry.geometries[i], + type: 'Feature', + properties: geojson.properties + }, options); + + if (layer) { + layers.push(layer); + } + } + return new FeatureGroup(layers); + + default: + throw new Error('Invalid GeoJSON object.'); + } + } + +// @function coordsToLatLng(coords: Array): LatLng +// Creates a `LatLng` object from an array of 2 numbers (longitude, latitude) +// or 3 numbers (longitude, latitude, altitude) used in GeoJSON for points. + function coordsToLatLng(coords) { + return new LatLng(coords[1], coords[0], coords[2]); + } + +// @function coordsToLatLngs(coords: Array, levelsDeep?: Number, coordsToLatLng?: Function): Array +// Creates a multidimensional array of `LatLng`s from a GeoJSON coordinates array. +// `levelsDeep` specifies the nesting level (0 is for an array of points, 1 for an array of arrays of points, etc., 0 by default). +// Can use a custom [`coordsToLatLng`](#geojson-coordstolatlng) function. + function coordsToLatLngs(coords, levelsDeep, _coordsToLatLng) { + var latlngs = []; + + for (var i = 0, len = coords.length, latlng; i < len; i++) { + latlng = levelsDeep ? + coordsToLatLngs(coords[i], levelsDeep - 1, _coordsToLatLng) : + (_coordsToLatLng || coordsToLatLng)(coords[i]); + + latlngs.push(latlng); + } + + return latlngs; + } + +// @function latLngToCoords(latlng: LatLng, precision?: Number): Array +// Reverse of [`coordsToLatLng`](#geojson-coordstolatlng) + function latLngToCoords(latlng, precision) { + precision = typeof precision === 'number' ? precision : 6; + return latlng.alt !== undefined ? + [formatNum(latlng.lng, precision), formatNum(latlng.lat, precision), formatNum(latlng.alt, precision)] : + [formatNum(latlng.lng, precision), formatNum(latlng.lat, precision)]; + } + +// @function latLngsToCoords(latlngs: Array, levelsDeep?: Number, closed?: Boolean): Array +// Reverse of [`coordsToLatLngs`](#geojson-coordstolatlngs) +// `closed` determines whether the first point should be appended to the end of the array to close the feature, only used when `levelsDeep` is 0. False by default. + function latLngsToCoords(latlngs, levelsDeep, closed, precision) { + var coords = []; + + for (var i = 0, len = latlngs.length; i < len; i++) { + coords.push(levelsDeep ? + latLngsToCoords(latlngs[i], levelsDeep - 1, closed, precision) : + latLngToCoords(latlngs[i], precision)); + } + + if (!levelsDeep && closed) { + coords.push(coords[0]); + } + + return coords; + } + + function getFeature(layer, newGeometry) { + return layer.feature ? + extend({}, layer.feature, {geometry: newGeometry}) : + asFeature(newGeometry); + } + +// @function asFeature(geojson: Object): Object +// Normalize GeoJSON geometries/features into GeoJSON features. + function asFeature(geojson) { + if (geojson.type === 'Feature' || geojson.type === 'FeatureCollection') { + return geojson; + } + + return { + type: 'Feature', + properties: {}, + geometry: geojson + }; + } + + var PointToGeoJSON = { + toGeoJSON: function (precision) { + return getFeature(this, { + type: 'Point', + coordinates: latLngToCoords(this.getLatLng(), precision) + }); + } + }; + +// @namespace Marker +// @method toGeoJSON(): Object +// Returns a [`GeoJSON`](http://en.wikipedia.org/wiki/GeoJSON) representation of the marker (as a GeoJSON `Point` Feature). + Marker.include(PointToGeoJSON); + +// @namespace CircleMarker +// @method toGeoJSON(): Object +// Returns a [`GeoJSON`](http://en.wikipedia.org/wiki/GeoJSON) representation of the circle marker (as a GeoJSON `Point` Feature). + Circle.include(PointToGeoJSON); + CircleMarker.include(PointToGeoJSON); + + +// @namespace Polyline +// @method toGeoJSON(): Object +// Returns a [`GeoJSON`](http://en.wikipedia.org/wiki/GeoJSON) representation of the polyline (as a GeoJSON `LineString` or `MultiLineString` Feature). + Polyline.include({ + toGeoJSON: function (precision) { + var multi = !isFlat(this._latlngs); + + var coords = latLngsToCoords(this._latlngs, multi ? 1 : 0, false, precision); + + return getFeature(this, { + type: (multi ? 'Multi' : '') + 'LineString', + coordinates: coords + }); + } + }); + +// @namespace Polygon +// @method toGeoJSON(): Object +// Returns a [`GeoJSON`](http://en.wikipedia.org/wiki/GeoJSON) representation of the polygon (as a GeoJSON `Polygon` or `MultiPolygon` Feature). + Polygon.include({ + toGeoJSON: function (precision) { + var holes = !isFlat(this._latlngs), + multi = holes && !isFlat(this._latlngs[0]); + + var coords = latLngsToCoords(this._latlngs, multi ? 2 : holes ? 1 : 0, true, precision); + + if (!holes) { + coords = [coords]; + } + + return getFeature(this, { + type: (multi ? 'Multi' : '') + 'Polygon', + coordinates: coords + }); + } + }); + + +// @namespace LayerGroup + LayerGroup.include({ + toMultiPoint: function (precision) { + var coords = []; + + this.eachLayer(function (layer) { + coords.push(layer.toGeoJSON(precision).geometry.coordinates); + }); + + return getFeature(this, { + type: 'MultiPoint', + coordinates: coords + }); + }, + + // @method toGeoJSON(): Object + // Returns a [`GeoJSON`](http://en.wikipedia.org/wiki/GeoJSON) representation of the layer group (as a GeoJSON `FeatureCollection`, `GeometryCollection`, or `MultiPoint`). + toGeoJSON: function (precision) { + + var type = this.feature && this.feature.geometry && this.feature.geometry.type; + + if (type === 'MultiPoint') { + return this.toMultiPoint(precision); + } + + var isGeometryCollection = type === 'GeometryCollection', + jsons = []; + + this.eachLayer(function (layer) { + if (layer.toGeoJSON) { + var json = layer.toGeoJSON(precision); + if (isGeometryCollection) { + jsons.push(json.geometry); + } else { + var feature = asFeature(json); + // Squash nested feature collections + if (feature.type === 'FeatureCollection') { + jsons.push.apply(jsons, feature.features); + } else { + jsons.push(feature); + } + } + } + }); + + if (isGeometryCollection) { + return getFeature(this, { + geometries: jsons, + type: 'GeometryCollection' + }); + } + + return { + type: 'FeatureCollection', + features: jsons + }; + } + }); + +// @namespace GeoJSON +// @factory L.geoJSON(geojson?: Object, options?: GeoJSON options) +// Creates a GeoJSON layer. Optionally accepts an object in +// [GeoJSON format](https://tools.ietf.org/html/rfc7946) to display on the map +// (you can alternatively add it later with `addData` method) and an `options` object. + function geoJSON(geojson, options) { + return new GeoJSON(geojson, options); + } + +// Backward compatibility. + var geoJson = geoJSON; + + /* + * @class ImageOverlay + * @aka L.ImageOverlay + * @inherits Interactive layer + * + * Used to load and display a single image over specific bounds of the map. Extends `Layer`. + * + * @example + * + * ```js + * var imageUrl = 'http://www.lib.utexas.edu/maps/historical/newark_nj_1922.jpg', + * imageBounds = [[40.712216, -74.22655], [40.773941, -74.12544]]; + * L.imageOverlay(imageUrl, imageBounds).addTo(map); + * ``` + */ + + var ImageOverlay = Layer.extend({ + + // @section + // @aka ImageOverlay options + options: { + // @option opacity: Number = 1.0 + // The opacity of the image overlay. + opacity: 1, + + // @option alt: String = '' + // Text for the `alt` attribute of the image (useful for accessibility). + alt: '', + + // @option interactive: Boolean = false + // If `true`, the image overlay will emit [mouse events](#interactive-layer) when clicked or hovered. + interactive: false, + + // @option crossOrigin: Boolean|String = false + // Whether the crossOrigin attribute will be added to the image. + // If a String is provided, the image will have its crossOrigin attribute set to the String provided. This is needed if you want to access image pixel data. + // Refer to [CORS Settings](https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_settings_attributes) for valid String values. + crossOrigin: false, + + // @option errorOverlayUrl: String = '' + // URL to the overlay image to show in place of the overlay that failed to load. + errorOverlayUrl: '', + + // @option zIndex: Number = 1 + // The explicit [zIndex](https://developer.mozilla.org/docs/Web/CSS/CSS_Positioning/Understanding_z_index) of the overlay layer. + zIndex: 1, + + // @option className: String = '' + // A custom class name to assign to the image. Empty by default. + className: '' + }, + + initialize: function (url, bounds, options) { // (String, LatLngBounds, Object) + this._url = url; + this._bounds = toLatLngBounds(bounds); + + setOptions(this, options); + }, + + onAdd: function () { + if (!this._image) { + this._initImage(); + + if (this.options.opacity < 1) { + this._updateOpacity(); + } + } + + if (this.options.interactive) { + addClass(this._image, 'leaflet-interactive'); + this.addInteractiveTarget(this._image); + } + + this.getPane().appendChild(this._image); + this._reset(); + }, + + onRemove: function () { + remove(this._image); + if (this.options.interactive) { + this.removeInteractiveTarget(this._image); + } + }, + + // @method setOpacity(opacity: Number): this + // Sets the opacity of the overlay. + setOpacity: function (opacity) { + this.options.opacity = opacity; + + if (this._image) { + this._updateOpacity(); + } + return this; + }, + + setStyle: function (styleOpts) { + if (styleOpts.opacity) { + this.setOpacity(styleOpts.opacity); + } + return this; + }, + + // @method bringToFront(): this + // Brings the layer to the top of all overlays. + bringToFront: function () { + if (this._map) { + toFront(this._image); + } + return this; + }, + + // @method bringToBack(): this + // Brings the layer to the bottom of all overlays. + bringToBack: function () { + if (this._map) { + toBack(this._image); + } + return this; + }, + + // @method setUrl(url: String): this + // Changes the URL of the image. + setUrl: function (url) { + this._url = url; + + if (this._image) { + this._image.src = url; + } + return this; + }, + + // @method setBounds(bounds: LatLngBounds): this + // Update the bounds that this ImageOverlay covers + setBounds: function (bounds) { + this._bounds = toLatLngBounds(bounds); + + if (this._map) { + this._reset(); + } + return this; + }, + + getEvents: function () { + var events = { + zoom: this._reset, + viewreset: this._reset + }; + + if (this._zoomAnimated) { + events.zoomanim = this._animateZoom; + } + + return events; + }, + + // @method setZIndex(value: Number): this + // Changes the [zIndex](#imageoverlay-zindex) of the image overlay. + setZIndex: function (value) { + this.options.zIndex = value; + this._updateZIndex(); + return this; + }, + + // @method getBounds(): LatLngBounds + // Get the bounds that this ImageOverlay covers + getBounds: function () { + return this._bounds; + }, + + // @method getElement(): HTMLElement + // Returns the instance of [`HTMLImageElement`](https://developer.mozilla.org/docs/Web/API/HTMLImageElement) + // used by this overlay. + getElement: function () { + return this._image; + }, + + _initImage: function () { + var wasElementSupplied = this._url.tagName === 'IMG'; + var img = this._image = wasElementSupplied ? this._url : create$1('img'); + + addClass(img, 'leaflet-image-layer'); + if (this._zoomAnimated) { addClass(img, 'leaflet-zoom-animated'); } + if (this.options.className) { addClass(img, this.options.className); } + + img.onselectstart = falseFn; + img.onmousemove = falseFn; + + // @event load: Event + // Fired when the ImageOverlay layer has loaded its image + img.onload = bind(this.fire, this, 'load'); + img.onerror = bind(this._overlayOnError, this, 'error'); + + if (this.options.crossOrigin || this.options.crossOrigin === '') { + img.crossOrigin = this.options.crossOrigin === true ? '' : this.options.crossOrigin; + } + + if (this.options.zIndex) { + this._updateZIndex(); + } + + if (wasElementSupplied) { + this._url = img.src; + return; + } + + img.src = this._url; + img.alt = this.options.alt; + }, + + _animateZoom: function (e) { + var scale = this._map.getZoomScale(e.zoom), + offset = this._map._latLngBoundsToNewLayerBounds(this._bounds, e.zoom, e.center).min; + + setTransform(this._image, offset, scale); + }, + + _reset: function () { + var image = this._image, + bounds = new Bounds( + this._map.latLngToLayerPoint(this._bounds.getNorthWest()), + this._map.latLngToLayerPoint(this._bounds.getSouthEast())), + size = bounds.getSize(); + + setPosition(image, bounds.min); + + image.style.width = size.x + 'px'; + image.style.height = size.y + 'px'; + }, + + _updateOpacity: function () { + setOpacity(this._image, this.options.opacity); + }, + + _updateZIndex: function () { + if (this._image && this.options.zIndex !== undefined && this.options.zIndex !== null) { + this._image.style.zIndex = this.options.zIndex; + } + }, + + _overlayOnError: function () { + // @event error: Event + // Fired when the ImageOverlay layer fails to load its image + this.fire('error'); + + var errorUrl = this.options.errorOverlayUrl; + if (errorUrl && this._url !== errorUrl) { + this._url = errorUrl; + this._image.src = errorUrl; + } + } + }); + +// @factory L.imageOverlay(imageUrl: String, bounds: LatLngBounds, options?: ImageOverlay options) +// Instantiates an image overlay object given the URL of the image and the +// geographical bounds it is tied to. + var imageOverlay = function (url, bounds, options) { + return new ImageOverlay(url, bounds, options); + }; + + /* + * @class VideoOverlay + * @aka L.VideoOverlay + * @inherits ImageOverlay + * + * Used to load and display a video player over specific bounds of the map. Extends `ImageOverlay`. + * + * A video overlay uses the [`