From 5c62368a65dacd56e90f69074f798951879b6868 Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Wed, 6 Dec 2017 18:36:27 +0530 Subject: [PATCH] [Agriculture Domain] (#11663) * created Soil Analysis, Water Analysis, Weather and Fertilizer doctype * soil doctype edited and crop doctype added * minor stuff * Land Unit + Leaflet * crop cycle added * Land Unit changes + Crop cycle * autoname for plant_analysis * created Agriculture Task * minor stuff * - deleted agriculture_task - current state after the call * [Agriculture] modified fertilizer doctype to have a link to Item This was done so that the `Fertilizer` doctype could track the contents exclusive to the fertilizer, whereas the `Fertilizer Item` could be a seperate entity, so as to leverage the existing ERPNext doctypes * Added fields to `Water Analysis` doctype - Collection Datetime - Laboratory Testing Datetime - Results Datetime (default to Laboratory Testing Datetime) * Edited the doctypes `Agrivulture Task`, `Pest` and `Soil Texture` - Created `agriculture task` doctype - added fields `Common Name`, `Scientific Name`, `Treatment` and `Treatment Options` to `Pest` doctype - edited `Soil Texture` doctype to contain a soil texture ternary plot diagram made using SnapSVG. The code was put in public folder so as to be accessible by the entire agriculture module * Recursively reflect child land unit feature changes on parents * fixed feature repition bug * added legeneds to ternary plot * added stuff * changes * fix Task * reverted the Task Doctype to have naming in the form TASK.##### * fixed modifications made to TASK doctype * [dirty commit] added auto create Task from Crop on creation of Crop Cycle * Changed the Crop Cycle Doctype - Deleted the "Crop Cycly Task" doctype and its link from "Crop Cycle" - Creation of a new Project with the same name as the Crop Cycle on creation of a new Crop Cycle - Creation of all the tasks imported from Agriculture Task doctype of the Crop in the Crop Cycle * [Agriculture Module] Modifications - Created childtable doctype "Pest Detected" - Added childtable "Pest Detected" to Pest - Modified "Agriculture Task" to include "Start Day" and "End Day" of task - Modified the code in "Crop Cycle" to create a parent task with same name as Crop Cycle * [Agriculture Module] fixed Pest doctype not saving issue * [Agrcilture Module] Changes in Crop Cycle - removed the creation of a master task on creation of a new crop cycle - temporary fix to add the pest tasks from the pests added in crop cycle * land_unit_tree.js fields modified to have field objects instead of just field names * Revert "land_unit_tree.js modified" * land_unit_tree.js fields modified to have field objects instead of just field names * [Agriculture Domain] Converted Agriculture Module to a Domain - Converted into a Domain field from Select to Link field in Company doctype, linked to Domain doctype - Agriculture (alpha) is now a Domain * land_unit area aggregation enabled * land_unit.py checks feature diff for every ancestor and not just the parent * Removed unnecessary print messages * agriculture.py modified to include fixtures * fixtures added to setup.py inside agriculture module * [Agriculture Domain] UI tests added - 'materials' table renamed to 'materials_required' in 'Crop' - wrote UI test for Crop, Fertilizer, Crop Cycle, Pest, Water Analysis, Soil Texture - moved creation of tasks from client side to server side in Crop Cycle - Plant Analysis, Water Analysis, Soil Analysis, Soil Texture docs are now autonamed in the format PAnalysis.#####, WAnalysis.#####, SAnalysis.#####, STexture.##### respectively - company_name changed in domains.py from 'Schrute Farms.' to 'Schrute Farms' * [Agriculture Domain] Mostly written server side tests and moved client side code to server side - moved client side code to server side for Crop, Water Analysis, Pest, Soil Texture, - wrote server side tests for Crop, Crop Cycle, Fertilizer, Soil Texture, Pest - NOTE: none of the server side codes were tested * [Agriculture Domain] All server side tests working locally * [Agriculture Domain] Testing - added sample test for Land Unit, which needs to be modified to test multiple things - modified tests to be independant of each other * Land Units tests added and area aggregation code migrated to server side * added land_unit server side tests and on_trash added to land_unit * Changing field location for start date * [Agriculture Domain] deleted unnecessary comments * [Agriculture Domain] reverted changes * [Agriculture Domain] Modified the code to replace Pest doctype with Land Unit doctype - Deleted the Pest doctype and replaced it with the more generic Disease doctype - Deleted the Detected Pest doctype and replaced it with Detected Disease doctype * [Agriculture Domain] resolves #11654, resolves #11653 * [Agriculture] Added links to soil analysis, soil texture, plant analysis in crop cycle and land unit - not working perfectly yet - docs are fetched but not appended * [Agricuture] Crop Cycle modifed to link with relevent analysis docs, not fully functional * [Agriculture] added seperate stage for client side agriculture tests * [Agriculture] minor modification to crop_cycle.js test * [Agriculture] fixed tests * upgrade chromedriver in .travis.yml from 2.32 to 2.33 * [Agriculture] added land unit ui test * [Agriculture] added Agriculture server side test as a seperate stage in travis * tesing travis.yml * [Agriculture] Crop Cycle is able to fetch linked analysis docs * Modified travis.yml for modular server side testing * [minor fix][Agriculture] in soil_texture - fixed multiple soil_texture ternary plot creation on refresh - fixed error on soil composition change * Update .travis.yml * removed location field from linked doctypes * minor fixes and cleanup of agri * minor fix in agriculture and domain patches * permissions added to agriculture - Agriculture Manager and Agriculture User roles were added to all Agriculture doctypes * [Agriculture] - Created Agiculture Analysis Criteria and added sample records to it - All the analysis doctypes now fetch their fields inside a child table, form Agriculture Analysis Criteria - Also Fertilizer does the same This was introduced so that, new parameters could be added on demand * minor changes requested in Agriculture * minor changes * minor fix * Update desktop.py * Update .travis.yml --- .travis.yml | 7 +- erpnext/agriculture/__init__.py | 0 erpnext/agriculture/doctype/__init__.py | 0 .../agriculture_analysis_criteria/__init__.py | 0 .../agriculture_analysis_criteria.js | 8 + .../agriculture_analysis_criteria.json | 155 +++ .../agriculture_analysis_criteria.py | 10 + .../test_agriculture_analysis_criteria.js | 23 + .../test_agriculture_analysis_criteria.py | 10 + .../doctype/agriculture_task/__init__.py | 0 .../agriculture_task/agriculture_task.js | 8 + .../agriculture_task/agriculture_task.json | 199 ++++ .../agriculture_task/agriculture_task.py | 10 + .../agriculture_task/test_agriculture_task.js | 23 + .../agriculture_task/test_agriculture_task.py | 10 + erpnext/agriculture/doctype/crop/__init__.py | 0 erpnext/agriculture/doctype/crop/crop.js | 7 + erpnext/agriculture/doctype/crop/crop.json | 1045 +++++++++++++++++ erpnext/agriculture/doctype/crop/crop.py | 18 + .../doctype/crop/crop_dashboard.py | 11 + erpnext/agriculture/doctype/crop/test_crop.js | 116 ++ erpnext/agriculture/doctype/crop/test_crop.py | 14 + .../doctype/crop/test_records.json | 80 ++ .../doctype/crop_cycle/__init__.py | 0 .../doctype/crop_cycle/crop_cycle.js | 48 + .../doctype/crop_cycle/crop_cycle.json | 849 +++++++++++++ .../doctype/crop_cycle/crop_cycle.py | 62 + .../doctype/crop_cycle/test_crop_cycle.js | 34 + .../doctype/crop_cycle/test_crop_cycle.py | 68 ++ .../doctype/crop_cycle/test_records.json | 15 + .../doctype/detected_disease/__init__.py | 0 .../detected_disease/detected_disease.json | 102 ++ .../detected_disease/detected_disease.py | 10 + .../agriculture/doctype/disease/__init__.py | 0 .../agriculture/doctype/disease/disease.js | 8 + .../agriculture/doctype/disease/disease.json | 293 +++++ .../agriculture/doctype/disease/disease.py | 18 + .../doctype/disease/test_disease.js | 39 + .../doctype/disease/test_disease.py | 12 + .../doctype/disease/test_records.json | 18 + .../doctype/fertilizer/__init__.py | 0 .../doctype/fertilizer/fertilizer.js | 8 + .../doctype/fertilizer/fertilizer.json | 292 +++++ .../doctype/fertilizer/fertilizer.py | 13 + .../doctype/fertilizer/test_fertilizer.js | 31 + .../doctype/fertilizer/test_fertilizer.py | 11 + .../doctype/fertilizer/test_records.json | 13 + .../doctype/fertilizer_content/__init__.py | 0 .../fertilizer_content.json | 103 ++ .../fertilizer_content/fertilizer_content.py | 10 + .../agriculture/doctype/land_unit/__init__.py | 0 .../doctype/land_unit/land_unit.js | 31 + .../doctype/land_unit/land_unit.json | 690 +++++++++++ .../doctype/land_unit/land_unit.py | 165 +++ .../doctype/land_unit/land_unit_tree.js | 15 + .../doctype/land_unit/test_land_unit.js | 24 + .../doctype/land_unit/test_land_unit.py | 26 + .../doctype/land_unit/test_records.json | 38 + .../doctype/linked_land_unit/__init__.py | 0 .../linked_land_unit/linked_land_unit.json | 72 ++ .../linked_land_unit/linked_land_unit.py | 10 + .../doctype/linked_plant_analysis/__init__.py | 0 .../linked_plant_analysis.json | 72 ++ .../linked_plant_analysis.py | 10 + .../doctype/linked_soil_analysis/__init__.py | 0 .../linked_soil_analysis.json | 72 ++ .../linked_soil_analysis.py | 10 + .../doctype/linked_soil_texture/__init__.py | 0 .../linked_soil_texture.json | 72 ++ .../linked_soil_texture.py | 10 + .../doctype/plant_analysis/__init__.py | 0 .../doctype/plant_analysis/plant_analysis.js | 17 + .../plant_analysis/plant_analysis.json | 353 ++++++ .../doctype/plant_analysis/plant_analysis.py | 14 + .../plant_analysis/test_plant_analysis.js | 23 + .../plant_analysis/test_plant_analysis.py | 10 + .../plant_analysis_criteria/__init__.py | 0 .../plant_analysis_criteria.json | 162 +++ .../plant_analysis_criteria.py | 10 + .../doctype/soil_analysis/__init__.py | 0 .../doctype/soil_analysis/soil_analysis.js | 17 + .../doctype/soil_analysis/soil_analysis.json | 560 +++++++++ .../doctype/soil_analysis/soil_analysis.py | 13 + .../soil_analysis/test_soil_analysis.js | 23 + .../soil_analysis/test_soil_analysis.py | 10 + .../soil_analysis_criteria/__init__.py | 0 .../soil_analysis_criteria.json | 162 +++ .../soil_analysis_criteria.py | 10 + .../doctype/soil_texture/__init__.py | 0 .../doctype/soil_texture/soil_texture.js | 59 + .../doctype/soil_texture/soil_texture.json | 504 ++++++++ .../doctype/soil_texture/soil_texture.py | 68 ++ .../doctype/soil_texture/test_records.json | 9 + .../doctype/soil_texture/test_soil_texture.js | 26 + .../doctype/soil_texture/test_soil_texture.py | 14 + .../doctype/soil_texture_criteria/__init__.py | 0 .../soil_texture_criteria.json | 162 +++ .../soil_texture_criteria.py | 10 + .../doctype/water_analysis/__init__.py | 0 .../water_analysis/test_water_analysis.js | 25 + .../water_analysis/test_water_analysis.py | 10 + .../doctype/water_analysis/water_analysis.js | 18 + .../water_analysis/water_analysis.json | 561 +++++++++ .../doctype/water_analysis/water_analysis.py | 23 + .../water_analysis_criteria/__init__.py | 0 .../water_analysis_criteria.json | 162 +++ .../water_analysis_criteria.py | 10 + .../agriculture/doctype/weather/__init__.py | 0 .../doctype/weather/test_weather.js | 23 + .../doctype/weather/test_weather.py | 10 + .../agriculture/doctype/weather/weather.js | 8 + .../agriculture/doctype/weather/weather.json | 261 ++++ .../agriculture/doctype/weather/weather.py | 13 + .../doctype/weather_parameter/__init__.py | 0 .../weather_parameter/weather_parameter.json | 162 +++ .../weather_parameter/weather_parameter.py | 10 + erpnext/agriculture/setup.py | 434 +++++++ erpnext/config/agriculture.py | 65 + erpnext/config/desktop.py | 150 ++- erpnext/demo/domains.py | 3 + erpnext/domains/agriculture.py | 22 + erpnext/hooks.py | 1 + erpnext/modules.txt | 1 + erpnext/patches.txt | 3 +- .../patches/v10_0/add_agriculture_domain.py | 13 + erpnext/patches/v9_0/add_healthcare_domain.py | 3 +- erpnext/public/build.json | 3 + erpnext/public/css/leaflet/leaflet.css | 611 ++++++++++ erpnext/public/css/leaflet/leaflet.draw.css | 316 +++++ erpnext/public/images/leaflet/farmer.png | Bin 0 -> 52773 bytes erpnext/public/images/leaflet/layers-2x.png | Bin 0 -> 1259 bytes erpnext/public/images/leaflet/layers.png | Bin 0 -> 696 bytes .../public/images/leaflet/marker-icon-2x.png | Bin 0 -> 2586 bytes erpnext/public/images/leaflet/marker-icon.png | Bin 0 -> 1466 bytes .../public/images/leaflet/marker-shadow.png | Bin 0 -> 618 bytes .../public/images/leaflet/spritesheet-2x.png | Bin 0 -> 3581 bytes erpnext/public/images/leaflet/spritesheet.png | Bin 0 -> 1906 bytes erpnext/public/images/leaflet/spritesheet.svg | 156 +++ erpnext/public/js/agriculture/ternary_plot.js | 232 ++++ erpnext/public/js/leaflet/leaflet.draw.js | 143 +++ erpnext/public/js/leaflet/leaflet.js | 771 ++++++++++++ erpnext/public/js/setup_wizard.js | 5 +- erpnext/setup/doctype/company/company.json | 5 +- .../setup/setup_wizard/install_fixtures.py | 1 + erpnext/tests/server/agriculture.txt | 5 + erpnext/tests/ui/agriculture.txt | 7 + erpnext/tests/ui/tests.txt | 10 +- 147 files changed, 11596 insertions(+), 24 deletions(-) create mode 100644 erpnext/agriculture/__init__.py create mode 100644 erpnext/agriculture/doctype/__init__.py create mode 100644 erpnext/agriculture/doctype/agriculture_analysis_criteria/__init__.py create mode 100644 erpnext/agriculture/doctype/agriculture_analysis_criteria/agriculture_analysis_criteria.js create mode 100644 erpnext/agriculture/doctype/agriculture_analysis_criteria/agriculture_analysis_criteria.json create mode 100644 erpnext/agriculture/doctype/agriculture_analysis_criteria/agriculture_analysis_criteria.py create mode 100644 erpnext/agriculture/doctype/agriculture_analysis_criteria/test_agriculture_analysis_criteria.js create mode 100644 erpnext/agriculture/doctype/agriculture_analysis_criteria/test_agriculture_analysis_criteria.py create mode 100644 erpnext/agriculture/doctype/agriculture_task/__init__.py create mode 100644 erpnext/agriculture/doctype/agriculture_task/agriculture_task.js create mode 100644 erpnext/agriculture/doctype/agriculture_task/agriculture_task.json create mode 100644 erpnext/agriculture/doctype/agriculture_task/agriculture_task.py create mode 100644 erpnext/agriculture/doctype/agriculture_task/test_agriculture_task.js create mode 100644 erpnext/agriculture/doctype/agriculture_task/test_agriculture_task.py create mode 100644 erpnext/agriculture/doctype/crop/__init__.py create mode 100644 erpnext/agriculture/doctype/crop/crop.js create mode 100644 erpnext/agriculture/doctype/crop/crop.json create mode 100644 erpnext/agriculture/doctype/crop/crop.py create mode 100644 erpnext/agriculture/doctype/crop/crop_dashboard.py create mode 100644 erpnext/agriculture/doctype/crop/test_crop.js create mode 100644 erpnext/agriculture/doctype/crop/test_crop.py create mode 100644 erpnext/agriculture/doctype/crop/test_records.json create mode 100644 erpnext/agriculture/doctype/crop_cycle/__init__.py create mode 100644 erpnext/agriculture/doctype/crop_cycle/crop_cycle.js create mode 100644 erpnext/agriculture/doctype/crop_cycle/crop_cycle.json create mode 100644 erpnext/agriculture/doctype/crop_cycle/crop_cycle.py create mode 100644 erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.js create mode 100644 erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.py create mode 100644 erpnext/agriculture/doctype/crop_cycle/test_records.json create mode 100644 erpnext/agriculture/doctype/detected_disease/__init__.py create mode 100644 erpnext/agriculture/doctype/detected_disease/detected_disease.json create mode 100644 erpnext/agriculture/doctype/detected_disease/detected_disease.py create mode 100644 erpnext/agriculture/doctype/disease/__init__.py create mode 100644 erpnext/agriculture/doctype/disease/disease.js create mode 100644 erpnext/agriculture/doctype/disease/disease.json create mode 100644 erpnext/agriculture/doctype/disease/disease.py create mode 100644 erpnext/agriculture/doctype/disease/test_disease.js create mode 100644 erpnext/agriculture/doctype/disease/test_disease.py create mode 100644 erpnext/agriculture/doctype/disease/test_records.json create mode 100644 erpnext/agriculture/doctype/fertilizer/__init__.py create mode 100644 erpnext/agriculture/doctype/fertilizer/fertilizer.js create mode 100644 erpnext/agriculture/doctype/fertilizer/fertilizer.json create mode 100644 erpnext/agriculture/doctype/fertilizer/fertilizer.py create mode 100644 erpnext/agriculture/doctype/fertilizer/test_fertilizer.js create mode 100644 erpnext/agriculture/doctype/fertilizer/test_fertilizer.py create mode 100644 erpnext/agriculture/doctype/fertilizer/test_records.json create mode 100644 erpnext/agriculture/doctype/fertilizer_content/__init__.py create mode 100644 erpnext/agriculture/doctype/fertilizer_content/fertilizer_content.json create mode 100644 erpnext/agriculture/doctype/fertilizer_content/fertilizer_content.py create mode 100644 erpnext/agriculture/doctype/land_unit/__init__.py create mode 100644 erpnext/agriculture/doctype/land_unit/land_unit.js create mode 100644 erpnext/agriculture/doctype/land_unit/land_unit.json create mode 100644 erpnext/agriculture/doctype/land_unit/land_unit.py create mode 100644 erpnext/agriculture/doctype/land_unit/land_unit_tree.js create mode 100644 erpnext/agriculture/doctype/land_unit/test_land_unit.js create mode 100644 erpnext/agriculture/doctype/land_unit/test_land_unit.py create mode 100644 erpnext/agriculture/doctype/land_unit/test_records.json create mode 100644 erpnext/agriculture/doctype/linked_land_unit/__init__.py create mode 100644 erpnext/agriculture/doctype/linked_land_unit/linked_land_unit.json create mode 100644 erpnext/agriculture/doctype/linked_land_unit/linked_land_unit.py create mode 100644 erpnext/agriculture/doctype/linked_plant_analysis/__init__.py create mode 100644 erpnext/agriculture/doctype/linked_plant_analysis/linked_plant_analysis.json create mode 100644 erpnext/agriculture/doctype/linked_plant_analysis/linked_plant_analysis.py create mode 100644 erpnext/agriculture/doctype/linked_soil_analysis/__init__.py create mode 100644 erpnext/agriculture/doctype/linked_soil_analysis/linked_soil_analysis.json create mode 100644 erpnext/agriculture/doctype/linked_soil_analysis/linked_soil_analysis.py create mode 100644 erpnext/agriculture/doctype/linked_soil_texture/__init__.py create mode 100644 erpnext/agriculture/doctype/linked_soil_texture/linked_soil_texture.json create mode 100644 erpnext/agriculture/doctype/linked_soil_texture/linked_soil_texture.py create mode 100644 erpnext/agriculture/doctype/plant_analysis/__init__.py create mode 100644 erpnext/agriculture/doctype/plant_analysis/plant_analysis.js create mode 100644 erpnext/agriculture/doctype/plant_analysis/plant_analysis.json create mode 100644 erpnext/agriculture/doctype/plant_analysis/plant_analysis.py create mode 100644 erpnext/agriculture/doctype/plant_analysis/test_plant_analysis.js create mode 100644 erpnext/agriculture/doctype/plant_analysis/test_plant_analysis.py create mode 100644 erpnext/agriculture/doctype/plant_analysis_criteria/__init__.py create mode 100644 erpnext/agriculture/doctype/plant_analysis_criteria/plant_analysis_criteria.json create mode 100644 erpnext/agriculture/doctype/plant_analysis_criteria/plant_analysis_criteria.py create mode 100644 erpnext/agriculture/doctype/soil_analysis/__init__.py create mode 100644 erpnext/agriculture/doctype/soil_analysis/soil_analysis.js create mode 100644 erpnext/agriculture/doctype/soil_analysis/soil_analysis.json create mode 100644 erpnext/agriculture/doctype/soil_analysis/soil_analysis.py create mode 100644 erpnext/agriculture/doctype/soil_analysis/test_soil_analysis.js create mode 100644 erpnext/agriculture/doctype/soil_analysis/test_soil_analysis.py create mode 100644 erpnext/agriculture/doctype/soil_analysis_criteria/__init__.py create mode 100644 erpnext/agriculture/doctype/soil_analysis_criteria/soil_analysis_criteria.json create mode 100644 erpnext/agriculture/doctype/soil_analysis_criteria/soil_analysis_criteria.py create mode 100644 erpnext/agriculture/doctype/soil_texture/__init__.py create mode 100644 erpnext/agriculture/doctype/soil_texture/soil_texture.js create mode 100644 erpnext/agriculture/doctype/soil_texture/soil_texture.json create mode 100644 erpnext/agriculture/doctype/soil_texture/soil_texture.py create mode 100644 erpnext/agriculture/doctype/soil_texture/test_records.json create mode 100644 erpnext/agriculture/doctype/soil_texture/test_soil_texture.js create mode 100644 erpnext/agriculture/doctype/soil_texture/test_soil_texture.py create mode 100644 erpnext/agriculture/doctype/soil_texture_criteria/__init__.py create mode 100644 erpnext/agriculture/doctype/soil_texture_criteria/soil_texture_criteria.json create mode 100644 erpnext/agriculture/doctype/soil_texture_criteria/soil_texture_criteria.py create mode 100644 erpnext/agriculture/doctype/water_analysis/__init__.py create mode 100644 erpnext/agriculture/doctype/water_analysis/test_water_analysis.js create mode 100644 erpnext/agriculture/doctype/water_analysis/test_water_analysis.py create mode 100644 erpnext/agriculture/doctype/water_analysis/water_analysis.js create mode 100644 erpnext/agriculture/doctype/water_analysis/water_analysis.json create mode 100644 erpnext/agriculture/doctype/water_analysis/water_analysis.py create mode 100644 erpnext/agriculture/doctype/water_analysis_criteria/__init__.py create mode 100644 erpnext/agriculture/doctype/water_analysis_criteria/water_analysis_criteria.json create mode 100644 erpnext/agriculture/doctype/water_analysis_criteria/water_analysis_criteria.py create mode 100644 erpnext/agriculture/doctype/weather/__init__.py create mode 100644 erpnext/agriculture/doctype/weather/test_weather.js create mode 100644 erpnext/agriculture/doctype/weather/test_weather.py create mode 100644 erpnext/agriculture/doctype/weather/weather.js create mode 100644 erpnext/agriculture/doctype/weather/weather.json create mode 100644 erpnext/agriculture/doctype/weather/weather.py create mode 100644 erpnext/agriculture/doctype/weather_parameter/__init__.py create mode 100644 erpnext/agriculture/doctype/weather_parameter/weather_parameter.json create mode 100644 erpnext/agriculture/doctype/weather_parameter/weather_parameter.py create mode 100644 erpnext/agriculture/setup.py create mode 100644 erpnext/config/agriculture.py create mode 100644 erpnext/domains/agriculture.py create mode 100644 erpnext/patches/v10_0/add_agriculture_domain.py create mode 100755 erpnext/public/css/leaflet/leaflet.css create mode 100755 erpnext/public/css/leaflet/leaflet.draw.css create mode 100644 erpnext/public/images/leaflet/farmer.png create mode 100644 erpnext/public/images/leaflet/layers-2x.png create mode 100644 erpnext/public/images/leaflet/layers.png create mode 100644 erpnext/public/images/leaflet/marker-icon-2x.png create mode 100644 erpnext/public/images/leaflet/marker-icon.png create mode 100644 erpnext/public/images/leaflet/marker-shadow.png create mode 100644 erpnext/public/images/leaflet/spritesheet-2x.png create mode 100644 erpnext/public/images/leaflet/spritesheet.png create mode 100644 erpnext/public/images/leaflet/spritesheet.svg create mode 100644 erpnext/public/js/agriculture/ternary_plot.js create mode 100755 erpnext/public/js/leaflet/leaflet.draw.js create mode 100755 erpnext/public/js/leaflet/leaflet.js create mode 100644 erpnext/tests/server/agriculture.txt create mode 100644 erpnext/tests/ui/agriculture.txt diff --git a/.travis.yml b/.travis.yml index ca739db99ca..602144cd126 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,10 +64,15 @@ jobs: - bench execute erpnext.setup.utils.enable_all_roles_and_domains - bench run-ui-tests --app erpnext env: Client Side Test + - # stage + script: + - bench --verbose run-setup-wizard-ui-test + - bench execute erpnext.setup.utils.enable_all_roles_and_domains + - bench run-ui-tests --app erpnext --test-list erpnext/tests/ui/agriculture.txt + env: Agriculture Client Side Test - # stage script: - wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz - bench --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis - bench migrate env: Patch Testing - diff --git a/erpnext/agriculture/__init__.py b/erpnext/agriculture/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/__init__.py b/erpnext/agriculture/doctype/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/agriculture_analysis_criteria/__init__.py b/erpnext/agriculture/doctype/agriculture_analysis_criteria/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/agriculture_analysis_criteria/agriculture_analysis_criteria.js b/erpnext/agriculture/doctype/agriculture_analysis_criteria/agriculture_analysis_criteria.js new file mode 100644 index 00000000000..e236cc66757 --- /dev/null +++ b/erpnext/agriculture/doctype/agriculture_analysis_criteria/agriculture_analysis_criteria.js @@ -0,0 +1,8 @@ +// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Agriculture Analysis Criteria', { + refresh: function(frm) { + + } +}); diff --git a/erpnext/agriculture/doctype/agriculture_analysis_criteria/agriculture_analysis_criteria.json b/erpnext/agriculture/doctype/agriculture_analysis_criteria/agriculture_analysis_criteria.json new file mode 100644 index 00000000000..a53bffd3c70 --- /dev/null +++ b/erpnext/agriculture/doctype/agriculture_analysis_criteria/agriculture_analysis_criteria.json @@ -0,0 +1,155 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "autoname": "field:title", + "beta": 0, + "creation": "2017-12-05 16:37:46.599982", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "title", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Title", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "standard", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Standard", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "linked_doctype", + "fieldtype": "Select", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Linked Doctype", + "length": 0, + "no_copy": 0, + "options": "\nWater Analysis\nSoil Analysis\nPlant Analysis\nFertilizer\nSoil Texture\nWeather", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2017-12-05 18:54:26.250707", + "modified_by": "Administrator", + "module": "Agriculture", + "name": "Agriculture Analysis Criteria", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + } + ], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "title_field": "", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/agriculture/doctype/agriculture_analysis_criteria/agriculture_analysis_criteria.py b/erpnext/agriculture/doctype/agriculture_analysis_criteria/agriculture_analysis_criteria.py new file mode 100644 index 00000000000..3bd3d7db065 --- /dev/null +++ b/erpnext/agriculture/doctype/agriculture_analysis_criteria/agriculture_analysis_criteria.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class AgricultureAnalysisCriteria(Document): + pass diff --git a/erpnext/agriculture/doctype/agriculture_analysis_criteria/test_agriculture_analysis_criteria.js b/erpnext/agriculture/doctype/agriculture_analysis_criteria/test_agriculture_analysis_criteria.js new file mode 100644 index 00000000000..f70dcd2f322 --- /dev/null +++ b/erpnext/agriculture/doctype/agriculture_analysis_criteria/test_agriculture_analysis_criteria.js @@ -0,0 +1,23 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Agriculture Analysis Criteria", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Agriculture Analysis Criteria + () => frappe.tests.make('Agriculture Analysis Criteria', [ + // values to be set + {key: 'value'} + ]), + () => { + assert.equal(cur_frm.doc.key, 'value'); + }, + () => done() + ]); + +}); diff --git a/erpnext/agriculture/doctype/agriculture_analysis_criteria/test_agriculture_analysis_criteria.py b/erpnext/agriculture/doctype/agriculture_analysis_criteria/test_agriculture_analysis_criteria.py new file mode 100644 index 00000000000..d79970b742f --- /dev/null +++ b/erpnext/agriculture/doctype/agriculture_analysis_criteria/test_agriculture_analysis_criteria.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +class TestAgricultureAnalysisCriteria(unittest.TestCase): + pass diff --git a/erpnext/agriculture/doctype/agriculture_task/__init__.py b/erpnext/agriculture/doctype/agriculture_task/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/agriculture_task/agriculture_task.js b/erpnext/agriculture/doctype/agriculture_task/agriculture_task.js new file mode 100644 index 00000000000..4d6b9597a28 --- /dev/null +++ b/erpnext/agriculture/doctype/agriculture_task/agriculture_task.js @@ -0,0 +1,8 @@ +// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Agriculture Task', { + refresh: function(frm) { + + } +}); diff --git a/erpnext/agriculture/doctype/agriculture_task/agriculture_task.json b/erpnext/agriculture/doctype/agriculture_task/agriculture_task.json new file mode 100644 index 00000000000..11c691c3a41 --- /dev/null +++ b/erpnext/agriculture/doctype/agriculture_task/agriculture_task.json @@ -0,0 +1,199 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "autoname": "ATask.########", + "beta": 0, + "creation": "2017-10-26 15:51:19.602452", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "task_name", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Task Name", + "length": 0, + "no_copy": 0, + "options": "", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "", + "fieldname": "start_day", + "fieldtype": "Int", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Start Day", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "", + "fieldname": "end_day", + "fieldtype": "Int", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "End Day", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "Ignore holidays", + "fieldname": "holiday_management", + "fieldtype": "Select", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Holiday Management", + "length": 0, + "no_copy": 0, + "options": "Ignore holidays\nPrevious Business Day\nNext Business Day", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "Low", + "fieldname": "priority", + "fieldtype": "Select", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Priority", + "length": 0, + "no_copy": 0, + "options": "Low\nMedium\nHigh\nUrgent", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2017-12-06 01:13:14.512609", + "modified_by": "Administrator", + "module": "Agriculture", + "name": "Agriculture Task", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 0, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/agriculture/doctype/agriculture_task/agriculture_task.py b/erpnext/agriculture/doctype/agriculture_task/agriculture_task.py new file mode 100644 index 00000000000..ce39368cd99 --- /dev/null +++ b/erpnext/agriculture/doctype/agriculture_task/agriculture_task.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class AgricultureTask(Document): + pass diff --git a/erpnext/agriculture/doctype/agriculture_task/test_agriculture_task.js b/erpnext/agriculture/doctype/agriculture_task/test_agriculture_task.js new file mode 100644 index 00000000000..a012c4b1ade --- /dev/null +++ b/erpnext/agriculture/doctype/agriculture_task/test_agriculture_task.js @@ -0,0 +1,23 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Agriculture Task", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Agriculture Task + () => frappe.tests.make('Agriculture Task', [ + // values to be set + {key: 'value'} + ]), + () => { + assert.equal(cur_frm.doc.key, 'value'); + }, + () => done() + ]); + +}); diff --git a/erpnext/agriculture/doctype/agriculture_task/test_agriculture_task.py b/erpnext/agriculture/doctype/agriculture_task/test_agriculture_task.py new file mode 100644 index 00000000000..e828151d0d8 --- /dev/null +++ b/erpnext/agriculture/doctype/agriculture_task/test_agriculture_task.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +class TestAgricultureTask(unittest.TestCase): + pass diff --git a/erpnext/agriculture/doctype/crop/__init__.py b/erpnext/agriculture/doctype/crop/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/crop/crop.js b/erpnext/agriculture/doctype/crop/crop.js new file mode 100644 index 00000000000..587727c5bb3 --- /dev/null +++ b/erpnext/agriculture/doctype/crop/crop.js @@ -0,0 +1,7 @@ +// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Crop', { + validate: (frm) => { + } +}); \ No newline at end of file diff --git a/erpnext/agriculture/doctype/crop/crop.json b/erpnext/agriculture/doctype/crop/crop.json new file mode 100644 index 00000000000..8e6807f6fbb --- /dev/null +++ b/erpnext/agriculture/doctype/crop/crop.json @@ -0,0 +1,1045 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "autoname": "field:title", + "beta": 0, + "creation": "2017-10-20 01:16:17.606174", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "title", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Title", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_2", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "crop_name", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Crop Name", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_4", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "scientific_name", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Scientific Name", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "description": "You can define all the tasks which need to carried out for this crop here. The day field is used to mention the day on which the task needs to be carried out, 1 being the 1st day, etc.. ", + "fieldname": "section_break_20", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Tasks", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "agriculture_task", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Agriculture Task", + "length": 0, + "no_copy": 0, + "options": "Agriculture Task", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "0", + "fieldname": "period", + "fieldtype": "Int", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Period", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_9", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "crop_spacing", + "fieldtype": "Float", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Crop Spacing", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "crop_spacing_uom", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Crop Spacing UOM", + "length": 0, + "no_copy": 0, + "options": "UOM", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_12", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "row_spacing", + "fieldtype": "Float", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Row Spacing", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "row_spacing_uom", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Row Spacing UOM", + "length": 0, + "no_copy": 0, + "options": "UOM", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_4", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "type", + "fieldtype": "Select", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Type", + "length": 0, + "no_copy": 0, + "options": "Annual\nPerennial\nBiennial", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_6", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "category", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Category", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_8", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "target_warehouse", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Target Warehouse", + "length": 0, + "no_copy": 0, + "options": "Warehouse", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_12", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "planting_uom", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Planting UOM", + "length": 0, + "no_copy": 0, + "options": "UOM", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "planting_area", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Planting Area", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_14", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "yield_uom", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Yield UOM", + "length": 0, + "no_copy": 0, + "options": "UOM", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_16", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_17", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Materials Required", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "materials_required", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Materials Required", + "length": 0, + "no_copy": 0, + "options": "BOM Item", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_19", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Produced Items", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "produce", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Produce", + "length": 0, + "no_copy": 0, + "options": "BOM Item", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_18", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Byproducts", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "byproducts", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Byproducts", + "length": 0, + "no_copy": 0, + "options": "BOM Item", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2017-12-06 11:00:06.333894", + "modified_by": "Administrator", + "module": "Agriculture", + "name": "Crop", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Agriculture Manager", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + }, + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 0, + "delete": 0, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Agriculture User", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + } + ], + "quick_entry": 0, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/agriculture/doctype/crop/crop.py b/erpnext/agriculture/doctype/crop/crop.py new file mode 100644 index 00000000000..29b982399c4 --- /dev/null +++ b/erpnext/agriculture/doctype/crop/crop.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class Crop(Document): + def validate(self): + max_period = 0 + for task in self.agriculture_task: + # validate start_day is not > end_day + if task.start_day > task.end_day: + frappe.throw("Start day is greater than end day in task '{0}'".format(task.subject)) + # to calculate the period of the Crop Cycle + if task.end_day > max_period: max_period = task.end_day + if max_period > self.period: self.period = max_period \ No newline at end of file diff --git a/erpnext/agriculture/doctype/crop/crop_dashboard.py b/erpnext/agriculture/doctype/crop/crop_dashboard.py new file mode 100644 index 00000000000..715f92b6ebb --- /dev/null +++ b/erpnext/agriculture/doctype/crop/crop_dashboard.py @@ -0,0 +1,11 @@ +from frappe import _ + +def get_data(): + return { + 'transactions': [ + { + 'label': _('Crop Cycle'), + 'items': ['Crop Cycle'] + } + ] + } \ No newline at end of file diff --git a/erpnext/agriculture/doctype/crop/test_crop.js b/erpnext/agriculture/doctype/crop/test_crop.js new file mode 100644 index 00000000000..138acbf85a3 --- /dev/null +++ b/erpnext/agriculture/doctype/crop/test_crop.js @@ -0,0 +1,116 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Crop", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(2); + + frappe.run_serially([ + // insert a new Item + () => frappe.tests.make('Item', [ + // values to be set + {item_code: 'Basil Seeds'}, + {item_name: 'Basil Seeds'}, + {item_group: 'Seed'} + ]), + // insert a new Item + () => frappe.tests.make('Item', [ + // values to be set + {item_code: 'Twigs'}, + {item_name: 'Twigs'}, + {item_group: 'By-product'} + ]), + // insert a new Item + () => frappe.tests.make('Item', [ + // values to be set + {item_code: 'Basil Leaves'}, + {item_name: 'Basil Leaves'}, + {item_group: 'Produce'} + ]), + // insert a new Crop + () => frappe.tests.make('Crop', [ + // values to be set + {title: 'Basil from seed'}, + {crop_name: 'Basil'}, + {scientific_name: 'Ocimum basilicum'}, + {materials_required: [ + [ + {item_code: 'Basil Seeds'}, + {qty: '25'}, + {uom: 'Nos'}, + {rate: '1'} + ], + [ + {item_code: 'Urea'}, + {qty: '5'}, + {uom: 'Kg'}, + {rate: '10'} + ] + ]}, + {byproducts: [ + [ + {item_code: 'Twigs'}, + {qty: '25'}, + {uom: 'Nos'}, + {rate: '1'} + ] + ]}, + {produce: [ + [ + {item_code: 'Basil Leaves'}, + {qty: '100'}, + {uom: 'Nos'}, + {rate: '1'} + ] + ]}, + {agriculture_task: [ + [ + {task_name: "Plough the field"}, + {start_day: 1}, + {end_day: 1}, + {holiday_management: "Ignore holidays"} + ], + [ + {task_name: "Plant the seeds"}, + {start_day: 2}, + {end_day: 3}, + {holiday_management: "Ignore holidays"} + ], + [ + {task_name: "Water the field"}, + {start_day: 4}, + {end_day: 4}, + {holiday_management: "Ignore holidays"} + ], + [ + {task_name: "First harvest"}, + {start_day: 8}, + {end_day: 8}, + {holiday_management: "Ignore holidays"} + ], + [ + {task_name: "Add the fertilizer"}, + {start_day: 10}, + {end_day: 12}, + {holiday_management: "Ignore holidays"} + ], + [ + {task_name: "Final cut"}, + {start_day: 15}, + {end_day: 15}, + {holiday_management: "Ignore holidays"} + ] + ]} + ]), + // agriculture task list + () => { + assert.equal(cur_frm.doc.name, 'Basil from seed'); + assert.equal(cur_frm.doc.period, 15); + }, + () => done() + ]); + +}); diff --git a/erpnext/agriculture/doctype/crop/test_crop.py b/erpnext/agriculture/doctype/crop/test_crop.py new file mode 100644 index 00000000000..5c992ead684 --- /dev/null +++ b/erpnext/agriculture/doctype/crop/test_crop.py @@ -0,0 +1,14 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +test_dependencies = ["Fertilizer"] + +class TestCrop(unittest.TestCase): + def test_crop_period(self): + basil = frappe.get_doc('Crop', 'Basil from seed') + self.assertEquals(basil.period, 15) \ No newline at end of file diff --git a/erpnext/agriculture/doctype/crop/test_records.json b/erpnext/agriculture/doctype/crop/test_records.json new file mode 100644 index 00000000000..41ddb9af228 --- /dev/null +++ b/erpnext/agriculture/doctype/crop/test_records.json @@ -0,0 +1,80 @@ +[ + { + "doctype": "Item", + "item_code": "Basil Seeds", + "item_name": "Basil Seeds", + "item_group": "Seed" + }, + { + "doctype": "Item", + "item_code": "Twigs", + "item_name": "Twigs", + "item_group": "By-product" + }, + { + "doctype": "Item", + "item_code": "Basil Leaves", + "item_name": "Basil Leaves", + "item_group": "Produce" + }, + { + "doctype": "Crop", + "title": "Basil from seed", + "crop_name": "Basil", + "scientific_name": "Ocimum basilicum", + "materials_required": [{ + "item_code": "Basil Seeds", + "qty": "25", + "uom": "Nos", + "rate": "1" + }, { + "item_code": "Urea", + "qty": "5", + "uom": "Kg", + "rate": "10" + }], + "byproducts": [{ + "item_code": "Twigs", + "qty": "25", + "uom": "Nos", + "rate": "1" + }], + "produce": [{ + "item_code": "Basil Leaves", + "qty": "100", + "uom": "Nos", + "rate": "1" + }], + "agriculture_task": [{ + "task_name": "Plough the field", + "start_day": 1, + "end_day": 1, + "holiday_management": "Ignore holidays" + }, { + "task_name": "Plant the seeds", + "start_day": 2, + "end_day": 3, + "holiday_management": "Ignore holidays" + }, { + "task_name": "Water the field", + "start_day": 4, + "end_day": 4, + "holiday_management": "Ignore holidays" + }, { + "task_name": "First harvest", + "start_day": 8, + "end_day": 8, + "holiday_management": "Ignore holidays" + }, { + "task_name": "Add the fertilizer", + "start_day": 10, + "end_day": 12, + "holiday_management": "Ignore holidays" + }, { + "task_name": "Final cut", + "start_day": 15, + "end_day": 15, + "holiday_management": "Ignore holidays" + }] + } +] \ No newline at end of file diff --git a/erpnext/agriculture/doctype/crop_cycle/__init__.py b/erpnext/agriculture/doctype/crop_cycle/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js b/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js new file mode 100644 index 00000000000..98dd056a2b6 --- /dev/null +++ b/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js @@ -0,0 +1,48 @@ +// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Crop Cycle', { + refresh: (frm) => { + if (!frm.doc.__islocal) + frm.add_custom_button(__('Reload Linked Analysis'), () => frm.call("reload_linked_analysis")); + + frappe.realtime.on("List of Linked Docs", (output) => { + let analysis_doctypes = ['Soil Texture', 'Plant Analysis', 'Soil Analysis']; + let analysis_doctypes_docs = ['soil_texture', 'plant_analysis', 'soil_analysis']; + let obj_to_append = {soil_analysis: [], soil_texture: [], plant_analysis: []}; + output['Land Unit'].forEach( (land_doc) => { + analysis_doctypes.forEach( (doctype) => { + output[doctype].forEach( (analysis_doc) => { + let point_to_be_tested = JSON.parse(analysis_doc.location).features[0].geometry.coordinates; + let poly_of_land = JSON.parse(land_doc.location).features[0].geometry.coordinates[0]; + if (test_analysis_position(point_to_be_tested, poly_of_land)){ + obj_to_append[analysis_doctypes_docs[analysis_doctypes.indexOf(doctype)]].push(analysis_doc.name); + } + }); + }); + }); + frm.call('append_to_child', { + obj_to_append: obj_to_append + }); + }); + } +}); + +function test_analysis_position(point, vs) { + // ray-casting algorithm based on + // http://www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html + + var x = point[0], y = point[1]; + + var inside = false; + for (var i = 0, j = vs.length - 1; i < vs.length; j = i++) { + var xi = vs[i][0], yi = vs[i][1]; + var xj = vs[j][0], yj = vs[j][1]; + + var intersect = ((yi > y) != (yj > y)) + && (x < (xj - xi) * (y - yi) / (yj - yi) + xi); + if (intersect) inside = !inside; + } + + return inside; +}; diff --git a/erpnext/agriculture/doctype/crop_cycle/crop_cycle.json b/erpnext/agriculture/doctype/crop_cycle/crop_cycle.json new file mode 100644 index 00000000000..410a0d45fdc --- /dev/null +++ b/erpnext/agriculture/doctype/crop_cycle/crop_cycle.json @@ -0,0 +1,849 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "autoname": "field:title", + "beta": 0, + "creation": "2017-11-02 03:09:35.449880", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "title", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Title", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "crop", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Crop", + "length": 0, + "no_copy": 0, + "options": "Crop", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "description": "", + "fieldname": "column_break_3", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Linked Land Unit", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "description": "A link to all the Land Units in which the Crop is growing", + "fieldname": "linked_land_unit", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Linked Land Unit", + "length": 0, + "no_copy": 0, + "options": "Linked Land Unit", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_3", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "depends_on": "eval:!doc.__islocal", + "fieldname": "project", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 1, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Project", + "length": 0, + "no_copy": 0, + "options": "Project", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_12", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "description": "This will be day 1 of the crop cycle", + "fieldname": "start_date", + "fieldtype": "Date", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Start Date", + "length": 0, + "no_copy": 0, + "options": "", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "end_date", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "End Date", + "length": 0, + "no_copy": 0, + "options": "project.expected_end_date", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_7", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "iso_8016_standard", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "ISO 8016 standard", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_5", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "cycle_type", + "fieldtype": "Select", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Cycle Type", + "length": 0, + "no_copy": 0, + "options": "Yearly\nLess than a year", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_12", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "description": "The minimum length between each plant in the field for optimum growth", + "fieldname": "crop_spacing", + "fieldtype": "Float", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Crop Spacing", + "length": 0, + "no_copy": 0, + "options": "crop.crop_spacing", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "crop_spacing_uom", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Crop Spacing UOM", + "length": 0, + "no_copy": 0, + "options": "UOM", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_11", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "description": "The minimum distance between rows of plants for optimum growth", + "fieldname": "row_spacing", + "fieldtype": "Float", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Row Spacing", + "length": 0, + "no_copy": 0, + "options": "crop.row_spacing", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "row_spacing_uom", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Row Spacing UOM", + "length": 0, + "no_copy": 0, + "options": "UOM", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "description": "List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ", + "fieldname": "section_break_14", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Detected Diseases", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "detected_disease", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Detected Disease", + "length": 0, + "no_copy": 0, + "options": "Detected Disease", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 1, + "collapsible_depends_on": "eval:false", + "columns": 0, + "fieldname": "section_break_22", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "LInked Analysis", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "soil_texture", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Soil Texture", + "length": 0, + "no_copy": 0, + "options": "Linked Soil Texture", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "soil_analysis", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Soil Analysis", + "length": 0, + "no_copy": 0, + "options": "Linked Soil Analysis", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "plant_analysis", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Plant Analysis", + "length": 0, + "no_copy": 0, + "options": "Linked Plant Analysis", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2017-12-06 01:47:26.656870", + "modified_by": "Administrator", + "module": "Agriculture", + "name": "Crop Cycle", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Agriculture Manager", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + }, + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 0, + "delete": 0, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Agriculture User", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + } + ], + "quick_entry": 0, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/agriculture/doctype/crop_cycle/crop_cycle.py b/erpnext/agriculture/doctype/crop_cycle/crop_cycle.py new file mode 100644 index 00000000000..8912f598639 --- /dev/null +++ b/erpnext/agriculture/doctype/crop_cycle/crop_cycle.py @@ -0,0 +1,62 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document +import ast + +class CropCycle(Document): + def validate(self): + if self.is_new(): + crop = frappe.get_doc('Crop', self.crop) + self.create_project(crop.period, crop.agriculture_task) + if not self.project: + self.project = self.name + for detected_disease in self.detected_disease: + disease = frappe.get_doc('Disease', detected_disease.disease) + self.create_task(disease.treatment_task, self.name, detected_disease.start_date) + + def create_project(self, period, crop_tasks): + project = frappe.new_doc("Project") + project.project_name = self.title + project.expected_start_date = self.start_date + project.expected_end_date = frappe.utils.data.add_days(self.start_date, period-1) + project.insert() + self.create_task(crop_tasks, project.as_dict.im_self.name, self.start_date) + return project.as_dict.im_self.name + + def create_task(self, crop_tasks, project_name, start_date): + for crop_task in crop_tasks: + task = frappe.new_doc("Task") + task.subject = crop_task.get("task_name") + task.priority = crop_task.get("priority") + task.project = project_name + task.exp_start_date = frappe.utils.data.add_days(start_date, crop_task.get("start_day")-1) + task.exp_end_date = frappe.utils.data.add_days(start_date, crop_task.get("end_day")-1) + task.insert() + + def reload_linked_analysis(self): + linked_doctypes = ['Soil Texture', 'Soil Analysis', 'Plant Analysis'] + required_fields = ['location', 'name', 'collection_datetime'] + output = {} + for doctype in linked_doctypes: + output[doctype] = frappe.get_all(doctype, fields=required_fields) + output['Land Unit'] = [] + for land in self.linked_land_unit: + output['Land Unit'].append(frappe.get_doc('Land Unit', land.land_unit)) + + frappe.publish_realtime("List of Linked Docs", output, user=frappe.session.user) + + def append_to_child(self, obj_to_append): + for doctype in obj_to_append: + for doc_name in set(obj_to_append[doctype]): + self.append(doctype, {doctype: doc_name}) + self.save() + + def get_coordinates(self, doc): + return ast.literal_eval(doc.location).get('features')[0].get('geometry').get('coordinates') + + def get_geometry_type(self, doc): + return ast.literal_eval(doc.location).get('features')[0].get('geometry').get('type') \ No newline at end of file diff --git a/erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.js b/erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.js new file mode 100644 index 00000000000..464a3680baa --- /dev/null +++ b/erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.js @@ -0,0 +1,34 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Crop Cycle", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Crop Cycle + () => frappe.tests.make('Crop Cycle', [ + // values to be set + {title: 'Basil from seed 2017'}, + {detected_disease: [ + [ + {start_date: '2017-11-21'}, + {disease: 'Aphids'} + ] + ]}, + {linked_land_unit: [ + [ + {land_unit: 'Basil Farm'} + ] + ]}, + {crop: 'Basil from seed'}, + {start_date: '2017-11-11'}, + {cycle_type: 'Less than a year'} + ]), + () => assert.equal(cur_frm.doc.name, 'Basil from seed 2017'), + () => done() + ]); +}); diff --git a/erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.py b/erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.py new file mode 100644 index 00000000000..0c3db73ee4d --- /dev/null +++ b/erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.py @@ -0,0 +1,68 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +test_dependencies = ["Crop", "Fertilizer", "Land Unit", "Disease"] + +class TestCropCycle(unittest.TestCase): + def test_crop_cycle_creation(self): + cycle = frappe.get_doc('Crop Cycle', 'Basil from seed 2017') + self.assertEquals(frappe.db.exists('Crop Cycle', 'Basil from seed 2017'), 'Basil from seed 2017') + + # check if the tasks were created + self.assertEquals(check_task_creation(), True) + self.assertEquals(check_project_creation(), True) + +def check_task_creation(): + all_task_dict = { + "Survey and find the aphid locations": { + "exp_start_date": frappe.utils.datetime.date(2017,11,21), + "exp_end_date": frappe.utils.datetime.date(2017,11,22) + }, + "Apply Pesticides": { + "exp_start_date": frappe.utils.datetime.date(2017,11,23), + "exp_end_date": frappe.utils.datetime.date(2017,11,23) + }, + "Plough the field": { + "exp_start_date": frappe.utils.datetime.date(2017,11,11), + "exp_end_date": frappe.utils.datetime.date(2017,11,11) + }, + "Plant the seeds": { + "exp_start_date": frappe.utils.datetime.date(2017,11,12), + "exp_end_date": frappe.utils.datetime.date(2017,11,13) + }, + "Water the field": { + "exp_start_date": frappe.utils.datetime.date(2017,11,14), + "exp_end_date": frappe.utils.datetime.date(2017,11,14) + }, + "First harvest": { + "exp_start_date": frappe.utils.datetime.date(2017,11,18), + "exp_end_date": frappe.utils.datetime.date(2017,11,18) + }, + "Add the fertilizer": { + "exp_start_date": frappe.utils.datetime.date(2017,11,20), + "exp_end_date": frappe.utils.datetime.date(2017,11,22) + }, + "Final cut":{ + "exp_start_date": frappe.utils.datetime.date(2017,11,25), + "exp_end_date": frappe.utils.datetime.date(2017,11,25) + } + } + all_tasks = frappe.get_all('Task') + for task in all_tasks: + sample_task = frappe.get_doc('Task', task.name) + if sample_task.subject in all_task_dict.keys(): + if sample_task.exp_start_date != all_task_dict[sample_task.subject]['exp_start_date'] or sample_task.exp_end_date != all_task_dict[sample_task.subject]['exp_end_date']: + return False + all_task_dict.pop(sample_task.subject) + if all_task_dict != {}: + return False + return True + +def check_project_creation(): + if frappe.db.exists('Project', 'Basil from seed 2017'): return True + else: return False \ No newline at end of file diff --git a/erpnext/agriculture/doctype/crop_cycle/test_records.json b/erpnext/agriculture/doctype/crop_cycle/test_records.json new file mode 100644 index 00000000000..fade7a0f9e1 --- /dev/null +++ b/erpnext/agriculture/doctype/crop_cycle/test_records.json @@ -0,0 +1,15 @@ +[ + { + "doctype": "Crop Cycle", + "title": "Basil from seed 2017", + "linked_land_unit": [{ + "land_unit": "Basil Farm" + }], + "crop": "Basil from seed", + "start_date": "2017-11-11", + "detected_disease": [{ + "disease": "Aphids", + "start_date": "2017-11-21" + }] + } +] \ No newline at end of file diff --git a/erpnext/agriculture/doctype/detected_disease/__init__.py b/erpnext/agriculture/doctype/detected_disease/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/detected_disease/detected_disease.json b/erpnext/agriculture/doctype/detected_disease/detected_disease.json new file mode 100644 index 00000000000..cf44149cb9b --- /dev/null +++ b/erpnext/agriculture/doctype/detected_disease/detected_disease.json @@ -0,0 +1,102 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 0, + "creation": "2017-11-20 17:31:30.772779", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "disease", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Disease", + "length": 0, + "no_copy": 0, + "options": "Disease", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "start_date", + "fieldtype": "Date", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Start Date", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2017-11-26 21:10:14.753511", + "modified_by": "Administrator", + "module": "Agriculture", + "name": "Detected Disease", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/agriculture/doctype/detected_disease/detected_disease.py b/erpnext/agriculture/doctype/detected_disease/detected_disease.py new file mode 100644 index 00000000000..8c90b839b59 --- /dev/null +++ b/erpnext/agriculture/doctype/detected_disease/detected_disease.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class DetectedDisease(Document): + pass diff --git a/erpnext/agriculture/doctype/disease/__init__.py b/erpnext/agriculture/doctype/disease/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/disease/disease.js b/erpnext/agriculture/doctype/disease/disease.js new file mode 100644 index 00000000000..f6b678c1a9e --- /dev/null +++ b/erpnext/agriculture/doctype/disease/disease.js @@ -0,0 +1,8 @@ +// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Disease', { + refresh: function(frm) { + + } +}); diff --git a/erpnext/agriculture/doctype/disease/disease.json b/erpnext/agriculture/doctype/disease/disease.json new file mode 100644 index 00000000000..e10b1cadf38 --- /dev/null +++ b/erpnext/agriculture/doctype/disease/disease.json @@ -0,0 +1,293 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "autoname": "field:common_name", + "beta": 0, + "creation": "2017-11-20 17:16:54.496355", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "common_name", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Common Name", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "scientific_name", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Scientific Name", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_3", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "description", + "fieldtype": "Long Text", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Description", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_2", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Treatment Task", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "treatment_task", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Treatment Task", + "length": 0, + "no_copy": 0, + "options": "Agriculture Task", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "treatment_period", + "fieldtype": "Int", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Treatment Period", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2017-12-04 19:20:19.352479", + "modified_by": "Administrator", + "module": "Agriculture", + "name": "Disease", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Agriculture Manager", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + }, + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 0, + "delete": 0, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Agriculture User", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + } + ], + "quick_entry": 0, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/agriculture/doctype/disease/disease.py b/erpnext/agriculture/doctype/disease/disease.py new file mode 100644 index 00000000000..42005d6b06c --- /dev/null +++ b/erpnext/agriculture/doctype/disease/disease.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class Disease(Document): + def validate(self): + max_period = 0 + for task in self.treatment_task: + # validate start_day is not > end_day + if task.start_day > task.end_day: + frappe.throw("Start day is greater than end day in task '{0}'".format(task.task_name)) + # to calculate the period of the Crop Cycle + if task.end_day > max_period: max_period = task.end_day + self.treatment_period = max_period \ No newline at end of file diff --git a/erpnext/agriculture/doctype/disease/test_disease.js b/erpnext/agriculture/doctype/disease/test_disease.js new file mode 100644 index 00000000000..57d62c16c25 --- /dev/null +++ b/erpnext/agriculture/doctype/disease/test_disease.js @@ -0,0 +1,39 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Disease", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Disease + () => frappe.tests.make('Disease', [ + // values to be set + {common_name: 'Aphids'}, + {scientific_name: 'Aphidoidea'}, + {treatment_task: [ + [ + {task_name: "Survey and find the aphid locations"}, + {start_day: 1}, + {end_day: 2}, + {holiday_management: "Ignore holidays"} + ], + [ + {task_name: "Apply Pesticides"}, + {start_day: 3}, + {end_day: 3}, + {holiday_management: "Ignore holidays"} + ] + ]} + ]), + () => { + assert.equal(cur_frm.doc.treatment_period, 3); + }, + () => done() + ]); + +}); + diff --git a/erpnext/agriculture/doctype/disease/test_disease.py b/erpnext/agriculture/doctype/disease/test_disease.py new file mode 100644 index 00000000000..a040358d92f --- /dev/null +++ b/erpnext/agriculture/doctype/disease/test_disease.py @@ -0,0 +1,12 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +class TestDisease(unittest.TestCase): + def test_treatment_period(self): + disease = frappe.get_doc('Disease', 'Aphids') + self.assertEquals(disease.treatment_period, 3) \ No newline at end of file diff --git a/erpnext/agriculture/doctype/disease/test_records.json b/erpnext/agriculture/doctype/disease/test_records.json new file mode 100644 index 00000000000..e91a61190db --- /dev/null +++ b/erpnext/agriculture/doctype/disease/test_records.json @@ -0,0 +1,18 @@ +[ + { + "doctype": "Disease", + "common_name": "Aphids", + "scientific_name": "Aphidoidea", + "treatment_task": [{ + "task_name": "Survey and find the aphid locations", + "start_day": 1, + "end_day": 2, + "holiday_management": "Ignore holidays" + }, { + "task_name": "Apply Pesticides", + "start_day": 3, + "end_day": 3, + "holiday_management": "Ignore holidays" + }] + } +] \ No newline at end of file diff --git a/erpnext/agriculture/doctype/fertilizer/__init__.py b/erpnext/agriculture/doctype/fertilizer/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/fertilizer/fertilizer.js b/erpnext/agriculture/doctype/fertilizer/fertilizer.js new file mode 100644 index 00000000000..357e089af24 --- /dev/null +++ b/erpnext/agriculture/doctype/fertilizer/fertilizer.js @@ -0,0 +1,8 @@ +// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Fertilizer', { + onload: (frm) => { + if (frm.doc.fertilizer_contents == undefined) frm.call('load_contents'); + } +}); diff --git a/erpnext/agriculture/doctype/fertilizer/fertilizer.json b/erpnext/agriculture/doctype/fertilizer/fertilizer.json new file mode 100644 index 00000000000..b2a1b81294d --- /dev/null +++ b/erpnext/agriculture/doctype/fertilizer/fertilizer.json @@ -0,0 +1,292 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "autoname": "field:fertilizer_name", + "beta": 0, + "creation": "2017-10-17 18:17:06.175062", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "fertilizer_name", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Fertilizer Name", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "item", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Item", + "length": 0, + "no_copy": 0, + "options": "Item", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_2", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "density", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Density (if liquid)", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_4", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_28", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Fertilizer Contents", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "fertilizer_contents", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "options": "Fertilizer Content", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2017-12-05 19:13:42.471667", + "modified_by": "Administrator", + "module": "Agriculture", + "name": "Fertilizer", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Agriculture Manager", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + }, + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 0, + "delete": 0, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Agriculture User", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + } + ], + "quick_entry": 0, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/agriculture/doctype/fertilizer/fertilizer.py b/erpnext/agriculture/doctype/fertilizer/fertilizer.py new file mode 100644 index 00000000000..dc2781cf006 --- /dev/null +++ b/erpnext/agriculture/doctype/fertilizer/fertilizer.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class Fertilizer(Document): + def load_contents(self): + docs = frappe.get_all("Agriculture Analysis Criteria", filters={'linked_doctype':'Fertilizer'}) + for doc in docs: + self.append('fertilizer_contents', {'title': str(doc.name)}) \ No newline at end of file diff --git a/erpnext/agriculture/doctype/fertilizer/test_fertilizer.js b/erpnext/agriculture/doctype/fertilizer/test_fertilizer.js new file mode 100644 index 00000000000..5dd73137873 --- /dev/null +++ b/erpnext/agriculture/doctype/fertilizer/test_fertilizer.js @@ -0,0 +1,31 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Fertilizer", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Item + () => frappe.tests.make('Item', [ + // values to be set + {item_code: 'Urea'}, + {item_name: 'Urea'}, + {item_group: 'Fertilizer'} + ]), + // insert a new Fertilizer + () => frappe.tests.make('Fertilizer', [ + // values to be set + {fertilizer_name: 'Urea'}, + {item: 'Urea'} + ]), + () => { + assert.equal(cur_frm.doc.name, 'Urea'); + }, + () => done() + ]); + +}); diff --git a/erpnext/agriculture/doctype/fertilizer/test_fertilizer.py b/erpnext/agriculture/doctype/fertilizer/test_fertilizer.py new file mode 100644 index 00000000000..3b34e4fb857 --- /dev/null +++ b/erpnext/agriculture/doctype/fertilizer/test_fertilizer.py @@ -0,0 +1,11 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +class TestFertilizer(unittest.TestCase): + def test_fertilizer_creation(self): + self.assertEquals(frappe.db.exists('Fertilizer', 'Urea'), 'Urea') \ No newline at end of file diff --git a/erpnext/agriculture/doctype/fertilizer/test_records.json b/erpnext/agriculture/doctype/fertilizer/test_records.json new file mode 100644 index 00000000000..ba735cd9850 --- /dev/null +++ b/erpnext/agriculture/doctype/fertilizer/test_records.json @@ -0,0 +1,13 @@ +[ + { + "doctype": "Item", + "item_code": "Urea", + "item_name": "Urea", + "item_group": "Fertilizer" + }, + { + "doctype": "Fertilizer", + "fertilizer_name": "Urea", + "item": "Urea" + } +] \ No newline at end of file diff --git a/erpnext/agriculture/doctype/fertilizer_content/__init__.py b/erpnext/agriculture/doctype/fertilizer_content/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/fertilizer_content/fertilizer_content.json b/erpnext/agriculture/doctype/fertilizer_content/fertilizer_content.json new file mode 100644 index 00000000000..bf222abaca3 --- /dev/null +++ b/erpnext/agriculture/doctype/fertilizer_content/fertilizer_content.json @@ -0,0 +1,103 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 0, + "creation": "2017-12-05 16:54:17.071914", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "title", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Title", + "length": 0, + "no_copy": 0, + "options": "Agriculture Analysis Criteria", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "value", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Value", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2017-12-05 19:20:38.892231", + "modified_by": "Administrator", + "module": "Agriculture", + "name": "Fertilizer Content", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "restrict_to_domain": "Agriculture", + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/agriculture/doctype/fertilizer_content/fertilizer_content.py b/erpnext/agriculture/doctype/fertilizer_content/fertilizer_content.py new file mode 100644 index 00000000000..d3852425918 --- /dev/null +++ b/erpnext/agriculture/doctype/fertilizer_content/fertilizer_content.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class FertilizerContent(Document): + pass diff --git a/erpnext/agriculture/doctype/land_unit/__init__.py b/erpnext/agriculture/doctype/land_unit/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/land_unit/land_unit.js b/erpnext/agriculture/doctype/land_unit/land_unit.js new file mode 100644 index 00000000000..c9ab3483cd9 --- /dev/null +++ b/erpnext/agriculture/doctype/land_unit/land_unit.js @@ -0,0 +1,31 @@ +// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt + +// Code for finding the area of editable features drawn on the geolocation control + + + +frappe.ui.form.on('Land Unit', { + setup: function(frm) { + frm.add_fetch("parent_land_unit", "latitude", "latitude"); + frm.add_fetch("parent_land_unit", "longitude", "longitude"); + }, + + onload_post_render(frm){ + if(!frm.doc.location && frm.doc.latitude && frm.doc.longitude) { + frm.fields_dict.location.map.setView([frm.doc.latitude, frm.doc.longitude],13); + } + else { + frm.doc.latitude = frm.fields_dict.location.map.getCenter()['lat']; + frm.doc.longitude = frm.fields_dict.location.map.getCenter()['lng']; + } + }, + refresh: function(frm) { + if(!frm.doc.parent_land_unit) { + frm.set_read_only(); + frm.set_intro(__("This is a root land unit and cannot be edited.")); + } else { + frm.set_intro(null); + } + }, +}); diff --git a/erpnext/agriculture/doctype/land_unit/land_unit.json b/erpnext/agriculture/doctype/land_unit/land_unit.json new file mode 100644 index 00000000000..9ed3d0377bd --- /dev/null +++ b/erpnext/agriculture/doctype/land_unit/land_unit.json @@ -0,0 +1,690 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 1, + "allow_rename": 1, + "autoname": "field:land_unit_name", + "beta": 0, + "creation": "2017-10-21 05:35:34.508529", + "custom": 0, + "description": "Land Unit describing various land assets", + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "land_unit_name", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Land Unit Name", + "length": 0, + "no_copy": 1, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 1, + "collapsible": 0, + "columns": 0, + "fieldname": "parent_land_unit", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 1, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Parent Land Unit", + "length": 0, + "no_copy": 0, + "options": "Land Unit", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_2", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "description": "Check if it is a hydroponic unit", + "fieldname": "is_container", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Is Container", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 1, + "collapsible": 0, + "columns": 0, + "default": "", + "fieldname": "is_group", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Is Group", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "tree_details", + "fieldtype": "Section Break", + "hidden": 1, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Tree Details", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "lft", + "fieldtype": "Int", + "hidden": 1, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "lft", + "length": 0, + "no_copy": 1, + "permlevel": 0, + "precision": "", + "print_hide": 1, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 1, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "rgt", + "fieldtype": "Int", + "hidden": 1, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "rgt", + "length": 0, + "no_copy": 1, + "permlevel": 0, + "precision": "", + "print_hide": 1, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 1, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "old_parent", + "fieldtype": "Link", + "hidden": 1, + "ignore_user_permissions": 1, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "old_parent", + "length": 0, + "no_copy": 1, + "options": "Land Unit", + "permlevel": 0, + "precision": "", + "print_hide": 1, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 1, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "land_unit_details", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Land Unit Details", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "latitude", + "fieldtype": "Float", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Latitude", + "length": 0, + "no_copy": 0, + "options": "", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "longitude", + "fieldtype": "Float", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Longitude", + "length": 0, + "no_copy": 0, + "options": "", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "latlong", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "area", + "fieldtype": "Float", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Area", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_13", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "location", + "fieldtype": "Geolocation", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Location", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_17", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "linked_soil_texture", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Linked Soil Texture", + "length": 0, + "no_copy": 0, + "options": "Linked Soil Texture", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "linked_soil_analysis", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Linked Soil Analysis", + "length": 0, + "no_copy": 0, + "options": "Linked Soil Analysis", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "linked_plant_analysis", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Linked Plant Analysis", + "length": 0, + "no_copy": 0, + "options": "Linked Plant Analysis", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2017-12-05 10:57:33.108504", + "modified_by": "Administrator", + "module": "Agriculture", + "name": "Land Unit", + "name_case": "Title Case", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Agriculture Manager", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + }, + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 0, + "delete": 0, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Agriculture User", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + } + ], + "quick_entry": 0, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 1, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 0, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/agriculture/doctype/land_unit/land_unit.py b/erpnext/agriculture/doctype/land_unit/land_unit.py new file mode 100644 index 00000000000..634cb75a25e --- /dev/null +++ b/erpnext/agriculture/doctype/land_unit/land_unit.py @@ -0,0 +1,165 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +import json +import math + +from frappe import _ + +from frappe.utils.nestedset import NestedSet +# from frappe.model.document import Document + +RADIUS = 6378137 +FLATTENING_DENOM = 298.257223563 +FLATTENING = 1/FLATTENING_DENOM +POLAR_RADIUS = RADIUS*(1-FLATTENING) + +class LandUnit(NestedSet): + # pass + nsm_parent_field = 'parent_land_unit' + + def on_trash(self): + ancestors = self.get_ancestors() + for ancestor in ancestors: + ancestor_doc = frappe.get_doc('Land Unit', ancestor) + ancestor_child_features, ancestor_non_child_features = ancestor_doc.feature_seperator(child_feature = self.get('land_unit_name')) + ancestor_features = ancestor_non_child_features + for index,feature in enumerate(ancestor_features): + ancestor_features[index] = json.loads(feature) + ancestor_doc.set_location_value(features = ancestor_features) + ancestor_doc.db_set(fieldname='area', value=ancestor_doc.get('area')-self.get('area'),commit=True) + + def validate(self): + if not self.is_new(): + if not self.get('location'): + features = '' + else: + features = json.loads(self.get('location')).get('features') + new_area = compute_area(features) + self.area_difference = new_area - self.area + self.area = new_area + + if self.get('parent'): + ancestors = self.get_ancestors() + self_features = self.add_child_property() + self_features = set(self_features) + + for ancestor in ancestors: + ancestor_doc = frappe.get_doc('Land Unit', ancestor) + ancestor_child_features, ancestor_non_child_features = ancestor_doc.feature_seperator(child_feature = self.get('land_unit_name')) + ancestor_features = list(set(ancestor_non_child_features)) + child_features = set(ancestor_child_features) + + if not (self_features.issubset(child_features) and child_features.issubset(self_features)): + features_to_be_appended = self_features - child_features + features_to_be_discarded = child_features - self_features + for feature in features_to_be_discarded: + child_features.discard(feature) + for feature in features_to_be_appended: + child_features.add(feature) + child_features = list(child_features) + + ancestor_features.extend(child_features) + for index,feature in enumerate(ancestor_features): + ancestor_features[index] = json.loads(feature) + ancestor_doc.set_location_value(features = ancestor_features) + ancestor_doc.db_set(fieldname='area', value=ancestor_doc.get('area')+\ + self.get('area_difference'),commit=True) + + def set_location_value(self, features): + if not self.get('location'): + self.location = '{"type":"FeatureCollection","features":[]}' + location = json.loads(self.location) + location['features'] = features + self.db_set(fieldname='location', value=json.dumps(location), commit=True) + + def on_update(self): + super(LandUnit, self).on_update() + self.validate_one_root() + + def add_child_property(self): + location = self.get('location') + if location: + features = json.loads(location).get('features') + if type(features) != list: + features = json.loads(features) + filter_features = [feature for feature in features if feature.get('properties').get('child_feature') != True] + for index,feature in enumerate(filter_features): + feature['properties'].update({'child_feature': True, 'feature_of': self.land_unit_name}) + filter_features[index] = json.dumps(filter_features[index]) + return filter_features + return [] + + def feature_seperator(self, child_feature=None): + doc = self + child_features = [] + non_child_features = [] + location = doc.get('location') + if location: + features = json.loads(location).get('features') + if type(features) != list: + features = json.loads(features) + for feature in features: + if feature.get('properties').get('feature_of') == child_feature: + child_features.extend([json.dumps(feature)]) + else: + non_child_features.extend([json.dumps(feature)]) + + return child_features, non_child_features + + +def compute_area(features): + layer_area = 0 + for feature in features: + if feature.get('geometry').get('type') == 'Polygon': + layer_area += polygon_area(coords = feature.get('geometry').get('coordinates')) + elif feature.get('geometry').get('type') == 'Point' and feature.get('properties').get('point_type') == 'circle': + layer_area += math.pi * math.pow(feature.get('properties').get('radius'), 2) + return layer_area + +def rad(angle_in_degrees): + return angle_in_degrees*math.pi/180 + +def polygon_area(coords): + area = 0 + if coords and len(coords) > 0: + area += math.fabs(ring_area(coords[0])); + for i in range(1, len(coords)): + area -= math.fabs(ring_area(coords[i])); + return area; + +def ring_area(coords): + p1 = 0 + p2 = 0 + p3 = 0 + lower_index = 0 + middle_index = 0 + upper_index = 0 + i = 0 + area = 0 + coords_length = len(coords) + if coords_length > 2: + for i in range(0, coords_length): + if i == coords_length - 2: # i = N-2 + lower_index = coords_length - 2; + middle_index = coords_length -1; + upper_index = 0; + elif i == coords_length - 1: # i = N-1 + lower_index = coords_length - 1; + middle_index = 0; + upper_index = 1; + else: # i = 0 to N-3 + lower_index = i; + middle_index = i+1; + upper_index = i+2; + p1 = coords[lower_index]; + p2 = coords[middle_index]; + p3 = coords[upper_index]; + area += ( rad(p3[0]) - rad(p1[0]) ) * math.sin( rad(p2[1])); + + area = area * RADIUS * RADIUS / 2 + return area + \ No newline at end of file diff --git a/erpnext/agriculture/doctype/land_unit/land_unit_tree.js b/erpnext/agriculture/doctype/land_unit/land_unit_tree.js new file mode 100644 index 00000000000..0d7a53eda9a --- /dev/null +++ b/erpnext/agriculture/doctype/land_unit/land_unit_tree.js @@ -0,0 +1,15 @@ +frappe.treeview_settings["Land Unit"] = { + ignore_fields:["parent_land_unit"], + disable_add_node: true, + toolbar: [ + { toggle_btn: true }, + { + label:__("Add Child"), + click: function(node) { + var lu = frappe.new_doc("Land Unit", { + "parent_land_unit": node.label + }) + } + } + ], +} \ No newline at end of file diff --git a/erpnext/agriculture/doctype/land_unit/test_land_unit.js b/erpnext/agriculture/doctype/land_unit/test_land_unit.js new file mode 100644 index 00000000000..c23db7711a7 --- /dev/null +++ b/erpnext/agriculture/doctype/land_unit/test_land_unit.js @@ -0,0 +1,24 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Land Unit", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Land Unit + () => frappe.tests.make('Land Unit', [ + // values to be set + {parent_land_unit: 'All Land Units'}, + {land_unit_name: 'Basil Farm'} + ]), + () => { + assert.equal(cur_frm.doc.name, 'Basil Farm'); + }, + () => done() + ]); + +}); diff --git a/erpnext/agriculture/doctype/land_unit/test_land_unit.py b/erpnext/agriculture/doctype/land_unit/test_land_unit.py new file mode 100644 index 00000000000..cf08f987eaf --- /dev/null +++ b/erpnext/agriculture/doctype/land_unit/test_land_unit.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals +import json +import frappe +import unittest + +class TestLandUnit(unittest.TestCase): + + def runTest(self): + land_units = ['Basil Farm', 'Division 1', 'Field 1', 'Block 1'] + area = 0 + formatted_land_units = [] + for land_unit in land_units: + doc = frappe.get_doc('Land Unit', land_unit) + doc.save() + area += doc.area + temp = json.loads(doc.location) + temp['features'][0]['properties']['child_feature'] = True + temp['features'][0]['properties']['feature_of'] = land_unit + formatted_land_units.extend(temp['features']) + formatted_land_unit_string = str(formatted_land_units) + all_land_units = frappe.get_doc('Land Unit', 'All Land Units') + self.assertEquals(formatted_land_unit_string, str(json.loads(all_land_units.get('location'))['features'])) + self.assertEquals(area, all_land_units.get('area')) diff --git a/erpnext/agriculture/doctype/land_unit/test_records.json b/erpnext/agriculture/doctype/land_unit/test_records.json new file mode 100644 index 00000000000..6baaf2754ba --- /dev/null +++ b/erpnext/agriculture/doctype/land_unit/test_records.json @@ -0,0 +1,38 @@ +[ + { + "doctype": "Land Unit", + "land_unit_name": "Basil Farm", + "location": "{\"type\":\"FeatureCollection\",\"features\":[{\"type\":\"Feature\",\"properties\":{\"point_type\":\"circle\",\"radius\":884.5625420736483},\"geometry\":{\"type\":\"Point\",\"coordinates\":[72.875834,19.100566]}}]}", + "parent_land_unit": "All Land Units", + "parent": "All Land Units", + "is_group": 1, + "is_container": 1 + }, + { + "doctype": "Land Unit", + "land_unit_name": "Division 1", + "location": "{\"type\":\"FeatureCollection\",\"features\":[{\"type\":\"Feature\",\"properties\":{\"point_type\":\"circle\",\"radius\":542.3424997060739},\"geometry\":{\"type\":\"Point\",\"coordinates\":[72.852359,19.11557]}}]}", + "parent_land_unit": "Basil Farm", + "parent": "Basil Farm", + "is_group": 1, + "is_container": 1 + }, + { + "doctype": "Land Unit", + "land_unit_name": "Field 1", + "location": "{\"type\":\"FeatureCollection\",\"features\":[{\"type\":\"Feature\",\"properties\":{},\"geometry\":{\"type\":\"Polygon\",\"coordinates\":[[[72.846758,19.118287],[72.846758,19.121206],[72.850535,19.121206],[72.850535,19.118287],[72.846758,19.118287]]]}}]}", + "parent_land_unit": "Division 1", + "parent": "Division 1", + "is_group": 1, + "is_container": 1 + }, + { + "doctype": "Land Unit", + "land_unit_name": "Block 1", + "location": "{\"type\":\"FeatureCollection\",\"features\":[{\"type\":\"Feature\",\"properties\":{},\"geometry\":{\"type\":\"Polygon\",\"coordinates\":[[[72.921495,19.073313],[72.924929,19.068121],[72.934713,19.06585],[72.929392,19.05579],[72.94158,19.056926],[72.951365,19.095213],[72.921495,19.073313]]]}}]}", + "parent_land_unit": "Field 1", + "parent": "Field 1", + "is_group": 0, + "is_container": 1 + } +] \ No newline at end of file diff --git a/erpnext/agriculture/doctype/linked_land_unit/__init__.py b/erpnext/agriculture/doctype/linked_land_unit/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/linked_land_unit/linked_land_unit.json b/erpnext/agriculture/doctype/linked_land_unit/linked_land_unit.json new file mode 100644 index 00000000000..63816b85748 --- /dev/null +++ b/erpnext/agriculture/doctype/linked_land_unit/linked_land_unit.json @@ -0,0 +1,72 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 0, + "creation": "2017-11-22 14:34:59.461273", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "land_unit", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Land Unit", + "length": 0, + "no_copy": 0, + "options": "Land Unit", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2017-12-04 13:25:50.856991", + "modified_by": "Administrator", + "module": "Agriculture", + "name": "Linked Land Unit", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/agriculture/doctype/linked_land_unit/linked_land_unit.py b/erpnext/agriculture/doctype/linked_land_unit/linked_land_unit.py new file mode 100644 index 00000000000..266edb9b121 --- /dev/null +++ b/erpnext/agriculture/doctype/linked_land_unit/linked_land_unit.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class LinkedLandUnit(Document): + pass diff --git a/erpnext/agriculture/doctype/linked_plant_analysis/__init__.py b/erpnext/agriculture/doctype/linked_plant_analysis/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/linked_plant_analysis/linked_plant_analysis.json b/erpnext/agriculture/doctype/linked_plant_analysis/linked_plant_analysis.json new file mode 100644 index 00000000000..e136d611359 --- /dev/null +++ b/erpnext/agriculture/doctype/linked_plant_analysis/linked_plant_analysis.json @@ -0,0 +1,72 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 0, + "creation": "2017-11-22 15:04:25.180446", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "plant_analysis", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Plant Analysis", + "length": 0, + "no_copy": 0, + "options": "Plant Analysis", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2017-12-04 13:25:30.437597", + "modified_by": "Administrator", + "module": "Agriculture", + "name": "Linked Plant Analysis", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/agriculture/doctype/linked_plant_analysis/linked_plant_analysis.py b/erpnext/agriculture/doctype/linked_plant_analysis/linked_plant_analysis.py new file mode 100644 index 00000000000..daea54b6132 --- /dev/null +++ b/erpnext/agriculture/doctype/linked_plant_analysis/linked_plant_analysis.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class LinkedPlantAnalysis(Document): + pass diff --git a/erpnext/agriculture/doctype/linked_soil_analysis/__init__.py b/erpnext/agriculture/doctype/linked_soil_analysis/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/linked_soil_analysis/linked_soil_analysis.json b/erpnext/agriculture/doctype/linked_soil_analysis/linked_soil_analysis.json new file mode 100644 index 00000000000..a248ed0218d --- /dev/null +++ b/erpnext/agriculture/doctype/linked_soil_analysis/linked_soil_analysis.json @@ -0,0 +1,72 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 0, + "creation": "2017-11-22 15:00:37.259063", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "soil_analysis", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Soil Analysis", + "length": 0, + "no_copy": 0, + "options": "Soil Analysis", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2017-12-04 13:26:18.682109", + "modified_by": "Administrator", + "module": "Agriculture", + "name": "Linked Soil Analysis", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/agriculture/doctype/linked_soil_analysis/linked_soil_analysis.py b/erpnext/agriculture/doctype/linked_soil_analysis/linked_soil_analysis.py new file mode 100644 index 00000000000..c4e9245cd79 --- /dev/null +++ b/erpnext/agriculture/doctype/linked_soil_analysis/linked_soil_analysis.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class LinkedSoilAnalysis(Document): + pass diff --git a/erpnext/agriculture/doctype/linked_soil_texture/__init__.py b/erpnext/agriculture/doctype/linked_soil_texture/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/linked_soil_texture/linked_soil_texture.json b/erpnext/agriculture/doctype/linked_soil_texture/linked_soil_texture.json new file mode 100644 index 00000000000..5df18129ef4 --- /dev/null +++ b/erpnext/agriculture/doctype/linked_soil_texture/linked_soil_texture.json @@ -0,0 +1,72 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 0, + "creation": "2017-11-22 14:58:52.818040", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "soil_texture", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Soil Texture", + "length": 0, + "no_copy": 0, + "options": "Soil Texture", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2017-12-04 13:26:07.773314", + "modified_by": "Administrator", + "module": "Agriculture", + "name": "Linked Soil Texture", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/agriculture/doctype/linked_soil_texture/linked_soil_texture.py b/erpnext/agriculture/doctype/linked_soil_texture/linked_soil_texture.py new file mode 100644 index 00000000000..1b7589298e2 --- /dev/null +++ b/erpnext/agriculture/doctype/linked_soil_texture/linked_soil_texture.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class LinkedSoilTexture(Document): + pass diff --git a/erpnext/agriculture/doctype/plant_analysis/__init__.py b/erpnext/agriculture/doctype/plant_analysis/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/plant_analysis/plant_analysis.js b/erpnext/agriculture/doctype/plant_analysis/plant_analysis.js new file mode 100644 index 00000000000..3914f832a5a --- /dev/null +++ b/erpnext/agriculture/doctype/plant_analysis/plant_analysis.js @@ -0,0 +1,17 @@ +// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Plant Analysis', { + onload: (frm) => { + if (frm.doc.plant_analysis_criteria == undefined) frm.call('load_contents'); + }, + refresh: (frm) => { + let map_tools = ["a.leaflet-draw-draw-polyline", + "a.leaflet-draw-draw-polygon", + "a.leaflet-draw-draw-rectangle", + "a.leaflet-draw-draw-circle", + "a.leaflet-draw-draw-circlemarker"]; + + map_tools.forEach((element) => $(element).hide()); + } +}); diff --git a/erpnext/agriculture/doctype/plant_analysis/plant_analysis.json b/erpnext/agriculture/doctype/plant_analysis/plant_analysis.json new file mode 100644 index 00000000000..cb66103ac37 --- /dev/null +++ b/erpnext/agriculture/doctype/plant_analysis/plant_analysis.json @@ -0,0 +1,353 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "autoname": "PANA.#####", + "beta": 0, + "creation": "2017-10-18 12:45:13.575986", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "crop", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Crop", + "length": 0, + "no_copy": 0, + "options": "Crop", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_1", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "location", + "fieldtype": "Geolocation", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Location", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_2", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "collection_datetime", + "fieldtype": "Datetime", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Collection Datetime", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "laboratory_testing_datetime", + "fieldtype": "Datetime", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Laboratory Testing Datetime", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "result_datetime", + "fieldtype": "Datetime", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Result Datetime", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_2", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Plant Analysis Criterias", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "plant_analysis_criteria", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "", + "length": 0, + "no_copy": 0, + "options": "Plant Analysis Criteria", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2017-12-05 19:29:58.612659", + "modified_by": "Administrator", + "module": "Agriculture", + "name": "Plant Analysis", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Agriculture Manager", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + }, + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 0, + "delete": 0, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Agriculture User", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + } + ], + "quick_entry": 0, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/agriculture/doctype/plant_analysis/plant_analysis.py b/erpnext/agriculture/doctype/plant_analysis/plant_analysis.py new file mode 100644 index 00000000000..304727e04fb --- /dev/null +++ b/erpnext/agriculture/doctype/plant_analysis/plant_analysis.py @@ -0,0 +1,14 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.naming import make_autoname +from frappe.model.document import Document + +class PlantAnalysis(Document): + def load_contents(self): + docs = frappe.get_all("Agriculture Analysis Criteria", filters={'linked_doctype':'Plant Analysis'}) + for doc in docs: + self.append('plant_analysis_criteria', {'title': str(doc.name)}) \ No newline at end of file diff --git a/erpnext/agriculture/doctype/plant_analysis/test_plant_analysis.js b/erpnext/agriculture/doctype/plant_analysis/test_plant_analysis.js new file mode 100644 index 00000000000..786c0471a47 --- /dev/null +++ b/erpnext/agriculture/doctype/plant_analysis/test_plant_analysis.js @@ -0,0 +1,23 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Plant Analysis", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Plant Analysis + () => frappe.tests.make('Plant Analysis', [ + // values to be set + {key: 'value'} + ]), + () => { + assert.equal(cur_frm.doc.key, 'value'); + }, + () => done() + ]); + +}); diff --git a/erpnext/agriculture/doctype/plant_analysis/test_plant_analysis.py b/erpnext/agriculture/doctype/plant_analysis/test_plant_analysis.py new file mode 100644 index 00000000000..cbd2fd7431a --- /dev/null +++ b/erpnext/agriculture/doctype/plant_analysis/test_plant_analysis.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +class TestPlantAnalysis(unittest.TestCase): + pass diff --git a/erpnext/agriculture/doctype/plant_analysis_criteria/__init__.py b/erpnext/agriculture/doctype/plant_analysis_criteria/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/plant_analysis_criteria/plant_analysis_criteria.json b/erpnext/agriculture/doctype/plant_analysis_criteria/plant_analysis_criteria.json new file mode 100644 index 00000000000..9b07a8a1f1b --- /dev/null +++ b/erpnext/agriculture/doctype/plant_analysis_criteria/plant_analysis_criteria.json @@ -0,0 +1,162 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 0, + "creation": "2017-12-05 19:23:52.481348", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "title", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Title", + "length": 0, + "no_copy": 0, + "options": "Agriculture Analysis Criteria", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "value", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Value", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "minimum_permissible_value", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Minimum Permissible Value", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "maximum_permissible_value", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Maximum Permissible Value", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2017-12-05 19:37:02.289320", + "modified_by": "Administrator", + "module": "Agriculture", + "name": "Plant Analysis Criteria", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/agriculture/doctype/plant_analysis_criteria/plant_analysis_criteria.py b/erpnext/agriculture/doctype/plant_analysis_criteria/plant_analysis_criteria.py new file mode 100644 index 00000000000..c1731846a86 --- /dev/null +++ b/erpnext/agriculture/doctype/plant_analysis_criteria/plant_analysis_criteria.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class PlantAnalysisCriteria(Document): + pass diff --git a/erpnext/agriculture/doctype/soil_analysis/__init__.py b/erpnext/agriculture/doctype/soil_analysis/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/soil_analysis/soil_analysis.js b/erpnext/agriculture/doctype/soil_analysis/soil_analysis.js new file mode 100644 index 00000000000..12829beefb2 --- /dev/null +++ b/erpnext/agriculture/doctype/soil_analysis/soil_analysis.js @@ -0,0 +1,17 @@ +// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Soil Analysis', { + onload: (frm) => { + if (frm.doc.soil_analysis_criteria == undefined) frm.call('load_contents'); + }, + refresh: (frm) => { + let map_tools = ["a.leaflet-draw-draw-polyline", + "a.leaflet-draw-draw-polygon", + "a.leaflet-draw-draw-rectangle", + "a.leaflet-draw-draw-circle", + "a.leaflet-draw-draw-circlemarker"]; + + map_tools.forEach((element) => $(element).hide()); + } +}); diff --git a/erpnext/agriculture/doctype/soil_analysis/soil_analysis.json b/erpnext/agriculture/doctype/soil_analysis/soil_analysis.json new file mode 100644 index 00000000000..e92cc3e983f --- /dev/null +++ b/erpnext/agriculture/doctype/soil_analysis/soil_analysis.json @@ -0,0 +1,560 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "autoname": "SANA.#####", + "beta": 0, + "creation": "2017-10-17 19:12:16.728395", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "location", + "fieldtype": "Geolocation", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Location", + "length": 0, + "no_copy": 0, + "options": "", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_2", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "collection_datetime", + "fieldtype": "Datetime", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Collection Datetime", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "laboratory_testing_datetime", + "fieldtype": "Datetime", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Laboratory Testing Datetime", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "result_datetime", + "fieldtype": "Datetime", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Result Datetime", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_3", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "ca_per_k", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Ca/K", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "ca_per_mg", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Ca/Mg", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "mg_per_k", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Mg/K", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_31", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "ca_mg_per_k", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "(Ca+Mg)/K", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "ca_per_k_ca_mg", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Ca/(K+Ca+Mg)", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_28", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "invoice_number", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Invoice Number", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "soil_analysis_criterias", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Soil Analysis Criterias", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "soil_analysis_criteria", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "options": "Soil Analysis Criteria", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2017-12-05 19:43:05.543080", + "modified_by": "Administrator", + "module": "Agriculture", + "name": "Soil Analysis", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Agriculture Manager", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + }, + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 0, + "delete": 0, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Agriculture User", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + } + ], + "quick_entry": 0, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/agriculture/doctype/soil_analysis/soil_analysis.py b/erpnext/agriculture/doctype/soil_analysis/soil_analysis.py new file mode 100644 index 00000000000..17b96a0ac15 --- /dev/null +++ b/erpnext/agriculture/doctype/soil_analysis/soil_analysis.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class SoilAnalysis(Document): + def load_contents(self): + docs = frappe.get_all("Agriculture Analysis Criteria", filters={'linked_doctype':'Soil Analysis'}) + for doc in docs: + self.append('soil_analysis_criteria', {'title': str(doc.name)}) \ No newline at end of file diff --git a/erpnext/agriculture/doctype/soil_analysis/test_soil_analysis.js b/erpnext/agriculture/doctype/soil_analysis/test_soil_analysis.js new file mode 100644 index 00000000000..29128eba27d --- /dev/null +++ b/erpnext/agriculture/doctype/soil_analysis/test_soil_analysis.js @@ -0,0 +1,23 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Soil Analysis", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Soil Analysis + () => frappe.tests.make('Soil Analysis', [ + // values to be set + {key: 'value'} + ]), + () => { + assert.equal(cur_frm.doc.key, 'value'); + }, + () => done() + ]); + +}); diff --git a/erpnext/agriculture/doctype/soil_analysis/test_soil_analysis.py b/erpnext/agriculture/doctype/soil_analysis/test_soil_analysis.py new file mode 100644 index 00000000000..b89d7563115 --- /dev/null +++ b/erpnext/agriculture/doctype/soil_analysis/test_soil_analysis.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +class TestSoilAnalysis(unittest.TestCase): + pass diff --git a/erpnext/agriculture/doctype/soil_analysis_criteria/__init__.py b/erpnext/agriculture/doctype/soil_analysis_criteria/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/soil_analysis_criteria/soil_analysis_criteria.json b/erpnext/agriculture/doctype/soil_analysis_criteria/soil_analysis_criteria.json new file mode 100644 index 00000000000..d2627e42452 --- /dev/null +++ b/erpnext/agriculture/doctype/soil_analysis_criteria/soil_analysis_criteria.json @@ -0,0 +1,162 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 0, + "creation": "2017-12-05 19:36:05.300770", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "title", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Title", + "length": 0, + "no_copy": 0, + "options": "Agriculture Analysis Criteria", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "value", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Value", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "minimum_permissible_value", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Minimum Permissible Value", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "maximum_permissible_value", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Maximum Permissible Value", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2017-12-05 23:35:34.569482", + "modified_by": "Administrator", + "module": "Agriculture", + "name": "Soil Analysis Criteria", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/agriculture/doctype/soil_analysis_criteria/soil_analysis_criteria.py b/erpnext/agriculture/doctype/soil_analysis_criteria/soil_analysis_criteria.py new file mode 100644 index 00000000000..b073c200c09 --- /dev/null +++ b/erpnext/agriculture/doctype/soil_analysis_criteria/soil_analysis_criteria.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class SoilAnalysisCriteria(Document): + pass diff --git a/erpnext/agriculture/doctype/soil_texture/__init__.py b/erpnext/agriculture/doctype/soil_texture/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/soil_texture/soil_texture.js b/erpnext/agriculture/doctype/soil_texture/soil_texture.js new file mode 100644 index 00000000000..1cb84087951 --- /dev/null +++ b/erpnext/agriculture/doctype/soil_texture/soil_texture.js @@ -0,0 +1,59 @@ +// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt + +frappe.provide('agriculture'); + +frappe.ui.form.on('Soil Texture', { + refresh: (frm) => { + let map_tools = ["a.leaflet-draw-draw-polyline", + "a.leaflet-draw-draw-polygon", + "a.leaflet-draw-draw-rectangle", + "a.leaflet-draw-draw-circle", + "a.leaflet-draw-draw-circlemarker"]; + + map_tools.forEach((element) => $(element).hide()); + }, + onload: function(frm) { + if (frm.doc.soil_texture_criteria == undefined) frm.call('load_contents'); + if (this.ternary_plot) return; + this.ternary_plot = new agriculture.TernaryPlot({ + parent: frm.get_field("ternary_plot").$wrapper, + clay: frm.doc.clay_composition, + sand: frm.doc.sand_composition, + silt: frm.doc.silt_composition, + }); + }, + soil_type: (frm) => { + let composition_types = ['clay_composition', 'sand_composition', 'silt_composition']; + composition_types.forEach((composition_type) => { + frm.doc[composition_type] = 0; + frm.refresh_field(composition_type); + }); + }, + clay_composition: function(frm) { + frm.call("update_soil_edit", { + soil_type: 'clay_composition' + }, () => { + refresh_ternary_plot(frm, this); + }); + }, + sand_composition: function(frm) { + frm.call("update_soil_edit", { + soil_type: 'sand_composition' + }, () => { + refresh_ternary_plot(frm, this); + }); + }, + silt_composition: function(frm) { + frm.call("update_soil_edit", { + soil_type: 'silt_composition' + }, () => { + refresh_ternary_plot(frm, this); + }); + } +}); + +let refresh_ternary_plot = (frm, me) => { + me.ternary_plot.remove_blip(); + me.ternary_plot.mark_blip({clay: frm.doc.clay_composition, sand: frm.doc.sand_composition, silt: frm.doc.silt_composition}); +}; diff --git a/erpnext/agriculture/doctype/soil_texture/soil_texture.json b/erpnext/agriculture/doctype/soil_texture/soil_texture.json new file mode 100644 index 00000000000..308039bceb5 --- /dev/null +++ b/erpnext/agriculture/doctype/soil_texture/soil_texture.json @@ -0,0 +1,504 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "autoname": "STEXT.#####", + "beta": 0, + "creation": "2017-10-18 13:06:47.506762", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "location", + "fieldtype": "Geolocation", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Location", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_2", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "collection_datetime", + "fieldtype": "Datetime", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Collection Datetime", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "laboratory_testing_datetime", + "fieldtype": "Datetime", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Laboratory Testing Datetime", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "result_datetime", + "fieldtype": "Datetime", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Result Datetime", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_4", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "soil_type", + "fieldtype": "Select", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Soil Type", + "length": 0, + "no_copy": 0, + "options": "Select\nSand\nLoamy Sand\nSandy Loam\nLoam\nSilt Loam\nSilt\nSandy Clay Loam\nClay Loam\nSilty Clay Loam\nSandy Clay\nSilty Clay\nClay", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "0", + "fieldname": "clay_composition", + "fieldtype": "Percent", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Clay Composition (%)", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "0", + "fieldname": "sand_composition", + "fieldtype": "Percent", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Sand Composition (%)", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "0", + "fieldname": "silt_composition", + "fieldtype": "Percent", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Silt Composition (%)", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_6", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "ternary_plot", + "fieldtype": "HTML", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Ternary Plot", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_15", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Soil Texture Criteria", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "soil_texture_criteria", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "options": "Soil Texture Criteria", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2017-12-05 23:57:10.725578", + "modified_by": "Administrator", + "module": "Agriculture", + "name": "Soil Texture", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Agriculture Manager", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + }, + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 0, + "delete": 0, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Agriculture User", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + } + ], + "quick_entry": 0, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/agriculture/doctype/soil_texture/soil_texture.py b/erpnext/agriculture/doctype/soil_texture/soil_texture.py new file mode 100644 index 00000000000..7345e862b95 --- /dev/null +++ b/erpnext/agriculture/doctype/soil_texture/soil_texture.py @@ -0,0 +1,68 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document +from frappe.utils import flt, cint + +class SoilTexture(Document): + soil_edit_order = [2, 1, 0] + soil_types = ['clay_composition', 'sand_composition', 'silt_composition'] + + def load_contents(self): + docs = frappe.get_all("Agriculture Analysis Criteria", filters={'linked_doctype':'Soil Texture'}) + for doc in docs: + self.append('soil_texture_criteria', {'title': str(doc.name)}) + + def validate(self): + self.update_soil_edit('sand_composition') + for soil_type in self.soil_types: + if self.get(soil_type) > 100 or self.get(soil_type) < 0: + frappe.throw("{0} should be a value between 0 and 100".format(soil_type)) + if sum(self.get(soil_type) for soil_type in self.soil_types) != 100: + frappe.throw('Soil compositions do not add up to 100') + + def update_soil_edit(self, soil_type): + self.soil_edit_order[self.soil_types.index(soil_type)] = max(self.soil_edit_order)+1 + self.soil_type = self.get_soil_type() + + def get_soil_type(self): + # update the last edited soil type + if sum(self.soil_edit_order) < 5: return + last_edit_index = self.soil_edit_order.index(min(self.soil_edit_order)) + + # set composition of the last edited soil + self.set( self.soil_types[last_edit_index], + 100 - sum(cint(self.get(soil_type)) for soil_type in self.soil_types) + cint(self.get(self.soil_types[last_edit_index]))) + + # calculate soil type + c, sa, si = flt(self.clay_composition), flt(self.sand_composition), flt(self.silt_composition) + + if si + (1.5 * c) < 15: + return 'Sand' + elif si + 1.5 * c >= 15 and si + 2 * c < 30: + return 'Loamy Sand' + elif ((c >= 7 and c < 20) or (sa > 52) and ((si + 2*c) >= 30) or (c < 7 and si < 50 and (si+2*c) >= 30)): + return 'Sandy Loam' + elif ((c >= 7 and c < 27) and (si >= 28 and si < 50) and (sa <= 52)): + return 'Loam' + elif ((si >= 50 and (c >= 12 and c < 27)) or ((si >= 50 and si < 80) and c < 12)): + return 'Silt Loam' + elif (si >= 80 and c < 12): + return 'Silt' + elif ((c >= 20 and c < 35) and (si < 28) and (sa > 45)): + return 'Sandy Clay Loam' + elif ((c >= 27 and c < 40) and (sa > 20 and sa <= 45)): + return 'Clay Loam' + elif ((c >= 27 and c < 40) and (sa <= 20)): + return 'Silty Clay Loam' + elif (c >= 35 and sa > 45): + return 'Sandy Clay' + elif (c >= 40 and si >= 40): + return 'Silty Clay' + elif (c >= 40 and sa <= 45 and si < 40): + return 'Clay' + else: + return 'Select' \ No newline at end of file diff --git a/erpnext/agriculture/doctype/soil_texture/test_records.json b/erpnext/agriculture/doctype/soil_texture/test_records.json new file mode 100644 index 00000000000..dcac7ad8df0 --- /dev/null +++ b/erpnext/agriculture/doctype/soil_texture/test_records.json @@ -0,0 +1,9 @@ +[ + { + "doctype": "Soil Texture", + "location": "{\"type\":\"FeatureCollection\",\"features\":[{\"type\":\"Feature\",\"properties\":{},\"geometry\":{\"type\":\"Point\",\"coordinates\":[72.861242,19.079153]}}]}", + "collection_datetime": "2017-11-08", + "clay_composition": 20, + "sand_composition": 30 + } +] \ No newline at end of file diff --git a/erpnext/agriculture/doctype/soil_texture/test_soil_texture.js b/erpnext/agriculture/doctype/soil_texture/test_soil_texture.js new file mode 100644 index 00000000000..d93f852750f --- /dev/null +++ b/erpnext/agriculture/doctype/soil_texture/test_soil_texture.js @@ -0,0 +1,26 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Soil Texture", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(2); + + frappe.run_serially([ + // insert a new Soil Texture + () => frappe.tests.make('Soil Texture', [ + // values to be set + {location: '{"type":"FeatureCollection","features":[{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[72.882185,19.076395]}}]}'}, + {collection_datetime: '2017-11-08'}, + {clay_composition: 20}, + {sand_composition: 30} + ]), + () => { + assert.equal(cur_frm.doc.silt_composition, 50); + assert.equal(cur_frm.doc.soil_type, 'Silt Loam'); + }, + () => done() + ]); +}); diff --git a/erpnext/agriculture/doctype/soil_texture/test_soil_texture.py b/erpnext/agriculture/doctype/soil_texture/test_soil_texture.py new file mode 100644 index 00000000000..3f20e1933c6 --- /dev/null +++ b/erpnext/agriculture/doctype/soil_texture/test_soil_texture.py @@ -0,0 +1,14 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +class TestSoilTexture(unittest.TestCase): + def test_texture_selection(self): + soil_tex = frappe.get_all('Soil Texture', fields=['name'], filters={'collection_datetime': '2017-11-08'}) + doc = frappe.get_doc('Soil Texture', soil_tex[0].name) + self.assertEquals(doc.silt_composition, 50) + self.assertEquals(doc.soil_type, 'Silt Loam') \ No newline at end of file diff --git a/erpnext/agriculture/doctype/soil_texture_criteria/__init__.py b/erpnext/agriculture/doctype/soil_texture_criteria/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/soil_texture_criteria/soil_texture_criteria.json b/erpnext/agriculture/doctype/soil_texture_criteria/soil_texture_criteria.json new file mode 100644 index 00000000000..e48a34b35bf --- /dev/null +++ b/erpnext/agriculture/doctype/soil_texture_criteria/soil_texture_criteria.json @@ -0,0 +1,162 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 0, + "creation": "2017-12-05 23:45:17.419610", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "title", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Title", + "length": 0, + "no_copy": 0, + "options": "Agriculture Analysis Criteria", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "value", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Value", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "minimum_permissible_value", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Minimum Permissible Value", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "maximum_permissible_value", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Maximum Permissible Value", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2017-12-05 23:45:17.419610", + "modified_by": "Administrator", + "module": "Agriculture", + "name": "Soil Texture Criteria", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/agriculture/doctype/soil_texture_criteria/soil_texture_criteria.py b/erpnext/agriculture/doctype/soil_texture_criteria/soil_texture_criteria.py new file mode 100644 index 00000000000..a7525ae6e96 --- /dev/null +++ b/erpnext/agriculture/doctype/soil_texture_criteria/soil_texture_criteria.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class SoilTextureCriteria(Document): + pass diff --git a/erpnext/agriculture/doctype/water_analysis/__init__.py b/erpnext/agriculture/doctype/water_analysis/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/water_analysis/test_water_analysis.js b/erpnext/agriculture/doctype/water_analysis/test_water_analysis.js new file mode 100644 index 00000000000..bb01cb3ce2b --- /dev/null +++ b/erpnext/agriculture/doctype/water_analysis/test_water_analysis.js @@ -0,0 +1,25 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Water Analysis", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Water Analysis + () => frappe.tests.make('Water Analysis', [ + // values to be set + {location: '{"type":"FeatureCollection","features":[{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[72.882185,19.076395]}}]}'}, + {collection_datetime: '2017-11-08 18:43:57'}, + {laboratory_testing_datetime: '2017-11-10 18:43:57'} + ]), + () => { + assert.equal(cur_frm.doc.result_datetime, '2017-11-10 18:43:57'); + }, + () => done() + ]); + +}); diff --git a/erpnext/agriculture/doctype/water_analysis/test_water_analysis.py b/erpnext/agriculture/doctype/water_analysis/test_water_analysis.py new file mode 100644 index 00000000000..b6467b7f45d --- /dev/null +++ b/erpnext/agriculture/doctype/water_analysis/test_water_analysis.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +class TestWaterAnalysis(unittest.TestCase): + pass diff --git a/erpnext/agriculture/doctype/water_analysis/water_analysis.js b/erpnext/agriculture/doctype/water_analysis/water_analysis.js new file mode 100644 index 00000000000..13fe3adde63 --- /dev/null +++ b/erpnext/agriculture/doctype/water_analysis/water_analysis.js @@ -0,0 +1,18 @@ +// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Water Analysis', { + onload: (frm) => { + if (frm.doc.water_analysis_criteria == undefined) frm.call('load_contents'); + }, + refresh: (frm) => { + let map_tools = ["a.leaflet-draw-draw-polyline", + "a.leaflet-draw-draw-polygon", + "a.leaflet-draw-draw-rectangle", + "a.leaflet-draw-draw-circle", + "a.leaflet-draw-draw-circlemarker"]; + + map_tools.forEach((element) => $(element).hide()); + }, + laboratory_testing_datetime: (frm) => frm.call("update_lab_result_date") +}); diff --git a/erpnext/agriculture/doctype/water_analysis/water_analysis.json b/erpnext/agriculture/doctype/water_analysis/water_analysis.json new file mode 100644 index 00000000000..467dde4765d --- /dev/null +++ b/erpnext/agriculture/doctype/water_analysis/water_analysis.json @@ -0,0 +1,561 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "autoname": "WANA.#####", + "beta": 0, + "creation": "2017-10-17 18:51:19.946950", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "location", + "fieldtype": "Geolocation", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Location", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_2", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "collection_datetime", + "fieldtype": "Datetime", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Collection Datetime", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "laboratory_testing_datetime", + "fieldtype": "Datetime", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Laboratory Testing Datetime", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "result_datetime", + "fieldtype": "Datetime", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Result Datetime", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_4", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "type_of_sample", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Type of Sample", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "container", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Container", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "origin", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Origin", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_8", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "collection_temperature", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Collection Temperature ", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "storage_temperature", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Storage Temperature", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "appearance", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Appearance", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "person_responsible", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Person Responsible", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_29", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Water Analysis Criteria", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "water_analysis_criteria", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "options": "Water Analysis Criteria", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2017-12-05 23:42:50.684183", + "modified_by": "Administrator", + "module": "Agriculture", + "name": "Water Analysis", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Agriculture Manager", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + }, + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 0, + "delete": 0, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Agriculture User", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + } + ], + "quick_entry": 0, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/agriculture/doctype/water_analysis/water_analysis.py b/erpnext/agriculture/doctype/water_analysis/water_analysis.py new file mode 100644 index 00000000000..81fdf14a372 --- /dev/null +++ b/erpnext/agriculture/doctype/water_analysis/water_analysis.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class WaterAnalysis(Document): + def load_contents(self): + docs = frappe.get_all("Agriculture Analysis Criteria", filters={'linked_doctype':'Water Analysis'}) + for doc in docs: + self.append('water_analysis_criteria', {'title': str(doc.name)}) + + def update_lab_result_date(self): + if not self.result_datetime: + self.result_datetime = self.laboratory_testing_datetime + + def validate(self): + if self.collection_datetime > self.laboratory_testing_datetime: + frappe.throw('Lab testing datetime cannot be before collection datetime') + if self.laboratory_testing_datetime > self.result_datetime: + frappe.throw('Lab result datetime cannot be before testing datetime') \ No newline at end of file diff --git a/erpnext/agriculture/doctype/water_analysis_criteria/__init__.py b/erpnext/agriculture/doctype/water_analysis_criteria/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/water_analysis_criteria/water_analysis_criteria.json b/erpnext/agriculture/doctype/water_analysis_criteria/water_analysis_criteria.json new file mode 100644 index 00000000000..395669a2b0b --- /dev/null +++ b/erpnext/agriculture/doctype/water_analysis_criteria/water_analysis_criteria.json @@ -0,0 +1,162 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 0, + "creation": "2017-12-05 23:36:22.723558", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "title", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Title", + "length": 0, + "no_copy": 0, + "options": "Agriculture Analysis Criteria", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "value", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Value", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "minimum_permissible_value", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Minimum Permissible Value", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "maximum_permissible_value", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Maximum Permissible Value", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2017-12-05 23:36:45.836858", + "modified_by": "Administrator", + "module": "Agriculture", + "name": "Water Analysis Criteria", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/agriculture/doctype/water_analysis_criteria/water_analysis_criteria.py b/erpnext/agriculture/doctype/water_analysis_criteria/water_analysis_criteria.py new file mode 100644 index 00000000000..6833f905394 --- /dev/null +++ b/erpnext/agriculture/doctype/water_analysis_criteria/water_analysis_criteria.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class WaterAnalysisCriteria(Document): + pass diff --git a/erpnext/agriculture/doctype/weather/__init__.py b/erpnext/agriculture/doctype/weather/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/weather/test_weather.js b/erpnext/agriculture/doctype/weather/test_weather.js new file mode 100644 index 00000000000..b5009a4ccd3 --- /dev/null +++ b/erpnext/agriculture/doctype/weather/test_weather.js @@ -0,0 +1,23 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Weather", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Weather + () => frappe.tests.make('Weather', [ + // values to be set + {key: 'value'} + ]), + () => { + assert.equal(cur_frm.doc.key, 'value'); + }, + () => done() + ]); + +}); diff --git a/erpnext/agriculture/doctype/weather/test_weather.py b/erpnext/agriculture/doctype/weather/test_weather.py new file mode 100644 index 00000000000..b4ab3ae6f35 --- /dev/null +++ b/erpnext/agriculture/doctype/weather/test_weather.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +class TestWeather(unittest.TestCase): + pass diff --git a/erpnext/agriculture/doctype/weather/weather.js b/erpnext/agriculture/doctype/weather/weather.js new file mode 100644 index 00000000000..dadb1d8b138 --- /dev/null +++ b/erpnext/agriculture/doctype/weather/weather.js @@ -0,0 +1,8 @@ +// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Weather', { + onload: (frm) => { + if (frm.doc.weather_parameter == undefined) frm.call('load_contents'); + } +}); diff --git a/erpnext/agriculture/doctype/weather/weather.json b/erpnext/agriculture/doctype/weather/weather.json new file mode 100644 index 00000000000..8f54957cec0 --- /dev/null +++ b/erpnext/agriculture/doctype/weather/weather.json @@ -0,0 +1,261 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "autoname": "field:date", + "beta": 0, + "creation": "2017-10-17 19:01:05.095598", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "source", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Source", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_2", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "date", + "fieldtype": "Date", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Date", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_3", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_9", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Weather Parameter", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "weather_parameter", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "options": "Weather Parameter", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2017-12-06 11:04:36.977755", + "modified_by": "Administrator", + "module": "Agriculture", + "name": "Weather", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Agriculture Manager", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + }, + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 0, + "delete": 0, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Agriculture User", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + } + ], + "quick_entry": 0, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/agriculture/doctype/weather/weather.py b/erpnext/agriculture/doctype/weather/weather.py new file mode 100644 index 00000000000..938daa207e8 --- /dev/null +++ b/erpnext/agriculture/doctype/weather/weather.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class Weather(Document): + def load_contents(self): + docs = frappe.get_all("Agriculture Analysis Criteria", filters={'linked_doctype':'Weather'}) + for doc in docs: + self.append('weather_parameter', {'title': str(doc.name)}) diff --git a/erpnext/agriculture/doctype/weather_parameter/__init__.py b/erpnext/agriculture/doctype/weather_parameter/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/agriculture/doctype/weather_parameter/weather_parameter.json b/erpnext/agriculture/doctype/weather_parameter/weather_parameter.json new file mode 100644 index 00000000000..724ead95700 --- /dev/null +++ b/erpnext/agriculture/doctype/weather_parameter/weather_parameter.json @@ -0,0 +1,162 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 0, + "creation": "2017-12-06 00:19:15.967334", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "title", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Title", + "length": 0, + "no_copy": 0, + "options": "Agriculture Analysis Criteria", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "value", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Value", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "minimum_permissible_value", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Minimum Permissible Value", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "maximum_permissible_value", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Maximum Permissible Value", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2017-12-06 00:26:48.887975", + "modified_by": "Administrator", + "module": "Agriculture", + "name": "Weather Parameter", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/agriculture/doctype/weather_parameter/weather_parameter.py b/erpnext/agriculture/doctype/weather_parameter/weather_parameter.py new file mode 100644 index 00000000000..89db74cd7cb --- /dev/null +++ b/erpnext/agriculture/doctype/weather_parameter/weather_parameter.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class WeatherParameter(Document): + pass diff --git a/erpnext/agriculture/setup.py b/erpnext/agriculture/setup.py new file mode 100644 index 00000000000..b3b136a4a96 --- /dev/null +++ b/erpnext/agriculture/setup.py @@ -0,0 +1,434 @@ +from __future__ import unicode_literals +import frappe +from frappe import _ +from erpnext.setup.utils import insert_record + +def setup_agriculture(): + records = [ + dict( + doctype="Land Unit", + land_unit_name="All Land Units", + is_group=1, + is_container=1), + dict( + doctype='Item Group', + item_group_name='Fertilizer', + is_group=0, + parent_item_group=_('All Item Groups')), + dict( + doctype='Item Group', + item_group_name='Seed', + is_group=0, + parent_item_group=_('All Item Groups')), + dict( + doctype='Item Group', + item_group_name='By-product', + is_group=0, + parent_item_group=_('All Item Groups')), + dict( + doctype='Item Group', + item_group_name='Produce', + is_group=0, + parent_item_group=_('All Item Groups')), + dict( + doctype='Agriculture Analysis Criteria', + title='Nitrogen Content', + standard=1, + linked_doctype='Fertilizer'), + dict( + doctype='Agriculture Analysis Criteria', + title='Phosphorous Content', + standard=1, + linked_doctype='Fertilizer'), + dict( + doctype='Agriculture Analysis Criteria', + title='Potassium Content', + standard=1, + linked_doctype='Fertilizer'), + dict( + doctype='Agriculture Analysis Criteria', + title='Calcium Content', + standard=1, + linked_doctype='Fertilizer'), + dict( + doctype='Agriculture Analysis Criteria', + title='Sulphur Content', + standard=1, + linked_doctype='Fertilizer'), + dict( + doctype='Agriculture Analysis Criteria', + title='Magnesium Content', + standard=1, + linked_doctype='Fertilizer'), + dict( + doctype='Agriculture Analysis Criteria', + title='Iron Content', + standard=1, + linked_doctype='Fertilizer'), + dict( + doctype='Agriculture Analysis Criteria', + title='Copper Content', + standard=1, + linked_doctype='Fertilizer'), + dict( + doctype='Agriculture Analysis Criteria', + title='Zinc Content', + standard=1, + linked_doctype='Fertilizer'), + dict( + doctype='Agriculture Analysis Criteria', + title='Boron Content', + standard=1, + linked_doctype='Fertilizer'), + dict( + doctype='Agriculture Analysis Criteria', + title='Manganese Content', + standard=1, + linked_doctype='Fertilizer'), + dict( + doctype='Agriculture Analysis Criteria', + title='Chlorine Content', + standard=1, + linked_doctype='Fertilizer'), + dict( + doctype='Agriculture Analysis Criteria', + title='Molybdenum Content', + standard=1, + linked_doctype='Fertilizer'), + dict( + doctype='Agriculture Analysis Criteria', + title='Sodium Content', + standard=1, + linked_doctype='Fertilizer'), + dict( + doctype='Agriculture Analysis Criteria', + title='Humic Acid', + standard=1, + linked_doctype='Fertilizer'), + dict( + doctype='Agriculture Analysis Criteria', + title='Fulvic Acid', + standard=1, + linked_doctype='Fertilizer'), + dict( + doctype='Agriculture Analysis Criteria', + title='Inert', + standard=1, + linked_doctype='Fertilizer'), + dict( + doctype='Agriculture Analysis Criteria', + title='Others', + standard=1, + linked_doctype='Fertilizer'), + dict( + doctype='Agriculture Analysis Criteria', + title='Nitrogen', + standard=1, + linked_doctype='Plant Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Phosphorous', + standard=1, + linked_doctype='Plant Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Potassium', + standard=1, + linked_doctype='Plant Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Calcium', + standard=1, + linked_doctype='Plant Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Magnesium', + standard=1, + linked_doctype='Plant Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Sulphur', + standard=1, + linked_doctype='Plant Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Boron', + standard=1, + linked_doctype='Plant Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Copper', + standard=1, + linked_doctype='Plant Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Iron', + standard=1, + linked_doctype='Plant Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Manganese', + standard=1, + linked_doctype='Plant Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Zinc', + standard=1, + linked_doctype='Plant Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Depth (in cm)', + standard=1, + linked_doctype='Soil Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='pH', + standard=1, + linked_doctype='Soil Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Salt Concentration (%)', + standard=1, + linked_doctype='Soil Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Organic Matter (%)', + standard=1, + linked_doctype='Soil Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='CEC (Cation Exchange Capacity) (MAQ/100mL)', + standard=1, + linked_doctype='Soil Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Potassium Saturation (%)', + standard=1, + linked_doctype='Soil Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Calcium Saturation (%)', + standard=1, + linked_doctype='Soil Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Manganese Saturation (%)', + standard=1, + linked_doctype='Soil Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Nirtogen (ppm)', + standard=1, + linked_doctype='Soil Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Phosphorous (ppm)', + standard=1, + linked_doctype='Soil Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Potassium (ppm)', + standard=1, + linked_doctype='Soil Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Calcium (ppm)', + standard=1, + linked_doctype='Soil Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Magnesium (ppm)', + standard=1, + linked_doctype='Soil Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Sulphur (ppm)', + standard=1, + linked_doctype='Soil Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Copper (ppm)', + standard=1, + linked_doctype='Soil Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Iron (ppm)', + standard=1, + linked_doctype='Soil Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Manganese (ppm)', + standard=1, + linked_doctype='Soil Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Zinc (ppm)', + standard=1, + linked_doctype='Soil Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Aluminium (ppm)', + standard=1, + linked_doctype='Soil Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='pH', + standard=1, + linked_doctype='Water Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Conductivity (mS/cm)', + standard=1, + linked_doctype='Water Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Hardness (mg/CaCO3)', + standard=1, + linked_doctype='Water Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Turbidity (NTU)', + standard=1, + linked_doctype='Water Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Odor', + standard=1, + linked_doctype='Water Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Color', + standard=1, + linked_doctype='Water Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Nitrate (mg/L)', + standard=1, + linked_doctype='Water Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Nirtite (mg/L)', + standard=1, + linked_doctype='Water Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Calcium (mg/L)', + standard=1, + linked_doctype='Water Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Magnesium (mg/L)', + standard=1, + linked_doctype='Water Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Sulphate (mg/L)', + standard=1, + linked_doctype='Water Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Boron (mg/L)', + standard=1, + linked_doctype='Water Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Copper (mg/L)', + standard=1, + linked_doctype='Water Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Iron (mg/L)', + standard=1, + linked_doctype='Water Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Manganese (mg/L)', + standard=1, + linked_doctype='Water Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Zinc (mg/L)', + standard=1, + linked_doctype='Water Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Chlorine (mg/L)', + standard=1, + linked_doctype='Water Analysis'), + dict( + doctype='Agriculture Analysis Criteria', + title='Bulk Density', + standard=1, + linked_doctype='Soil Texture'), + dict( + doctype='Agriculture Analysis Criteria', + title='Field Capacity', + standard=1, + linked_doctype='Soil Texture'), + dict( + doctype='Agriculture Analysis Criteria', + title='Wilting Point', + standard=1, + linked_doctype='Soil Texture'), + dict( + doctype='Agriculture Analysis Criteria', + title='Hydraulic Conductivity', + standard=1, + linked_doctype='Soil Texture'), + dict( + doctype='Agriculture Analysis Criteria', + title='Organic Matter', + standard=1, + linked_doctype='Soil Texture'), + dict( + doctype='Agriculture Analysis Criteria', + title='Temperature High', + standard=1, + linked_doctype='Weather'), + dict( + doctype='Agriculture Analysis Criteria', + title='Temperature Low', + standard=1, + linked_doctype='Weather'), + dict( + doctype='Agriculture Analysis Criteria', + title='Temperature Average', + standard=1, + linked_doctype='Weather'), + dict( + doctype='Agriculture Analysis Criteria', + title='Dew Point', + standard=1, + linked_doctype='Weather'), + dict( + doctype='Agriculture Analysis Criteria', + title='Precipitation Received', + standard=1, + linked_doctype='Weather'), + dict( + doctype='Agriculture Analysis Criteria', + title='Humidity', + standard=1, + linked_doctype='Weather'), + dict( + doctype='Agriculture Analysis Criteria', + title='Pressure', + standard=1, + linked_doctype='Weather'), + dict( + doctype='Agriculture Analysis Criteria', + title='Insolation/ PAR (Photosynthetically Active Radiation)', + standard=1, + linked_doctype='Weather'), + dict( + doctype='Agriculture Analysis Criteria', + title='Degree Days', + standard=1, + linked_doctype='Weather'), + dict( + doctype='Agriculture Analysis Criteria', + title='Degree Days', + standard=1, + linked_doctype='Water Analysis') + ] + insert_record(records) diff --git a/erpnext/config/agriculture.py b/erpnext/config/agriculture.py new file mode 100644 index 00000000000..20ee7cf215b --- /dev/null +++ b/erpnext/config/agriculture.py @@ -0,0 +1,65 @@ +from __future__ import unicode_literals +from frappe import _ + +def get_data(): + return [ + { + "label": _("Crops & Lands"), + "items": [ + { + "type": "doctype", + "name": "Crop", + }, + { + "type": "doctype", + "name": "Crop Cycle", + }, + { + "type": "doctype", + "name": "Land Unit", + } + ] + }, + { + "label": _("Diseases & Fertilizers"), + "items": [ + { + "type": "doctype", + "name": "Disease", + }, + { + "type": "doctype", + "name": "Fertilizer", + } + ] + }, + { + "label": _("Analytics"), + "items": [ + { + "type": "doctype", + "name": "Plant Analysis", + }, + { + "type": "doctype", + "name": "Soil Analysis", + }, + { + "type": "doctype", + "name": "Water Analysis", + }, + { + "type": "doctype", + "name": "Soil Texture", + }, + { + "type": "doctype", + "name": "Weather", + }, + { + "type": "doctype", + "name": "Agriculture Analysis Criteria", + } + ] + }, + ] \ No newline at end of file diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py index 1bd8314ff52..e913c46db79 100644 --- a/erpnext/config/desktop.py +++ b/erpnext/config/desktop.py @@ -164,7 +164,8 @@ def get_data(): "color": "#FF888B", "icon": "octicon octicon-tools", "type": "module", - "label": _("Maintenance") + "label": _("Maintenance"), + "hidden": 1 }, { "module_name": "Student", @@ -173,7 +174,8 @@ def get_data(): "label": _("Student"), "link": "List/Student", "_doctype": "Student", - "type": "list" + "type": "list", + "hidden": 1 }, { "module_name": "Student Group", @@ -182,7 +184,8 @@ def get_data(): "label": _("Student Group"), "link": "List/Student Group", "_doctype": "Student Group", - "type": "list" + "type": "list", + "hidden": 1 }, { "module_name": "Course Schedule", @@ -191,7 +194,8 @@ def get_data(): "label": _("Course Schedule"), "link": "Calendar/Course Schedule", "_doctype": "Course Schedule", - "type": "list" + "type": "list", + "hidden": 1 }, { "module_name": "Student Attendance Tool", @@ -200,7 +204,8 @@ def get_data(): "label": _("Student Attendance Tool"), "link": "List/Student Attendance Tool", "_doctype": "Student Attendance Tool", - "type": "list" + "type": "list", + "hidden": 1 }, { "module_name": "Course", @@ -209,7 +214,8 @@ def get_data(): "label": _("Course"), "link": "List/Course", "_doctype": "Course", - "type": "list" + "type": "list", + "hidden": 1 }, { "module_name": "Program", @@ -218,7 +224,8 @@ def get_data(): "label": _("Program"), "link": "List/Program", "_doctype": "Program", - "type": "list" + "type": "list", + "hidden": 1 }, { "module_name": "Student Applicant", @@ -227,7 +234,8 @@ def get_data(): "label": _("Student Applicant"), "link": "List/Student Applicant", "_doctype": "Student Applicant", - "type": "list" + "type": "list", + "hidden": 1 }, { "module_name": "Fees", @@ -236,7 +244,8 @@ def get_data(): "label": _("Fees"), "link": "List/Fees", "_doctype": "Fees", - "type": "list" + "type": "list", + "hidden": 1 }, { "module_name": "Instructor", @@ -245,7 +254,8 @@ def get_data(): "label": _("Instructor"), "link": "List/Instructor", "_doctype": "Instructor", - "type": "list" + "type": "list", + "hidden": 1 }, { "module_name": "Room", @@ -254,14 +264,16 @@ def get_data(): "label": _("Room"), "link": "List/Room", "_doctype": "Room", - "type": "list" + "type": "list", + "hidden": 1 }, { "module_name": "Education", "color": "#428B46", "icon": "octicon octicon-mortar-board", "type": "module", - "label": _("Education") + "label": _("Education"), + "hidden": 1 }, { "module_name": "Healthcare", @@ -269,6 +281,7 @@ def get_data(): "icon": "octicon octicon-plus", "type": "module", "label": _("Healthcare"), + "hidden": 1 }, { "module_name": "Hub", @@ -292,12 +305,123 @@ def get_data(): "icon": "🍔", "_doctype": "Restaurant", "link": "List/Restaurant", - "label": _("Restaurant") + "label": _("Restaurant"), + "hidden": 1 + }, + { + "module_name": "Agriculture", + "color": "#8BC34A", + "icon": "octicon octicon-globe", + "type": "module", + "label": _("Agriculture"), + "hidden": 1 + }, + { + "module_name": "Crop", + "_doctype": "Crop", + "label": _("Crop"), + "color": "#8BC34A", + "icon": "fa fa-tree", + "type": "link", + "link": "List/Crop", + "hidden": 1 + }, + { + "module_name": "Crop Cycle", + "_doctype": "Crop Cycle", + "label": _("Crop Cycle"), + "color": "#8BC34A", + "icon": "fa fa-circle-o-notch", + "type": "link", + "link": "List/Crop Cycle", + "hidden": 1 + }, + { + "module_name": "Fertilizer", + "_doctype": "Fertilizer", + "label": _("Fertilizer"), + "color": "#8BC34A", + "icon": "fa fa-leaf", + "type": "link", + "link": "List/Fertilizer", + "hidden": 1 + }, + { + "module_name": "Land Unit", + "_doctype": "Land Unit", + "label": _("Land Unit"), + "color": "#8BC34A", + "icon": "fa fa-map", + "type": "link", + "link": "List/Land Unit", + "hidden": 1 + }, + { + "module_name": "Disease", + "_doctype": "Disease", + "label": _("Disease"), + "color": "#8BC34A", + "icon": "octicon octicon-bug", + "type": "link", + "link": "List/Disease", + "hidden": 1 + }, + { + "module_name": "Plant Analysis", + "_doctype": "Plant Analysis", + "label": _("Plant Analysis"), + "color": "#8BC34A", + "icon": "fa fa-pagelines", + "type": "link", + "link": "List/Plant Analysis", + "hidden": 1 + }, + { + "module_name": "Soil Analysis", + "_doctype": "Soil Analysis", + "label": _("Soil Analysis"), + "color": "#8BC34A", + "icon": "fa fa-flask", + "type": "link", + "link": "List/Soil Analysis", + "hidden": 1 + }, + { + "module_name": "Soil Texture", + "_doctype": "Soil Texture", + "label": _("Soil Texture"), + "color": "#8BC34A", + "icon": "octicon octicon-beaker", + "type": "link", + "link": "List/Soil Texture", + "hidden": 1 + }, + { + "module_name": "Water Analysis", + "_doctype": "Water Analysis", + "label": _("Water Analysis"), + "color": "#8BC34A", + "icon": "fa fa-tint", + "type": "link", + "link": "List/Water Analysis", + "hidden": 1 + }, + { + "module_name": "Weather", + "_doctype": "Weather", + "label": _("Weather"), + "color": "#8BC34A", + "icon": "fa fa-sun-o", + "type": "link", + "link": "List/Weather", + "hidden": 1 }, { "module_name": "Assets", "color": "#4286f4", "icon": "octicon octicon-database", + "hidden": 1, + "label": _("Assets"), "type": "module" }, { diff --git a/erpnext/demo/domains.py b/erpnext/demo/domains.py index 5ae69755593..5ad3e04013b 100644 --- a/erpnext/demo/domains.py +++ b/erpnext/demo/domains.py @@ -19,6 +19,9 @@ data = { 'Healthcare': { 'company_name': 'ABC Hospital Ltd.' }, + 'Agriculture': { + 'company_name': 'Schrute Farms' + }, 'Non Profit': { 'company_name': 'Erpnext Foundation' } diff --git a/erpnext/domains/agriculture.py b/erpnext/domains/agriculture.py new file mode 100644 index 00000000000..378c5f1c2d5 --- /dev/null +++ b/erpnext/domains/agriculture.py @@ -0,0 +1,22 @@ +data = { + 'desktop_icons': [ + 'Agriculture Task', + 'Crop', + 'Crop Cycle', + 'Fertilizer', + 'Item', + 'Land Unit', + 'Disease', + 'Plant Analysis', + 'Soil Analysis', + 'Soil Texture', + 'Task', + 'Water Analysis', + 'Weather' + ], + 'modules': [ + 'Agriculture' + ], + 'default_portal_role': 'System Manager', + 'on_setup': 'erpnext.agriculture.setup.setup_agriculture' +} \ No newline at end of file diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 60bb6ac6a4e..bf6894c906b 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -54,6 +54,7 @@ calendars = ["Task", "Production Order", "Leave Application", "Sales Order", "Ho domains = { + 'Agriculture': 'erpnext.domains.agriculture', 'Distribution': 'erpnext.domains.distribution', 'Education': 'erpnext.domains.education', 'Healthcare': 'erpnext.domains.healthcare', diff --git a/erpnext/modules.txt b/erpnext/modules.txt index 0e6eb1fd1a2..42f0f0beaad 100644 --- a/erpnext/modules.txt +++ b/erpnext/modules.txt @@ -18,5 +18,6 @@ Education Regional Healthcare Restaurant +Agriculture ERPNext Integrations Non Profit \ No newline at end of file diff --git a/erpnext/patches.txt b/erpnext/patches.txt index dc45b5d0aef..cf97030e83d 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -476,4 +476,5 @@ erpnext.patches.v9_2.remove_company_from_patient erpnext.patches.v9_2.set_item_name_in_production_order erpnext.patches.v10_0.update_lft_rgt_for_employee erpnext.patches.v9_2.rename_net_weight_in_item_master -erpnext.patches.v10_0.add_non_profit_domain \ No newline at end of file +erpnext.patches.v10_0.add_agriculture_domain +erpnext.patches.v10_0.add_non_profit_domain diff --git a/erpnext/patches/v10_0/add_agriculture_domain.py b/erpnext/patches/v10_0/add_agriculture_domain.py new file mode 100644 index 00000000000..c18e69f3e6c --- /dev/null +++ b/erpnext/patches/v10_0/add_agriculture_domain.py @@ -0,0 +1,13 @@ +# Copyright (c) 2017, Frappe and Contributors +# License: GNU General Public License v3. See license.txt + +from __future__ import unicode_literals +import frappe + +def execute(): + domain = 'Agriculture' + if not frappe.db.exists('Domain', domain): + frappe.get_doc({ + 'doctype': 'Domain', + 'domain': domain + }).insert(ignore_permissions=True) \ No newline at end of file diff --git a/erpnext/patches/v9_0/add_healthcare_domain.py b/erpnext/patches/v9_0/add_healthcare_domain.py index 45fceb126f7..3c0433b9d49 100644 --- a/erpnext/patches/v9_0/add_healthcare_domain.py +++ b/erpnext/patches/v9_0/add_healthcare_domain.py @@ -3,10 +3,9 @@ from __future__ import unicode_literals import frappe -from frappe import _ def execute(): - domain = _('Healthcare') + domain = 'Healthcare' if not frappe.db.exists('Domain', domain): frappe.get_doc({ 'doctype': 'Domain', diff --git a/erpnext/public/build.json b/erpnext/public/build.json index 0bcbf710320..a7114a9c565 100644 --- a/erpnext/public/build.json +++ b/erpnext/public/build.json @@ -31,6 +31,9 @@ "public/js/templates/item_selector.html", "public/js/utils/item_selector.js", "public/js/help_links.js", + "public/js/schools/student_button.html", + "public/js/schools/assessment_result_tool.html", + "public/js/agriculture/ternary_plot.js", "public/js/templates/item_quick_entry.html", "public/js/utils/item_quick_entry.js", "public/js/education/student_button.html", diff --git a/erpnext/public/css/leaflet/leaflet.css b/erpnext/public/css/leaflet/leaflet.css new file mode 100755 index 00000000000..979a8bd712b --- /dev/null +++ b/erpnext/public/css/leaflet/leaflet.css @@ -0,0 +1,611 @@ +/* required styles */ + +.leaflet-pane, +.leaflet-tile, +.leaflet-marker-icon, +.leaflet-marker-shadow, +.leaflet-tile-container, +.leaflet-map-pane svg, +.leaflet-map-pane canvas, +.leaflet-zoom-box, +.leaflet-image-layer, +.leaflet-layer { + position: absolute; + left: 0; + top: 0; +} + +.leaflet-container { + overflow: hidden; + -ms-touch-action: none; + touch-action: none; +} + +.leaflet-tile, +.leaflet-marker-icon, +.leaflet-marker-shadow { + -webkit-user-select: none; + -moz-user-select: none; + user-select: none; + -webkit-user-drag: none; +} + + +/* Safari renders non-retina tile on retina better with this, but Chrome is worse */ + +.leaflet-safari .leaflet-tile { + image-rendering: -webkit-optimize-contrast; +} + + +/* hack that prevents hw layers "stretching" when loading new tiles */ + +.leaflet-safari .leaflet-tile-container { + width: 1600px; + height: 1600px; + -webkit-transform-origin: 0 0; +} + +.leaflet-marker-icon, +.leaflet-marker-shadow { + display: block; +} + + +/* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */ + + +/* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */ + +.leaflet-container .leaflet-overlay-pane svg, +.leaflet-container .leaflet-marker-pane img, +.leaflet-container .leaflet-tile-pane img, +.leaflet-container img.leaflet-image-layer { + max-width: none !important; +} + +.leaflet-tile { + filter: inherit; + visibility: hidden; +} + +.leaflet-tile-loaded { + visibility: inherit; +} + +.leaflet-zoom-box { + width: 0; + height: 0; + -moz-box-sizing: border-box; + box-sizing: border-box; + z-index: 800; +} + + +/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */ + +.leaflet-overlay-pane svg { + -moz-user-select: none; +} + +.leaflet-pane { + z-index: 400; +} + +.leaflet-tile-pane { + z-index: 200; +} + +.leaflet-overlay-pane { + z-index: 400; +} + +.leaflet-shadow-pane { + z-index: 500; +} + +.leaflet-marker-pane { + z-index: 600; +} + +.leaflet-popup-pane { + z-index: 700; +} + +.leaflet-map-pane canvas { + z-index: 100; +} + +.leaflet-map-pane svg { + z-index: 200; +} + +.leaflet-vml-shape { + width: 1px; + height: 1px; +} + +.lvml { + behavior: url(#default#VML); + display: inline-block; + position: absolute; +} + + +/* control positioning */ + +.leaflet-control { + position: relative; + z-index: 800; + pointer-events: auto; +} + +.leaflet-top, +.leaflet-bottom { + position: absolute; + z-index: 1000; + pointer-events: none; +} + +.leaflet-top { + top: 0; +} + +.leaflet-right { + right: 0; +} + +.leaflet-bottom { + bottom: 0; +} + +.leaflet-left { + left: 0; +} + +.leaflet-control { + float: left; + clear: both; +} + +.leaflet-right .leaflet-control { + float: right; +} + +.leaflet-top .leaflet-control { + margin-top: 10px; +} + +.leaflet-bottom .leaflet-control { + margin-bottom: 10px; +} + +.leaflet-left .leaflet-control { + margin-left: 10px; +} + +.leaflet-right .leaflet-control { + margin-right: 10px; +} + + +/* zoom and fade animations */ + +.leaflet-fade-anim .leaflet-tile { + will-change: opacity; +} + +.leaflet-fade-anim .leaflet-popup { + opacity: 0; + -webkit-transition: opacity 0.2s linear; + -moz-transition: opacity 0.2s linear; + -o-transition: opacity 0.2s linear; + transition: opacity 0.2s linear; +} + +.leaflet-fade-anim .leaflet-map-pane .leaflet-popup { + opacity: 1; +} + +.leaflet-zoom-animated { + -webkit-transform-origin: 0 0; + -ms-transform-origin: 0 0; + transform-origin: 0 0; +} + +.leaflet-zoom-anim .leaflet-zoom-animated { + will-change: transform; +} + +.leaflet-zoom-anim .leaflet-zoom-animated { + -webkit-transition: -webkit-transform 0.25s cubic-bezier(0, 0, 0.25, 1); + -moz-transition: -moz-transform 0.25s cubic-bezier(0, 0, 0.25, 1); + -o-transition: -o-transform 0.25s cubic-bezier(0, 0, 0.25, 1); + transition: transform 0.25s cubic-bezier(0, 0, 0.25, 1); +} + +.leaflet-zoom-anim .leaflet-tile, +.leaflet-pan-anim .leaflet-tile { + -webkit-transition: none; + -moz-transition: none; + -o-transition: none; + transition: none; +} + +.leaflet-zoom-anim .leaflet-zoom-hide { + visibility: hidden; +} + + +/* cursors */ + +.leaflet-interactive { + cursor: pointer; +} + +.leaflet-grab { + cursor: -webkit-grab; + cursor: -moz-grab; +} + +.leaflet-crosshair, +.leaflet-crosshair .leaflet-interactive { + cursor: crosshair; +} + +.leaflet-popup-pane, +.leaflet-control { + cursor: auto; +} + +.leaflet-dragging .leaflet-grab, +.leaflet-dragging .leaflet-grab .leaflet-interactive, +.leaflet-dragging .leaflet-marker-draggable { + cursor: move; + cursor: -webkit-grabbing; + cursor: -moz-grabbing; +} + + +/* visual tweaks */ + +.leaflet-container { + background: #ddd; + outline: 0; +} + +.leaflet-container a { + color: #0078A8; +} + +.leaflet-container a.leaflet-active { + outline: 2px solid orange; +} + +.leaflet-zoom-box { + border: 2px dotted #38f; + background: rgba(255, 255, 255, 0.5); +} + + +/* general typography */ + +.leaflet-container { + font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif; +} + + +/* general toolbar styles */ + +.leaflet-bar { + box-shadow: 0 1px 5px rgba(0, 0, 0, 0.65); + border-radius: 4px; +} + +.leaflet-bar a, +.leaflet-bar a:hover { + background-color: #fff; + border-bottom: 1px solid #ccc; + width: 26px; + height: 26px; + line-height: 26px; + display: block; + text-align: center; + text-decoration: none; + color: black; +} + +.leaflet-bar a, +.leaflet-control-layers-toggle { + background-position: 50% 50%; + background-repeat: no-repeat; + display: block; +} + +.leaflet-bar a:hover { + background-color: #f4f4f4; +} + +.leaflet-bar a:first-child { + border-top-left-radius: 4px; + border-top-right-radius: 4px; +} + +.leaflet-bar a:last-child { + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; + border-bottom: none; +} + +.leaflet-bar a.leaflet-disabled { + cursor: default; + background-color: #f4f4f4; + color: #bbb; +} + +.leaflet-touch .leaflet-bar a { + width: 30px; + height: 30px; + line-height: 30px; +} + + +/* zoom control */ + +.leaflet-control-zoom-in, +.leaflet-control-zoom-out { + font: bold 18px 'Lucida Console', Monaco, monospace; + text-indent: 1px; +} + +.leaflet-control-zoom-out { + font-size: 20px; +} + +.leaflet-touch .leaflet-control-zoom-in { + font-size: 22px; +} + +.leaflet-touch .leaflet-control-zoom-out { + font-size: 24px; +} + + +/* layers control */ + +.leaflet-control-layers { + box-shadow: 0 1px 5px rgba(0, 0, 0, 0.4); + background: #fff; + border-radius: 5px; +} + +.leaflet-control-layers-toggle { + background-image: url('assets/erpnext/images/leaflet/layers.png'); + width: 36px; + height: 36px; +} + +.leaflet-retina .leaflet-control-layers-toggle { + background-image: url('assets/erpnext/images/leaflet/layers-2x.png'); + background-size: 26px 26px; +} + +.leaflet-touch .leaflet-control-layers-toggle { + width: 44px; + height: 44px; +} + +.leaflet-control-layers .leaflet-control-layers-list, +.leaflet-control-layers-expanded .leaflet-control-layers-toggle { + display: none; +} + +.leaflet-control-layers-expanded .leaflet-control-layers-list { + display: block; + position: relative; +} + +.leaflet-control-layers-expanded { + padding: 6px 10px 6px 6px; + color: #333; + background: #fff; +} + +.leaflet-control-layers-scrollbar { + overflow-y: scroll; + padding-right: 5px; +} + +.leaflet-control-layers-selector { + margin-top: 2px; + position: relative; + top: 1px; +} + +.leaflet-control-layers label { + display: block; +} + +.leaflet-control-layers-separator { + height: 0; + border-top: 1px solid #ddd; + margin: 5px -10px 5px -6px; +} + + +/* attribution and scale controls */ + +.leaflet-container .leaflet-control-attribution { + background: #fff; + background: rgba(255, 255, 255, 0.7); + margin: 0; +} + +.leaflet-control-attribution, +.leaflet-control-scale-line { + padding: 0 5px; + color: #333; +} + +.leaflet-control-attribution a { + text-decoration: none; +} + +.leaflet-control-attribution a:hover { + text-decoration: underline; +} + +.leaflet-container .leaflet-control-attribution, +.leaflet-container .leaflet-control-scale { + font-size: 11px; +} + +.leaflet-left .leaflet-control-scale { + margin-left: 5px; +} + +.leaflet-bottom .leaflet-control-scale { + margin-bottom: 5px; +} + +.leaflet-control-scale-line { + border: 2px solid #777; + border-top: none; + line-height: 1.1; + padding: 2px 5px 1px; + font-size: 11px; + white-space: nowrap; + overflow: hidden; + -moz-box-sizing: border-box; + box-sizing: border-box; + background: #fff; + background: rgba(255, 255, 255, 0.5); +} + +.leaflet-control-scale-line:not(:first-child) { + border-top: 2px solid #777; + border-bottom: none; + margin-top: -2px; +} + +.leaflet-control-scale-line:not(:first-child):not(:last-child) { + border-bottom: 2px solid #777; +} + +.leaflet-touch .leaflet-control-attribution, +.leaflet-touch .leaflet-control-layers, +.leaflet-touch .leaflet-bar { + box-shadow: none; +} + +.leaflet-touch .leaflet-control-layers, +.leaflet-touch .leaflet-bar { + border: 2px solid rgba(0, 0, 0, 0.2); + background-clip: padding-box; +} + + +/* popup */ + +.leaflet-popup { + position: absolute; + text-align: center; +} + +.leaflet-popup-content-wrapper { + padding: 1px; + text-align: left; + border-radius: 12px; +} + +.leaflet-popup-content { + margin: 13px 19px; + line-height: 1.4; +} + +.leaflet-popup-content p { + margin: 18px 0; +} + +.leaflet-popup-tip-container { + margin: 0 auto; + width: 40px; + height: 20px; + position: relative; + overflow: hidden; +} + +.leaflet-popup-tip { + width: 17px; + height: 17px; + padding: 1px; + margin: -10px auto 0; + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); +} + +.leaflet-popup-content-wrapper, +.leaflet-popup-tip { + background: white; + color: #333; + box-shadow: 0 3px 14px rgba(0, 0, 0, 0.4); +} + +.leaflet-container a.leaflet-popup-close-button { + position: absolute; + top: 0; + right: 0; + padding: 4px 4px 0 0; + border: none; + text-align: center; + width: 18px; + height: 14px; + font: 16px/14px Tahoma, Verdana, sans-serif; + color: #c3c3c3; + text-decoration: none; + font-weight: bold; + background: transparent; +} + +.leaflet-container a.leaflet-popup-close-button:hover { + color: #999; +} + +.leaflet-popup-scrolled { + overflow: auto; + border-bottom: 1px solid #ddd; + border-top: 1px solid #ddd; +} + +.leaflet-oldie .leaflet-popup-content-wrapper { + zoom: 1; +} + +.leaflet-oldie .leaflet-popup-tip { + width: 24px; + margin: 0 auto; + -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)"; + filter: progid: DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678); +} + +.leaflet-oldie .leaflet-popup-tip-container { + margin-top: -1px; +} + +.leaflet-oldie .leaflet-control-zoom, +.leaflet-oldie .leaflet-control-layers, +.leaflet-oldie .leaflet-popup-content-wrapper, +.leaflet-oldie .leaflet-popup-tip { + border: 1px solid #999; +} + + +/* div icon */ + +.leaflet-div-icon { + background: #fff; + border: 1px solid #666; +} \ No newline at end of file diff --git a/erpnext/public/css/leaflet/leaflet.draw.css b/erpnext/public/css/leaflet/leaflet.draw.css new file mode 100755 index 00000000000..6fb7db0e64a --- /dev/null +++ b/erpnext/public/css/leaflet/leaflet.draw.css @@ -0,0 +1,316 @@ +/* ================================================================== */ + + +/* Toolbars +/* ================================================================== */ + +.leaflet-draw-section { + position: relative; +} + +.leaflet-draw-toolbar { + margin-top: 12px; +} + +.leaflet-draw-toolbar-top { + margin-top: 0; +} + +.leaflet-draw-toolbar-notop a:first-child { + border-top-right-radius: 0; +} + +.leaflet-draw-toolbar-nobottom a:last-child { + border-bottom-right-radius: 0; +} + +.leaflet-draw-toolbar a { + background-image: url('assets/erpnext/images/leaflet/spritesheet.png'); + background-repeat: no-repeat; +} + +.leaflet-retina .leaflet-draw-toolbar a { + background-image: url('assets/erpnext/images/leaflet/spritesheet-2x.png'); + background-size: 270px 30px; +} + +.leaflet-draw a { + display: block; + text-align: center; + text-decoration: none; +} + + +/* ================================================================== */ + + +/* Toolbar actions menu +/* ================================================================== */ + +.leaflet-draw-actions { + display: none; + list-style: none; + margin: 0; + padding: 0; + position: absolute; + left: 26px; + /* leaflet-draw-toolbar.left + leaflet-draw-toolbar.width */ + top: 0; + white-space: nowrap; +} + +.leaflet-right .leaflet-draw-actions { + right: 26px; + left: auto; +} + +.leaflet-draw-actions li { + display: inline-block; +} + +.leaflet-draw-actions li:first-child a { + border-left: none; +} + +.leaflet-draw-actions li:last-child a { + -webkit-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; +} + +.leaflet-right .leaflet-draw-actions li:last-child a { + -webkit-border-radius: 0; + border-radius: 0; +} + +.leaflet-right .leaflet-draw-actions li:first-child a { + -webkit-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; +} + +.leaflet-draw-actions a { + background-color: #919187; + border-left: 1px solid #AAA; + color: #FFF; + font: 11px/19px "Helvetica Neue", Arial, Helvetica, sans-serif; + line-height: 28px; + text-decoration: none; + padding-left: 10px; + padding-right: 10px; + height: 28px; +} + +.leaflet-draw-actions-bottom { + margin-top: 0; +} + +.leaflet-draw-actions-top { + margin-top: 1px; +} + +.leaflet-draw-actions-top a, +.leaflet-draw-actions-bottom a { + height: 27px; + line-height: 27px; +} + +.leaflet-draw-actions a:hover { + background-color: #A0A098; +} + +.leaflet-draw-actions-top.leaflet-draw-actions-bottom a { + height: 26px; + line-height: 26px; +} + + +/* ================================================================== */ + + +/* Draw toolbar +/* ================================================================== */ + +.leaflet-draw-toolbar .leaflet-draw-draw-polyline { + background-position: -2px -2px; +} + +.leaflet-draw-toolbar .leaflet-draw-draw-polygon { + background-position: -31px -2px; +} + +.leaflet-draw-toolbar .leaflet-draw-draw-rectangle { + background-position: -62px -2px; +} + +.leaflet-draw-toolbar .leaflet-draw-draw-circle { + background-position: -92px -2px; +} + +.leaflet-draw-toolbar .leaflet-draw-draw-marker { + background-position: -122px -2px; +} + + +/* ================================================================== */ + + +/* Edit toolbar +/* ================================================================== */ + +.leaflet-draw-toolbar .leaflet-draw-edit-edit { + background-position: -152px -2px; +} + +.leaflet-draw-toolbar .leaflet-draw-edit-remove { + background-position: -182px -2px; +} + +.leaflet-draw-toolbar .leaflet-draw-edit-edit.leaflet-disabled { + background-position: -212px -2px; +} + +.leaflet-draw-toolbar .leaflet-draw-edit-remove.leaflet-disabled { + background-position: -242px -2px; +} + + +/* ================================================================== */ + + +/* Drawing styles +/* ================================================================== */ + +.leaflet-mouse-marker { + background-color: #fff; + cursor: crosshair; +} + +.leaflet-draw-tooltip { + background: rgb(54, 54, 54); + background: rgba(0, 0, 0, 0.5); + border: 1px solid transparent; + -webkit-border-radius: 4px; + border-radius: 4px; + color: #fff; + font: 12px/18px "Helvetica Neue", Arial, Helvetica, sans-serif; + margin-left: 20px; + margin-top: -21px; + padding: 4px 8px; + position: absolute; + visibility: hidden; + white-space: nowrap; + z-index: 6; +} + +.leaflet-draw-tooltip:before { + border-right: 6px solid black; + border-right-color: rgba(0, 0, 0, 0.5); + border-top: 6px solid transparent; + border-bottom: 6px solid transparent; + content: ""; + position: absolute; + top: 7px; + left: -7px; +} + +.leaflet-error-draw-tooltip { + background-color: #F2DEDE; + border: 1px solid #E6B6BD; + color: #B94A48; +} + +.leaflet-error-draw-tooltip:before { + border-right-color: #E6B6BD; +} + +.leaflet-draw-tooltip-single { + margin-top: -12px +} + +.leaflet-draw-tooltip-subtext { + color: #f8d5e4; +} + +.leaflet-draw-guide-dash { + font-size: 1%; + opacity: 0.6; + position: absolute; + width: 5px; + height: 5px; +} + + +/* ================================================================== */ + + +/* Edit styles +/* ================================================================== */ + +.leaflet-edit-marker-selected { + background: rgba(254, 87, 161, 0.1); + border: 4px dashed rgba(254, 87, 161, 0.6); + -webkit-border-radius: 4px; + border-radius: 4px; +} + +.leaflet-edit-move { + cursor: move; +} + +.leaflet-edit-resize { + cursor: pointer; +} + + +/* ================================================================== */ + + +/* Old IE styles +/* ================================================================== */ + +.leaflet-oldie .leaflet-draw-toolbar { + border: 3px solid #999; +} + +.leaflet-oldie .leaflet-draw-toolbar a { + background-color: #eee; +} + +.leaflet-oldie .leaflet-draw-toolbar a:hover { + background-color: #fff; +} + +.leaflet-oldie .leaflet-draw-actions { + left: 32px; + margin-top: 3px; +} + +.leaflet-oldie .leaflet-draw-actions li { + display: inline; + zoom: 1; +} + +.leaflet-oldie .leaflet-edit-marker-selected { + border: 4px dashed #fe93c2; +} + +.leaflet-oldie .leaflet-draw-actions a { + background-color: #999; +} + +.leaflet-oldie .leaflet-draw-actions a:hover { + background-color: #a5a5a5; +} + +.leaflet-oldie .leaflet-draw-actions-top a { + margin-top: 1px; +} + +.leaflet-oldie .leaflet-draw-actions-bottom a { + height: 28px; + line-height: 28px; +} + +.leaflet-oldie .leaflet-draw-actions-top.leaflet-draw-actions-bottom a { + height: 27px; + line-height: 27px; +} \ No newline at end of file diff --git a/erpnext/public/images/leaflet/farmer.png b/erpnext/public/images/leaflet/farmer.png new file mode 100644 index 0000000000000000000000000000000000000000..03e42ff135e622707af364332491055a42b78046 GIT binary patch literal 52773 zcmbSxWmFv9vgqK04=y3d1b1g}cXua9@Zjzq+}+(7+=FZI0Kq*32qZ8_@BokR+;i@G zKkm9e-mG4$clYd)UAwHScC?y`EG8N$8UO&ml$Vpzc)h~_061bG^6RKIskrX-M&d55 z=dS5w!h@+h+_J4;&H*vk33T59^LXj%B$ zTkwAXi;7SRc?-NEaIkbYqx5$8=;$WkEe!q_UV+!~Kd;%ql>eIIZZ8b}FQ)XA)hH#M zTrDYiSlL-D*m>D0c{x})xVZWF_?Rg<**VzR*g4raI9WLO1h_Z_*x4!n{R6*JbNyf? zpdlsmZ(6TU!eASBcV_`MHZLzPRxd7ACs%7W4t{?Ae{gVevb@eH}ht3bbI$7 z3{sYE7Ou9=?zT>jl>cBfGk5ZE7Y4s_`d>?Ma8_3SZ^Vvn{}$A%$k@EioY^>7+1VT% z{#n<*X1lp-SpHu&{>RyFT0YK}Y#NqsP9Clnulr&3?mxhNT1H#84BPGcX;o#$j@bU9< z{|Cqa1j_~C=I54{;ev4RvU6}qvrF(uNkU{~q&T_x`6T(pW&Q&z@95@k=4fI0AG)@$ zbpH*@`M<&nNV-~@xjVUPIXQj&j|QmOIJrBy**G~q?EV>KR<^gmn07#2Os#~upj<^ zWXAT&4BJ1-@&72xe_p+6;6KCvR{ht9|27^=$5)GSeKie}+nEgjU{YINN?gl({dccz ztL3pi`AyGGD`9L zOGm%7HEyAPv%+omqL29nM?UgW=SFi~nsiMNzBzTNsvcQjTwD3}1si|Rr7+X*wr<40 zTB)vQ;Nu)c?_IyinlJ>PFj(aF8Znsu8JWw%7BbMdGHk;+IMx_BET15+ZfaqPI?Ht< zYjFo!Uzw(`zysk(Ax87;4nTq)AUD`pO)WuD%*voFv(~ZEQ)7B*w!3Q*)vL@uJB3{t zPJ!LAeGtC03o27Lhl9IXn9$4Hj=J0J71eK0-YIqlg*vR3j$46aV~V>l)xT{Z3GeRy zN6^rB@HYMK%#^FksAI}7^UvGvwXpXO19Jt&r^0$l<6q@N_ZHMXa1So^N*cf_VZweN zPmjnyyI)Jn{Cd|w1Vpp?(jr8bhi#fMiu7V0wnE&}Y0fvnkUxC9Kfc|$sl3zvxdT17 z?7Q$gHb$jNe#WD6<|*nn_m^ky2ddho#cgcW_%G8KM+l4*jcwijQv#97&}$1pl+@VR z+GlA*rV_lvpND zu5aBUyMLlB=v3-3DE=%Fm*M9zscB<5a*lS=v$MSArx+@84r=23Ejfdb0A#*;!Ssf? zoPCRa>^qEac%C?r>dRZLRcXMcEvl(8JQMtUt;%}(JLpe~s?qb$#qwQahoY!PxyJXD z=j+nz{%+qsgI{;@PPc;ehzt?jbYB)V06s6k38ifKTk2OjG0t>!G{B^`4&YWSjX;u5 z*}HD&KI(_r-A`V82zBgW;{6pIF(?I`#pKQG#tuAmxu?gYxEE5Wu8bekSeXeSnGPL* z_novS+U@-$VC&-OyvzAcnJZ7!<#&EDV-Zl}0e}-i847U*gmW;|h~9`8$vpX86%B1h zHC>X^B|2>NeVf^Kxu2xztV!E0k~l^P^@2c%%?$8^&o4$ufAZqci6QdJ7o`cLgzCN zj*lk2Y~wN|B1$=MkgErKcVJ{1LVWbX0W^j3r*PUkB$o9U*l)T_9eWLD)=C#h0^-K- zlqxl~X5XG=rIv_Ic854nSG{6)wZ|r$^Y+r_ZWR0poTRJKug)WD|!y zJxTr%Je-nAJ>DqjY`%)}$)R0`@0oKJ&~NX2bo%4Vhq&o`_~RGLM77#@cNQm;bJaTc z5=sHN$`rP0EUpY*j;TF#)F5b8#vJEUn>=jfVbZT+ABRy_KE>**LP)l{4uQf^^=02C z#Sz6>nLN4)4je;7jjMwcHq~yQ;H>D~q3+i8vzih&L&)hL>R%rq#L5iw?vHEG1E`x9Cf((*aZs{OfUI6e(~N)?Mp0LLFyQ*gg(Ylmmb z2Xn)wk_`}G2x%I@?2vGv5>A?k|D|&tERwQ`kA?%fwQe9`o+@C4j;rGAA8=r7MA*)V zPHa(>4iC2rqClPw9k#uof?n?xS?45SIxwejM~oby<=sL8{;o1DBX2d3!;A;H+0>g% zQ;0xTN>^m*w_j?VdDxhQ+U$D)Ft9_PZQ>Pq?eL(maP6G@pqc_zIIaSNHw8!n&;n|q zWZNoa!R$`%-|PulsLGQ(sOb*0`XjKl_t5yVY~GB0NV)#uba=oIdoBc?%Tx9q^UPxQp1)yn8u9{d7>8nCmSDd;AF*Ec2=2Ny?-;*E_jty8ZwTQtR6^^c* z7p988<)QWi09+@wf$kayW5eN+=x!_yJ-N^+t|zBzpy^jGR{WTb3vB4{_4hd5TAUX# z(w1L1ZdGQ+Dpu(q9`-9ehFNC^tfdOqqxMAZPrw8CekKcaLa`qkkYv@G<&<2~;aB1r zae|RbUDN|lOgSBL6{W({4-WK(+ie{O4o?ZSUTkGMOq4S7s&-<`uAlg0Ip6t{k`y}&K;HzxXJlk7 zK-2ehGZzt@&)M_w$813Aigh4DCB@rHW({tfT$<(iEfwTFh@^`2zf`A~S!+oMn1;+i zuy{W(0`BYp{I_j>Ukz2gg}&azg2wo01;QKoSr^Q1$YWnCj+;-jU)>BJ}i zWs-z;YM{Sq9V-iz!qC{)kYhc9eV7#8f*UeYH8tcc-hNAW4^xi${>6`F;E`;0Y#n^L zT~%2}wwxL1WxJ#tp3qw$ zl}g#wF}D@C2gI{I@DZ!m&oTTZBP=L<(wUJmONbI2rvBcM@=w|Eh9bz@Kkp3i+W3iwhQ7 zX+_65zU)berNnDeFCOseQFbSV4LhEXZ?2tA1+7bD+ewxX^bLGA+C z2FG47!W%UM)RRxDc$oU;ER)lwgAtl6GwT~B#9Kf(`u9j(8z8fI)9c6|a5-yY z2Vl%AxB zjLT1PJ>Z|W0^>aMxHw{rytQcylp4w;8*wJ9NaWfgCw^}R@&#PXk+(sOLce!dM5;g% zb*gQjbVyD75!n!?;i$gs)A40k;G?K@tI1y6Z7VSKTqayKSiGk~WYf=CHn#WpA+9D6 zB%UlleDirgqB-bv_i3b3^q;hCx0*4s!F$+Vg^qM2khXWxU`btxQogySCJTtn|Ewnl`1}w6DHpZ48HjlKiV~)fE~v@{|oGL zC0-{|S|i6$gZjp%I#G6=47{pmI65|lETNpJ6^=*kDgpUsQ3{cXNhULuf$pad-8<_& ztbW6_!aznSv(@1n6Vmw|y}f7{fRn%uWk`_X!and^eoQNka(0Fc4elXIHQjqWPfuVX0fs0` zczsg^azZ;qO9R<$pe{a-jI0jt9jJpJo(1O$F$cr=2eL2>#@AY|L_GVYDU0NfpUm{T zN3(wV4nAhfvb`E4W+tcK$9kv-p2Y*THl|K>x)hEU=G}=)0*3;P4AW18tR#=mjctCP zuE_OsKBCD6IQaM9t-pg(KNz`rfF)8YD1ky;uLT6aPZ0JroHWs`t_f~#0Zs&pyju+vJjdS+}5 ze(1VpuGIEUQ}Z06yR2tIDl<_8?AC8r0Z*y#&bj5oXz^?qa$=nyBSLjqtUmH>s?VEf z<1B%T1&GSKtXf8#|HEe%s!bThdiE|9Ob}8tiz??7vH0}lo$rl zq)7N~sch6u;(ms2w3E74Zq;@R0Vl+S^PjvU+}rmZ%%z=pwIEa3$Y5r9PIyk35UzvW z#v8{8d=E{ahUBbWTUt((=iyK9`BV4O&mZE70uIrp+br!*bKu0|b{R!5@Ts^AuH)v} zV|E!M69c}d0)lrD&iY~X1W2LS;yJrTIdrI`ssf=vSD5kfQ^{ekV%%{v*%tOgww|Y=AZaA+*iE^tZ#6 z&Ur`JizFq9&=O8p=S!WVG582CiI#>>0kdxYs}vBPyBX;%d>qHq+=M|+PS3S6dsxp|XOp%5*gRkiIj>5a%Dl$@<`Hf-dvqeZ_qU?}Cv_d9SbQlPOV6vq z$Zv6SgUmn65BoM$KIUy2k)OrI)BvY}@c5}5m-FJ)g2s`cMPrJup&e^AYJB}t08Y~3 zG|VW(ZKPn5GG!L&w6t7aEr&ro4=E1P4hBf^iu|;OsXluh;ckGL%HqI8Gh(j2q>;BP z3j8N*mq(KvYT28=J;arPS!p89>bDUVtxyLisYBu!7tsdlT`v*msl!OgfmsDB*0;YZ z6A#`@B_bWlZh8krVz4y1$!dwtB$U46v8@Y183P#5Wpy)5f+OWQKj@<rR8>2@g9p`_#0NQjz@A9qv`+PhP64OiDNF<#SOqI;N>xK;CDxdTFV@hJYl^qTTHC7jxl^vyvgb4i);%i4M@#=8uz3N_MLg)5gZKh^oRzg z9^)7Go+GNf6e&@kT)0Z-SKV7yw@$D(u)7XZFxauNU341y z=t|w&JB&)G752LRKc#7*SLBbS0UzW$u9X8_PD}_Xyx|vs(=3vu_jIng^UG&Al15xr zhXqm`wV;x9kJ1W*Puqr{(zA4^U}mUFOf@*-wAGzBbSd3 zs8jh`p}?qYb0~{2=$hLsmJ*~Pp(7qQW|LCty0nQ?kuD;>?F9p^S~)-l;4TyG+LGAwpLBx)(DBU8y=9eVHoz;zyz zWEW;GP`_xz&k43C)#Sc)R%5JJyV&m7ul?eY@YYJ1*x;20d=FdlYX#AY)aMxNa1jCD zaOJ#B(a!blQ;J>#je3mLem?)$rv7;@Us^E!s18m7Ch^L-d^8}?#I*C5`YiX0G zU+q^uXz`qYmFL^ru1i9PZoVxpnd5qNBGTg$!^dfuw@R3E*Cpis6m zgCc_5e5d+ZD?|76!tQb}I5bOXy^EeVpHV|G_>aVHf;F;Ykt??}2YBJ`a+ z*zKc=3Gpv&0?ds!5lQvEO=67j-7<~v;`kvpv|V&O2#w%B8upsXdjDv4rrHBDyv97y zV}YP!VT82r^Y)IN@O8*MW9;E5F8(_UW7QN5(%JN&*y2E2p&35JRXONZ>lj(fvZH0# zAVR`$(4e+-Z}^9; znwngImr>=y_bQPtFIeNi>WFn%z7Vem{LTW7xx-n+Qf*gTFSad`cp|CzSD)r9i?erf z#=5{QO*d7*2QPb?#X+Ekl5^uad68Ce|9<%1Rs9Ygt|oM=qZ53D~+$>$T|n_LsK_Shbu5(1tfaW5B2M$xC|x-X>s( zee%fkh%pY0LUlcm5G&EO@WroEmh`nD z=S~H@7N=JAmr1n`0BY%aTr(;7A+>j0dge2+rG(-J_K5FK@ymml<$qfM;S%5XAeQpz z=wx(v6bJ;s&JGkC*hL~Ws!HoypS87M5U_-K{E2=kQSv`JUM^zmXrM0IhDHUv!Nzv+x5qo0E08`20Erh+6KY5o+I$=HG(smo^aL{1Y6lfFzgEm- zfPFm2gTq}}B9k6rnZ<3@S(do+poNT8oF2~H%4O`Bgbc53KmUU;6X%KRMJ84ZR)X30 zlehs*e>hR^Kj`-$AezEL)`c~tia@p*3Jg?mw$j4VXk87IWdoK8$9t>_dSy>%t2XgP zJXPEA?o!9$`n;xgZ`P3dec-m=zz_9)`)+D9(6Z~hmO71L9e2gdUod8E@S)uX1BZEN z`?h0bx^SC+qhPbQ^eOiHB!oBw9d1y zkDQ(JZ1)Ud*r$TBD#h?|fhDNMt=-j&-zrobI)Jk$-wp8DxOVw|X`IZUwLN}nt$AvP zqa~BbvGK^{IAkTZ-C}xo{#FV#iDtLR+1op6W+uK%9cO*6jOSXg+V~&m_~wXST95os zQ(IR=V1u9W)eeZbfX0bb@5&rN#^GFz^r6vfwNZ%3`jvb72l51&ETs%F1!FGhM&3XQgm#{!(&a@3 zgOo9&v{-mJ5HVM-p4}L~DjbKK`=AY+@P=pbyKVgz6Qj3-2Vd-^5Jft(4`w&}-s4$@ zpr5l2_zg$AraR54)@WWlKcCU&cL4VBKEV{t4Od10GD7{^BEqR z#92QGOt$bUXDml%9>*mV98toYoOw`3sAHooJA?Z%r={dI-J1K>?b@o6-a`F(jR>do zM#*r~|4pP?CK4ANCa@^DuWf7+zUNgZtA0B46x`*28)OfLI;-8@{bEGh)h{7P$Z@Nu zEN|qhw&@TEhnJ-4R$>HabyHck5kf7(X>iCavi(S>)u|bB=6I03l3957wPyJy)nGn$ zH~eqqk3s^?mBH$!O#s+;+|4XmrXt2CH_!aKcQ8GAEI$KG$3>--oT_3iJXCqht#O*; zGbF59xG(rr5po9XbffN}7lT-~Na|9M-Y!DRII2)BJ_DojV!1t2&hjCyR`}MKq7@$Y zHjS@s6Wvio?%JPSnp_U5D44fKe!8n){KdvM(V|O=k z@UXetq$$MM{J@t{2??kA9wlW?A&4k<-e?fLj3&cSSI0c3v>jcv;ln0SJ--Iu{TdPJ z>FS|zTxx`H=-jd4?0iJM+jv=fb`oK&4n>us>9_Q?c8p2Eovk)1?JMqS)=V<38US5a zXLbfbTh~!B=?>TI6C1&Chrx`Kmqm%XH_O7b}_ulViQr}*axE{CWp>EGvTzi35Q@z)GB~)fShk={S z-S3y;7T=bK?{&Q5){pe;3TO`*S;FOsMdnRqf6Mr#IML9bb&k#UfY;LOoF`Bi@2g}m zht+re9>OvxT=y5vo4r{XA)Q*w(B0i#fW3XK8e@WUfFP75rW(0oSUAGNZZJKUijRm91P0$ zi6Wo2u~a{+^+h?7wsl9@Yu@JAA;EKV-BwznmR`RaQeP@5M6~qmG-q}OFz8J-Ef9f3Dcs+x=liz zpBpqb@%c3XRf;^7y~q=GJ$wW$E9{*-i@a`eMfPQ!SvLli5}dZE+#!8p z=yG)vPXC*7_qFsbiGz{g?Vq{iTqtVa+%vOxLF(DPZfhGTAo54C8)A&#?xJtf^ zMp0I07q9TJc2^&+}6FMEy~?#d9bB=rW@pE&>eKk ze9WGAySgPh(zp|F_)TBU2TM~;!|RiwhZq^r{Kxmnz@(&}gTL#$biIE%^06O9&c*qZ zZ}h!`prwj;uKeC8NFm{0j1L8di};HrF@K!3x}VQV;+a)vhRA`m;5FUQe8-&L!y5}xZ{O&^qRHD7ke(b#l(TyTNc>z#QMG(KLXj(& z+uXBW9+#3P2Olv!A^CB(zT&03aIMhq&&dxMVn*!Tk6xKF_JYGknK_r_BNuegZqMz$ z4x-%ro6RRf;H%Bg;=szi+1mh*4Af&4*F_E z1}`qV_*A+4>HV2744vI@001GM_6cIdR5;m=4qMcb=n2Bfw zx_%;%UA*4qcuNt=%LhpA`ttT&!@OP6dPL%DO0{CNBV(9j#`pPl=_n(Rw)7Iy@)(pg zs!c)#?1tE#~15A3g;^E#DtMM}QGqF+oACpuU(JyiYcI;w*o4 zUZjqtSIf%d{C4)Wu5cgU)7cY_=!H9W*5rMq@i!Jg&sC{j*j$F;oZ^l7k9d8!s^z2Q z<^o!RdXjk?45(G;J#pJRLA&kj(x##8N3IpvQdZ~);Zhv+!nYsY*@7!vHnrD{nY8Gz zLnQA)dyAMs_}A{?qLcqAl<6h6^LVZKOF5$(`(vpg<_DbydA#iPsB%g-LSA)gNp~#yjks!{P`xw?vC8Nk}I27d0wev!_(YI$LKU9F~-`)Q`N?(m|A`dz(Fc}$J z+4d%-V0;zg?Uie38ZTdc8(~MmcF#*&NBxsx=fzsh^r$X>76Lw;5)Qk=59m7*5Z}v) zEozaSe%`Xcvj!e$ zlL$^9F`J`v|HoKzHBO6I7TqigV(o5dq}N4piF-&1ebSL81h!tGSvN9Y@p9#^VB5b9 z;`YXJ&ssdzKtH?j;dlWI3-RDVKd2v)iJ0%BtA(G9);`wMk@asHQ#auBuyw=|IPJPs z@+S5_&q535jq<#TadCG@TYL(#!>{tB;~cZZ?UtY7F9jt4#jY-IB$O9|myr!d%Z*tP zAxG*u^~DCuwxtPt?6LUiVc4mHb5O5snEzdOtYBo&LRs64YOMrhVHFjerE_r8nk5D) zokVdF5wnl@AS9Da1c8uI&0S^je^Vg_bFH9%F&c3s*PFqpQyGmwDzhhfZ{)RL#g2KB zZ8h)Jo^);Lcc|(qNC6)N% z3B|bch<+q+u)MuwY)&!SfjbYrEl&t0V!!A(N8rL}8qD#(t`FE0xyH$x zm}#YbLB}TYuibLs#hg|(DCmwZk}vPFwc%;76_Esmivc*e;VN8m&&j0;Org>#)VO+8 zwf7r*pVpj2o4B6KX*G2iD~{tgka4KkHh-q7lKu7aDoA>dTA%{t#UhA=}q*m0J#p$Lnb01A!--Aqy@ z*5f|e>*aI2XFn*+{<*lE1Z%!-f0`$k0de|dgmj?o1j^%)`_lVm2)>h-hK^udd9g&| zfJ8qhDyhn>=H;v^H}K9mMKs~vOo=`VD@f?_$DnLaW`k(^!qY~!{I(qnF5y7*5dKZe zVAhUm^R!M8>*L8%>HJwnEhCi~b@X7-1{`$^N6r=v=2~f&?BU|!*lIl-cZZv)T?x;D zHqzWYm6Sb;!6?#Z@#!`?66a&0@!BKOp#t+`HT+*1e_sVqdP@GG@_kDI!B;C365cf|rQm>sS)Y0T?T@BRdQo3#mbh+{LtE zYZ?mTZzRl1-fMH=(cpqs+y{M!{ddu9&86)(`_@$how-^1nZnr-lvqlf#sv|7t4?AQ zk;6{Po~Iu2e+SY#Oiha7>WOsrehvr$=-JOtP3LCf{WWxGqEc$^4T^HKYubcSg{#2? z1=bB^gbR6OB!B%>EpHWQ?ryOSwk`jHGA7PWmZqcODLy(bbIJ!PzIsi!x$|BwLqX>9kb8PWuoC%Q8Fw!__dY7N7X?orPWrruB}mqKjw*1G55n^|k&;?1a}&)*?n zVL;D-H97SB3m!R<7wTeB5;aaLp(&IW&UT*d?`GR4b_j4l-IoUw!9Z^rLYW+MPdys@i=E1H5%pqb}JK ze*Q6eb0)gJLD3sTIP-c&m-hVZZJg6X=P&<({Ej?`n_a;9Oo*_N_QdR&2rDc;S(n_% zE2;~6izos}1&j5JckQD&1#AJF?wdU}y>0=uhQ?Kn$a?5v2<-6X)>p{`!PsKja$iug z;$*+jS;WcG)H~|leXDf)J2;N!{{xRa^M)r*T`tw9&>|Ep4w5;RM=Tbcp2ki@zbfp( z9`*0GYfY#=+q9M8SMKm5$HhGwTBXSBw~5T(@RfOq0;?V88FhC@avA<=lo`HfAFr?z zn4b|6vbOUh_QX)9li4uHSF|KJboY<#tgOp;CLc~j9%;tSFQbieJ-V8O?dic4#FRE+BjCZ zCLFmfJ)FuqiPi8;L+vNWAg-?CJj-IY$%fw}pR)Ol=pEwN zp~1_art&|%rSow0AK#D8nuRR5ys>>VA3|g*bOGr-yx4Ad``tL`o?0c(03HSD2CimU ztj2t>X1_);37)K&hMzCij=)r4U;v~cDTnX;B`z5|O9ej98bgP>?_rAIOz8dI%5&H_ zh3JQ*GDIjlo^bG>+V@c1r*DCeAv!Oax7%~C9WB+#YWzX|_a-EnJ8rHFpCyNbqCw8= z1(eFTb!?bwF;a7fV;Ds$`P#-;q)@f)tiCs;(MU_y?bv-melO=-AtciJ682oTBu59q zvH15sa=F-!j^~{FeOKe#`>_+%r?t9Gf|Ke32{;|dta7{XNk`=GFYE?`9^V%Z1T?H8 zs)yE?QZofl5s3Vi4OJCl?(`)FWx0G*c3$xbWAiB=G!+YOSX4wGpclH-9}5bUbM`SD z6pSs$+TWCkZYv&s)?+6{uTg09ng0G}=gcf^92O)Xo?))S4gi6>z%=(UCRRJ0ZfXJN z^iD%@`;X0=^Y1(Q`@?#NtF;OY(?Kiy zZ;nb)79YvA?v`)gjz1jY_Rvx5Br)6necVBM-kTE?@{um$D$2ygqKoTQkDgZ1< z?(YO)5w|sPOG^`IY1)ngVtBIdv_bLfg&I`slhU$4&p388ET7jfE3gdai0IYQ=`YMW zfa$}sf(Av1%`#4V5va!~l`*(yJTGV4seX3yQ!R)dQ+oB^R?~Ss&w3jS*dW!Gh6u%) zeuc59-AlZlvT?uSt@8(Vo=#u*)!jWdB+ym~&E1Hs@Z?!jLLzT_Q_pq#eDJmcKY@t1 zuuLNdC<5}%Yx@b#1A=CD*|wmKo4Uc;Vrmd(Zjon(F*=b^JrkW|M`;(MKkI%hXF?m} zhG*8yYh=G&$;br!FV)BTU!ulTpVm41uJS+2DT!&1J+!UxdH;GMV0}Rm-y?_{oAxvY zw=m6LCW!NOS#mQ_6!5Lsc*4k4T#eAzitqdK)i0hMIXhb#F5bZvHP`(3zGVCn$~sKC zB;%poz%j3|(vMFN(%}DnA|JN>Cf@4}Lde50iRRg;kJ-TIKF*%#K_{NVCCYFkSN)yvGMK%z zZ5$>QAZaJ4E>uj=%<)o4R++Xd|fz5`~>|?X{GVs)#AyMvh}1FcKBvhfA2YO61ThRg$JI45i1RoK0}dkXTk1@fheAH^qIP zh5TK!fM+B1HK}+9vZ_!i*;zRCd?q--L{!yf$CnPFmOmPh;+g+`EZ8HC7`X`Efq4ae zU$&USX7%{oyJsq&f&6-?p`G=Onz}YY5Q9bxJHu8Xw%^v+B!O%J{YOF_^%V>kcC zHN3dFQjS_DTSH9_oR(XdIEdE94Ds*S zi!oS{VEdUsl3EzOvwe}7GJ5|VauI5G!^K77VW+!goNmF&PfO}Y8Y@!E;CG5=~F0MBOJQbwWVu|NmqN0P5B9ES%0k;8n2SN9mcYU`;5*YwIUHiaX<-pT! zgHVoeH^VsD`i0~sG|k_H_UCJk8F^n7ME~BOgFHIn7JKfE z{Qdh+-7N+^V?{G9CHr`)q_H@6^;&C6cz4v7lfr|$k#gPrqn%qyfa&R3;h5laAw$5E zUnXK{*PjdkbvPZH_ur>N*7Lcbi;aurm40}q#|qKWmy3}1Lmf|+5w_%Tiac_yw8Zgu z=afT-oTa%ycz1j6kg+!gA9_<)@s?L33#Z!X8NHOTd+$eAW3)ay6mJc&%UWw8>Pe5^ z$fS0~1670Cy*ytVd`(dUb41>3u-`jrM1x3U3M<><-&vLnx8LYSQiht4IzReEaC6Dw zB9&SoQb&+#^XRQRAcfDFoa`mOoWHwEfIU$eZEXynjVgNo`EKW+wzRo+ZCn7V|A;{3 zDHM2F`HU)Z)6^d>`cNu5qQi%bCr9sor$!0WO9^5lZGF+)6DZ_1`inKSVRfMd37 zaGa`IE-ivb+@-EB^w=>=7_&5lTH@m)@tcVL?NP4+lNeB^7O$6?#wTN|Vmj{WDd2;? zb;!aIjl;HHFA0|w5Lo;4N0C2`5**D+=;1box132bo@l>1GGKsY0dSyS?pBTO@gV(s z_(<@4{754Di2g!oD&bU}*bu0R1{uWhg23-0S*zM_de$ete>&J1Yj}QmLB}`F^I;Du z>4|Sw;A@qPK5j`^khTvtLHm7#CS@eMLsB{!+34wF{i2`g91E=D`04R^&c&&b?0#qY zV=vBX*a-{9{MaY_K|6u%sfGF|rGnmMV(XI_VBgJP!Wm6Z)Rz^s?br=LzAYpmv);*V zcUWq#?&k^r^EmZsA5(kf#_kG+CXj{Q5h{=7*Va+;rO#aGgP*sR?~+x^??&IR=$*jt zyqv!6xol(f%&@=`nqpxZoFqI??4uhFy1Iog*u?9(fg9xOhl=gl%tqP~UhFf@e(6(! z7Uj+^toR@k#17Es$w31=&zF^Hr}>QnO+G{esG%*TV2_avw63qG(=}-r1z! z3Admg_y}}0sh@h76y18Jx1@s`zdT<(|4sMWh1Py6vGK;nH#|-0^AH!;MKi4}#;qZ9 z2M?6>GLKe=?kP7DR>T2>XtTdRu^IoyI~`L_0DCP+zwm=qR|?p!4rlSk!eC$T^4&7GaJy8Vdk6exw{EkV zJq{mcO)SC-vcx5`e z>Y<2{OWLNkY9$!Is{G+{wLNAPJTiUi18LyXMv_5@Omsq&$n^HRj3I~wxyB0M{gPvm z%s96r;v*HmACIA7lA#ONCH6dcy?pt`7Q|FG9~1G)mX}N>7&CUjYS1Odd<8s9!QfXDiPM4g$CyQqV5s;XZ>&LSJ~v^LTcph$ra>5m-D*2 zH=o%|oqvNUo=!hIPvz@2`TM@1c-i&Y^xZ&m*NEJCdh&C5d0RL#Xht;r5&H>?YH^^C z4kF7gP;tR=GRA#>S(P|5$U26i{ue7;@6(DSIY((_2oK{s)4#t5HO*J<^uN|3swptk zczKgoCmk&pb7Rzw^<_w~>zk{%H`^3-K-h4-oyHDS@D;zdMpG(C&->Of@MzQ~dk{a~ zqvq-LMzxirQu=0qJC-@MHYk<@wN0y9BV|RNNjI-g62JdG%`C#)OYQfGb-{X||xxf9$TAFF__t<*&d&q{!C%OXW^XHx4yE8AMeoo|$Yx)^JFWY9A zenO9N+Lf=T1ZyTSvQgzJIX-cJq2{DFe|J7wZHR=^X84)vCkmt$+zRoR=xBkKOoL^_ z%qgisxN?k=+BE4obN)AL`=r~qPtSVxr@g8)Nnds4IwxB?u{^YwCaOJd)^2?ZZUfJb z`sP&EII}_HT|}*<%{_)=pIZ%(RptHjuPLx2hg+W>x=@w&lG&q zn=E&gXFL%6RBRWv@*&BBTd7^Q%iikeFX)m+XY!w0_fWnB)n5Jv56b-C`V=uAq2f&R zoH{F-2@n>p{&wv;ne|hFCr42Eo==CGD8WZv%DXFUhQ98ODa^ThMwW)r-@i#|bgfI) zCDIM=0?y6FZ5P$aMYt!5!$PZB5?yVAn903=s^1C*9bT+8+;5)OWl{9Z?tR>@&Yf;D zVv-I2&_>j}kV3ySD?~QxY?pq3j9Mner|Z|f5!=^xx5Mu*T4d57Otq0Wp8bCSd_aT0 zNP!a!;!g(X9oW1U0**`$DIFjJt+$L-OB;DZPbYZSPQk4r;~)*aMO*b!33^=$fV1Ev zNh(FH+;r7S;!?(m`VE3|7f>S=R}L5Kt>Z;6w)~$@8Q%Bd7SFrnG(=|^L=)5kNuto+ zJX%WPu8)%^aMCByyQtJB+_lfSn9k}W)WW~zcYnrWQp4&Rg9L(%sB##qu}-nM(V?}< zz~D{h50&hH7J>4ubzx#H(ur?*j#b|VTUB^bX9QVhnNyhR4PL{-Ju+{d!4Z0Dc5!tr zk4D+3zE2Bymzry*Ugfopq!J!arW#8cyD57^TCkZu*I0;S>zbV@geS37a9xk-T5I?Y z7TL%Io1YpZsMn@=|2tN=??+SKb@R=fzh@`=9yvm*-ObLTQcx*{R7wFs;4?GTU@SMa z-}lI2{_bzy$p83pOQUW$d@O5`3-=nOz^0DHR+X`GhsEU*f-cTxU>H`tVamb48%{hC zAcrp7W^q+p2KX~td<$2G!_?uRmg{37vb^Dk3!WZx04?px#e)i>ux%9#__~Ks2nbY4O zkE<0@7J&qU*@-nCJswgC+oVPiB?(fxb)=EZwhv=tZB(2Ho`^wyGT_Y;0nPAyJ7Ac_ zdX-f+0Un%tvsp4Tl`yDkDWeUs#nS}d-KTFm;>mB%=ENa>tW*n9jh_}3{%+I}kmgVIRfmXT2YYI*~fkVhl z+k9kcQbbAYro)I{?2{UU#sYF(Jc%*ZOw`Nic(wGcD{sEw6j{rY5l9ZbphceiVAp-E zQ7&&(IU)s9<-l)fC6_k9`!s>~*!-!duyW232BF$HJzI;TK2m2U>DFdUtw|k6j$6L* zz&PhUdlP|<**g6QakqgA97@_uk)&f*=cbrDvXyde6<_t(wQVnfiujG2YmASjyz`Ha zb9nFJtU@bB!VDxh#q_2!?|564pL%7&r@y#^GiUa(u+|{z@4%XfEsewUO=bdM1nihz zam&gvw^(DX+s`dn-9T&X^3DQ;&`P@}+I1IXI&Wv(lX%@mM!bSS;K@KNIZ$8~tuq5_ zSt%H+m4j(xg997beVV}AYM**pMVU@k)=Ggt9Yu=NBqV8yF=pTxxv=VUX#W8&zt|Aj zZMX#XA32wq>7z`}%;O?WXLSN?drUQsvb0>IF|)${N6+AFxu1&Y@?YLk;-%M(@sFQR zxZ_^KBPT4q#4%om)20mwcmg&puC`9e@#A+Tcuz%VKVvPvr$Y%PClr=sn73O5JWI(fxBE1C;s<^ zC5?JSvt8rNod+;$miAK2Qmag}tyy04SYDaQvU($U;P4r29$%nRidkz1EHq2ZR9D%% zU$WeWKq;iiQ_uPLGB55)^F;8!?%(0~=)i7eNJ%*GC z{hnZ9*-{lLxEN#Lo_(`ova;afD5mBwBcv757cP!9txmw9`8wOj4|8I^LBAJr-~Ltl ziBCDq76Y;nudMPpATsV>n(gkBSWIwu+M`~rJ~3gXGlf+a9_SvkxW6uBJFmK#tW!9L z6QQTJSIgOc^v3lxfcMmFaRkQLWm_U+n`7Vn4(j1?zI<<;MtPZob6YuMdarx%(e2FEkMO{wn<#m07sZm$?=ipRp;_VK zV<9qK;TwAs?muJ@+K{B6J)I{HK%5xiggD;rryudOe&WRh2V?a*r7(O#@EU6=l}Z&M zgjcAk?0~=;i7RyjLC0Y0NH_?z-d-)0vS9Cx>pKtLsfn>u@FuiGv(`FYbhlZp-iS(Ay&Z9z!wUrh-YF}V! zvCp>ZZA5KLT^-4~%T&_P(C=6_g(pa@z{ApS!KA-HyO}ViI=HA!P4$^9uW+nC0g=H= zEytEZPRyr#^?{VRrEE#UcLrlJ7Fues&I;=+J)=LG8XgHe4}^Qd2U!^SPij{-Uq2K$ zCkC;m`JU}Cx0iLPfTB=Z0iKq#)lwj&6mA2CPXl;Ynw?YfMM#Zd%Vg~#r96DkW3AOk zIH*-Ch)$Po-wqCNl@L~%F`vHGv3t&1i z0&6W%nj-LsQoa!->66wGTWfQ3^e4;K54W8P)9FV9cnbo_nU$?`<&D`Qjua! z{_h%_fmUSkrD25W6(g@-YQYRLl^ z(CYT-M+xi1fCWpmAcE@{rKxjJUJtCrJmf; zC~t{-Ldw{=EOgx2p=7cM8*`3<$5mnIo}V8=Ps@_0^~PTB(*fSK_Nhr&Ip>I?c+sKu zl>+~4EetkIN%A~d-_r!1MoU4Org^nB8M``CHL`VHkr}Zw+;JVG)60?A%XM$=^*OZG z+6>Gl8&%mN0<(B9jI0JSOf+#W@RTa~T5qVVo}M$WIc33Xlya#t*f=JRV@#5e zqzTqodQpUy3g1(CYC*9fBl1A6yzz8HVMM_wkG7J+3K9&ASV>8hTcZk*kxsc?j8X|v zl94^exoqBSQqnZV7?))RW7nM}UC#JQmyv1$hm~4{r4Wl_ZMFTxmaf8OS-MY9rL!#| z*>i~adIp;3GQ>x;7nvI>_rvbcS@XU{j zoO5W;V{&|qAn@q*Bbv2&)8+tD;NXst%xOvCop7{k%! z)_dxqzY+vvZ|Jnv&TaP+VXe&)5(F-eQ+mA!CBXMHqD5(mvz8<=B#9li!ERka9{SaZ z5mG1jyD|u@1LH)#p_Bb!yb(=sLF^2IyYdRHmB7~;>1j}kl9p6MpIzG~+_TT!A$DG{ z>yq(Jlb1|3D!bqRp?~^0-_uWU{&Y`*5=7If>^1SChi^Ip}Ied7IbI&=0 zBS+`ybb6e7_UU~6-ug zYY%Y#ORg2qI)CRYw{D*J^@B$i<~*&wDdX&LoLE?3c50d@n!Z{`Oz3w+Zh=!&T3H+) z@;@u`jm3bt!a1DqwW>M<8(s6$0N(GmbE+E=6Qudr#yLllq=Pp4wC$VecKb*n*|}qu z1CJcxv>mhTJ8+mNPO#Q8Gc(D~?OT|eU!u9zMoGCMg!tfEtNp>5O=Fim`<(6XyXuOw zpL6~5FJafS&jOJUEjGFLi(lh`&wh!d-KA<$&Pr1@$%qA=FxQJ&=p?jaLu}k|(P6~X zxQH!MKqwu~N*;|o8s&tFv?R8WWx8QDQ0}%P$&AcHC8+s|iIQehS+h5)aBJJ=#ibs; zuZdQhJowLF;`~?MxOK$;CYn{N$Kk~|skTI>7{h#@g$9jLsk zDTp{(EKHCa;E6oC#8!?itZaby-y3+J?3E;01+>tyX2N-Ng@l zE3ALQTu@c+me(Fe^%?PKFh4vzRA+>@>`R7ob6XWueVdBtJUez>qn$%mb?)9CA=ai`FV>Zy7+spy7Gb_y6A$_U$AMiHUW+(N?2T8bH1l&RLVGG z`1;5GnO>_+qh4aJ2YI^;3--6y^T5V26(^Cmb(=CSeuC+w3goUuDa+AmtJ)CkDsw)=HhZm zV{J;O+rwJt23cYPq*nBrE36zjPAT+Ri{XzB*O~ECwg)M(73)|UDIic1UqaPWM8;-v zN@Iy_2Hrx*aaT70rJ3C_&g$wio6DUnpjv=0Wk!@`Nqgx0S6Pf@M8<~4Rxs@uu4(l6 zx0R5K>Iq6ZR*%lJ^8+ut{wKcw#aF*C ziDSCG9!VmcQu#cWp=WAgARc%7q)~z=9e+Jnp_vNaxTTY~jBX%CSm)}LM;MirBvfFX z#JH?_c@p-wA+Aobb4!UW(^ZaGhp%F$O9Bh%Je*nxf&3<9Q*lK`aA_^#u6D?=zG8b| z=`5}|nWhu3f6ep%?2fx1`LjFj+V__$&Gs=jGHyEg0oUnt3BSc|Z)z>Z*fo?G2sE4< zI%|w_5{RMFYUpe!>Yk@I*yauJetTD%8fK;&D5=Ia2?lAdeI2{oKPc~EzMqdg7<@m~~&+hZK zuzTAWcRzH3wqIev`0VymI!3Gmrxl3LStqZ<~ZK+nNj_%*}O zKRUDN5j9V3fOiAD-$u(E#R*ZIu=~tym;TfnFMiW`XK%YIiTb!GVqtZjZm&;2GAzzj zIq#gaD3?osLP-y#pxm87phPrpsK`XpzN-t^XS0@hWfrq{v(&VNW?B%6bPv8Y5}8Qp(4zzM1OFu2~^R&dHymt z*H)N6ah#nyw*eX@OCTkkrBynK<@Az4*_3wr#2Y*A@%}7N2)%7JpjPtOU2**DqiufX zk}5yAyUfcz)#M8+5jRXmbglT7Uw`D00L~FR!4^No=DO!Et@_+~&nj=cz>(mb(wb7q zFTLRT7rr-+ljt*_zx#ua2hhSH!+RWYhZF+qT$_9ZmKm|TJSN7i3sB6`2gL~M3_?)x zwf3Ya0#P#~0kHwy4e*X$QJfGbiTLRsd&Q5w{)cb)?~P6Mo%DN<#Lm|e=W9f*0?rV} z5pfh#tAw=MEz%?<3?)T(8LzCMoJ9ynnuG9(-fv=EW1C%`fTdLNV9#f*pYV{C{OJoP z_`cHue(ClW3$2uYNlIK$Pnq&ePKJ%N;Um9Fii~fUC(t`)e8Y)E@;?uF9F=2y|MW~o z9N84mXeC`3YVW$M&-?9_)y~|%-hS^V7%;=b`LE}DTy)ME!-vkuNXVC>V{Dv>P@KcK zY<6r%(iaB#ydzSxY=k7rzNb7PNN@tB5^xd6m%1Ay)&_X9tJja1nQAnC^oMVJ*VW&1 z(N7{R#4&|Kxl|HQDXi9nVMwi3qu)=E0{V#|ieoC}5YJO!4R`Ke=4hnYS#o$ll;>j? zySGJKn4L@A5V&sGN?Wp)`N5XQS|oY?Hq8gF9V1E|H-2n|j&c0T6;*!go*uU>mw4^w z_PPr0^2+B+hZ2_9%0YEjQn1pO+}{uQ!lLHvb5G+vKk{t$>}ask?$c^ptjW}2o>s0> z4(c~td*Sb|G&^$->_2>`$XzfBExWarR;NAqzO?dCN@w4j5*@ruR%tW4&7t*;T_3M9 z$Pp~IqM+<+?F%8ganeK3qh3)QU4RWo*nj8XbmUUy zTo!Vh4w+;rkRogC!Z4s#uVv&e>MR45?kLS)PYSM7mn#T>3 znh9-4T%K_&vv9LVI*R)`J`eRgR^p6_b_jf5vlLm*+&<19y!E-%${x*bf|4rpa?TU_ z@-;;_RxfRP;q}k{kb{>UI=b+19LGda9+zS*^NS0EbMCfHb%d(ZiyXq29qWN}PFQPP zA=b!#wK!)0J@jm5IQx}ChB!*bMytm5&`Mx8I_3@VW;QJ;7oL0i4L9BN(m!Zyo;o9= zeWV-Y>Wa}oEH_y9Q%VtpK1mYN@Aomrpj5_~+Bo5N-+CRlTzwjU@sE4?xNeo&`w32Rms($`em+txF<(1Z}=DNLg**1kqoUl+1;Jh;h zw|r$4De4_r^-`SE&bllrW{_W0Y#Z5i$A@B3UrV9qR@Q_gBJ>o_IjW_NlKbx(yh)NG zoZ!E{^>sh~rXPFRySz$iA`|mT@&@;@4*xQXd@&WY#J|93Ow$6c#%(i^$@q5SmuUV!^Mph4@YdXI|-HJ z&#M;Ze*#3l2&UCE&YzMGV1qYoozo^ z(zHuz6xy$#{1Q5M32+R}39J(+X)4b-xAsEql@3)aUdl$Mn-Cjbc z8-a72cltON?V5bdna(-K!^hhEuaEELA3n2}e?8IU`I{~0)C^?>DUJu5u=BhcTc#`A z@xVNX=36{?c$LYCG7leH9dzawA+}TJyF_2*v0v2m=Rlirc_QL+}H|kPu+T^R}1)z&0nQb^N*>$%I#-;&f0 za&<(WvX`cY0PsD9wS^sx$yro~7>U!&cU5!3M$(Q9y~uFx&IZ5z=4&{3{8`-bz&uA5 zI!x3G3kx-t<@e;eVJ$YQ+zKa*0|f`SmMnyyl#(JpV6`(Th`Fe$8ntuSF!O zrPWOsuLk_yhwo!DYV)HPY^E7o>b~ICV|_k;*zyN&e->J0WSNxfnebw%-%C7*v` zK!Tdx#HCly^T5MB5|^3vSvMSV8EZ+ba7aO79E;1bn4B1!8n1b}8<}*Ybw0(x8^;Mj z;PcY&yXuF3>Zg9-cf4wO8q&N?cHm6*k(vy!X*_J1^UE4Xl9((QOJ}k`o41n2g75ig ztw`b+lct&RTuvMn>F-h$9eCj><;XodX!i_47-px+y!w02${YA%iwCa1d?&y54_rHj1itrg=b0~!@$%=L!Td^}ew^(q*DF4EA6VvZK7Aj5bajKeCuqeEi{PDK zTIIT{cX9OvGpw}Yk?J+HVO25%=~}x>rR*U*4=p6lNqjHC(+VYpQ(CH>JEq^$@5d|0 z=9+)nibAG=#6XflVjP~ye(yVnNF7Lz=&H={=#RQP)=m0;a)#w zq9Pmhst%ME8{j>a!5ha3Y3MYgL&)&WL z17R5Yk1TZmxK{43K;VqEB28_+nUx(MRN*L}*?fR8Xb(JXv3&+4zsz4KQ*2e`-am0- zP|DWED$3WA&IWi-QSiob!t`V#c;|n6<9n`u@ilKA$|MTlrWsJv1d{xGYs_%ZG+$#& zlZ1YhVA2$&H8@L}WJw5doRC^atyYE{)M=Uyw7PDcIo0|l1R+kUcm zPd<4c@4LRit9F%n<7bxn`v)T~+3xZ8FPq|3e|wx;zkZx+FWH75VZ0vj`ybiMzIz|# zk6$@MWE>?ed8B1{_g7l{#DBb!Gq=`RZ1yuv@~Et1pulnjzK1cE#pNX?CmWQdKxwE} zeWaFXt?2d=yl&(?r7C;Q+VY1d7FypoJ=H#*rcGy!6V@TDbI#>tmMR{K#Z$sMq;_cS zhIvK|gU2$$U*Loj&N-JP1}Q0zRduK&8!D?)5xhy9QZ9%3-8cW(Z$0lnT=kzHOHAcw zT9anLO_Hnv=kT^J+v81>lqimg`cZb?%eP}vlVVasr`rVtwQ31xY-Ti`+usTXkBLFW z9VOKm0rEO&lvuAs4z!|C4*08k=6LU2ExMI4#%3fZoaTG~P%f9a`MplRxj|fMFvvH4e&md;GLPCd}hZ)K(80^pKp4_D_-`4H~#mmRhGruAa9e?475o> zOy#U*k`l);ahwpx2~ixA#Bp|p&38^?mEauo``P$uWv$2TwrzNxrr+%oCCR`@ZuCLs zPOflyfb?+vZNz$A4EOmI0&C&uVw+9%fUoYI=W}-*W^Sp?Ti*8tdWqq4cOK-eue+4% zF5AwVfBRO}_8;bVU$vRkI07X&+A+NC3#oh=cJg(nedF{wS$E{ zAu=o9G&OX3F*OgCGIu;k^xcAB_-kVGlRoAV;qj$Dbm{f zS(*d4&`0Mj%D_cZ2%M8c*BqO5L_QrBH%M9vtyDTiOlBSNC zsqq1slH^SDpwbjvb1@z&Ow$L&w_teXW1m7mt?Kg^|MU>Q`TkqDd|FY_f*UKE>ZHbt zPtYhS{{G%3ANqKSg|(PJ{rj)*u@_IUrK(tqELC6dbDv*k>z*C_?5i$dt(`B<=S#$5 zB;Ks(21FiW1{rvbu{2vZ02I`#0Y{E6GIwH*PPd2W5{wNq*IDCSHf?jc zvEPVabzWi9xM1${xDzovQWz&NsTeqL#dqn++I7tS!u&K#fMCWXt17tC&C5{u? zoh}PYYm85fGdW(z8JmGUNe6Kz!`z*mEgiw7V148VBdzp0M+qVL#O;T;dW+_LFW5vk zN{J106HA<0V&L|BMIEk3*A@sVG-3MHXqvT9Xy z2BM(5UCssM51Ar3EeI3{!SZSstrVruLwjDPIU_E z*anNon9t#$*NI4y%1AoI&{AKeBz@-cd6Oh%W@@5# z&DGEP0bG)yS>)rOILbaunpN8k~yONgC&DvB}7)G{xk^RFbA7X_k5r z#R<)|E^DnGyZ4+)r5xsI2+1IqsF>~+?dQ5J+hLaFNtr#Pe>SX#-+R#(-t*;sT=-|l zu?P&HkZ1&@KqD&^4jorcEuiW0^?Qi~GEwO2rX|9+i^ESiQ#ngGX`EJg>T{%gj_APkSWR zk)*|_d>BpY3Ii+QGBaxDXg4Ez{oxXRA%e*OE3rllNi-!9!m+%TiUUU@yp78H)PeWP z%P)LJiK>~Y@ja7c<@3q(%h@={rrG?~Sxl1BY_?fhZPMvRryY}|*?CtKNr3qZybx|(X&sD+#AAP7 zwC4r9yS`AJ5i$GR=MvXCyk5zY=GzneL=5GRm!FL|%-Mshxjd2}I<99VwHjNijKg3urM zPZ?wB_2Vq;S_q;zrnT1O^x25S1VnL`vfxl4GqTNLF_xk1QHZ?E3%bi~=I2x5#G@QI zB*W+yk*{Q?M&@9KAW(FB)@db7qpB%|8_Nk#8F&NVdj`R)@I23pql8#x+cR1Zu!A$1 zWU(<;LrY0AH_z%yn^wC=l9>E!WIMjyeoU(q(eCu=^kVw`lztr3?3}&wx-6KEe(ZOMIUu?fNOlkE}62uSl(j zl9|d&41Z);Coo2X15ZnoRxGZhZu?Bwx#^{wksH{3>cG3Yy7ml$*W#S%^rDEs^KmL; zag`Q>;AY>`Xr-u>OO#6?r7+;&p%XlK;5f(US4ndaTbG@0d;K_LkrP9lX3g;QWQCdO z29x7;N~M4}Ne1JjkpnO53=fM|SgiY$Vf*?R@=A>Ur+IDur5F^A597X}_$4c9CR zX1~{us8)OsnpT^9qbi%iW#q8PIRINE-RFV~Sf20l&;v`%9f>$RUu9xS4ccWXY8iq@ob>ymogS4@4z$q@Y88*fSZ;dPzi`jL-N(ni ze-l@3_F3#%#(c?q-|~u&&vEh9=kfNNuB6pXv-OMO-R&}8tfEgZMlpgy+nm$QgEO&3 z@|g1hhU|J}aB-PO#LeFLCR8F)`D zEIp%@w-@!7j?b;^KYjb;E>B6UJLym!#6k9gc zdEmf2ckEpS9G()CO97J;V@xz^)T$vSNwf2E4l*SL-6%yXiOy|h)}41xHV+r#F_Pw@ z78h;i#8|+Ir5QYca|ajIK-!9(0A5mR9(lrWZv749B#sc8@e2qcK)z-_bh9kFQWFL8}?Npb|i> zSclH$vr;}1^LvsbkuAlCb%JicB04RPgD32#KK^gZ zzh|sNs}1BnrQkhh_s(bRMzhI7VjkRo2bv10^lhO33Nk#@TzYO)s`cA*fVJR4XMW8Wn=TqucEd{#%i^!T)ymF|K*m zEPm)^E*kQ&K_rg#=g##w%YdXLOpKMdbMG8Cz3VefwU+qoD`(kOQ!MojHD3@rc=gBU zSggR4e(+!JSp2Q|sLF+@>}$w{YTd=kY8rO;=r>eHI<0+wOLSa1Kg=q*C(v;3xKS^ZP%~ z%eFY)`^s4=8kYN(nkO;94}D^u{d$~_zWXI?o~*Fij-Hq5Ic3eB3bKsuEOZ**-f(;7LZ8GemCkmw{e_5JD^IK6h95ZM~%P=SgbNT4b;7 z#`V;KchjbcXY^*%)Udd`_VxM2=J7@?*y?nyskKEGPB!=#MFsYJ!oU!QA#ogIjLDTi zWR|B&Qm=TVX^NKF*rZx6QLmM-sU^urL=Fgi#et(udXXXYHLY$upo$0MA~^!o+Gu=HssW45h+p`hpX2X8br0`+PK}?tq)wDNR%1uq%PQ{cJ~_|5w$6ut^QD|N zTVu5y56`$GuoNecrChcRl##)95Ho5=X4F~bQwWi5Q;pTjL~+XTg(h1zO^~&%iq&Qp zkTk~XY?)0su@G|Skwvz*dQ2=jOcb)TrZ_y8u((vA+jESSt2AmAw35RPU<8YqPqY~M zc?r?#rQJtPw5fy&$XaQ!f#0VVyzO@H8NFGDcEYM$V|Ic@cvt z1=`aDzK`$wc%Db1btcvjCI`5rQqrVxgzrmAp--(EP%Z`QHjZ!(Pf7M4ZQ`8E*5_Cs z?p2^CPrsvD^6)*yKizSd&wcq(o`3N+UViNveB$38<(EHjE8g-V|M>DLuH6>Uj4X+P zi9paw;WZzh<00AL!@v1bcI_BrwG|J~%wot0uPd-_nTq#spTZ1*^FyhEqkXKA%dt7B;RRmNoM zDuIWR5-GAg;h|}P8!*g>5#kC6JT>lXg|+fYF!~$U{}p(<{r)q1x0wpaJh1QZtyf*X z`z2wZM7GRg^K)Hs7E=hJkiy}48sGQO+CwRYRC17=BZQz7NSuiYeUC8kXpB`*TG4KI zvr1h=b_h6pY&A1S%-iJw`2r}N%`pQ{;c3N#hgW&epL~TozW4w;0>g(tb1#4N(XHJ3 zjl=xN8Jhog<1CY*WVvUtz(h%MqGNgG$L3h5Pw@}$eko^csk73G*1egXdpvS1Z{giA zp>I76o)3v~ZK7~?@cnD82t%LA@p^J(uK&>dQshsLd*xEe3luUiP6Uh1*eeBEXfL3m z3`z-_0{SUV>g1SG_V&QzvQV%i@U-)kL@RMpry%mP?@+#3EO=-sYo5~2xE%7725+@o zdd6?K7scFj?}0D2J6A{5vKM6XM~PZzvr<&yY<`;w@HI;7?A#>_!bDIGHNJL~LXUDO zpfOg#SxXefq{iTBLFoIG0!_D@uywjZIn=cKIuF;%a%wyMlx8R9z~LsJzT*&|{lY%3 zs7Cz7jSc>Cf6UkJYvUh2%tv1|#x>hQx`|^s%4D8Xq2$3;!%IJMg36BVeEe5m#Oze% zF~D61*rMIYOtS_niNmp!7}+Bpj+BG|D+E#rl*pFwwbr6q30uvz?rV_A(S45`uSNZ+ zTq=c?!1pSiugjkH%D%5kzOTv>{7$#uU0!L;tu{N~kU}1r-Zt@Z-*-DaB{MO`V3~fn zPh9+7icAk#R9~%RO?wKx5m5A<1MhgF_Ke?f-B`Na{=LUetQ?$~tnP6(GcxmrC27FE z3No8htu@Na+Buc$Y753T@I9)PfO0vcRxMMnmPq1kb#ScWGr!X1y?=8L_wQfetNZ3@ z)I#ogc$rowCXNiLb=ewWKcU@=DJ2mXj!FLL>Kdny*LcgnHrd}aeBz~(Ja5)VOIXRP ztrE}(6<<6a@k1Y*=Zs5s^S^)PMrvivYAb$RE1UI2Rh+cUBu)Y|!!4s+9pWgM=HXdG zX-Q+OT#MuW*nxwG?nAKJ@5O|npC3Cs{J_WeG(qU2rKH#Iv$E1+ae0-%_mQVfcQp#B z6uC5dFxy@~KFhn6Ol9SqLntY#fu~L)<2J6Rwr%e9zYA_z@W`R#%>xIIfBC|5w(S`P zS21v}7(`U&Z%(Zgp3+F=A(b4uImoQ?l*52ZrA%Y2LMimpYku!*9p3QSMJielYQcpQ8Yvtr zaW2A_Pz@D-eSepq_~#{F{Gw;`J3n_VQV2S|6eY#z8vW2Oi;=l)v3xMfa*r@(qdIFT z$(=Nc>TE&CqHU#KDS1;9wLSX}&V5lhP+FlM?;}5UD3!5uQ;jjgFaRMsN({X;Wv-$k z-yOycLCeT+O9;?P)jaKO7|wl139C-;yW*y!DCWSyW4HF>^gsHZq%c8KBjX}5vVy0z zMtd5iG(xHYcniCjFz~2VOH7W}5K<6&k`I0KLEiG4pW%mhz9(MxP6U3yuQJ8TYWD7Ka0Hc&KAG-{00h3NlSb!xcRnKe*LZ)LK z=6h-byx&RiZl0O^uDIzqPT9Br=v~dVUbj-xW$UCH%sWT>$lOaxDv6g@4k=Xz;JkHq z7ChghQLi#SRt8`3nSVXVe}4C;dFLe|zj*l=o!GL_HS6>k?lGXs{(n-!U5hb$8k$${ z3Xuwa^1?FzgjNo}5TI)QEclhKlg#i=eRqFK;Q8(u1|L-(dHDA;B}Fr~EOsoDq2LG340-og+uVL4!Ai+%KQ_;Dd4hj@ z-wV0?+)XU4^#}9VVMEDdU35ldjdtA`p8?Z61ZMGsak)6ct@D}A;#(}v_ekOtr6m)M z%8quoUv0H}ZKX28DT*V4&|hD5jYU|9;yC-Btt0h<_8`pcF+&1ZY-S89vJk^PXsu+p z*6s@H3di=1>nR8Co?Sb>JMP*+oFuIS4U~IOo=A1<^+*(mGvwF$Gq%A?O zkJrso-T!~~-aN?C?5Yp^oqO-Myfyc%t*fiMdQ-PrORJ@pkc83FT0ji4fPpat48jb7 z0waU*Oc+8K2s>;~c+4_^vB8)b8!Qlu2aG@~NJ1-!mRh3st-7kZ_FP`R?c46XXa2bN zTV5{JlISY6TKOU>Dl0Q9^X1F$_nmXk`7KH*M1cXo=(J<3EYCr8BHVk=DLnr0S^Uzs z^idQRg>{ZDfgrRLA<>M&GXDHbf!7`m&<+K_?)_8E&Xhi{r!ztz#7O}k82M9QM zZUE>4D{YCwFgl9RjwJs0(JAh|r17r1y7ehX|tLL#3|@z~?1@cA!3j1!MP44s@qGG52xJfq(tgq&eq zFrHeA@xazHjJ9~gYmZ`Kt_2u_YgfBq72v|y;D!Z-$2SW6#wRxLI}c59G9~;^$77rs zX>{hg_J zW^!$Hw;kYK|B{^@ z4P3Q(@R5^`Ubr}TwJ;rxXWZoekP_dl+a@OB+`ixQswa zbXp3=GLqDw-RV?kx-`v)Cr+Ke=g>;~MSt_TFW?h@^*JoaGkEpwDZb%Vt2lhet-vtF zT(|%%ECOuMpNmoG97m5@^rI;{-9=n`0I5J$zhn_Ij0pS zPHq~!xEtXMUp#}2%>?I@2sbT7c;JH<@GpM;_wkQj+{X`m;|i8yfl=xB5PA9xr%*u)=v-(mD( z0bKx_IU_SbOKY^^5C>NJ&pUQ>6|Fd&L7b2Rn}Z3SI=jAuOyR*hVUT9F!47IkL-<@t z0{yDaF|XjktMx4vHC_B)PX>89hrC& z{Kh~3X54oD64Fc~P@=ND36;RvwF&;i?|%;8b8{QLkT959Sf4B0izI*oQ$;vGZzX7N-NmrxT-0~Ea{t-XoArSlx%5h_rZIm!24Ah zEW20@7_XucHbpxy$fh~+G{eU~bKeJt!vpu4Z1m!9e^ZZM^~PmZ-5z+5!;B}6AV4k> zh1ntu7253>tE&<(eQ|~pn{$|(pL6oR3m1XHq8|{9WgMTA_?BB+fbD`a#z#+Qc;S-5 zLmL{eJ{02qb&U_4%y2%jSW68C86!6g!@yEYV45=)Vu96`fbn+55WvNpfVFj;nQY+H z$l$gA@VD{r{`b4_Ki_?G#b++csJ%JxN9OD%) zTY$v^e&R!C@vT4phxoOhdL#PX2><oTDq!jqbU!8>7+`v0tyNbME#L|&b zGzj;c&+tbNZs4`oS*$MgSK0D`jlt-NAW$=nvooM8b_~}FV~}e-VTi)At(0D~eKTeV z9J4Jn;y|gkw!9DC=Ms2#DgQ7QxbAQd7d8~u2kFHN7luFbU2i`8+pqt&r5m9n^hJ&F zV1ir&#%f5(kV-%*0TqOhNMFPE8U?CzbMgp-Hlb@YB{_?NBb`IC|6vo=3tppxfFYx&_ zjX(MOOSo|^z(!{AuD{&CJO1?t@uHg#;Dt9WV?52BkF&3QKm4vg!#y9r4a+S*%KuX}xzVje{_(SXX_J8sRP=Uk^p~h-g;&j1K1iaxugn#-St2jKbkY|i1 zM;4zxo8XV1Nbre^1~=V!2yYG*dYyRb$f3of0JeeGJ%*zMx-c^UwAP~CiWALTgucQy z9VNN3EGjo*6${JV7lJ^^wq@Rz13p*5YuUBSQ7CC;rF-Y=UvvDM=H}aX1{hs?cxhwl z6!BolPPjRxV9&8 z+k(PB{)+(?+Y;@F@Pc`TR~`=Wzb+^o>q)G(1Qud}UPx$3LLj!;LNf3_PNaCVA36Uf&hiR16yHhHFm6-5H-?oBJpLfKGS00IhfM5&8dS)?BEIxBK z#V`DIhEHC|aAHCT`dz&2_T%`4x8HzQJbx9e3!K$j9XYsk)7B{YSfIA&jS%MAotlE# zm}VKvsj;lBUlpg(76;SSeu@nZXv%M4yH@K|mdC30vz57f+tS#`y`)^(?x5i*%|n92;z|3kcam)b1mW2|-}dX%o(!Pp~x! zaA0)_mIPWGmk>$|1OZwR<4@nZg!ez0A`S>|J03f;b*~O!>&O_I0mF>c0EuQaLjzh8 z_?^d6TtBDqg4F<4Gk))}6yJVhj2o8}bk0!1wdZjt@LS)qjDPXT4bX{o90~;<`NS!F z`27Z}vA}!YvV@l(i-F9b6;RX74s3zk0>gqaE)05+z`2RRzrSY-_pjx6aLeG#&|uR@ z=ynS?99hC$cOS-&zwiiNa`Q3{FLz;##@0APW(4;-5zWoDuKU7$ClG843$o0(?#MxO z;&{iomw}91QR;lccxJ^^v%6+}tjZq&07)S_c}3mae>`Wvo970-Zru6NAG-5r?taaY zcLsrJxx69ffD+6d8sYk*i-@9C5CV7S&o%NS#dt8r#R~(hZJfi#xQif)ptZnbCnnIe zf^H{<&^i9YM^EDZPhP^(T#S|gj`b8yO$W#Rw%qn=)w38OXWLRqXUrmxT4H z#aimf5g$37;@9pSss`H4m+5aokCxxsLfK^u0~Gs3xx#8D7SDIw)7cm*@GHpq%%$F7%w%yKlbfUmlZGc8cL zX;i5RRiXo+1R=}w?gJ;z?rVCVOW-XEgLWtE{lq`I>o@MYbK$$vG=bKZC27R*I-<@5 zh+_b&t_0;7P#6$NL~$F@!4{U57cm+R@zm)7&R)#1o&|X5kpyW5BuRpFJi(K)i_dni z0cjvja@b26S*mg3%ouO~z#9JH?L9CvLg}idWuRbJaka6?ERbu)W@a(f7N5IV;4e?4 z__j+arXoUjz6)@H@B8y9w6#bJ4J8Rio66ToTXtDto_noC?M>}eQ3Mq##H|=nCqlm; zWA(Z=o;Tmdp~W_?Incv3t6dye>R`SXq2CD+DG4H=Fcx`kkmm+Ts%I->nRZyOaCkS4 zvYRX$JGXUPJ?Fpu}MY|oUcfR9g zzx?u7EPYp=Bp@OVRgNIO2+^?sEdhxECSxF*lFR2cKxLFJm?6>Yc5vfO5f&B(xc|N( zKK-|hxdR18!wE){6z}@}yYRC=@NyrzZDFjt2!H>B598ndx6k6ke=!9cgTNUxc|iif zfDpCE#v%?~ z?yXx5xoX}D9bltCpx2HNDuH$!pcN@Zp+po2AB*V@mM+!6!Wj3r))sl;6YD)JoE8_2 zd?5x~Cil02kOUz}UG8S;@`-kWR~tKFRp<83XeW4vXf@;Z$?P<}rCxadaRtCDui`L) znGpp7@A!c`-~P&19elgVrT~bgC=j&Qfmi}|4%iw4;~^nSFd1cd>U_379GY`MAQpRF z9G;sa>h~j-9DpFOygY|H?-2OL7Z>=*133o6iM!Z{kQ=v~3HCq;gt*Je8 ze)F*zEn?$LP-yMH?hf$U!q|}&_4j6OWCS<#$K;25)wJ0e+V6w+N`m)>qjOiWUA9dNI2-*2jmsbD;6(K^NZbKvn)-TJEs5D70~j2mX6#W85Cw7$_;Blt7jh$g-je z0xvUgt+g;d1D9?6T(oh)U@jxq;mSQXTiQ80QM~KHA(g7#M*s*Zw}LQwU^BJ95w+q6 zzWBhC_qW>NuC_GRGEAX&NPPW`Wz5VlUWy4SX_{P7TtT(RR!P_Z7*dLUpwvEiuM~K* z++4LMHcbkA&o^EFh65|%^RhexED*#A5aobw1EUcz8q&ox!|{Ln0JtpK(qhN>3y(@aD6iCU4w6*U8M%)2K$!v$XDK7S$etSl0#QY#a0wz; zt=Xsj`HNk6GdDNr5tVDD5CRee*JbGT!%KY8ju z4+`@)GjiZ2KrL5Ei#ykNfVDg-t#WNcV_lwkOX_o3)SE0TNz{u%weMqfrNDdq==@cC zVxvip+iqQcv#|zR8&*O?L=(USz%&OY6WTaGNq*`7x%9t%=5LeVH4L<4fj|P2l#%8Z zUwGug$M3kQ`v;4?;0GUkybUSGc=PL1v^y;ng~c5&>fkNk7~uW)_8_Nc@QPb*#KD7y zk>!Q=e43q@)~XrQLV~6R4YtQ?0<-yhykm&KgoY25e_um!<1c$(CF_)32M|>8M7H`G zvtrsBIH=m#a-GBFJHceF4d%P8n=hPQhf)%)Fxc^Q2g%ei-Sz;lwiq>Ab8K4&*Z$hG z;tOJil%g93;l7*3l>+a@&FNJeRIMzu<7s%Z!s3Mt^c-W$p(?n#JR%B7WfE1TVX*1z{vwoe(d(d4vz$ zBcKG(Znd1J6BQNg(7X^)gTyu>Ezzjb+t2OW-`?@QM%-ovPR5KHmWZl|(dO{5%%FGt z;98L1l=g5#6U+?;6VJ%x!PZ(50&}ZPM%7h z`uz`W{rkbxV4A!BY)(mh@_{K%UD607AO}vR<`!XXQ{(8hZEzy7 zFfXv!E3mc>cR~B1)b<>{(zva3`7f(wRndGEq(-ZYMg}kK^0j6fV{ZIEG|q~pr47pI zbUDqffl7@tsXKFfU^h(Xn4Oi4AgZc08nL7P3?0hy+`Y^6pU4R;c(@pwNz^D3k)}J}j>QcsuQ@!|4bD0bLYZ7cULBj)a|ShzkIkQAj{r znobSwdo=mzI5Ds+stcvC0Ty~;l~Jpt#?oSMVR2=?wK*t|rzx}n#t8$Sybwl&e%n^| zq`WP3mw8ssRt{Ze+uu5ep20I9ECV*1XH{&k-VKY^Qm9^<4wTd42D+>BE;U->W;G;l zH^Y8c?LNiATB??=RlCo%!-bNv9flHWkD(C}kQW7Z+xS}s1mwsY;E=VJt+hbI3#+_e zRDXz^%cVq3PA1WShqAu5Ll>8DfV`qr5< zVUuaV)ewkhooa}i$GJLs#FHbeugNs?u|~!92rb)Y*T!;1ALK^9z3U99aUbB>76A-f zw%C<0fEo?IZ8Wqcp~A&)Hg8tDPn0c;DfajnBM=xnZ|EI%TUBy!Wxl>GI86x=O_MCz z+#2ssoUa6UKmXABReNGds&U5`Fa7DAFIxCsDN}I4K#@^8N%67IZ2j(oC$lH4w}xS6 zs31TvAHwFQaRCyZf9uj4vs{CO;2;hWDvNGMdrx6To*N7&@T7^F1=JiFaU;O1+M6~% zXGZ$whcK3Fa5P$Dq6QIT+u?FYHJ@pV{dBp}gR=)-H3%=~)ZF}DnDLI{$~3-S7YP6? z6@(x`moZ|8 zflqzz;-9_gwMXtbdPLp1eqqS{Sm3e8$4|cJ0~^1T6pT2e${}%*0Z*LTs9I2Kfp2-; zO)orpB!0`eb6XI?LI|MSDzLZ``RH1Ut<9XyUSbH<;&O1qz&7iaW_yfn&WziDQPnlB z5|gT2AY1=mrrGM`4Ab4&v>YB;IKSw!6KMJ_yRRx>%fM{^Y^}=~Z4jgwY^ef&HGQUf zmt@$IH5P`E7-rYyY;TzX6xKS!yj{?3Ekg%t!U(jrtY%4ARH?C8);#JuT9`qENGaJ; zYCp5+ihwuG%vF7IkDVHB{nqb4{*yoY12?@}7Uu8}DSr38Yd`n-$EHszMVO?eF`WPl z0vC>OZ;VB+6XA8QI`mJC&X-J~ISkzee|R-Vdua(gNWi+FQ)g{J}9?rkeGLrH}wigss`Q}$H{N(AU zw!ZM54_^8$2B39Wj|c}3bRfNlF#$+3jc*L5RWt*9M{3 zN{dfj+8jNijoGzrW&m+4AdSXuM`B|ww6!USG6p(LCygC(Esc=vs_!5~O3HSi_E}a} z1iV*!2q?*gRDJG&jZc5>{`K!%=t^AJEP1u=;s`>4!Kl`k7TV(4L*4dU?mqI*vaAU6 z+%O3NVW)WhEd`d39|P8g&_zn8PNw$LpEqj0AIq&I<%iB(s#hD$kxpZEw0)&h{kzdx zm!~}2Xp3iepDva(ZnZHtzkoc?z}CW8w@EIvh6d0L10Ts!kI=RQwYi?9nI_k*j7k%_ z<~f%{os<{^0ml+jb>p`_Dd>+vq4qrU3L+H6?k0rBT4-$&CS=W)tI;k zfs*Yo+-F%`5%7LB9z;MC3Jk|Nh$I3 zs)tNY)l;vd1Q^q;O>{`R=uOM;skvx#4kZW+tpJPN7~0sG>2?j+T}tn^gDO|PQNB&~ zoM`yJgD^xV4q$|O$F9O8IV$7u{FW-?_2>{ z1zx{^={Uis{wn{Y_kD`j4lQ+F*6wt<+wLGqa~N#^wh)bhPxZDx&sKw=#tyhTYg&IU z#;o+N5;>ITXKP_~4wwQ0PIX)wrMCis(0|j#xo%^^TbJ*OG}4&pZpW4N_N#*GRaX_W zDFmdH2tubnh77I?1NpqO>w{13rR*Ug5Jg!LgN zn;JzqI2>Bj0NWUJ+PF}rG~aK z*{;+=-Zg}MY+yN1D_L63CBu4#n61yjzM7ICkdWxNqgxjHon1Ax3?K{w6#n(t^`>gM zV1=YPiMOR7zdB=->MN>d7gVj>&>c;aeegb)!7GSRXp2Wq4l0sD^XxSo=YR7JpFQ|r zUV6ve4=%OFG&rAPYfEpw_s_Tf^LyUE^)JtCs;wjQ@y{;L&!f}nu~Gq4;Ier{DH5pM z{kK)Gsx@}&Bx77vww9rNWj21*R03T$KF3&t(`U~k)fQ4&v|256d);af#LS3vgib5M zXqq7m0*Ek#R;F&({T-|#qxb;r3RKle3w6?@azsDs2fMuwW6Tj!EOg9 zoM=SsF;KD=nj>6!%szOZ%itvfCh6YME2l1ui+BI` zhu?Yf#N6kPt>`;0t|t%Q`*8B74?daRzcmGf441E6nS1Tx;tGN&cA|MNV6TGdQHMXf z@7WX#Ff6Njw_CN!21Z*CY`_>@wbfc1FbJc`7+cc}1q0d|2qJV^E##`GtGtqEw_*$@ z36xR@!Vp9nvtquc%+Ph7O?#TUI+xwFZGgF+{<5QkfeC0w!OGdSL73)x*QiZq#=(^( zL{Yf=u9q2x)wo=fS+<@^BDU?r(QwgdT#SOcp$hiF`&=)jzbMTgrKmmh^#nx0n1se06cK_gf_cg|7 zShf%(VEpPtz)>xQ5RiV5Q?}G@H|i_%OpNZVLWW7gh041NS1ETcmQv!v`X<%~BUscz z2(9b0v!gLO!#UxJ6wWtFqbRiVoAT18Qmj8SQECuE%5x-@ljm|#+>ip6H-t*HM4}Ta z)iRd}{Bk!VyC--JV^r<4!85iVmC^~bc}0TA|1QuEf_?CQ-Gf(3f)I>z>lTw#APQqx zt1;J!?`Q||rYz5^%1T6#zAYx=L_Jk2p0YjjsPR<&})%F?Gh#zTw zj;nZHmBj1^UPcg+xLjtCHoA6#+@&g8<`GaE?KQt~(}Gg>qDaEAre)c^Ne$2sZp}lRyT${2wPrEVfO^Du^zl|3MX!Eh<0ap)J*}Q z69y_EAlrxLa}c}?hLQnVaqF@GULP=sLM-+o)QbtoejL0i&2kuPXCggHnjTdIe&0q* zQ2|#FIfJ?q#ErK}5QKHa2Q7JxQLNr=>u3n?^4pgq>1W_jpf^Z+a&(+GyfVPY*FTSk!6=N+9Ec6eDl3twVg<~r< zDwil}geVgYTn!V|*_S+seKi)c0=BEn1R*4pl%Dk9tFf8?qdxaWV79@OlOH2NqjEfsI-MG2j%5?-3{gHn^uW*ZOxwb z5pd*>BP&agJEA}R$C(j@;n=dNq>JSlydu0{))24ywOW7#+EJ(?0*&^e`3!@XW(Fcx z|KToL1!h8;7hl%@EsQ}s44zMH4`f=qVNb(xf*OWx!pD(R(m4_pa0%qk)3O4&l>SUC zB$Sd3kUKC>(-ddVUxbBw-nlj~41~T7P0|cSmizs&yQvgfLrIA&cV}X1w9DIHlZNYS zqiv@hgRCl6(@(LfHj{EvNNtlso3zjdd+m8!afDVJ?SAfcuj7PSgPDolqp}IALmNpK?XOqQlKucBh3Mp7usLZ_bH6UTqk~Up$nmng^%BB zJn`E3f~ZUvKsBI}Qj`gLFoqz6ONSRyKfuyw>@X`#k`;PS z@TPfDyJGHailBs;u%d=xL8C)xx|1{{3FR9~%HYz*rPhV@!M>*VnFjA9an-Jj&;Woq zaxEj+O?a;aaErnbAjXM8uO02`8~k*S7(g7T+tN%!Yr|9;s>3OIwqNgMvVbfHQo7kX z*Ogcp;nqohGELjoOxA|DxW0*Tl7R#v)5f>tj6hNaUgJgXCFw#Nizp0`(#ccq2M&nC_T-(hwFD6-5>=MFAz{K02?&nb-Q{Ish0?>mf%RDnwCGFXNvH@Cw4(mUEg&(jhKwZhiUB zml>@n42~`Lug&rV#tR9ySFCEJQw~uWFjVK|mcuO3Xrl!Q2uXEzkdSq?7A^{OZF7La zTEt3Woau@|B+AO0=T!(;S)7b;i02ScVdA4@$!MGv_(a#9%Tzsv(1r<%L_#P$TG!w;8|h05t8W z)V1{tDmM-CRj@oJOf&ri15kTtb_p(uhWA**`l)vULJFYW1a0|)HAxz~bPs_PvZLgF zTHse@+MJ{ribA6mhgj_Q8t(aDy@$1og%G%RnyY_$Ua*Fp6#3TjQmN?u?n&1_0YYN;CT& z-nOEeWquKfdQe0H(tiO@jvzo_lofw_X)xLwI1IGn$g$1#0`Ev9X2Wc#JeJ zz?N&zBwx{F=`=wCLb_Fu@}vw=a-cn(62gfT%1W%OcA8)=u(R3y8$Ug zMZjo+S8H9Vl!~H2BapD6a;g&xMKfTmT){N_oQ2oxR&-BcVf~JpNjhgr%cE&l+zaL^ zHf4L+wU&_=8cK*=E3*#_OF@`aP8z)1#-MKW%Ogoip$wGhMS(k@1Wamqd0sB!_f$9n_F1h7+^SZK(_4IR^^bY^jH$o zMSw`@Cdjh6+qD8#)DvpK46+``mNA?pP8R4z1(i7*T$`O21@b&^w3Lio8z>c^D6|7_ zV;a?Tkt}omwo@5vujuAkU4W|RPZi&qEF(}7nW2ZWLO;>(c0jxQqR0=?vb;dPXQBc_ z8Iv};Ec01XF8FhdF14T60K$*($iwKmuoju1y7dhPaCg>Y`HMYkPY zyE4~#h4yY3f(Q%!J{J3ZTzB{Y#?vX*H-}i;7+^3QBgt|P3cnsQ7MiFULJ3&|Sni-t z+G;-xV=+!r7f&K)0|kYz*jb@n{twrypuEty{rGiQoa;0VGX9;+#K~|PS2!S{ZuX+nz7=!B$F26dG;!tW#Wd&1mhyg;s+eN?I#kGeHV49}b z+#KT4zyW!ZX3#}Bpb`$e{_98&QsDaqQY_FqtGfTq}K|ZXK=CSf(~x-r6dM8Ur!sq`|%o7UWC=#-}f8%R3Vi zXRzyKjeHsKDj{=*OABmTy_RRU4za5Z}xx_OHK^q8Eqz_OH(>@Md|AOPdAaFhm&0t3t6XjKPuR#e=JJoxi93 zgn6d&`}GS-AeSo|wjdDVD8ixD2!~ddk>v%3<1y9;L#z+BFq$UF3op|nKbdChtFl03 z8L6>QK?n*$B$Fw{QIN)+@bhV!zN8&TQC1i-#yA&aW=so%gY#Xy=(bxxDu5{xC@Fk3 zr0UEo;pBV*O_EqiDyhAio0c=~Z*NeCS*Df{0-=(%DMenbB#*jvmRo=NTCb z81S_25N6YrDg!*!E*f=g5mX5;%ELpcRLgJv%)!-^+pW=<4D(#7Z7b zbH^PfMk7xMGgDqaJO-0MnORg`SxQN)EG}SWX#qu1U^Gdvu{Ff{V2G{p6nRmgF#aqn z7-S3z!=NyNE()+QXwS_(o|F3f?J#^n97V4&Me&n)mbLPtU}H2O6e6WyjByp*D+-!b zsI0!C%M13I%Ym1f9bqIFmx%#ow56)rX4}~9 zmX0KqE$p^4v=1U}KYH>h7=JX`e>_XTTMm%6MiaE#aTVHirO-=4;JO2gZ)Ubsw#=np zQ@Mkzl{i%S9lI(g>UI;gp&Bfpq{6~{AB*#STz8GZG)XZSj;73`ijnDC<@vjYF=eyt3+>i#zh#Juhzd zpl04qkZ{8^0$`e+j@DJYP^rLLPA&&tW9-a;ZO8AI88(!o%B`a@CU-0{%rZ+#@(T#Y zO{KernY6XM58h`PcuN2mxyFH|dBo9`8Dd$>h@)V6x!-Zfz4wbG<9DLL#?r zSvhi7I|^>heap<;sJ7+bm#H#TYw4uZhXF>WrBiLmt$*z*Q(3QDwy5?6pgc zZRIRUb&wjELqQ}V_72wuyywZbnX_vU1~+R1npCG*6VnFypBaTN zu)Ms88;>5u=N~$OxYa_~>3wni?1>X;k|K%%2tg45)jao+XLbRo5*nI1-YOCWvuvvd z0B7Fc^sXw~=(=*3BkS^}#8OJ3=yIzf0I4pZ?cSf`tZ?iI5Ic<5iFdwTshUvfd%J;B z!FH$4{l~Kmynqv(k0w(DNS!zOxNARY`?)DYpP94wMQnyXPf>O>!T-vX?=fg|R$Fqjl#d z&AI${Lsm+aQ650V?Lf)ss)M(ow)$GJul%Zmmzgo1rs#Fs2m|F?#lItXnQ`pk@=M#H zy0wz8@oX?x30T6c=9C)MqR9ZN!n0@>6{@FIqH^MpNRt$2FRY`xu!welPH&vQ__0D8 zwBoolQtvUda-S~%vQ_M+wT`G^{7xCbPNxF~EG&p=rUY}-p{{W(;D&IaJWmU1tZyo3 z$ICyoF||Z-Pw?6iLpk&L9eQ4_2_-Z;8!xBLVW2`$I(=L%?2^+~4~8RXWB0-P<(z-B z%>oA&=b@gF3QRb>*ncB2tJ$hM8wb+F#LOUQn>w~x{kQ=PYUuQuiyA>dp68h41ypYi z*4oFCG`p|g?N(8xQi^`%UyK@WN;tdMqR?Pt8o9hX!OJz}q2%?~t$u^FQF5Kh+ts?H z1ZtdJZLPt6n%CZX-)6d;ue0TezbA?vrg)7TBQ=#zHHcfG3R*%~&{YAgyNPX$r#O4z z(w@$k``~?=3cNL*U~#_hU%;;nz{Xni+nvtg#on89qdlM2&Pp@l{piD@Nrc>lB&4{*DQDer$SoW+`_@-#jjY; zsg1?qmAP-|MC$e=b&iY#Pu1HNwAF~PuR6>!Zn9Z?%g?2%4A#?UuG(IzcFRPB!Eg)& z5h3>fAfCe1Bl|Ogyr@!1`c_g?@KWXa37xU<@2zU3{B0Mp`c@Er}V-O;**; zYFn*ZP^)e%+gW10Pf3_*Rm13LoRm>>kJZCk)9yHe4v?z3Txq+2sM!)BCjQ6O~zFSW$ z>%ua}+ubx=#Ay9ma$_*%C72@1iq6H&!Jbi~UwOrKuXB>5Uy+^CK6t-`$0SKAkEk!N z>KYtgUOc=y*LjQcM&>G!y)h?goL}p6?QF|Lvx76Pr_gm+AXg;+S$kDrI!%yjizteb z=J`E&UYzK4JD4O1h{961e}JpjvE*0-fgraxu6(xYcApyO+#TW$p3N4iLD684nR@4H z{6MG*CSzD*t+7wDvdi)Ug)mPy{7G1e6hN>131;kRXB-5C-xsj&wtOPGJkR&O>K*93vHmAFtnJs{uj;y{l6gW1?tRKYGn$qfAXL(yY zjBN<4*Be6Adf2+e(afr-X=X|!FdUCzWr!dQv9&q)@TK()Lm+g!Z3ICC0saR9jq$>baI@^YZ^1 z%hRIJ`O{TiXQyNLoNO@wDMZEyr{$oK8-uE*uDCR1)Nt!*UfcvZlF9X;bje%YV-FE9~y_$^$ZalK`hE5<}KAxryuMGjh&flCXTf8kk zr0k2yQ=7Q4->oaKkGP)UKR5&SEYC2>G{S{83T?i)H5}h>3Imn`ttdtq1z>A?02W-4 zuSYi}+bYj%@YVyVdcelp8U^fFCDH7ev@uL8D-rp$+OrTCs^#ZaWsk{h3Go)e&tp;f(U7rBgr!4UuL?- zK6sxY01qcgm63b7svCxZJbqx|?OC1)qYYQwaWoeZb!JN``@AGVo@dDO z+z(*6!B?&;FmXeiK#i`NxatTP<-g0DPd(B0jsj3hK?s4uU^6RpzLzk8$l1{5MS;A~ z=(O9r?t~eD6{29KX)TbLi3WC#m4dJ~9OKlv3y6XMQshudV6NB3rF7H_zC!Spo?Vk9 zaX0_x@Z(t@G-j>EBux=2wP*F!#^Ctj)t4-^qq|3=p--suf68iQXF1H&FgPQ!v&nlb z>c-h$4D4I5GMG#F_mN){3BTjr8jV3=OeE!GbFlS(?GpyZ`4q$P7{*u}IgT^tbBKoXYE33hMy=pI;5@F zEWEobB0w{Qf$}_9wV0w_=dk~`E!$jC4z&~tt+6%D5Y4TiDD*vR8-x2?k|04!Cw(;5 zB2;P-Kv2q)NDz|+6cLQpNTvyl)-`{MXDe*wOV!|J&o;aMNI)gnU2BYODFq;ckeVVU zB!xb;ywLY1?DY=#;>N%^hHP)2)4Ve1YyLJE01II(V}$0Y8BL*w`8|&nk0y$uo~=@=W!_{ z3}af4snDQlqMAn>SY5`Y!4@7neI7(WD-JOj48hj+;vo2vOz4!9NYV_a&Ynm196j59 zO@p@taPvX!ss`zp5~hXhk6crCh+alu$}xZ8(B#_W&SU-yD1-%W_C5P-qQfEut_) z6o!x_=IhZCRYS5!DQIJm6fVG;8+JXGxlx3Val^5rw_bl__2*BY zJuA01Hn`BH3UMyS#x5m5KuF1DqMvJxU0QGQ#91GWrn46J3gUTGsrW`?i6fs|;+ z8uOhNf{+lZ0F!BgVQ!)3I!Ke`u{_Hk48s89$+SAVuWt@8KiBt_w`LWU*+`u@1Pg*D z36`Q-{n+iyMZ0}M?!LYoym7q|t}=&fzH@a<5JW-{69Go&(Q3c__Am(l(`Y)muNwT| zOJkVp!T=y#duXL1#DMIynpZV>)7FpGe8(Y)&~LX9D2d55g|-$-hOMX0pOaaZ8``7# zmOSh7_5FH$d`*G3Jc~Kkea21KUHh%K-F*E2N{546#?ypzYhgSXow~)s8YX7TWfgOs zF_rQ=mJZaAQb8)8O(aA$>9ju4y==c>owssUXb35>(uz@NjkB90=&%cAHPSTu+x5X< zkfhnRu{3yVIKt6GtDSOy13|C`B!$2vFBr_w#**tSU1#7(4UY3%9RaGn>FltI8`ie| zH6sGCEISA(AeDrYf&--x1d4+oklkMAoj0}G-*bL*^sApsvVWcBMf#<01sG>9uA$S4 z(QUU-7z+`KF>f;fD1V1s3#ff};UZs3!lV#rr&%6Orb)6}E)w}0ntqzjU?05CqAHtY z83YlcFbrP*(%XOL_@Sl$qbP<^AT)x*hmfTSio8HkxRr*{8roe`5{@w zt6(8`q=`C#;3&|XOvh#F9s*esINVyt#jdzNN(z!vu###fmPJZIQc5m!mXuWWjY&z8 zLU5JzAcZ%3v&#$Z@SmSu8+`bQvzI>p<#HNMox6ZzhYvz31!FLUDu-)a+i>~eVdYEb z2Y}6coFK$OAj2S#GvF;(eYu}!e7!%uX25H##WYDFg}{M@{kqkt6tYi+cr;^ePnro6HlGP!POPS z{r1=sTWEHkR*FCv0-_!aQpt7$2xu!QBX`4@U3Iw>$^!e3ufa2~u@+K_UY_S7XE*>_ z1{({o_1Xo*Ud|lBLfE195pqxI4>)4IzDq*j>Vc%kxG+=~LL}%AFcvSp88oDUBv|M%PStc$mRDDBg znYr=+tF}fJtgDX+m+nX8iOqtDgYxj)u|61Jp&L)QpV_ml|E`S0-GY37r7E z?p!Tfe;Lny(XtMZFA2;J%+;*N4OX}$aD;_MmSxTnLrR8}E+NEM$9iqDD8JE81B_WHbS)EZcCurvNEx{|kgtmD%(H9$QlK;QGD_xSKIKp3MRnN>G zTJ1_QAPfdWSm7}I!EfLP^$YkV{L>B`2pk|IkP#-tDHgH!9Nm@aA63;|UFx~^khH6* zh>q!3YD~k0=<#2p*f`g;u6>wib@Y0f> z5ddecxkiMdse+ginV`S|sqf|ERb%$i5TSJs`B>#3n<&_OhyjwVvQ(55bqK1o9~x9( z5U~$t3R1=}-vY1!U_AjZg5+f)^f*AR#1EDssS3@ z&jVw4{mI?|hNIC6rOz3>bc)X@d%qU2*6;?0h>E%vTy$_Ew7H920g2${sYh}v5xjwD zT7%Kc)FxL~QQO1tkct5IE+&mZ4@3xn=2zgehSsuc5kQ%l1|~ERQxRex=|iKOyIB&E5n{MY1f3kYZ3%I-`bcdh6;|o=kNV7LpqB>dl3y za8Pv7BnMI^hGo7PGzSi#tpK>N?-C&AuMt$06PXZEm6jWc<=_(mT$c`OU5YBK;f*Ec zn6AM4Y;0HRc%=-yIbb;fficWCn(#nUM6D5dvVkv+Lz!4_IWLn=eB`OwR>7rIBKt7p z08(pViUQ0A%qB`)a$x=DhsSFG{t_m-CfBhhBG>MJ^}pVGciz>_^#P5BBj4g%36=>4 z3Tu3uQJ<>lqp+y%wVQ~~ti}Mv^HX1=xuwEH!(E$9s>Du4Wa?lD#_$e6zX?a5ge?Nt zWk7ZvK(@|F3F5k4XlRm5{#0MI`=J~1DC_WAdJeE0XS-M+PBM&l7w1lBMN0AnP? zU;D20el|)?3OBA?N~Cf6KG)IAc@cxS_|)$P|8#vkWmv=4h;UOCBLL%Y-euS#h^ypz zrD}Brz*Hg?h$=MgLt@W{HrGu6GZS+YumJ)JuevYfedqw|OCgo*1p}9+065=}fYqc@ zHUVu-pjhTjBpE=B{wqoIEJ-AcG?gF2qm1>9pv}YuH2_bYAa&xs`m7>mf-MT)-2p(a zSJ1E&-2Km&dwcu)Pr~FzqBfV=L`PLt`=8x^P@TN>=Bw|#d3&I)1bGIz4oqNT@9+tk zI??WKYZBqyqB#&s&~knLspim>TCM4AG}jmGc^Ee90Br%9J`2vYqIlSfjKq&6%3{_dz3ZKhWHUug~E`GMeM%lgjpjCGMi+RSMiVNo=z9lC9`jyM@}T znmmt4NKuGQjy-Wgc^Ossg5xbav8_foHlVg7F@>{?cCRr$J897C;b2ti-Fpvq4-OBX zgvnebQc4ragyh-^0OiAP9u1F*j0J#xrNMg|+qR3K%GG3=@mUJsbpV@%HQUS#!wjD> z6qHGcZ7yT!RzDLAnxr_B)OX@kygqfp)bfYc(wHd*^J8sofL{(q`q5|iADs+`kHcgh zCpKaVU}V=+L~Y{n?(Y7F!{Hkr{OJ#`-@3j*MkZbzHyWF7)k*douQq8e4{bFdO_JZ6 zT;Q}uUD}dJVzRt~TwvmN4^KuS+K&WbxCTk=+q5ZSyuBvTEYyjEg2v38^d+ie*J|f_ z2+IWf6h$z5_fcWZHWL}wEFS5@(m4RtITH6usMX7YcaajxiylWih$`v0$#E;9D*D~- z-sr~G8VE`)5Hd1WtiU1kU;QDkmsKq;ew8iIgH*Ig!dqRaS0XIvG{Yos>>as>+>AD)(gX z@Z|5Rau2{TEJS4jU`fn^h6-<t&}buz?;@;>FJ2rZXu&r9lWOny3SBnqyxB;toV}vh7o)@(ZdfvfB4r2-#z}Z zu;#X99vH)Y!_+g(J!81AOa(Ld3d4OSvet0VXU?%P%rH!z93r1O$LzcFai}BA>>GZ0 z`xap0AQc!zxmu30YC-=U1 zc(8x)=iS$D{#I2nsT?ZjTIbWSEtq^kVuuyQhTA}1m; zbRr`W9f{~rRVK+f#)V~+ycZXsVJ2~NSI{(1LA^RU=TuayNS>i?X-w^o37(jX$r3er zW(;o|qRrBu7iH(cnco>Rq%)zrl@l&Ii0v6cInNH61>khwCNr#nl|M>aW z{eJ~DdOb+6e%JKMmA2~mJCC}o0LbI@f3Sa zvq_8&prQlZUH>ano@aF3X{J5IB#b_MWY#qm**ZKPZoIj@4XXkoRyJO{Aq7$34d4?w zV3^ff1E)fUE%tvI{xT`c8{zol4u3Oc3!!v8i&^vV(yGg61+Oka$J3PebPn(-vlCNL z%p$&!`HN=-fpCZ2MjcFe*QB5sEA}F*eb=HkOQq8(zmxxlWcxJ5Hk@`om~x$*nK_)D zpUnWo_rCh({=o8`+dJ!P;EISDMFg-^s7i*2U{Y3?R6@hjVSgxiyniJ39)9~@=iH4% zv#65abqf-xx&#Y-=>{#6YBi&4!6GCUEy++%0|;S$um`4mkEa}a+A+J-e(G3cmhmyt z3<8fAm|Qf&)|)p`b&k(;R`@EVs(rGb`{IklGqAzT@9b=Cez3K^_V&i0*jeirJB8sj z0`&o~6P00Ej*m~qhX=#)uZJh2ABUsST>u{g_yNE{;5x>M)GaeJAeXv1p`{DnllBKM zcpl<;f%mK+o(JY>YIWE5(4k&V1MIB-rzOsvmhe5&k~Y?|?5JWfyG>^-E?oSDzAe!X$4u>a=>V(Fa3w7xiC=W=p1aMf3rzN9 zCZo<#M`uZHnIqLt1JKhfR;M9Cmig{1pC(OlmCypF4KJv1Ofy-!?(@8~LdvA4c1YG~ zgxr}W?aRP6UnH2PG1i#DU}J_$U>*oh1IR@*2c5FN412!}3AktoAaxLg)4nUGSlDva ze;VnB8K%QD08ULm#C&(rJWyUrJNQ{w($EC~q6-54G>qXQOyg++QD_M;Uc`N+CBc8* z=SZ2vTvh{{2Rfaz;4k|9D>I%~8JuN6qo+LPX){eu>*u2d7oLj(uAcG!oF|CSn&qQs zc<(H~u>$WogPInw?ateVJdMiyJlzskHSO&@?b9oFkL)FTfQz_M&ilc25oXU?y1oqK zJOd|I$@o`brKSrwre4s(a9*FCwFhCYNy;#0irRPomHqW|G1C*;4?@4#E?jH>?v@U%cy?3dQAc-DchXVErpOh~ z-jbon+tNbnl6hoEb;)TVk+%hTDDi_G%i3*RZ&15!$Fjr^f;Ke&A@|?=`2&+{zr+3a z{D*=t(`AXyS%X7N z%a#RZw6vD^t_rnM`L4E>m=U&R!A-&}nZIi$BOPvkhrCuUe@BN~-lRD)f44;J%TwgE zcze8u!PQ_NR7?o(NylLXVTfDO zxs5=@|GsYEsNo4M#nT%N!UE(?dnS)t2+{ELYAFp*3=iF=|EQnTp`#vlSXuGVraYo? z+RCzXo6h3qA8{KG?S4nE(lM+;Eb4nT3XV;7gcAxUi5m)`k5tv}cPy()8ZR3TLW3I- zAS^}cq-IJvL7a4RgR!yk@~RT%$lA7{L5ES*hyx)M4(yxI$Ub(4f)K|^v1>zvwQY!_ zIrWw8q9GS^!Dp~}+?mbnB6jDF8mVlbQ!jFKDY;w=7;XO{9bq7>LXGK24WA`;rL)_Z z)&j}pbV(;6gY;VMhbxgvn`X;6x}VUEE-7 z%)7j-%t8S=ZL3yc)HbXDAqJZvBTPoiW_A-+a8m3_Z?v{DN7Tnr#O_VUMT0UBt$;p` zDh6JbGHN8JJ*JN%y2%msb97@_S>9!%Egwk;?PEkU9ntz&3uR}%Fj5d$JHQbQb3}a{ zSzFT^#n=VInPpcAS}CNxj?_ zVscANk5Cfz(51EI1pz};AWWb|kgbYNb4wCEGUn3+eMUMV?1-{=I4TlmLJMot@rd07 zZuo2hk1ccu{YmGkcYdWAVdk{Z4Nm?^cTD&}jGm+Q1SYIXMwmG*oO*83&#>l%nbR`G zhh=lZ%xIb7kU3#;TBbfECrnC9P=-XpL|TG2BoZdj61*XiFbW8?1Z_wp%#;>${SUIy V$8qr;L*)Pf002ovPDHLkV1hYLS~36t literal 0 HcmV?d00001 diff --git a/erpnext/public/images/leaflet/layers.png b/erpnext/public/images/leaflet/layers.png new file mode 100644 index 0000000000000000000000000000000000000000..1a72e5784b2b456eac5d7670738db80697af3377 GIT binary patch literal 696 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 UQO-*oc+)|Q_08}VdXD6O0C*xx%>V!Z literal 0 HcmV?d00001 diff --git a/erpnext/public/images/leaflet/marker-icon.png b/erpnext/public/images/leaflet/marker-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..950edf24677ded147df13b26f91baa2b0fa70513 GIT binary patch literal 1466 zcmV;r1x5OaP)P001cn1^@s6z>|W`000GnNklGNuHDcIX17Zdjl&3`L?0sTjIws<{((Dh&g-s0<@jYQyl?D*X^?%13;ml^gy> ziMrY_^1WI=(g@LMizu=zCoA>C`6|QEq1eV92k*7m>G65*&@&6)aC&e}G zI)pf-Za|N`DT&Cn1J|o`19mumxW~hiKiKyc-P`S@q)rdTo84@QI@;0yXrG%9uhI>A zG5QHb6s4=<6xy{1 z@NMxEkryp{LS44%z$3lP^cX!9+2-;CTt3wM4(k*#C{aiIiLuB>jJj;KPhPzIC00bL zU3a#;aJld94lCW=`4&aAy8M7PY=HQ>O%$YEP4c4UY#CRxfgbE~(|uiI=YS8q;O9y6 zmIkXzR`}p7ti|PrM3a}WMnR=3NVnWdAAR>b9X@)DKL6=YsvmH%?I24wdq?Gh54_;# z$?_LvgjEdspdQlft#4CQ z`2Zyvy?*)N1Ftw|{_hakhG9WjS?Az@I@+IZ8JbWewR!XUK4&6346+d#~gsE0SY(LX8&JfY>Aj)RxGy96nwhs2rv zzW6pTnMpFkDSkT*a*6Dx|u@ds6ISVn0@^RmIsKZ5Y;bazbc;tTSq(kg(=481ODrPyNB6n z-$+U}(w$m6U6H$w17Bw+wDaFIe~GvNMYvnw31MpY0eQKT9l>SU``8k7w4)z!GZKMI z#_cEKq7k~i%nlK@6c-K?+R;B#5$?T#YpKD`t_4bAs^#E+@5QW$@OX3*`;(#{U^d-vY)&xEE>n5lYl&T?Amke9$Lam@{1K@O ze*LXqlKQHiv=gx+V^Cbb2?z@ISBQ*3amF;9UJ3SBg(N|710TLamQmYZ&Qjn2LuO<* zCZlB4n%@pc&7NNnY1}x+NWpHlq`OJEo|`aYN9<`RBUB+79g;>dgb6YlfN#kGL?lO_ z!6~M^7sOnbsUkKk<@Ysie&`G>ruxH&Mgy&8;i=A zB9OO!xR{AyODw>DS-q5YM{0ExFEAzt zm>RdS+ssW(-8|?xr0(?$vBVB*%(xDLtq3Hf0I5yFm<_g=W2`QWAax{1rWVH=I!VrP zs(rTFX@W#t$hXNvbgX`gK&^w_YD;CQ!B@e0QbLIWaKAXQe2-kkloo;{iF#6}z!4=W zi$giRj1{ zt;2w`VSCF#WE&*ev7jpsC=6175@(~nTE2;7M-L((0bH@yG}-TB$R~WXd?tA$s3|%y zA`9$sA(>F%J3ioz<-LJl*^o1|w84l>HBR`>3l9c8$5Xr@xCiIQ7{x$fMCzOk_-M=% z+{a_Q#;42`#KfUte@$NT77uaTz?b-fBe)1s5XE$yA79fm?KqM^VgLXD07*qoM6N<$ Ef<_J(9smFU literal 0 HcmV?d00001 diff --git a/erpnext/public/images/leaflet/spritesheet-2x.png b/erpnext/public/images/leaflet/spritesheet-2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c45231aff86b1344333414cdfa7a2a74d38d5304 GIT binary patch literal 3581 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 i{eP_FzxHA`84t@4c6%tZ%} + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/erpnext/public/js/agriculture/ternary_plot.js b/erpnext/public/js/agriculture/ternary_plot.js new file mode 100644 index 00000000000..6f06585e2cc --- /dev/null +++ b/erpnext/public/js/agriculture/ternary_plot.js @@ -0,0 +1,232 @@ +frappe.provide('agriculture'); + +agriculture.TernaryPlot = class TernaryPlot { + constructor(opts) { + Object.assign(this, opts); + + frappe.require('assets/frappe/js/lib/snap.svg-min.js', () => { + this.make_svg(); + this.init_snap(); + this.init_config(); + this.make_plot(); + this.make_plot_marking(); + this.make_legend(); + this.mark_blip(); + }); + } + + make_svg() { + this.$svg = $(''); + $(this.parent).append(this.$svg); + } + + init_snap() { + this.paper = new Snap(this.$svg.get(0)); + } + + init_config() { + this.config = { + triangle_side: 300, + spacing: 50, + strokeWidth: 1, + stroke: frappe.ui.color.get('black') + }; + this.config.scaling_factor = this.config.triangle_side / 100; + let { triangle_side: t, spacing: s, scaling_factor: p } = this.config; + + this.coords = { + sand: { + points: [ + s + t * Snap.cos(60), s, + s, s + t * Snap.cos(30), + s + t, s + t * Snap.cos(30) + ], + color: frappe.ui.color.get('peach') + }, + loamy_sand: { + points: [ + s + 15 * p * Snap.cos(60), s + (100 - 15) * p * Snap.cos(30), + s + 10 * p * Snap.cos(60), s + (100 - 10) * p * Snap.cos(30), + s + (100 - 85) * p, s + t * Snap.cos(30), + s + (100 - 70) * p, s + t * Snap.cos(30) + ], + color: frappe.ui.color.get('pink') + }, + sandy_loam: { + points: [ + s + 20 * p * Snap.cos(60) + 27.5 * p, s + (100 - 20) * p * Snap.cos(30), + s + 20 * p * Snap.cos(60), s + (100 - 20) * p * Snap.cos(30), + s + 15 * p * Snap.cos(60), s + (100 - 15) * p * Snap.cos(30), + s + (100 - 75) * p, s + t * Snap.cos(30), + s + (100 - 50) * p, s + t * Snap.cos(30), + s + (100 - 50) * p + 7.5 * p * Snap.cos(60), s + t * Snap.cos(30) - 7.5 * p * Snap.cos(30), + s + (100 - 50) * p + 7.5 * p * Snap.cos(60) - 10 * p, s + t * Snap.cos(30) - 7.5 * p * Snap.cos(30) + ], + color: frappe.ui.color.get('pink', 'light') + }, + loam: { + points: [ + s + (100 - 50) * p + 27.5 * p * Snap.cos(60), s + t * Snap.cos(30) - 27.5 * p * Snap.cos(30), + s + (100 - 50) * p + 27.5 * p * Snap.cos(60) - 22.5 * p, s + t * Snap.cos(30) - 27.5 * p * Snap.cos(30), + s + 20 * p * Snap.cos(60) + 27.5 * p, s + (100 - 20) * p * Snap.cos(30), + s + (100 - 50) * p + 7.5 * p * Snap.cos(60) - 10 * p, s + t * Snap.cos(30) - 7.5 * p * Snap.cos(30), + s + (100 - 50) * p + 7.5 * p * Snap.cos(60), s + t * Snap.cos(30) - 7.5 * p * Snap.cos(30) + ], + color: frappe.ui.color.get('brown') + }, + silt_loam: { + points: [ + s + t - 27.5 * p * Snap.cos(60), s + 72.5 * p * Snap.cos(30), + s + (100 - 50) * p + 27.5 * p * Snap.cos(60), s + t * Snap.cos(30) - 27.5 * p * Snap.cos(30), + s + (100 - 50) * p, s + t * Snap.cos(30), + s + (100 - 20) * p, s + t * Snap.cos(30), + s + (100 - 20) * p + 12.5 * p * Snap.cos(60), s + 90 * p * Snap.cos(30), + s + t - 12.5 * p * Snap.cos(60), s + (100 - 12.5) * p * Snap.cos(30) + ], + color: frappe.ui.color.get('green', 'dark') + }, + silt: { + points: [ + s + t - 12.5 * p * Snap.cos(60), s + (100 - 12.5) * p * Snap.cos(30), + s + (100 - 20) * p + 12.5 * p * Snap.cos(60), s + 90 * p * Snap.cos(30), + s + (100 - 20) * p, s + t * Snap.cos(30), + s + t, s + t * Snap.cos(30) + ], + color: frappe.ui.color.get('green') + }, + silty_clay_loam: { + points: [ + s + t - 40 * p * Snap.cos(60), s + 60 * p * Snap.cos(30), + s + t - 40 * p * Snap.cos(60) - 20 * p, s + 60 * p * Snap.cos(30), + s + t - 27.5 * p * Snap.cos(60) - 20 * p, s + 72.5 * p * Snap.cos(30), + s + t - 27.5 * p * Snap.cos(60), s + 72.5 * p * Snap.cos(30) + ], + color: frappe.ui.color.get('cyan', 'dark') + }, + silty_clay: { + points: [ + s + t - 60 * p * Snap.cos(60), s + 40 * p * Snap.cos(30), + s + t - 40 * p * Snap.cos(60) - 20 * p, s + 60 * p * Snap.cos(30), + s + t - 40 * p * Snap.cos(60), s + 60 * p * Snap.cos(30) + ], + color: frappe.ui.color.get('cyan') + }, + clay_loam: { + points: [ + s + t - 40 * p * Snap.cos(60) - 20 * p, s + 60 * p * Snap.cos(30), + s + t - 40 * p * Snap.cos(60) - 45 * p, s + 60 * p * Snap.cos(30), + s + t - 27.5 * p * Snap.cos(60) - 45 * p, s + 72.5 * p * Snap.cos(30), + s + t - 27.5 * p * Snap.cos(60) - 20 * p, s + 72.5 * p * Snap.cos(30) + ], + color: frappe.ui.color.get('green', 'light') + }, + sandy_clay_loam: { + points: [ + s + 35 * p * Snap.cos(60) + 20 * p, s + (100 - 35) * p * Snap.cos(30), + s + 35 * p * Snap.cos(60), s + (100 - 35) * p * Snap.cos(30), + s + 20 * p * Snap.cos(60), s + (100 - 20) * p * Snap.cos(30), + s + 20 * p * Snap.cos(60) + 27.5 * p, s + (100 - 20) * p * Snap.cos(30), + s + t - 27.5 * p * Snap.cos(60) - 45 * p, s + 72.5 * p * Snap.cos(30) + ], + color: frappe.ui.color.get('pink', 'dark') + }, + sandy_clay: { + points: [ + s + 55 * p * Snap.cos(60), s + (100 - 55) * p * Snap.cos(30), + s + 35 * p * Snap.cos(60), s + (100 - 35) * p * Snap.cos(30), + s + 35 * p * Snap.cos(60) + 20 * p, s + (100 - 35) * p * Snap.cos(30) + ], + color: frappe.ui.color.get('red') + }, + clay: { + points: [ + s + t * Snap.cos(60), s, + s + 55 * p * Snap.cos(60), s + (100 - 55) * p * Snap.cos(30), + s + t - 40 * p * Snap.cos(60) - 45 * p, s + 60 * p * Snap.cos(30), + s + t - 40 * p * Snap.cos(60) - 20 * p, s + 60 * p * Snap.cos(30), + s + t - 60 * p * Snap.cos(60), s + 40 * p * Snap.cos(30) + ], + color: frappe.ui.color.get('yellow') + }, + }; + } + + get_coords(soil_type) { + return this.coords[soil_type].points; + } + + get_color(soil_type) { + return this.coords[soil_type].color; + } + + make_plot() { + for (let soil_type in this.coords) { + this.paper.polygon(this.get_coords(soil_type)).attr({ + fill: this.get_color(soil_type), + stroke: this.config.stroke, + strokeWidth: this.config.strokeWidth + }); + } + } + + make_plot_marking() { + let { triangle_side: t, spacing: s, scaling_factor: p } = this.config; + + let clay = this.paper.text(t * Snap.cos(60) / 2, s + t * Snap.cos(30) / 2, "Clay").attr({ + fill: frappe.ui.color.get('black') + }); + clay.transform("r300"); + + let silt = this.paper.text(t, s + t * Snap.cos(30) / 2, "Silt").attr({ + fill: frappe.ui.color.get('black') + }); + silt.transform("r60"); + + let sand = this.paper.text(35 + t * Snap.cos(60), 90 + t * Snap.cos(30), "Sand").attr({ + fill: frappe.ui.color.get('black') + }); + sand.transform("r0"); + } + + make_legend() { + // let side = len(this.coords)/2; + let index = 1; + let offset = 0; + let exec_once = true; + for (let soil_type in this.coords) { + if (index > 6 && exec_once){ + offset = 300; + index = 1; + exec_once = false; + } + let rect = this.paper.rect(0+offset, 0+index*20, 100, 19, 5, 5).attr({ + fill: this.get_color(soil_type), + stroke: frappe.ui.color.get('black') + }); + let text = this.paper.text(5+offset, 16+index*20, soil_type).attr({ + fill: frappe.ui.color.get('black'), + 'font-size': 12 + }); + index++; + } + } + + mark_blip({clay, sand, silt} = this) { + if (clay + sand + silt != 0){ + let { triangle_side: t, spacing: s, scaling_factor: p } = this.config; + + let x_blip = s + clay * p * Snap.cos(60) + silt * p; + let y_blip = s + silt * p * Snap.cos(30) + sand * p * Snap.sin(60); + this.blip = this.paper.circle(x_blip, y_blip, 4).attr({ + fill: frappe.ui.color.get("orange"), + stroke: frappe.ui.color.get("orange"), + strokeWidth: 2 + }); + } + } + + remove_blip() { + if (typeof this.blip !== 'undefined') + this.blip.remove(); + } +}; \ No newline at end of file diff --git a/erpnext/public/js/leaflet/leaflet.draw.js b/erpnext/public/js/leaflet/leaflet.draw.js new file mode 100755 index 00000000000..4352f7025b7 --- /dev/null +++ b/erpnext/public/js/leaflet/leaflet.draw.js @@ -0,0 +1,143 @@ +/* + Leaflet.draw, a plugin that adds drawing and editing tools to Leaflet powered maps. + (c) 2012-2013, Jacob Toye, Smartrak + + https://github.com/Leaflet/Leaflet.draw + http://leafletjs.com + https://github.com/jacobtoye +*/ +! function(t, e) { + L.drawVersion = "0.2.3", L.drawLocal = { draw: { toolbar: { actions: { title: "Cancel drawing", text: "Cancel" }, undo: { title: "Delete last point drawn", text: "Delete last point" }, buttons: { polyline: "Draw a polyline", polygon: "Draw a polygon", rectangle: "Draw a rectangle", circle: "Draw a circle", marker: "Draw a marker" } }, handlers: { circle: { tooltip: { start: "Click and drag to draw circle." } }, marker: { tooltip: { start: "Click map to place marker." } }, polygon: { tooltip: { start: "Click to start drawing shape.", cont: "Click to continue drawing shape.", end: "Click first point to close this shape." } }, polyline: { error: "Error: shape edges cannot cross!", tooltip: { start: "Click to start drawing line.", cont: "Click to continue drawing line.", end: "Click last point to finish line." } }, rectangle: { tooltip: { start: "Click and drag to draw rectangle." } }, simpleshape: { tooltip: { end: "Release mouse to finish drawing." } } } }, edit: { toolbar: { actions: { save: { title: "Save changes.", text: "Save" }, cancel: { title: "Cancel editing, discards all changes.", text: "Cancel" } }, buttons: { edit: "Edit layers.", editDisabled: "No layers to edit.", remove: "Delete layers.", removeDisabled: "No layers to delete." } }, handlers: { edit: { tooltip: { text: "Drag handles, or marker to edit feature.", subtext: "Click cancel to undo changes." } }, remove: { tooltip: { text: "Click on a feature to remove" } } } } }, L.Draw = {}, L.Draw.Feature = L.Handler.extend({ includes: L.Mixin.Events, initialize: function(t, e) { this._map = t, this._container = t._container, this._overlayPane = t._panes.overlayPane, this._popupPane = t._panes.popupPane, e && e.shapeOptions && (e.shapeOptions = L.Util.extend({}, this.options.shapeOptions, e.shapeOptions)), L.setOptions(this, e) }, enable: function() { this._enabled || (this.fire("enabled", { handler: this.type }), this._map.fire("draw:drawstart", { layerType: this.type }), L.Handler.prototype.enable.call(this)) }, disable: function() { this._enabled && (L.Handler.prototype.disable.call(this), this._map.fire("draw:drawstop", { layerType: this.type }), this.fire("disabled", { handler: this.type })) }, addHooks: function() { var t = this._map; + t && (L.DomUtil.disableTextSelection(), t.getContainer().focus(), this._tooltip = new L.Tooltip(this._map), L.DomEvent.on(this._container, "keyup", this._cancelDrawing, this)) }, removeHooks: function() { this._map && (L.DomUtil.enableTextSelection(), this._tooltip.dispose(), this._tooltip = null, L.DomEvent.off(this._container, "keyup", this._cancelDrawing, this)) }, setOptions: function(t) { L.setOptions(this, t) }, _fireCreatedEvent: function(t) { this._map.fire("draw:created", { layer: t, layerType: this.type }) }, _cancelDrawing: function(t) { 27 === t.keyCode && this.disable() } }), L.Draw.Polyline = L.Draw.Feature.extend({ statics: { TYPE: "polyline" }, Poly: L.Polyline, options: { allowIntersection: !0, repeatMode: !1, drawError: { color: "#b00b00", timeout: 2500 }, icon: new L.DivIcon({ iconSize: new L.Point(8, 8), className: "leaflet-div-icon leaflet-editing-icon" }), guidelineDistance: 20, maxGuideLineLength: 4e3, shapeOptions: { stroke: !0, color: "#f06eaa", weight: 4, opacity: .5, fill: !1, clickable: !0 }, metric: !0, showLength: !0, zIndexOffset: 2e3 }, initialize: function(t, e) { this.options.drawError.message = L.drawLocal.draw.handlers.polyline.error, e && e.drawError && (e.drawError = L.Util.extend({}, this.options.drawError, e.drawError)), this.type = L.Draw.Polyline.TYPE, L.Draw.Feature.prototype.initialize.call(this, t, e) }, addHooks: function() { L.Draw.Feature.prototype.addHooks.call(this), this._map && (this._markers = [], this._markerGroup = new L.LayerGroup, this._map.addLayer(this._markerGroup), this._poly = new L.Polyline([], this.options.shapeOptions), this._tooltip.updateContent(this._getTooltipText()), this._mouseMarker || (this._mouseMarker = L.marker(this._map.getCenter(), { icon: L.divIcon({ className: "leaflet-mouse-marker", iconAnchor: [20, 20], iconSize: [40, 40] }), opacity: 0, zIndexOffset: this.options.zIndexOffset })), this._mouseMarker.on("mousedown", this._onMouseDown, this).addTo(this._map), this._map.on("mousemove", this._onMouseMove, this).on("mouseup", this._onMouseUp, this).on("zoomend", this._onZoomEnd, this)) }, removeHooks: function() { L.Draw.Feature.prototype.removeHooks.call(this), this._clearHideErrorTimeout(), this._cleanUpShape(), this._map.removeLayer(this._markerGroup), delete this._markerGroup, delete this._markers, this._map.removeLayer(this._poly), delete this._poly, this._mouseMarker.off("mousedown", this._onMouseDown, this).off("mouseup", this._onMouseUp, this), this._map.removeLayer(this._mouseMarker), delete this._mouseMarker, this._clearGuides(), this._map.off("mousemove", this._onMouseMove, this).off("zoomend", this._onZoomEnd, this) }, deleteLastVertex: function() { if (!(this._markers.length <= 1)) { var t = this._markers.pop(), + e = this._poly, + i = this._poly.spliceLatLngs(e.getLatLngs().length - 1, 1)[0]; + this._markerGroup.removeLayer(t), e.getLatLngs().length < 2 && this._map.removeLayer(e), this._vertexChanged(i, !1) } }, addVertex: function(t) { var e = this._markers.length; return e > 0 && !this.options.allowIntersection && this._poly.newLatLngIntersects(t) ? void this._showErrorTooltip() : (this._errorShown && this._hideErrorTooltip(), this._markers.push(this._createMarker(t)), this._poly.addLatLng(t), 2 === this._poly.getLatLngs().length && this._map.addLayer(this._poly), void this._vertexChanged(t, !0)) }, _finishShape: function() { var t = this._poly.newLatLngIntersects(this._poly.getLatLngs()[0], !0); return !this.options.allowIntersection && t || !this._shapeIsValid() ? void this._showErrorTooltip() : (this._fireCreatedEvent(), this.disable(), void(this.options.repeatMode && this.enable())) }, _shapeIsValid: function() { return !0 }, _onZoomEnd: function() { this._updateGuide() }, _onMouseMove: function(t) { var e = t.layerPoint, + i = t.latlng; + this._currentLatLng = i, this._updateTooltip(i), this._updateGuide(e), this._mouseMarker.setLatLng(i), L.DomEvent.preventDefault(t.originalEvent) }, _vertexChanged: function(t, e) { this._updateFinishHandler(), this._updateRunningMeasure(t, e), this._clearGuides(), this._updateTooltip() }, _onMouseDown: function(t) { var e = t.originalEvent; + this._mouseDownOrigin = L.point(e.clientX, e.clientY) }, _onMouseUp: function(e) { if (this._mouseDownOrigin) { var i = L.point(e.originalEvent.clientX, e.originalEvent.clientY).distanceTo(this._mouseDownOrigin); + Math.abs(i) < 9 * (t.devicePixelRatio || 1) && this.addVertex(e.latlng) } + this._mouseDownOrigin = null }, _updateFinishHandler: function() { var t = this._markers.length; + t > 1 && this._markers[t - 1].on("click", this._finishShape, this), t > 2 && this._markers[t - 2].off("click", this._finishShape, this) }, _createMarker: function(t) { var e = new L.Marker(t, { icon: this.options.icon, zIndexOffset: 2 * this.options.zIndexOffset }); return this._markerGroup.addLayer(e), e }, _updateGuide: function(t) { var e = this._markers.length; + e > 0 && (t = t || this._map.latLngToLayerPoint(this._currentLatLng), this._clearGuides(), this._drawGuide(this._map.latLngToLayerPoint(this._markers[e - 1].getLatLng()), t)) }, _updateTooltip: function(t) { var e = this._getTooltipText(); + t && this._tooltip.updatePosition(t), this._errorShown || this._tooltip.updateContent(e) }, _drawGuide: function(t, e) { var i, o, a, s = Math.floor(Math.sqrt(Math.pow(e.x - t.x, 2) + Math.pow(e.y - t.y, 2))), + r = this.options.guidelineDistance, + n = this.options.maxGuideLineLength, + l = s > n ? s - n : r; for (this._guidesContainer || (this._guidesContainer = L.DomUtil.create("div", "leaflet-draw-guides", this._overlayPane)); s > l; l += this.options.guidelineDistance) i = l / s, o = { x: Math.floor(t.x * (1 - i) + i * e.x), y: Math.floor(t.y * (1 - i) + i * e.y) }, a = L.DomUtil.create("div", "leaflet-draw-guide-dash", this._guidesContainer), a.style.backgroundColor = this._errorShown ? this.options.drawError.color : this.options.shapeOptions.color, L.DomUtil.setPosition(a, o) }, _updateGuideColor: function(t) { if (this._guidesContainer) + for (var e = 0, i = this._guidesContainer.childNodes.length; i > e; e++) this._guidesContainer.childNodes[e].style.backgroundColor = t }, _clearGuides: function() { if (this._guidesContainer) + for (; this._guidesContainer.firstChild;) this._guidesContainer.removeChild(this._guidesContainer.firstChild) }, _getTooltipText: function() { var t, e, i = this.options.showLength; return 0 === this._markers.length ? t = { text: L.drawLocal.draw.handlers.polyline.tooltip.start } : (e = i ? this._getMeasurementString() : "", t = 1 === this._markers.length ? { text: L.drawLocal.draw.handlers.polyline.tooltip.cont, subtext: e } : { text: L.drawLocal.draw.handlers.polyline.tooltip.end, subtext: e }), t }, _updateRunningMeasure: function(t, e) { var i, o, a = this._markers.length; + 1 === this._markers.length ? this._measurementRunningTotal = 0 : (i = a - (e ? 2 : 1), o = t.distanceTo(this._markers[i].getLatLng()), this._measurementRunningTotal += o * (e ? 1 : -1)) }, _getMeasurementString: function() { var t, e = this._currentLatLng, + i = this._markers[this._markers.length - 1].getLatLng(); return t = this._measurementRunningTotal + e.distanceTo(i), L.GeometryUtil.readableDistance(t, this.options.metric) }, _showErrorTooltip: function() { this._errorShown = !0, this._tooltip.showAsError().updateContent({ text: this.options.drawError.message }), this._updateGuideColor(this.options.drawError.color), this._poly.setStyle({ color: this.options.drawError.color }), this._clearHideErrorTimeout(), this._hideErrorTimeout = setTimeout(L.Util.bind(this._hideErrorTooltip, this), this.options.drawError.timeout) }, _hideErrorTooltip: function() { this._errorShown = !1, this._clearHideErrorTimeout(), this._tooltip.removeError().updateContent(this._getTooltipText()), this._updateGuideColor(this.options.shapeOptions.color), this._poly.setStyle({ color: this.options.shapeOptions.color }) }, _clearHideErrorTimeout: function() { this._hideErrorTimeout && (clearTimeout(this._hideErrorTimeout), this._hideErrorTimeout = null) }, _cleanUpShape: function() { this._markers.length > 1 && this._markers[this._markers.length - 1].off("click", this._finishShape, this) }, _fireCreatedEvent: function() { var t = new this.Poly(this._poly.getLatLngs(), this.options.shapeOptions); + L.Draw.Feature.prototype._fireCreatedEvent.call(this, t) } }), L.Draw.Polygon = L.Draw.Polyline.extend({ statics: { TYPE: "polygon" }, Poly: L.Polygon, options: { showArea: !1, shapeOptions: { stroke: !0, color: "#f06eaa", weight: 4, opacity: .5, fill: !0, fillColor: null, fillOpacity: .2, clickable: !0 } }, initialize: function(t, e) { L.Draw.Polyline.prototype.initialize.call(this, t, e), this.type = L.Draw.Polygon.TYPE }, _updateFinishHandler: function() { var t = this._markers.length; + 1 === t && this._markers[0].on("click", this._finishShape, this), t > 2 && (this._markers[t - 1].on("dblclick", this._finishShape, this), t > 3 && this._markers[t - 2].off("dblclick", this._finishShape, this)) }, _getTooltipText: function() { var t, e; return 0 === this._markers.length ? t = L.drawLocal.draw.handlers.polygon.tooltip.start : this._markers.length < 3 ? t = L.drawLocal.draw.handlers.polygon.tooltip.cont : (t = L.drawLocal.draw.handlers.polygon.tooltip.end, e = this._getMeasurementString()), { text: t, subtext: e } }, _getMeasurementString: function() { var t = this._area; return t ? L.GeometryUtil.readableArea(t, this.options.metric) : null }, _shapeIsValid: function() { return this._markers.length >= 3 }, _vertexAdded: function() { if (!this.options.allowIntersection && this.options.showArea) { var t = this._poly.getLatLngs(); + this._area = L.GeometryUtil.geodesicArea(t) } }, _cleanUpShape: function() { var t = this._markers.length; + t > 0 && (this._markers[0].off("click", this._finishShape, this), t > 2 && this._markers[t - 1].off("dblclick", this._finishShape, this)) } }), L.SimpleShape = {}, L.Draw.SimpleShape = L.Draw.Feature.extend({ options: { repeatMode: !1 }, initialize: function(t, e) { this._endLabelText = L.drawLocal.draw.handlers.simpleshape.tooltip.end, L.Draw.Feature.prototype.initialize.call(this, t, e) }, addHooks: function() { L.Draw.Feature.prototype.addHooks.call(this), this._map && (this._mapDraggable = this._map.dragging.enabled(), this._mapDraggable && this._map.dragging.disable(), this._container.style.cursor = "crosshair", this._tooltip.updateContent({ text: this._initialLabelText }), this._map.on("mousedown", this._onMouseDown, this).on("mousemove", this._onMouseMove, this)) }, removeHooks: function() { L.Draw.Feature.prototype.removeHooks.call(this), this._map && (this._mapDraggable && this._map.dragging.enable(), this._container.style.cursor = "", this._map.off("mousedown", this._onMouseDown, this).off("mousemove", this._onMouseMove, this), L.DomEvent.off(e, "mouseup", this._onMouseUp, this), this._shape && (this._map.removeLayer(this._shape), delete this._shape)), this._isDrawing = !1 }, _onMouseDown: function(t) { this._isDrawing = !0, this._startLatLng = t.latlng, L.DomEvent.on(e, "mouseup", this._onMouseUp, this).preventDefault(t.originalEvent) }, _onMouseMove: function(t) { var e = t.latlng; + this._tooltip.updatePosition(e), this._isDrawing && (this._tooltip.updateContent({ text: this._endLabelText }), this._drawShape(e)) }, _onMouseUp: function() { this._shape && this._fireCreatedEvent(), this.disable(), this.options.repeatMode && this.enable() } }), L.Draw.Rectangle = L.Draw.SimpleShape.extend({ statics: { TYPE: "rectangle" }, options: { shapeOptions: { stroke: !0, color: "#f06eaa", weight: 4, opacity: .5, fill: !0, fillColor: null, fillOpacity: .2, clickable: !0 } }, initialize: function(t, e) { this.type = L.Draw.Rectangle.TYPE, this._initialLabelText = L.drawLocal.draw.handlers.rectangle.tooltip.start, L.Draw.SimpleShape.prototype.initialize.call(this, t, e) }, _drawShape: function(t) { this._shape ? this._shape.setBounds(new L.LatLngBounds(this._startLatLng, t)) : (this._shape = new L.Rectangle(new L.LatLngBounds(this._startLatLng, t), this.options.shapeOptions), this._map.addLayer(this._shape)) }, _fireCreatedEvent: function() { var t = new L.Rectangle(this._shape.getBounds(), this.options.shapeOptions); + L.Draw.SimpleShape.prototype._fireCreatedEvent.call(this, t) } }), L.Draw.Circle = L.Draw.SimpleShape.extend({ statics: { TYPE: "circle" }, options: { shapeOptions: { stroke: !0, color: "#f06eaa", weight: 4, opacity: .5, fill: !0, fillColor: null, fillOpacity: .2, clickable: !0 }, showRadius: !0, metric: !0 }, initialize: function(t, e) { this.type = L.Draw.Circle.TYPE, this._initialLabelText = L.drawLocal.draw.handlers.circle.tooltip.start, L.Draw.SimpleShape.prototype.initialize.call(this, t, e) }, _drawShape: function(t) { this._shape ? this._shape.setRadius(this._startLatLng.distanceTo(t)) : (this._shape = new L.Circle(this._startLatLng, this._startLatLng.distanceTo(t), this.options.shapeOptions), this._map.addLayer(this._shape)) }, _fireCreatedEvent: function() { var t = new L.Circle(this._startLatLng, this._shape.getRadius(), this.options.shapeOptions); + L.Draw.SimpleShape.prototype._fireCreatedEvent.call(this, t) }, _onMouseMove: function(t) { var e, i = t.latlng, + o = this.options.showRadius, + a = this.options.metric; + this._tooltip.updatePosition(i), this._isDrawing && (this._drawShape(i), e = this._shape.getRadius().toFixed(1), this._tooltip.updateContent({ text: this._endLabelText, subtext: o ? "Radius: " + L.GeometryUtil.readableDistance(e, a) : "" })) } }), L.Draw.Marker = L.Draw.Feature.extend({ statics: { TYPE: "marker" }, options: { icon: new L.Icon.Default, repeatMode: !1, zIndexOffset: 2e3 }, initialize: function(t, e) { this.type = L.Draw.Marker.TYPE, L.Draw.Feature.prototype.initialize.call(this, t, e) }, addHooks: function() { L.Draw.Feature.prototype.addHooks.call(this), this._map && (this._tooltip.updateContent({ text: L.drawLocal.draw.handlers.marker.tooltip.start }), this._mouseMarker || (this._mouseMarker = L.marker(this._map.getCenter(), { icon: L.divIcon({ className: "leaflet-mouse-marker", iconAnchor: [20, 20], iconSize: [40, 40] }), opacity: 0, zIndexOffset: this.options.zIndexOffset })), this._mouseMarker.on("click", this._onClick, this).addTo(this._map), this._map.on("mousemove", this._onMouseMove, this)) }, removeHooks: function() { L.Draw.Feature.prototype.removeHooks.call(this), this._map && (this._marker && (this._marker.off("click", this._onClick, this), this._map.off("click", this._onClick, this).removeLayer(this._marker), delete this._marker), this._mouseMarker.off("click", this._onClick, this), this._map.removeLayer(this._mouseMarker), delete this._mouseMarker, this._map.off("mousemove", this._onMouseMove, this)) }, _onMouseMove: function(t) { var e = t.latlng; + this._tooltip.updatePosition(e), this._mouseMarker.setLatLng(e), this._marker ? (e = this._mouseMarker.getLatLng(), this._marker.setLatLng(e)) : (this._marker = new L.Marker(e, { icon: this.options.icon, zIndexOffset: this.options.zIndexOffset }), this._marker.on("click", this._onClick, this), this._map.on("click", this._onClick, this).addLayer(this._marker)) }, _onClick: function() { this._fireCreatedEvent(), this.disable(), this.options.repeatMode && this.enable() }, _fireCreatedEvent: function() { var t = new L.Marker(this._marker.getLatLng(), { icon: this.options.icon }); + L.Draw.Feature.prototype._fireCreatedEvent.call(this, t) } }), L.Edit = L.Edit || {}, L.Edit.Poly = L.Handler.extend({ options: { icon: new L.DivIcon({ iconSize: new L.Point(8, 8), className: "leaflet-div-icon leaflet-editing-icon" }) }, initialize: function(t, e) { this._poly = t, L.setOptions(this, e) }, addHooks: function() { this._poly._map && (this._markerGroup || this._initMarkers(), this._poly._map.addLayer(this._markerGroup)) }, removeHooks: function() { this._poly._map && (this._poly._map.removeLayer(this._markerGroup), delete this._markerGroup, delete this._markers) }, updateMarkers: function() { this._markerGroup.clearLayers(), this._initMarkers() }, _initMarkers: function() { this._markerGroup || (this._markerGroup = new L.LayerGroup), this._markers = []; var t, e, i, o, a = this._poly._latlngs; for (t = 0, i = a.length; i > t; t++) o = this._createMarker(a[t], t), o.on("click", this._onMarkerClick, this), this._markers.push(o); var s, r; for (t = 0, e = i - 1; i > t; e = t++)(0 !== t || L.Polygon && this._poly instanceof L.Polygon) && (s = this._markers[e], r = this._markers[t], this._createMiddleMarker(s, r), this._updatePrevNext(s, r)) }, _createMarker: function(t, e) { var i = new L.Marker(t, { draggable: !0, icon: this.options.icon }); return i._origLatLng = t, i._index = e, i.on("drag", this._onMarkerDrag, this), i.on("dragend", this._fireEdit, this), this._markerGroup.addLayer(i), i }, _removeMarker: function(t) { var e = t._index; + this._markerGroup.removeLayer(t), this._markers.splice(e, 1), this._poly.spliceLatLngs(e, 1), this._updateIndexes(e, -1), t.off("drag", this._onMarkerDrag, this).off("dragend", this._fireEdit, this).off("click", this._onMarkerClick, this) }, _fireEdit: function() { this._poly.edited = !0, this._poly.fire("edit") }, _onMarkerDrag: function(t) { var e = t.target; + L.extend(e._origLatLng, e._latlng), e._middleLeft && e._middleLeft.setLatLng(this._getMiddleLatLng(e._prev, e)), e._middleRight && e._middleRight.setLatLng(this._getMiddleLatLng(e, e._next)), this._poly.redraw() }, _onMarkerClick: function(t) { var e = L.Polygon && this._poly instanceof L.Polygon ? 4 : 3, + i = t.target; + this._poly._latlngs.length < e || (this._removeMarker(i), this._updatePrevNext(i._prev, i._next), i._middleLeft && this._markerGroup.removeLayer(i._middleLeft), i._middleRight && this._markerGroup.removeLayer(i._middleRight), i._prev && i._next ? this._createMiddleMarker(i._prev, i._next) : i._prev ? i._next || (i._prev._middleRight = null) : i._next._middleLeft = null, this._fireEdit()) }, _updateIndexes: function(t, e) { this._markerGroup.eachLayer(function(i) { i._index > t && (i._index += e) }) }, _createMiddleMarker: function(t, e) { var i, o, a, s = this._getMiddleLatLng(t, e), + r = this._createMarker(s); + r.setOpacity(.6), t._middleRight = e._middleLeft = r, o = function() { var o = e._index; + r._index = o, r.off("click", i, this).on("click", this._onMarkerClick, this), s.lat = r.getLatLng().lat, s.lng = r.getLatLng().lng, this._poly.spliceLatLngs(o, 0, s), this._markers.splice(o, 0, r), r.setOpacity(1), this._updateIndexes(o, 1), e._index++, this._updatePrevNext(t, r), this._updatePrevNext(r, e), this._poly.fire("editstart") }, a = function() { r.off("dragstart", o, this), r.off("dragend", a, this), this._createMiddleMarker(t, r), this._createMiddleMarker(r, e) }, i = function() { o.call(this), a.call(this), this._fireEdit() }, r.on("click", i, this).on("dragstart", o, this).on("dragend", a, this), this._markerGroup.addLayer(r) }, _updatePrevNext: function(t, e) { t && (t._next = e), e && (e._prev = t) }, _getMiddleLatLng: function(t, e) { var i = this._poly._map, + o = i.project(t.getLatLng()), + a = i.project(e.getLatLng()); return i.unproject(o._add(a)._divideBy(2)) } }), L.Polyline.addInitHook(function() { this.editing || (L.Edit.Poly && (this.editing = new L.Edit.Poly(this), this.options.editable && this.editing.enable()), this.on("add", function() { this.editing && this.editing.enabled() && this.editing.addHooks() }), this.on("remove", function() { this.editing && this.editing.enabled() && this.editing.removeHooks() })) }), L.Edit = L.Edit || {}, L.Edit.SimpleShape = L.Handler.extend({ options: { moveIcon: new L.DivIcon({ iconSize: new L.Point(8, 8), className: "leaflet-div-icon leaflet-editing-icon leaflet-edit-move" }), resizeIcon: new L.DivIcon({ iconSize: new L.Point(8, 8), className: "leaflet-div-icon leaflet-editing-icon leaflet-edit-resize" }) }, initialize: function(t, e) { this._shape = t, L.Util.setOptions(this, e) }, addHooks: function() { this._shape._map && (this._map = this._shape._map, this._markerGroup || this._initMarkers(), this._map.addLayer(this._markerGroup)) }, removeHooks: function() { if (this._shape._map) { this._unbindMarker(this._moveMarker); for (var t = 0, e = this._resizeMarkers.length; e > t; t++) this._unbindMarker(this._resizeMarkers[t]); + this._resizeMarkers = null, this._map.removeLayer(this._markerGroup), delete this._markerGroup } + this._map = null }, updateMarkers: function() { this._markerGroup.clearLayers(), this._initMarkers() }, _initMarkers: function() { this._markerGroup || (this._markerGroup = new L.LayerGroup), this._createMoveMarker(), this._createResizeMarker() }, _createMoveMarker: function() {}, _createResizeMarker: function() {}, _createMarker: function(t, e) { var i = new L.Marker(t, { draggable: !0, icon: e, zIndexOffset: 10 }); return this._bindMarker(i), this._markerGroup.addLayer(i), i }, _bindMarker: function(t) { t.on("dragstart", this._onMarkerDragStart, this).on("drag", this._onMarkerDrag, this).on("dragend", this._onMarkerDragEnd, this) }, _unbindMarker: function(t) { t.off("dragstart", this._onMarkerDragStart, this).off("drag", this._onMarkerDrag, this).off("dragend", this._onMarkerDragEnd, this) }, _onMarkerDragStart: function(t) { var e = t.target; + e.setOpacity(0), this._shape.fire("editstart") }, _fireEdit: function() { this._shape.edited = !0, this._shape.fire("edit") }, _onMarkerDrag: function(t) { var e = t.target, + i = e.getLatLng(); + e === this._moveMarker ? this._move(i) : this._resize(i), this._shape.redraw() }, _onMarkerDragEnd: function(t) { var e = t.target; + e.setOpacity(1), this._fireEdit() }, _move: function() {}, _resize: function() {} }), L.Edit = L.Edit || {}, L.Edit.Rectangle = L.Edit.SimpleShape.extend({ _createMoveMarker: function() { var t = this._shape.getBounds(), + e = t.getCenter(); + this._moveMarker = this._createMarker(e, this.options.moveIcon) }, _createResizeMarker: function() { var t = this._getCorners(); + this._resizeMarkers = []; for (var e = 0, i = t.length; i > e; e++) this._resizeMarkers.push(this._createMarker(t[e], this.options.resizeIcon)), this._resizeMarkers[e]._cornerIndex = e }, _onMarkerDragStart: function(t) { L.Edit.SimpleShape.prototype._onMarkerDragStart.call(this, t); var e = this._getCorners(), + i = t.target, + o = i._cornerIndex; + this._oppositeCorner = e[(o + 2) % 4], this._toggleCornerMarkers(0, o) }, _onMarkerDragEnd: function(t) { var e, i, o = t.target; + o === this._moveMarker && (e = this._shape.getBounds(), i = e.getCenter(), o.setLatLng(i)), this._toggleCornerMarkers(1), this._repositionCornerMarkers(), L.Edit.SimpleShape.prototype._onMarkerDragEnd.call(this, t) }, _move: function(t) { for (var e, i = this._shape.getLatLngs(), o = this._shape.getBounds(), a = o.getCenter(), s = [], r = 0, n = i.length; n > r; r++) e = [i[r].lat - a.lat, i[r].lng - a.lng], s.push([t.lat + e[0], t.lng + e[1]]); + this._shape.setLatLngs(s), this._repositionCornerMarkers() }, _resize: function(t) { var e; + this._shape.setBounds(L.latLngBounds(t, this._oppositeCorner)), e = this._shape.getBounds(), this._moveMarker.setLatLng(e.getCenter()) }, _getCorners: function() { var t = this._shape.getBounds(), + e = t.getNorthWest(), + i = t.getNorthEast(), + o = t.getSouthEast(), + a = t.getSouthWest(); return [e, i, o, a] }, _toggleCornerMarkers: function(t) { for (var e = 0, i = this._resizeMarkers.length; i > e; e++) this._resizeMarkers[e].setOpacity(t) }, _repositionCornerMarkers: function() { for (var t = this._getCorners(), e = 0, i = this._resizeMarkers.length; i > e; e++) this._resizeMarkers[e].setLatLng(t[e]) } }), L.Rectangle.addInitHook(function() { L.Edit.Rectangle && (this.editing = new L.Edit.Rectangle(this), this.options.editable && this.editing.enable()) }), L.Edit = L.Edit || {}, L.Edit.Circle = L.Edit.SimpleShape.extend({ _createMoveMarker: function() { var t = this._shape.getLatLng(); + this._moveMarker = this._createMarker(t, this.options.moveIcon) }, _createResizeMarker: function() { var t = this._shape.getLatLng(), + e = this._getResizeMarkerPoint(t); + this._resizeMarkers = [], this._resizeMarkers.push(this._createMarker(e, this.options.resizeIcon)) }, _getResizeMarkerPoint: function(t) { var e = this._shape._radius * Math.cos(Math.PI / 4), + i = this._map.project(t); return this._map.unproject([i.x + e, i.y - e]) }, _move: function(t) { var e = this._getResizeMarkerPoint(t); + this._resizeMarkers[0].setLatLng(e), this._shape.setLatLng(t) }, _resize: function(t) { var e = this._moveMarker.getLatLng(), + i = e.distanceTo(t); + this._shape.setRadius(i) } }), L.Circle.addInitHook(function() { L.Edit.Circle && (this.editing = new L.Edit.Circle(this), this.options.editable && this.editing.enable()), this.on("add", function() { this.editing && this.editing.enabled() && this.editing.addHooks() }), this.on("remove", function() { this.editing && this.editing.enabled() && this.editing.removeHooks() }) }), L.LatLngUtil = { cloneLatLngs: function(t) { for (var e = [], i = 0, o = t.length; o > i; i++) e.push(this.cloneLatLng(t[i])); return e }, cloneLatLng: function(t) { return L.latLng(t.lat, t.lng) } }, L.GeometryUtil = L.extend(L.GeometryUtil || {}, { geodesicArea: function(t) { var e, i, o = t.length, + a = 0, + s = L.LatLng.DEG_TO_RAD; if (o > 2) { for (var r = 0; o > r; r++) e = t[r], i = t[(r + 1) % o], a += (i.lng - e.lng) * s * (2 + Math.sin(e.lat * s) + Math.sin(i.lat * s)); + a = 6378137 * a * 6378137 / 2 } return Math.abs(a) }, readableArea: function(t, e) { var i; return e ? i = t >= 1e4 ? (1e-4 * t).toFixed(2) + " ha" : t.toFixed(2) + " m²" : (t *= .836127, i = t >= 3097600 ? (t / 3097600).toFixed(2) + " mi²" : t >= 4840 ? (t / 4840).toFixed(2) + " acres" : Math.ceil(t) + " yd²"), i }, readableDistance: function(t, e) { var i; return e ? i = t > 1e3 ? (t / 1e3).toFixed(2) + " km" : Math.ceil(t) + " m" : (t *= 1.09361, i = t > 1760 ? (t / 1760).toFixed(2) + " miles" : Math.ceil(t) + " yd"), i } }), L.Util.extend(L.LineUtil, { segmentsIntersect: function(t, e, i, o) { return this._checkCounterclockwise(t, i, o) !== this._checkCounterclockwise(e, i, o) && this._checkCounterclockwise(t, e, i) !== this._checkCounterclockwise(t, e, o) }, _checkCounterclockwise: function(t, e, i) { return (i.y - t.y) * (e.x - t.x) > (e.y - t.y) * (i.x - t.x) } }), L.Polyline.include({ intersects: function() { var t, e, i, o = this._originalPoints, + a = o ? o.length : 0; if (this._tooFewPointsForIntersection()) return !1; for (t = a - 1; t >= 3; t--) + if (e = o[t - 1], i = o[t], this._lineSegmentsIntersectsRange(e, i, t - 2)) return !0; + return !1 }, newLatLngIntersects: function(t, e) { return this._map ? this.newPointIntersects(this._map.latLngToLayerPoint(t), e) : !1 }, newPointIntersects: function(t, e) { var i = this._originalPoints, + o = i ? i.length : 0, + a = i ? i[o - 1] : null, + s = o - 2; return this._tooFewPointsForIntersection(1) ? !1 : this._lineSegmentsIntersectsRange(a, t, s, e ? 1 : 0) }, _tooFewPointsForIntersection: function(t) { var e = this._originalPoints, + i = e ? e.length : 0; return i += t || 0, !this._originalPoints || 3 >= i }, _lineSegmentsIntersectsRange: function(t, e, i, o) { var a, s, r = this._originalPoints; + o = o || 0; for (var n = i; n > o; n--) + if (a = r[n - 1], s = r[n], L.LineUtil.segmentsIntersect(t, e, a, s)) return !0; + return !1 } }), L.Polygon.include({ intersects: function() { var t, e, i, o, a, s = this._originalPoints; return this._tooFewPointsForIntersection() ? !1 : (t = L.Polyline.prototype.intersects.call(this)) ? !0 : (e = s.length, i = s[0], o = s[e - 1], a = e - 2, this._lineSegmentsIntersectsRange(o, i, a, 1)) } }), L.Control.Draw = L.Control.extend({ options: { position: "topleft", draw: {}, edit: !1 }, initialize: function(t) { if (L.version < "0.7") throw new Error("Leaflet.draw 0.2.3+ requires Leaflet 0.7.0+. Download latest from https://github.com/Leaflet/Leaflet/"); + L.Control.prototype.initialize.call(this, t); var e, i; + this._toolbars = {}, L.DrawToolbar && this.options.draw && (i = new L.DrawToolbar(this.options.draw), e = L.stamp(i), this._toolbars[e] = i, this._toolbars[e].on("enable", this._toolbarEnabled, this)), L.EditToolbar && this.options.edit && (i = new L.EditToolbar(this.options.edit), e = L.stamp(i), this._toolbars[e] = i, this._toolbars[e].on("enable", this._toolbarEnabled, this)) }, onAdd: function(t) { var e, i = L.DomUtil.create("div", "leaflet-draw"), + o = !1, + a = "leaflet-draw-toolbar-top"; for (var s in this._toolbars) this._toolbars.hasOwnProperty(s) && (e = this._toolbars[s].addToolbar(t), e && (o || (L.DomUtil.hasClass(e, a) || L.DomUtil.addClass(e.childNodes[0], a), o = !0), i.appendChild(e))); return i }, onRemove: function() { for (var t in this._toolbars) this._toolbars.hasOwnProperty(t) && this._toolbars[t].removeToolbar() }, setDrawingOptions: function(t) { for (var e in this._toolbars) this._toolbars[e] instanceof L.DrawToolbar && this._toolbars[e].setOptions(t) }, _toolbarEnabled: function(t) { var e = "" + L.stamp(t.target); for (var i in this._toolbars) this._toolbars.hasOwnProperty(i) && i !== e && this._toolbars[i].disable() } }), L.Map.mergeOptions({ drawControlTooltips: !0, drawControl: !1 }), L.Map.addInitHook(function() { this.options.drawControl && (this.drawControl = new L.Control.Draw, this.addControl(this.drawControl)) }), L.Toolbar = L.Class.extend({ + includes: [L.Mixin.Events], + initialize: function(t) { L.setOptions(this, t), this._modes = {}, this._actionButtons = [], this._activeMode = null }, + enabled: function() { return null !== this._activeMode }, + disable: function() { this.enabled() && this._activeMode.handler.disable() }, + addToolbar: function(t) { var e, i = L.DomUtil.create("div", "leaflet-draw-section"), + o = 0, + a = this._toolbarClass || "", + s = this.getModeHandlers(t); for (this._toolbarContainer = L.DomUtil.create("div", "leaflet-draw-toolbar leaflet-bar"), this._map = t, e = 0; e < s.length; e++) s[e].enabled && this._initModeHandler(s[e].handler, this._toolbarContainer, o++, a, s[e].title); return o ? (this._lastButtonIndex = --o, this._actionsContainer = L.DomUtil.create("ul", "leaflet-draw-actions"), i.appendChild(this._toolbarContainer), i.appendChild(this._actionsContainer), i) : void 0 }, + removeToolbar: function() { for (var t in this._modes) this._modes.hasOwnProperty(t) && (this._disposeButton(this._modes[t].button, this._modes[t].handler.enable, this._modes[t].handler), this._modes[t].handler.disable(), this._modes[t].handler.off("enabled", this._handlerActivated, this).off("disabled", this._handlerDeactivated, this)); + this._modes = {}; for (var e = 0, i = this._actionButtons.length; i > e; e++) this._disposeButton(this._actionButtons[e].button, this._actionButtons[e].callback, this); + this._actionButtons = [], this._actionsContainer = null }, + _initModeHandler: function(t, e, i, o, a) { var s = t.type; + this._modes[s] = {}, this._modes[s].handler = t, this._modes[s].button = this._createButton({ title: a, className: o + "-" + s, container: e, callback: this._modes[s].handler.enable, context: this._modes[s].handler }), this._modes[s].buttonIndex = i, this._modes[s].handler.on("enabled", this._handlerActivated, this).on("disabled", this._handlerDeactivated, this) }, + _createButton: function(t) { var e = L.DomUtil.create("a", t.className || "", t.container); return e.href = "#", t.text && (e.innerHTML = t.text), t.title && (e.title = t.title), L.DomEvent.on(e, "click", L.DomEvent.stopPropagation).on(e, "mousedown", L.DomEvent.stopPropagation).on(e, "dblclick", L.DomEvent.stopPropagation).on(e, "click", L.DomEvent.preventDefault).on(e, "click", t.callback, t.context), e }, + _disposeButton: function(t, e) { L.DomEvent.off(t, "click", L.DomEvent.stopPropagation).off(t, "mousedown", L.DomEvent.stopPropagation).off(t, "dblclick", L.DomEvent.stopPropagation).off(t, "click", L.DomEvent.preventDefault).off(t, "click", e) }, + _handlerActivated: function(t) { this.disable(), this._activeMode = this._modes[t.handler], L.DomUtil.addClass(this._activeMode.button, "leaflet-draw-toolbar-button-enabled"), this._showActionsToolbar(), this.fire("enable") }, + _handlerDeactivated: function() { this._hideActionsToolbar(), L.DomUtil.removeClass(this._activeMode.button, "leaflet-draw-toolbar-button-enabled"), this._activeMode = null, this.fire("disable") }, + _createActions: function(t) { var e, i, o, a, s = this._actionsContainer, + r = this.getActions(t), + n = r.length; for (i = 0, o = this._actionButtons.length; o > i; i++) this._disposeButton(this._actionButtons[i].button, this._actionButtons[i].callback); for (this._actionButtons = []; s.firstChild;) s.removeChild(s.firstChild); for (var l = 0; n > l; l++) "enabled" in r[l] && !r[l].enabled || (e = L.DomUtil.create("li", "", s), a = this._createButton({ title: r[l].title, text: r[l].text, container: e, callback: r[l].callback, context: r[l].context }), this._actionButtons.push({ button: a, callback: r[l].callback })) }, + _showActionsToolbar: function() { + var t = this._activeMode.buttonIndex, + e = this._lastButtonIndex, + i = this._activeMode.button.offsetTop - 1; + this._createActions(this._activeMode.handler), this._actionsContainer.style.top = i + "px", 0 === t && (L.DomUtil.addClass(this._toolbarContainer, "leaflet-draw-toolbar-notop"), L.DomUtil.addClass(this._actionsContainer, "leaflet-draw-actions-top")), t === e && (L.DomUtil.addClass(this._toolbarContainer, "leaflet-draw-toolbar-nobottom"), L.DomUtil.addClass(this._actionsContainer, "leaflet-draw-actions-bottom")), this._actionsContainer.style.display = "block" + }, + _hideActionsToolbar: function() { this._actionsContainer.style.display = "none", L.DomUtil.removeClass(this._toolbarContainer, "leaflet-draw-toolbar-notop"), L.DomUtil.removeClass(this._toolbarContainer, "leaflet-draw-toolbar-nobottom"), L.DomUtil.removeClass(this._actionsContainer, "leaflet-draw-actions-top"), L.DomUtil.removeClass(this._actionsContainer, "leaflet-draw-actions-bottom") } + }), L.Tooltip = L.Class.extend({ initialize: function(t) { this._map = t, this._popupPane = t._panes.popupPane, this._container = t.options.drawControlTooltips ? L.DomUtil.create("div", "leaflet-draw-tooltip", this._popupPane) : null, this._singleLineLabel = !1 }, dispose: function() { this._container && (this._popupPane.removeChild(this._container), this._container = null) }, updateContent: function(t) { return this._container ? (t.subtext = t.subtext || "", 0 !== t.subtext.length || this._singleLineLabel ? t.subtext.length > 0 && this._singleLineLabel && (L.DomUtil.removeClass(this._container, "leaflet-draw-tooltip-single"), this._singleLineLabel = !1) : (L.DomUtil.addClass(this._container, "leaflet-draw-tooltip-single"), this._singleLineLabel = !0), this._container.innerHTML = (t.subtext.length > 0 ? '' + t.subtext + "
" : "") + "" + t.text + "", this) : this }, updatePosition: function(t) { var e = this._map.latLngToLayerPoint(t), + i = this._container; return this._container && (i.style.visibility = "inherit", L.DomUtil.setPosition(i, e)), this }, showAsError: function() { return this._container && L.DomUtil.addClass(this._container, "leaflet-error-draw-tooltip"), this }, removeError: function() { return this._container && L.DomUtil.removeClass(this._container, "leaflet-error-draw-tooltip"), this } }), L.DrawToolbar = L.Toolbar.extend({ options: { polyline: {}, polygon: {}, rectangle: {}, circle: {}, marker: {} }, initialize: function(t) { for (var e in this.options) this.options.hasOwnProperty(e) && t[e] && (t[e] = L.extend({}, this.options[e], t[e])); + this._toolbarClass = "leaflet-draw-draw", L.Toolbar.prototype.initialize.call(this, t) }, getModeHandlers: function(t) { return [{ enabled: this.options.polyline, handler: new L.Draw.Polyline(t, this.options.polyline), title: L.drawLocal.draw.toolbar.buttons.polyline }, { enabled: this.options.polygon, handler: new L.Draw.Polygon(t, this.options.polygon), title: L.drawLocal.draw.toolbar.buttons.polygon }, { enabled: this.options.rectangle, handler: new L.Draw.Rectangle(t, this.options.rectangle), title: L.drawLocal.draw.toolbar.buttons.rectangle }, { enabled: this.options.circle, handler: new L.Draw.Circle(t, this.options.circle), title: L.drawLocal.draw.toolbar.buttons.circle }, { enabled: this.options.marker, handler: new L.Draw.Marker(t, this.options.marker), title: L.drawLocal.draw.toolbar.buttons.marker }] }, getActions: function(t) { return [{ enabled: t.deleteLastVertex, title: L.drawLocal.draw.toolbar.undo.title, text: L.drawLocal.draw.toolbar.undo.text, callback: t.deleteLastVertex, context: t }, { title: L.drawLocal.draw.toolbar.actions.title, text: L.drawLocal.draw.toolbar.actions.text, callback: this.disable, context: this }] }, setOptions: function(t) { L.setOptions(this, t); for (var e in this._modes) this._modes.hasOwnProperty(e) && t.hasOwnProperty(e) && this._modes[e].handler.setOptions(t[e]) } }), L.EditToolbar = L.Toolbar.extend({ options: { edit: { selectedPathOptions: { color: "#fe57a1", opacity: .6, dashArray: "10, 10", fill: !0, fillColor: "#fe57a1", fillOpacity: .1 } }, remove: {}, featureGroup: null }, initialize: function(t) { t.edit && ("undefined" == typeof t.edit.selectedPathOptions && (t.edit.selectedPathOptions = this.options.edit.selectedPathOptions), t.edit = L.extend({}, this.options.edit, t.edit)), t.remove && (t.remove = L.extend({}, this.options.remove, t.remove)), this._toolbarClass = "leaflet-draw-edit", L.Toolbar.prototype.initialize.call(this, t), this._selectedFeatureCount = 0 }, getModeHandlers: function(t) { var e = this.options.featureGroup; return [{ enabled: this.options.edit, handler: new L.EditToolbar.Edit(t, { featureGroup: e, selectedPathOptions: this.options.edit.selectedPathOptions }), title: L.drawLocal.edit.toolbar.buttons.edit }, { enabled: this.options.remove, handler: new L.EditToolbar.Delete(t, { featureGroup: e }), title: L.drawLocal.edit.toolbar.buttons.remove }] }, getActions: function() { return [{ title: L.drawLocal.edit.toolbar.actions.save.title, text: L.drawLocal.edit.toolbar.actions.save.text, callback: this._save, context: this }, { title: L.drawLocal.edit.toolbar.actions.cancel.title, text: L.drawLocal.edit.toolbar.actions.cancel.text, callback: this.disable, context: this }] }, addToolbar: function(t) { var e = L.Toolbar.prototype.addToolbar.call(this, t); return this._checkDisabled(), this.options.featureGroup.on("layeradd layerremove", this._checkDisabled, this), e }, removeToolbar: function() { this.options.featureGroup.off("layeradd layerremove", this._checkDisabled, this), L.Toolbar.prototype.removeToolbar.call(this) }, disable: function() { this.enabled() && (this._activeMode.handler.revertLayers(), L.Toolbar.prototype.disable.call(this)) }, _save: function() { this._activeMode.handler.save(), this._activeMode.handler.disable() }, _checkDisabled: function() { var t, e = this.options.featureGroup, + i = 0 !== e.getLayers().length; + this.options.edit && (t = this._modes[L.EditToolbar.Edit.TYPE].button, i ? L.DomUtil.removeClass(t, "leaflet-disabled") : L.DomUtil.addClass(t, "leaflet-disabled"), t.setAttribute("title", i ? L.drawLocal.edit.toolbar.buttons.edit : L.drawLocal.edit.toolbar.buttons.editDisabled)), this.options.remove && (t = this._modes[L.EditToolbar.Delete.TYPE].button, i ? L.DomUtil.removeClass(t, "leaflet-disabled") : L.DomUtil.addClass(t, "leaflet-disabled"), t.setAttribute("title", i ? L.drawLocal.edit.toolbar.buttons.remove : L.drawLocal.edit.toolbar.buttons.removeDisabled)) } }), L.EditToolbar.Edit = L.Handler.extend({ statics: { TYPE: "edit" }, includes: L.Mixin.Events, initialize: function(t, e) { if (L.Handler.prototype.initialize.call(this, t), this._selectedPathOptions = e.selectedPathOptions, this._featureGroup = e.featureGroup, !(this._featureGroup instanceof L.FeatureGroup)) throw new Error("options.featureGroup must be a L.FeatureGroup"); + this._uneditedLayerProps = {}, this.type = L.EditToolbar.Edit.TYPE }, enable: function() {!this._enabled && this._hasAvailableLayers() && (this.fire("enabled", { handler: this.type }), this._map.fire("draw:editstart", { handler: this.type }), L.Handler.prototype.enable.call(this), this._featureGroup.on("layeradd", this._enableLayerEdit, this).on("layerremove", this._disableLayerEdit, this)) }, disable: function() { this._enabled && (this._featureGroup.off("layeradd", this._enableLayerEdit, this).off("layerremove", this._disableLayerEdit, this), L.Handler.prototype.disable.call(this), this._map.fire("draw:editstop", { handler: this.type }), this.fire("disabled", { handler: this.type })) }, addHooks: function() { var t = this._map; + t && (t.getContainer().focus(), this._featureGroup.eachLayer(this._enableLayerEdit, this), this._tooltip = new L.Tooltip(this._map), this._tooltip.updateContent({ text: L.drawLocal.edit.handlers.edit.tooltip.text, subtext: L.drawLocal.edit.handlers.edit.tooltip.subtext }), this._map.on("mousemove", this._onMouseMove, this)) }, removeHooks: function() { this._map && (this._featureGroup.eachLayer(this._disableLayerEdit, this), this._uneditedLayerProps = {}, this._tooltip.dispose(), this._tooltip = null, this._map.off("mousemove", this._onMouseMove, this)) }, revertLayers: function() { this._featureGroup.eachLayer(function(t) { this._revertLayer(t) }, this) }, save: function() { var t = new L.LayerGroup; + this._featureGroup.eachLayer(function(e) { e.edited && (t.addLayer(e), e.edited = !1) }), this._map.fire("draw:edited", { layers: t }) }, _backupLayer: function(t) { var e = L.Util.stamp(t); + this._uneditedLayerProps[e] || (t instanceof L.Polyline || t instanceof L.Polygon || t instanceof L.Rectangle ? this._uneditedLayerProps[e] = { latlngs: L.LatLngUtil.cloneLatLngs(t.getLatLngs()) } : t instanceof L.Circle ? this._uneditedLayerProps[e] = { latlng: L.LatLngUtil.cloneLatLng(t.getLatLng()), radius: t.getRadius() } : t instanceof L.Marker && (this._uneditedLayerProps[e] = { latlng: L.LatLngUtil.cloneLatLng(t.getLatLng()) })) }, _revertLayer: function(t) { var e = L.Util.stamp(t); + t.edited = !1, this._uneditedLayerProps.hasOwnProperty(e) && (t instanceof L.Polyline || t instanceof L.Polygon || t instanceof L.Rectangle ? t.setLatLngs(this._uneditedLayerProps[e].latlngs) : t instanceof L.Circle ? (t.setLatLng(this._uneditedLayerProps[e].latlng), t.setRadius(this._uneditedLayerProps[e].radius)) : t instanceof L.Marker && t.setLatLng(this._uneditedLayerProps[e].latlng)) }, _toggleMarkerHighlight: function(t) { if (t._icon) { var e = t._icon; + e.style.display = "none", L.DomUtil.hasClass(e, "leaflet-edit-marker-selected") ? (L.DomUtil.removeClass(e, "leaflet-edit-marker-selected"), this._offsetMarker(e, -4)) : (L.DomUtil.addClass(e, "leaflet-edit-marker-selected"), this._offsetMarker(e, 4)), e.style.display = "" } }, _offsetMarker: function(t, e) { var i = parseInt(t.style.marginTop, 10) - e, + o = parseInt(t.style.marginLeft, 10) - e; + t.style.marginTop = i + "px", t.style.marginLeft = o + "px" }, _enableLayerEdit: function(t) { var e, i = t.layer || t.target || t, + o = i instanceof L.Marker; + (!o || i._icon) && (this._backupLayer(i), this._selectedPathOptions && (e = L.Util.extend({}, this._selectedPathOptions), o ? this._toggleMarkerHighlight(i) : (i.options.previousOptions = L.Util.extend({ dashArray: null }, i.options), i instanceof L.Circle || i instanceof L.Polygon || i instanceof L.Rectangle || (e.fill = !1), i.setStyle(e))), o ? (i.dragging.enable(), i.on("dragend", this._onMarkerDragEnd)) : i.editing.enable()) }, _disableLayerEdit: function(t) { var e = t.layer || t.target || t; + e.edited = !1, this._selectedPathOptions && (e instanceof L.Marker ? this._toggleMarkerHighlight(e) : (e.setStyle(e.options.previousOptions), delete e.options.previousOptions)), e instanceof L.Marker ? (e.dragging.disable(), e.off("dragend", this._onMarkerDragEnd, this)) : e.editing.disable() }, _onMarkerDragEnd: function(t) { var e = t.target; + e.edited = !0 }, _onMouseMove: function(t) { this._tooltip.updatePosition(t.latlng) }, _hasAvailableLayers: function() { return 0 !== this._featureGroup.getLayers().length } }), L.EditToolbar.Delete = L.Handler.extend({ statics: { TYPE: "remove" }, includes: L.Mixin.Events, initialize: function(t, e) { if (L.Handler.prototype.initialize.call(this, t), L.Util.setOptions(this, e), this._deletableLayers = this.options.featureGroup, !(this._deletableLayers instanceof L.FeatureGroup)) throw new Error("options.featureGroup must be a L.FeatureGroup"); + this.type = L.EditToolbar.Delete.TYPE }, enable: function() {!this._enabled && this._hasAvailableLayers() && (this.fire("enabled", { handler: this.type }), this._map.fire("draw:deletestart", { handler: this.type }), L.Handler.prototype.enable.call(this), this._deletableLayers.on("layeradd", this._enableLayerDelete, this).on("layerremove", this._disableLayerDelete, this)) }, disable: function() { this._enabled && (this._deletableLayers.off("layeradd", this._enableLayerDelete, this).off("layerremove", this._disableLayerDelete, this), L.Handler.prototype.disable.call(this), this._map.fire("draw:deletestop", { handler: this.type }), this.fire("disabled", { handler: this.type })) }, addHooks: function() { var t = this._map; + t && (t.getContainer().focus(), this._deletableLayers.eachLayer(this._enableLayerDelete, this), this._deletedLayers = new L.layerGroup, this._tooltip = new L.Tooltip(this._map), this._tooltip.updateContent({ text: L.drawLocal.edit.handlers.remove.tooltip.text }), this._map.on("mousemove", this._onMouseMove, this)) }, removeHooks: function() { this._map && (this._deletableLayers.eachLayer(this._disableLayerDelete, this), this._deletedLayers = null, this._tooltip.dispose(), this._tooltip = null, this._map.off("mousemove", this._onMouseMove, this)) }, revertLayers: function() { this._deletedLayers.eachLayer(function(t) { this._deletableLayers.addLayer(t) }, this) }, save: function() { this._map.fire("draw:deleted", { layers: this._deletedLayers }) }, _enableLayerDelete: function(t) { var e = t.layer || t.target || t; + e.on("click", this._removeLayer, this) }, _disableLayerDelete: function(t) { var e = t.layer || t.target || t; + e.off("click", this._removeLayer, this), this._deletedLayers.removeLayer(e) }, _removeLayer: function(t) { var e = t.layer || t.target || t; + this._deletableLayers.removeLayer(e), this._deletedLayers.addLayer(e) }, _onMouseMove: function(t) { this._tooltip.updatePosition(t.latlng) }, _hasAvailableLayers: function() { return 0 !== this._deletableLayers.getLayers().length } }) +}(window, document); \ No newline at end of file diff --git a/erpnext/public/js/leaflet/leaflet.js b/erpnext/public/js/leaflet/leaflet.js new file mode 100755 index 00000000000..41d9bb9ed4c --- /dev/null +++ b/erpnext/public/js/leaflet/leaflet.js @@ -0,0 +1,771 @@ +/* + Leaflet 1.0.0-beta.2 (dd0faa1), a JS library for interactive maps. http://leafletjs.com + (c) 2010-2015 Vladimir Agafonkin, (c) 2010-2011 CloudMade +*/ +! function(t, e, i) { + function n() { var e = t.L; + o.noConflict = function() { return t.L = e, this }, t.L = o } + var o = { version: "1.0.0-beta.2" }; + "object" == typeof module && "object" == typeof module.exports ? module.exports = o : "function" == typeof define && define.amd && define(o), "undefined" != typeof t && n(), o.Util = { extend: function(t) { var e, i, n, o; for (i = 1, n = arguments.length; n > i; i++) { o = arguments[i]; for (e in o) t[e] = o[e] } return t }, create: Object.create || function() { + function t() {} return function(e) { return t.prototype = e, new t } }(), bind: function(t, e) { var i = Array.prototype.slice; if (t.bind) return t.bind.apply(t, i.call(arguments, 1)); var n = i.call(arguments, 2); return function() { return t.apply(e, n.length ? n.concat(i.call(arguments)) : arguments) } }, stamp: function(t) { return t._leaflet_id = t._leaflet_id || ++o.Util.lastId, t._leaflet_id }, lastId: 0, throttle: function(t, e, i) { var n, o, s, r; return r = function() { n = !1, o && (s.apply(i, o), o = !1) }, s = function() { n ? o = arguments : (t.apply(i, arguments), setTimeout(r, e), n = !0) } }, wrapNum: function(t, e, i) { var n = e[1], + o = e[0], + s = n - o; return t === n && i ? t : ((t - o) % s + s) % s + o }, falseFn: function() { return !1 }, formatNum: function(t, e) { var i = Math.pow(10, e || 5); return Math.round(t * i) / i }, trim: function(t) { return t.trim ? t.trim() : t.replace(/^\s+|\s+$/g, "") }, splitWords: function(t) { return o.Util.trim(t).split(/\s+/) }, setOptions: function(t, e) { t.hasOwnProperty("options") || (t.options = t.options ? o.Util.create(t.options) : {}); for (var i in e) t.options[i] = e[i]; return t.options }, getParamString: function(t, e, i) { var n = []; for (var o in t) n.push(encodeURIComponent(i ? o.toUpperCase() : o) + "=" + encodeURIComponent(t[o])); return (e && -1 !== e.indexOf("?") ? "&" : "?") + n.join("&") }, template: function(t, e) { return t.replace(o.Util.templateRe, function(t, n) { var o = e[n]; if (o === i) throw new Error("No value provided for variable " + t); return "function" == typeof o && (o = o(e)), o }) }, templateRe: /\{ *([\w_]+) *\}/g, isArray: Array.isArray || function(t) { return "[object Array]" === Object.prototype.toString.call(t) }, indexOf: function(t, e) { for (var i = 0; i < t.length; i++) + if (t[i] === e) return i; + return -1 }, emptyImageUrl: "data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=" }, + function() { + function e(e) { return t["webkit" + e] || t["moz" + e] || t["ms" + e] } + + function i(e) { var i = +new Date, + o = Math.max(0, 16 - (i - n)); return n = i + o, t.setTimeout(e, o) } var n = 0, + s = t.requestAnimationFrame || e("RequestAnimationFrame") || i, + r = t.cancelAnimationFrame || e("CancelAnimationFrame") || e("CancelRequestAnimationFrame") || function(e) { t.clearTimeout(e) }; + o.Util.requestAnimFrame = function(e, n, r) { return r && s === i ? void e.call(n) : s.call(t, o.bind(e, n)) }, o.Util.cancelAnimFrame = function(e) { e && r.call(t, e) } }(), o.extend = o.Util.extend, o.bind = o.Util.bind, o.stamp = o.Util.stamp, o.setOptions = o.Util.setOptions, o.Class = function() {}, o.Class.extend = function(t) { var e = function() { this.initialize && this.initialize.apply(this, arguments), this.callInitHooks() }, + i = e.__super__ = this.prototype, + n = o.Util.create(i); + n.constructor = e, e.prototype = n; for (var s in this) this.hasOwnProperty(s) && "prototype" !== s && (e[s] = this[s]); return t.statics && (o.extend(e, t.statics), delete t.statics), t.includes && (o.Util.extend.apply(null, [n].concat(t.includes)), delete t.includes), n.options && (t.options = o.Util.extend(o.Util.create(n.options), t.options)), o.extend(n, t), n._initHooks = [], n.callInitHooks = function() { if (!this._initHooksCalled) { i.callInitHooks && i.callInitHooks.call(this), this._initHooksCalled = !0; for (var t = 0, e = n._initHooks.length; e > t; t++) n._initHooks[t].call(this) } }, e }, o.Class.include = function(t) { o.extend(this.prototype, t) }, o.Class.mergeOptions = function(t) { o.extend(this.prototype.options, t) }, o.Class.addInitHook = function(t) { var e = Array.prototype.slice.call(arguments, 1), + i = "function" == typeof t ? t : function() { this[t].apply(this, e) }; + this.prototype._initHooks = this.prototype._initHooks || [], this.prototype._initHooks.push(i) }, o.Evented = o.Class.extend({ on: function(t, e, i) { if ("object" == typeof t) + for (var n in t) this._on(n, t[n], e); + else { t = o.Util.splitWords(t); for (var s = 0, r = t.length; r > s; s++) this._on(t[s], e, i) } return this }, off: function(t, e, i) { if (t) + if ("object" == typeof t) + for (var n in t) this._off(n, t[n], e); + else { t = o.Util.splitWords(t); for (var s = 0, r = t.length; r > s; s++) this._off(t[s], e, i) } + else delete this._events; return this }, _on: function(t, e, i) { var n = this._events = this._events || {}, + s = i && i !== this && o.stamp(i); if (s) { var r = t + "_idx", + a = t + "_len", + h = n[r] = n[r] || {}, + l = o.stamp(e) + "_" + s; + h[l] || (h[l] = { fn: e, ctx: i }, n[a] = (n[a] || 0) + 1) } else n[t] = n[t] || [], n[t].push({ fn: e }) }, _off: function(t, e, i) { var n = this._events, + s = t + "_idx", + r = t + "_len"; if (n) { if (!e) return delete n[t], delete n[s], void delete n[r]; var a, h, l, u, c, d = i && i !== this && o.stamp(i); if (d) c = o.stamp(e) + "_" + d, a = n[s], a && a[c] && (u = a[c], delete a[c], n[r]--); + else if (a = n[t]) + for (h = 0, l = a.length; l > h; h++) + if (a[h].fn === e) { u = a[h], a.splice(h, 1); break } + u && (u.fn = o.Util.falseFn) } }, fire: function(t, e, i) { if (!this.listens(t, i)) return this; var n = o.Util.extend({}, e, { type: t, target: this }), + s = this._events; if (s) { var r, a, h, l, u = s[t + "_idx"]; if (s[t]) + for (h = s[t].slice(), r = 0, a = h.length; a > r; r++) h[r].fn.call(this, n); for (l in u) u[l].fn.call(u[l].ctx, n) } return i && this._propagateEvent(n), this }, listens: function(t, e) { var i = this._events; if (i && (i[t] || i[t + "_len"])) return !0; if (e) + for (var n in this._eventParents) + if (this._eventParents[n].listens(t, e)) return !0; + return !1 }, once: function(t, e, i) { if ("object" == typeof t) { for (var n in t) this.once(n, t[n], e); return this } var s = o.bind(function() { this.off(t, e, i).off(t, s, i) }, this); return this.on(t, e, i).on(t, s, i) }, addEventParent: function(t) { return this._eventParents = this._eventParents || {}, this._eventParents[o.stamp(t)] = t, this }, removeEventParent: function(t) { return this._eventParents && delete this._eventParents[o.stamp(t)], this }, _propagateEvent: function(t) { for (var e in this._eventParents) this._eventParents[e].fire(t.type, o.extend({ layer: t.target }, t), !0) } }); + var s = o.Evented.prototype; + s.addEventListener = s.on, s.removeEventListener = s.clearAllEventListeners = s.off, s.addOneTimeEventListener = s.once, s.fireEvent = s.fire, s.hasEventListeners = s.listens, o.Mixin = { Events: s }, + function() { var i = navigator.userAgent.toLowerCase(), + n = e.documentElement, + s = "ActiveXObject" in t, + r = -1 !== i.indexOf("webkit"), + a = -1 !== i.indexOf("phantom"), + h = -1 !== i.search("android [23]"), + l = -1 !== i.indexOf("chrome"), + u = -1 !== i.indexOf("gecko") && !r && !t.opera && !s, + c = "undefined" != typeof orientation || -1 !== i.indexOf("mobile"), + d = !t.PointerEvent && t.MSPointerEvent, + _ = t.PointerEvent && navigator.pointerEnabled || d, + m = s && "transition" in n.style, + p = "WebKitCSSMatrix" in t && "m11" in new t.WebKitCSSMatrix && !h, + f = "MozPerspective" in n.style, + g = "OTransition" in n.style, + v = !t.L_NO_TOUCH && !a && (_ || "ontouchstart" in t || t.DocumentTouch && e instanceof t.DocumentTouch); + o.Browser = { ie: s, ielt9: s && !e.addEventListener, webkit: r, gecko: u, android: -1 !== i.indexOf("android"), android23: h, chrome: l, safari: !l && -1 !== i.indexOf("safari"), ie3d: m, webkit3d: p, gecko3d: f, opera12: g, any3d: !t.L_DISABLE_3D && (m || p || f) && !g && !a, mobile: c, mobileWebkit: c && r, mobileWebkit3d: c && p, mobileOpera: c && t.opera, mobileGecko: c && u, touch: !!v, msPointer: !!d, pointer: !!_, retina: (t.devicePixelRatio || t.screen.deviceXDPI / t.screen.logicalXDPI) > 1 } }(), o.Point = function(t, e, i) { this.x = i ? Math.round(t) : t, this.y = i ? Math.round(e) : e }, o.Point.prototype = { clone: function() { return new o.Point(this.x, this.y) }, add: function(t) { return this.clone()._add(o.point(t)) }, _add: function(t) { return this.x += t.x, this.y += t.y, this }, subtract: function(t) { return this.clone()._subtract(o.point(t)) }, _subtract: function(t) { return this.x -= t.x, this.y -= t.y, this }, divideBy: function(t) { return this.clone()._divideBy(t) }, _divideBy: function(t) { return this.x /= t, this.y /= t, this }, multiplyBy: function(t) { return this.clone()._multiplyBy(t) }, _multiplyBy: function(t) { return this.x *= t, this.y *= t, this }, scaleBy: function(t) { return new o.Point(this.x * t.x, this.y * t.y) }, unscaleBy: function(t) { return new o.Point(this.x / t.x, this.y / t.y) }, round: function() { return this.clone()._round() }, _round: function() { return this.x = Math.round(this.x), this.y = Math.round(this.y), this }, floor: function() { return this.clone()._floor() }, _floor: function() { return this.x = Math.floor(this.x), this.y = Math.floor(this.y), this }, ceil: function() { return this.clone()._ceil() }, _ceil: function() { return this.x = Math.ceil(this.x), this.y = Math.ceil(this.y), this }, distanceTo: function(t) { t = o.point(t); var e = t.x - this.x, + i = t.y - this.y; return Math.sqrt(e * e + i * i) }, equals: function(t) { return t = o.point(t), t.x === this.x && t.y === this.y }, contains: function(t) { return t = o.point(t), Math.abs(t.x) <= Math.abs(this.x) && Math.abs(t.y) <= Math.abs(this.y) }, toString: function() { return "Point(" + o.Util.formatNum(this.x) + ", " + o.Util.formatNum(this.y) + ")" } }, o.point = function(t, e, n) { return t instanceof o.Point ? t : o.Util.isArray(t) ? new o.Point(t[0], t[1]) : t === i || null === t ? t : new o.Point(t, e, n) }, o.Bounds = function(t, e) { if (t) + for (var i = e ? [t, e] : t, n = 0, o = i.length; o > n; n++) this.extend(i[n]) }, o.Bounds.prototype = { extend: function(t) { return t = o.point(t), this.min || this.max ? (this.min.x = Math.min(t.x, this.min.x), this.max.x = Math.max(t.x, this.max.x), this.min.y = Math.min(t.y, this.min.y), this.max.y = Math.max(t.y, this.max.y)) : (this.min = t.clone(), this.max = t.clone()), this }, getCenter: function(t) { return new o.Point((this.min.x + this.max.x) / 2, (this.min.y + this.max.y) / 2, t) }, getBottomLeft: function() { return new o.Point(this.min.x, this.max.y) }, getTopRight: function() { return new o.Point(this.max.x, this.min.y) }, getSize: function() { return this.max.subtract(this.min) }, contains: function(t) { var e, i; return t = "number" == typeof t[0] || t instanceof o.Point ? o.point(t) : o.bounds(t), t instanceof o.Bounds ? (e = t.min, i = t.max) : e = i = t, e.x >= this.min.x && i.x <= this.max.x && e.y >= this.min.y && i.y <= this.max.y }, intersects: function(t) { t = o.bounds(t); var e = this.min, + i = this.max, + n = t.min, + s = t.max, + r = s.x >= e.x && n.x <= i.x, + a = s.y >= e.y && n.y <= i.y; return r && a }, overlaps: function(t) { t = o.bounds(t); var e = this.min, + i = this.max, + n = t.min, + s = t.max, + r = s.x > e.x && n.x < i.x, + a = s.y > e.y && n.y < i.y; return r && a }, isValid: function() { return !(!this.min || !this.max) } }, o.bounds = function(t, e) { return !t || t instanceof o.Bounds ? t : new o.Bounds(t, e) }, o.Transformation = function(t, e, i, n) { this._a = t, this._b = e, this._c = i, this._d = n }, o.Transformation.prototype = { transform: function(t, e) { return this._transform(t.clone(), e) }, _transform: function(t, e) { return e = e || 1, t.x = e * (this._a * t.x + this._b), t.y = e * (this._c * t.y + this._d), t }, untransform: function(t, e) { return e = e || 1, new o.Point((t.x / e - this._b) / this._a, (t.y / e - this._d) / this._c) } }, o.DomUtil = { get: function(t) { return "string" == typeof t ? e.getElementById(t) : t }, getStyle: function(t, i) { var n = t.style[i] || t.currentStyle && t.currentStyle[i]; if ((!n || "auto" === n) && e.defaultView) { var o = e.defaultView.getComputedStyle(t, null); + n = o ? o[i] : null } return "auto" === n ? null : n }, create: function(t, i, n) { var o = e.createElement(t); return o.className = i, n && n.appendChild(o), o }, remove: function(t) { var e = t.parentNode; + e && e.removeChild(t) }, empty: function(t) { for (; t.firstChild;) t.removeChild(t.firstChild) }, toFront: function(t) { t.parentNode.appendChild(t) }, toBack: function(t) { var e = t.parentNode; + e.insertBefore(t, e.firstChild) }, hasClass: function(t, e) { if (t.classList !== i) return t.classList.contains(e); var n = o.DomUtil.getClass(t); return n.length > 0 && new RegExp("(^|\\s)" + e + "(\\s|$)").test(n) }, addClass: function(t, e) { if (t.classList !== i) + for (var n = o.Util.splitWords(e), s = 0, r = n.length; r > s; s++) t.classList.add(n[s]); + else if (!o.DomUtil.hasClass(t, e)) { var a = o.DomUtil.getClass(t); + o.DomUtil.setClass(t, (a ? a + " " : "") + e) } }, removeClass: function(t, e) { t.classList !== i ? t.classList.remove(e) : o.DomUtil.setClass(t, o.Util.trim((" " + o.DomUtil.getClass(t) + " ").replace(" " + e + " ", " "))) }, setClass: function(t, e) { t.className.baseVal === i ? t.className = e : t.className.baseVal = e }, getClass: function(t) { return t.className.baseVal === i ? t.className : t.className.baseVal }, setOpacity: function(t, e) { "opacity" in t.style ? t.style.opacity = e : "filter" in t.style && o.DomUtil._setOpacityIE(t, e) }, _setOpacityIE: function(t, e) { var i = !1, + n = "DXImageTransform.Microsoft.Alpha"; try { i = t.filters.item(n) } catch (o) { if (1 === e) return } + e = Math.round(100 * e), i ? (i.Enabled = 100 !== e, i.Opacity = e) : t.style.filter += " progid:" + n + "(opacity=" + e + ")" }, testProp: function(t) { for (var i = e.documentElement.style, n = 0; n < t.length; n++) + if (t[n] in i) return t[n]; + return !1 }, setTransform: function(t, e, i) { var n = e || new o.Point(0, 0); + t.style[o.DomUtil.TRANSFORM] = (o.Browser.ie3d ? "translate(" + n.x + "px," + n.y + "px)" : "translate3d(" + n.x + "px," + n.y + "px,0)") + (i ? " scale(" + i + ")" : "") }, setPosition: function(t, e) { t._leaflet_pos = e, o.Browser.any3d ? o.DomUtil.setTransform(t, e) : (t.style.left = e.x + "px", t.style.top = e.y + "px") }, getPosition: function(t) { return t._leaflet_pos } }, + function() { o.DomUtil.TRANSFORM = o.DomUtil.testProp(["transform", "WebkitTransform", "OTransform", "MozTransform", "msTransform"]); var i = o.DomUtil.TRANSITION = o.DomUtil.testProp(["webkitTransition", "transition", "OTransition", "MozTransition", "msTransition"]); if (o.DomUtil.TRANSITION_END = "webkitTransition" === i || "OTransition" === i ? i + "End" : "transitionend", "onselectstart" in e) o.DomUtil.disableTextSelection = function() { o.DomEvent.on(t, "selectstart", o.DomEvent.preventDefault) }, o.DomUtil.enableTextSelection = function() { o.DomEvent.off(t, "selectstart", o.DomEvent.preventDefault) }; + else { var n = o.DomUtil.testProp(["userSelect", "WebkitUserSelect", "OUserSelect", "MozUserSelect", "msUserSelect"]); + o.DomUtil.disableTextSelection = function() { if (n) { var t = e.documentElement.style; + this._userSelect = t[n], t[n] = "none" } }, o.DomUtil.enableTextSelection = function() { n && (e.documentElement.style[n] = this._userSelect, delete this._userSelect) } } + o.DomUtil.disableImageDrag = function() { o.DomEvent.on(t, "dragstart", o.DomEvent.preventDefault) }, o.DomUtil.enableImageDrag = function() { o.DomEvent.off(t, "dragstart", o.DomEvent.preventDefault) }, o.DomUtil.preventOutline = function(e) { for (; - 1 === e.tabIndex;) e = e.parentNode; + e && e.style && (o.DomUtil.restoreOutline(), this._outlineElement = e, this._outlineStyle = e.style.outline, e.style.outline = "none", o.DomEvent.on(t, "keydown", o.DomUtil.restoreOutline, this)) }, o.DomUtil.restoreOutline = function() { this._outlineElement && (this._outlineElement.style.outline = this._outlineStyle, delete this._outlineElement, delete this._outlineStyle, o.DomEvent.off(t, "keydown", o.DomUtil.restoreOutline, this)) } }(), o.LatLng = function(t, e, n) { if (isNaN(t) || isNaN(e)) throw new Error("Invalid LatLng object: (" + t + ", " + e + ")"); + this.lat = +t, this.lng = +e, n !== i && (this.alt = +n) }, o.LatLng.prototype = { equals: function(t, e) { if (!t) return !1; + t = o.latLng(t); var n = Math.max(Math.abs(this.lat - t.lat), Math.abs(this.lng - t.lng)); return (e === i ? 1e-9 : e) >= n }, toString: function(t) { return "LatLng(" + o.Util.formatNum(this.lat, t) + ", " + o.Util.formatNum(this.lng, t) + ")" }, distanceTo: function(t) { return o.CRS.Earth.distance(this, o.latLng(t)) }, wrap: function() { return o.CRS.Earth.wrapLatLng(this) }, toBounds: function(t) { var e = 180 * t / 40075017, + i = e / Math.cos(Math.PI / 180 * this.lat); return o.latLngBounds([this.lat - e, this.lng - i], [this.lat + e, this.lng + i]) }, clone: function() { return new o.LatLng(this.lat, this.lng, this.alt) } }, o.latLng = function(t, e, n) { return t instanceof o.LatLng ? t : o.Util.isArray(t) && "object" != typeof t[0] ? 3 === t.length ? new o.LatLng(t[0], t[1], t[2]) : 2 === t.length ? new o.LatLng(t[0], t[1]) : null : t === i || null === t ? t : "object" == typeof t && "lat" in t ? new o.LatLng(t.lat, "lng" in t ? t.lng : t.lon, t.alt) : e === i ? null : new o.LatLng(t, e, n) }, o.LatLngBounds = function(t, e) { if (t) + for (var i = e ? [t, e] : t, n = 0, o = i.length; o > n; n++) this.extend(i[n]) }, o.LatLngBounds.prototype = { extend: function(t) { var e, i, n = this._southWest, + s = this._northEast; if (t instanceof o.LatLng) e = t, i = t; + else { if (!(t instanceof o.LatLngBounds)) return t ? this.extend(o.latLng(t) || o.latLngBounds(t)) : this; if (e = t._southWest, i = t._northEast, !e || !i) return this } return n || s ? (n.lat = Math.min(e.lat, n.lat), n.lng = Math.min(e.lng, n.lng), s.lat = Math.max(i.lat, s.lat), s.lng = Math.max(i.lng, s.lng)) : (this._southWest = new o.LatLng(e.lat, e.lng), this._northEast = new o.LatLng(i.lat, i.lng)), this }, pad: function(t) { var e = this._southWest, + i = this._northEast, + n = Math.abs(e.lat - i.lat) * t, + s = Math.abs(e.lng - i.lng) * t; return new o.LatLngBounds(new o.LatLng(e.lat - n, e.lng - s), new o.LatLng(i.lat + n, i.lng + s)) }, getCenter: function() { return new o.LatLng((this._southWest.lat + this._northEast.lat) / 2, (this._southWest.lng + this._northEast.lng) / 2) }, getSouthWest: function() { return this._southWest }, getNorthEast: function() { return this._northEast }, getNorthWest: function() { return new o.LatLng(this.getNorth(), this.getWest()) }, getSouthEast: function() { return new o.LatLng(this.getSouth(), this.getEast()) }, getWest: function() { return this._southWest.lng }, getSouth: function() { return this._southWest.lat }, getEast: function() { return this._northEast.lng }, getNorth: function() { return this._northEast.lat }, contains: function(t) { t = "number" == typeof t[0] || t instanceof o.LatLng ? o.latLng(t) : o.latLngBounds(t); var e, i, n = this._southWest, + s = this._northEast; return t instanceof o.LatLngBounds ? (e = t.getSouthWest(), i = t.getNorthEast()) : e = i = t, e.lat >= n.lat && i.lat <= s.lat && e.lng >= n.lng && i.lng <= s.lng }, intersects: function(t) { t = o.latLngBounds(t); var e = this._southWest, + i = this._northEast, + n = t.getSouthWest(), + s = t.getNorthEast(), + r = s.lat >= e.lat && n.lat <= i.lat, + a = s.lng >= e.lng && n.lng <= i.lng; return r && a }, overlaps: function(t) { t = o.latLngBounds(t); var e = this._southWest, + i = this._northEast, + n = t.getSouthWest(), + s = t.getNorthEast(), + r = s.lat > e.lat && n.lat < i.lat, + a = s.lng > e.lng && n.lng < i.lng; return r && a }, toBBoxString: function() { return [this.getWest(), this.getSouth(), this.getEast(), this.getNorth()].join(",") }, equals: function(t) { return t ? (t = o.latLngBounds(t), this._southWest.equals(t.getSouthWest()) && this._northEast.equals(t.getNorthEast())) : !1 }, isValid: function() { return !(!this._southWest || !this._northEast) } }, o.latLngBounds = function(t, e) { return !t || t instanceof o.LatLngBounds ? t : new o.LatLngBounds(t, e) }, o.Projection = {}, o.Projection.LonLat = { project: function(t) { return new o.Point(t.lng, t.lat) }, unproject: function(t) { return new o.LatLng(t.y, t.x) }, bounds: o.bounds([-180, -90], [180, 90]) }, o.Projection.SphericalMercator = { R: 6378137, MAX_LATITUDE: 85.0511287798, project: function(t) { var e = Math.PI / 180, + i = this.MAX_LATITUDE, + n = Math.max(Math.min(i, t.lat), -i), + s = Math.sin(n * e); return new o.Point(this.R * t.lng * e, this.R * Math.log((1 + s) / (1 - s)) / 2) }, unproject: function(t) { var e = 180 / Math.PI; return new o.LatLng((2 * Math.atan(Math.exp(t.y / this.R)) - Math.PI / 2) * e, t.x * e / this.R) }, bounds: function() { var t = 6378137 * Math.PI; return o.bounds([-t, -t], [t, t]) }() }, o.CRS = { latLngToPoint: function(t, e) { var i = this.projection.project(t), + n = this.scale(e); return this.transformation._transform(i, n) }, pointToLatLng: function(t, e) { var i = this.scale(e), + n = this.transformation.untransform(t, i); return this.projection.unproject(n) }, project: function(t) { return this.projection.project(t) }, unproject: function(t) { return this.projection.unproject(t) }, scale: function(t) { return 256 * Math.pow(2, t) }, zoom: function(t) { return Math.log(t / 256) / Math.LN2 }, getProjectedBounds: function(t) { if (this.infinite) return null; var e = this.projection.bounds, + i = this.scale(t), + n = this.transformation.transform(e.min, i), + s = this.transformation.transform(e.max, i); return o.bounds(n, s) }, wrapLatLng: function(t) { var e = this.wrapLng ? o.Util.wrapNum(t.lng, this.wrapLng, !0) : t.lng, + i = this.wrapLat ? o.Util.wrapNum(t.lat, this.wrapLat, !0) : t.lat, + n = t.alt; return o.latLng(i, e, n) } }, o.CRS.Simple = o.extend({}, o.CRS, { projection: o.Projection.LonLat, transformation: new o.Transformation(1, 0, -1, 0), scale: function(t) { return Math.pow(2, t) }, zoom: function(t) { return Math.log(t) / Math.LN2 }, distance: function(t, e) { var i = e.lng - t.lng, + n = e.lat - t.lat; return Math.sqrt(i * i + n * n) }, infinite: !0 }), o.CRS.Earth = o.extend({}, o.CRS, { wrapLng: [-180, 180], R: 6378137, distance: function(t, e) { var i = Math.PI / 180, + n = t.lat * i, + o = e.lat * i, + s = Math.sin(n) * Math.sin(o) + Math.cos(n) * Math.cos(o) * Math.cos((e.lng - t.lng) * i); return this.R * Math.acos(Math.min(s, 1)) } }), o.CRS.EPSG3857 = o.extend({}, o.CRS.Earth, { code: "EPSG:3857", projection: o.Projection.SphericalMercator, transformation: function() { var t = .5 / (Math.PI * o.Projection.SphericalMercator.R); return new o.Transformation(t, .5, -t, .5) }() }), o.CRS.EPSG900913 = o.extend({}, o.CRS.EPSG3857, { code: "EPSG:900913" }), o.CRS.EPSG4326 = o.extend({}, o.CRS.Earth, { code: "EPSG:4326", projection: o.Projection.LonLat, transformation: new o.Transformation(1 / 180, 1, -1 / 180, .5) }), o.Map = o.Evented.extend({ + options: { crs: o.CRS.EPSG3857, fadeAnimation: !0, trackResize: !0, markerZoomAnimation: !0, maxBoundsViscosity: 0, transform3DLimit: 8388608 }, + initialize: function(t, e) { e = o.setOptions(this, e), this._initContainer(t), this._initLayout(), this._onResize = o.bind(this._onResize, this), this._initEvents(), e.maxBounds && this.setMaxBounds(e.maxBounds), e.zoom !== i && (this._zoom = this._limitZoom(e.zoom)), e.center && e.zoom !== i && this.setView(o.latLng(e.center), e.zoom, { reset: !0 }), this._handlers = [], this._layers = {}, this._zoomBoundLayers = {}, this._sizeChanged = !0, this.callInitHooks(), this._addLayers(this.options.layers) }, + setView: function(t, e) { return e = e === i ? this.getZoom() : e, this._resetView(o.latLng(t), e), this }, + setZoom: function(t, e) { return this._loaded ? this.setView(this.getCenter(), t, { zoom: e }) : (this._zoom = t, this) }, + zoomIn: function(t, e) { return this.setZoom(this._zoom + (t || 1), e) }, + zoomOut: function(t, e) { return this.setZoom(this._zoom - (t || 1), e) }, + setZoomAround: function(t, e, i) { var n = this.getZoomScale(e), + s = this.getSize().divideBy(2), + r = t instanceof o.Point ? t : this.latLngToContainerPoint(t), + a = r.subtract(s).multiplyBy(1 - 1 / n), + h = this.containerPointToLatLng(s.add(a)); return this.setView(h, e, { zoom: i }) }, + _getBoundsCenterZoom: function(t, e) { e = e || {}, t = t.getBounds ? t.getBounds() : o.latLngBounds(t); var i = o.point(e.paddingTopLeft || e.padding || [0, 0]), + n = o.point(e.paddingBottomRight || e.padding || [0, 0]), + s = this.getBoundsZoom(t, !1, i.add(n)); + s = e.maxZoom ? Math.min(e.maxZoom, s) : s; var r = n.subtract(i).divideBy(2), + a = this.project(t.getSouthWest(), s), + h = this.project(t.getNorthEast(), s), + l = this.unproject(a.add(h).divideBy(2).add(r), s); return { center: l, zoom: s } }, + fitBounds: function(t, e) { var i = this._getBoundsCenterZoom(t, e); return this.setView(i.center, i.zoom, e) }, + fitWorld: function(t) { return this.fitBounds([ + [-90, -180], + [90, 180] + ], t) }, + panTo: function(t, e) { return this.setView(t, this._zoom, { pan: e }) }, + panBy: function(t) { return this.fire("movestart"), this._rawPanBy(o.point(t)), this.fire("move"), this.fire("moveend") }, + setMaxBounds: function(t) { return (t = o.latLngBounds(t)) ? (this.options.maxBounds && this.off("moveend", this._panInsideMaxBounds), this.options.maxBounds = t, this._loaded && this._panInsideMaxBounds(), this.on("moveend", this._panInsideMaxBounds)) : this.off("moveend", this._panInsideMaxBounds) }, + setMinZoom: function(t) { return this.options.minZoom = t, this._loaded && this.getZoom() < this.options.minZoom ? this.setZoom(t) : this }, + setMaxZoom: function(t) { return this.options.maxZoom = t, this._loaded && this.getZoom() > this.options.maxZoom ? this.setZoom(t) : this }, + panInsideBounds: function(t, e) { this._enforcingBounds = !0; var i = this.getCenter(), + n = this._limitCenter(i, this._zoom, o.latLngBounds(t)); return i.equals(n) ? this : (this.panTo(n, e), this._enforcingBounds = !1, this) }, + invalidateSize: function(t) { if (!this._loaded) return this; + t = o.extend({ animate: !1, pan: !0 }, t === !0 ? { animate: !0 } : t); var e = this.getSize(); + this._sizeChanged = !0, this._lastCenter = null; var i = this.getSize(), + n = e.divideBy(2).round(), + s = i.divideBy(2).round(), + r = n.subtract(s); return r.x || r.y ? (t.animate && t.pan ? this.panBy(r) : (t.pan && this._rawPanBy(r), this.fire("move"), t.debounceMoveend ? (clearTimeout(this._sizeTimer), this._sizeTimer = setTimeout(o.bind(this.fire, this, "moveend"), 200)) : this.fire("moveend")), this.fire("resize", { oldSize: e, newSize: i })) : this }, + stop: function() { return o.Util.cancelAnimFrame(this._flyToFrame), this._panAnim && this._panAnim.stop(), this }, + addHandler: function(t, e) { if (!e) return this; var i = this[t] = new e(this); return this._handlers.push(i), this.options[t] && i.enable(), this }, + remove: function() { this._initEvents(!0); try { delete this._container._leaflet } catch (t) { this._container._leaflet = i } + o.DomUtil.remove(this._mapPane), this._clearControlPos && this._clearControlPos(), this._clearHandlers(), this._loaded && this.fire("unload"); for (var e in this._layers) this._layers[e].remove(); return this }, + createPane: function(t, e) { var i = "leaflet-pane" + (t ? " leaflet-" + t.replace("Pane", "") + "-pane" : ""), + n = o.DomUtil.create("div", i, e || this._mapPane); return t && (this._panes[t] = n), n }, + getCenter: function() { return this._checkIfLoaded(), this._lastCenter && !this._moved() ? this._lastCenter : this.layerPointToLatLng(this._getCenterLayerPoint()) }, + getZoom: function() { return this._zoom }, + getBounds: function() { var t = this.getPixelBounds(), + e = this.unproject(t.getBottomLeft()), + i = this.unproject(t.getTopRight()); return new o.LatLngBounds(e, i) }, + getMinZoom: function() { return this.options.minZoom === i ? this._layersMinZoom || 0 : this.options.minZoom }, + getMaxZoom: function() { return this.options.maxZoom === i ? this._layersMaxZoom === i ? 1 / 0 : this._layersMaxZoom : this.options.maxZoom }, + getBoundsZoom: function(t, e, i) { t = o.latLngBounds(t); var n, s = this.getMinZoom() - (e ? 1 : 0), + r = this.getMaxZoom(), + a = this.getSize(), + h = t.getNorthWest(), + l = t.getSouthEast(), + u = !0; + i = o.point(i || [0, 0]); + do s++, n = this.project(l, s).subtract(this.project(h, s)).add(i).floor(), u = e ? n.x < a.x || n.y < a.y : a.contains(n); while (u && r >= s); return u && e ? null : e ? s : s - 1 }, + getSize: function() { return (!this._size || this._sizeChanged) && (this._size = new o.Point(this._container.clientWidth, this._container.clientHeight), this._sizeChanged = !1), this._size.clone() }, + getPixelBounds: function(t, e) { var i = this._getTopLeftPoint(t, e); return new o.Bounds(i, i.add(this.getSize())) }, + getPixelOrigin: function() { return this._checkIfLoaded(), this._pixelOrigin }, + getPixelWorldBounds: function(t) { return this.options.crs.getProjectedBounds(t === i ? this.getZoom() : t) }, + getPane: function(t) { return "string" == typeof t ? this._panes[t] : t }, + getPanes: function() { return this._panes }, + getContainer: function() { return this._container }, + getZoomScale: function(t, e) { var n = this.options.crs; return e = e === i ? this._zoom : e, n.scale(t) / n.scale(e) }, + getScaleZoom: function(t, e) { var n = this.options.crs; return e = e === i ? this._zoom : e, n.zoom(t * n.scale(e)) }, + project: function(t, e) { return e = e === i ? this._zoom : e, this.options.crs.latLngToPoint(o.latLng(t), e) }, + unproject: function(t, e) { return e = e === i ? this._zoom : e, this.options.crs.pointToLatLng(o.point(t), e) }, + layerPointToLatLng: function(t) { var e = o.point(t).add(this.getPixelOrigin()); return this.unproject(e) }, + latLngToLayerPoint: function(t) { var e = this.project(o.latLng(t))._round(); return e._subtract(this.getPixelOrigin()) }, + wrapLatLng: function(t) { return this.options.crs.wrapLatLng(o.latLng(t)) }, + distance: function(t, e) { return this.options.crs.distance(o.latLng(t), o.latLng(e)) }, + containerPointToLayerPoint: function(t) { return o.point(t).subtract(this._getMapPanePos()) }, + layerPointToContainerPoint: function(t) { return o.point(t).add(this._getMapPanePos()) }, + containerPointToLatLng: function(t) { var e = this.containerPointToLayerPoint(o.point(t)); return this.layerPointToLatLng(e) }, + latLngToContainerPoint: function(t) { return this.layerPointToContainerPoint(this.latLngToLayerPoint(o.latLng(t))) }, + mouseEventToContainerPoint: function(t) { return o.DomEvent.getMousePosition(t, this._container) }, + mouseEventToLayerPoint: function(t) { return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(t)) }, + mouseEventToLatLng: function(t) { return this.layerPointToLatLng(this.mouseEventToLayerPoint(t)) }, + _initContainer: function(t) { var e = this._container = o.DomUtil.get(t); if (!e) throw new Error("Map container not found."); if (e._leaflet) throw new Error("Map container is already initialized."); + o.DomEvent.addListener(e, "scroll", this._onScroll, this), e._leaflet = !0 }, + _initLayout: function() { var t = this._container; + this._fadeAnimated = this.options.fadeAnimation && o.Browser.any3d, o.DomUtil.addClass(t, "leaflet-container" + (o.Browser.touch ? " leaflet-touch" : "") + (o.Browser.retina ? " leaflet-retina" : "") + (o.Browser.ielt9 ? " leaflet-oldie" : "") + (o.Browser.safari ? " leaflet-safari" : "") + (this._fadeAnimated ? " leaflet-fade-anim" : "")); var e = o.DomUtil.getStyle(t, "position"); "absolute" !== e && "relative" !== e && "fixed" !== e && (t.style.position = "relative"), this._initPanes(), this._initControlPos && this._initControlPos() }, + _initPanes: function() { var t = this._panes = {}; + this._paneRenderers = {}, this._mapPane = this.createPane("mapPane", this._container), o.DomUtil.setPosition(this._mapPane, new o.Point(0, 0)), this.createPane("tilePane"), this.createPane("shadowPane"), this.createPane("overlayPane"), this.createPane("markerPane"), this.createPane("popupPane"), this.options.markerZoomAnimation || (o.DomUtil.addClass(t.markerPane, "leaflet-zoom-hide"), o.DomUtil.addClass(t.shadowPane, "leaflet-zoom-hide")) }, + _resetView: function(t, e) { o.DomUtil.setPosition(this._mapPane, new o.Point(0, 0)); var i = !this._loaded; + this._loaded = !0, e = this._limitZoom(e); var n = this._zoom !== e; + this._moveStart(n)._move(t, e)._moveEnd(n), this.fire("viewreset"), i && this.fire("load") }, + _moveStart: function(t) { return t && this.fire("zoomstart"), this.fire("movestart") }, + _move: function(t, e, n) { e === i && (e = this._zoom); var o = this._zoom !== e; return this._zoom = e, this._lastCenter = t, this._pixelOrigin = this._getNewPixelOrigin(t), o && this.fire("zoom", n), this.fire("move", n) }, + _moveEnd: function(t) { return t && this.fire("zoomend"), this.fire("moveend") }, + _rawPanBy: function(t) { o.DomUtil.setPosition(this._mapPane, this._getMapPanePos().subtract(t)) }, + _getZoomSpan: function() { return this.getMaxZoom() - this.getMinZoom() }, + _panInsideMaxBounds: function() { this._enforcingBounds || this.panInsideBounds(this.options.maxBounds) }, + _checkIfLoaded: function() { if (!this._loaded) throw new Error("Set map center and zoom first.") }, + _initEvents: function(e) { if (o.DomEvent) { this._targets = {}, this._targets[o.stamp(this._container)] = this; var i = e ? "off" : "on"; + o.DomEvent[i](this._container, "click dblclick mousedown mouseup mouseover mouseout mousemove contextmenu keypress", this._handleDOMEvent, this), this.options.trackResize && o.DomEvent[i](t, "resize", this._onResize, this), o.Browser.any3d && this.options.transform3DLimit && this[i]("moveend", this._onMoveEnd) } }, + _onResize: function() { o.Util.cancelAnimFrame(this._resizeRequest), this._resizeRequest = o.Util.requestAnimFrame(function() { this.invalidateSize({ debounceMoveend: !0 }) }, this) }, + _onScroll: function() { this._container.scrollTop = 0, this._container.scrollLeft = 0 }, + _onMoveEnd: function() { var t = this._getMapPanePos(); + Math.max(Math.abs(t.x), Math.abs(t.y)) >= this.options.transform3DLimit && this._resetView(this.getCenter(), this.getZoom()) }, + _findEventTargets: function(t, e) { for (var i, n = [], s = "mouseout" === e || "mouseover" === e, r = t.target || t.srcElement; r;) { if (i = this._targets[o.stamp(r)], i && i.listens(e, !0)) { if (s && !o.DomEvent._isExternalTarget(r, t)) break; if (n.push(i), s) break } if (r === this._container) break; + r = r.parentNode } return n.length || s || !o.DomEvent._isExternalTarget(r, t) || (n = [this]), n }, + _handleDOMEvent: function(t) { if (this._loaded && !o.DomEvent._skipped(t)) { var e = "keypress" === t.type && 13 === t.keyCode ? "click" : t.type; if ("click" === t.type) { var i = o.Util.extend({}, t); + i.type = "preclick", this._handleDOMEvent(i) } "mousedown" === e && o.DomUtil.preventOutline(t.target || t.srcElement), this._fireDOMEvent(t, e) } }, + _fireDOMEvent: function(t, e, i) { if (!t._stopped && (i = (i || []).concat(this._findEventTargets(t, e)), i.length)) { var n = i[0]; if ("contextmenu" === e && n.listens(e, !0) && o.DomEvent.preventDefault(t), "click" !== t.type && "preclick" !== t.type || t._simulated || !this._draggableMoved(n)) { var s = { originalEvent: t }; if ("keypress" !== t.type) { var r = n instanceof o.Marker; + s.containerPoint = r ? this.latLngToContainerPoint(n.getLatLng()) : this.mouseEventToContainerPoint(t), s.layerPoint = this.containerPointToLayerPoint(s.containerPoint), s.latlng = r ? n.getLatLng() : this.layerPointToLatLng(s.layerPoint) } for (var a = 0; a < i.length; a++) + if (i[a].fire(e, s, !0), s.originalEvent._stopped || i[a].options.nonBubblingEvents && -1 !== o.Util.indexOf(i[a].options.nonBubblingEvents, e)) return } } }, + _draggableMoved: function(t) { return t = t.options.draggable ? t : this, t.dragging && t.dragging.moved() || this.boxZoom && this.boxZoom.moved() }, + _clearHandlers: function() { for (var t = 0, e = this._handlers.length; e > t; t++) this._handlers[t].disable() }, + whenReady: function(t, e) { return this._loaded ? t.call(e || this, { target: this }) : this.on("load", t, e), this }, + _getMapPanePos: function() { return o.DomUtil.getPosition(this._mapPane) || new o.Point(0, 0) }, + _moved: function() { var t = this._getMapPanePos(); return t && !t.equals([0, 0]) }, + _getTopLeftPoint: function(t, e) { var n = t && e !== i ? this._getNewPixelOrigin(t, e) : this.getPixelOrigin(); return n.subtract(this._getMapPanePos()) }, + _getNewPixelOrigin: function(t, e) { var i = this.getSize()._divideBy(2); return this.project(t, e)._subtract(i)._add(this._getMapPanePos())._round() }, + _latLngToNewLayerPoint: function(t, e, i) { + var n = this._getNewPixelOrigin(i, e); + return this.project(t, e)._subtract(n) + }, + _getCenterLayerPoint: function() { return this.containerPointToLayerPoint(this.getSize()._divideBy(2)) }, + _getCenterOffset: function(t) { return this.latLngToLayerPoint(t).subtract(this._getCenterLayerPoint()) }, + _limitCenter: function(t, e, i) { if (!i) return t; var n = this.project(t, e), + s = this.getSize().divideBy(2), + r = new o.Bounds(n.subtract(s), n.add(s)), + a = this._getBoundsOffset(r, i, e); return this.unproject(n.add(a), e) }, + _limitOffset: function(t, e) { if (!e) return t; var i = this.getPixelBounds(), + n = new o.Bounds(i.min.add(t), i.max.add(t)); return t.add(this._getBoundsOffset(n, e)) }, + _getBoundsOffset: function(t, e, i) { var n = this.project(e.getNorthWest(), i).subtract(t.min), + s = this.project(e.getSouthEast(), i).subtract(t.max), + r = this._rebound(n.x, -s.x), + a = this._rebound(n.y, -s.y); return new o.Point(r, a) }, + _rebound: function(t, e) { return t + e > 0 ? Math.round(t - e) / 2 : Math.max(0, Math.ceil(t)) - Math.max(0, Math.floor(e)) }, + _limitZoom: function(t) { var e = this.getMinZoom(), + i = this.getMaxZoom(); return o.Browser.any3d || (t = Math.round(t)), Math.max(e, Math.min(i, t)) } + }), o.map = function(t, e) { return new o.Map(t, e) }, o.Layer = o.Evented.extend({ options: { pane: "overlayPane", nonBubblingEvents: [] }, addTo: function(t) { return t.addLayer(this), this }, remove: function() { return this.removeFrom(this._map || this._mapToAdd) }, removeFrom: function(t) { return t && t.removeLayer(this), this }, getPane: function(t) { return this._map.getPane(t ? this.options[t] || t : this.options.pane) }, addInteractiveTarget: function(t) { return this._map._targets[o.stamp(t)] = this, this }, removeInteractiveTarget: function(t) { return delete this._map._targets[o.stamp(t)], this }, _layerAdd: function(t) { var e = t.target; + e.hasLayer(this) && (this._map = e, this._zoomAnimated = e._zoomAnimated, this.getEvents && e.on(this.getEvents(), this), this.onAdd(e), this.getAttribution && this._map.attributionControl && this._map.attributionControl.addAttribution(this.getAttribution()), this.fire("add"), e.fire("layeradd", { layer: this })) } }), o.Map.include({ addLayer: function(t) { var e = o.stamp(t); return this._layers[e] ? t : (this._layers[e] = t, t._mapToAdd = this, t.beforeAdd && t.beforeAdd(this), this.whenReady(t._layerAdd, t), this) }, removeLayer: function(t) { var e = o.stamp(t); return this._layers[e] ? (this._loaded && t.onRemove(this), t.getAttribution && this.attributionControl && this.attributionControl.removeAttribution(t.getAttribution()), t.getEvents && this.off(t.getEvents(), t), delete this._layers[e], this._loaded && (this.fire("layerremove", { layer: t }), t.fire("remove")), t._map = t._mapToAdd = null, this) : this }, hasLayer: function(t) { return !!t && o.stamp(t) in this._layers }, eachLayer: function(t, e) { for (var i in this._layers) t.call(e, this._layers[i]); return this }, _addLayers: function(t) { t = t ? o.Util.isArray(t) ? t : [t] : []; for (var e = 0, i = t.length; i > e; e++) this.addLayer(t[e]) }, _addZoomLimit: function(t) { + (isNaN(t.options.maxZoom) || !isNaN(t.options.minZoom)) && (this._zoomBoundLayers[o.stamp(t)] = t, this._updateZoomLevels()) }, _removeZoomLimit: function(t) { var e = o.stamp(t); + this._zoomBoundLayers[e] && (delete this._zoomBoundLayers[e], this._updateZoomLevels()) }, _updateZoomLevels: function() { var t = 1 / 0, + e = -(1 / 0), + n = this._getZoomSpan(); for (var o in this._zoomBoundLayers) { var s = this._zoomBoundLayers[o].options; + t = s.minZoom === i ? t : Math.min(t, s.minZoom), e = s.maxZoom === i ? e : Math.max(e, s.maxZoom) } + this._layersMaxZoom = e === -(1 / 0) ? i : e, this._layersMinZoom = t === 1 / 0 ? i : t, n !== this._getZoomSpan() && this.fire("zoomlevelschange") } }), o.Projection.Mercator = { R: 6378137, R_MINOR: 6356752.314245179, bounds: o.bounds([-20037508.34279, -15496570.73972], [20037508.34279, 18764656.23138]), project: function(t) { var e = Math.PI / 180, + i = this.R, + n = t.lat * e, + s = this.R_MINOR / i, + r = Math.sqrt(1 - s * s), + a = r * Math.sin(n), + h = Math.tan(Math.PI / 4 - n / 2) / Math.pow((1 - a) / (1 + a), r / 2); return n = -i * Math.log(Math.max(h, 1e-10)), new o.Point(t.lng * e * i, n) }, unproject: function(t) { for (var e, i = 180 / Math.PI, n = this.R, s = this.R_MINOR / n, r = Math.sqrt(1 - s * s), a = Math.exp(-t.y / n), h = Math.PI / 2 - 2 * Math.atan(a), l = 0, u = .1; 15 > l && Math.abs(u) > 1e-7; l++) e = r * Math.sin(h), e = Math.pow((1 - e) / (1 + e), r / 2), u = Math.PI / 2 - 2 * Math.atan(a * e) - h, h += u; return new o.LatLng(h * i, t.x * i / n) } }, o.CRS.EPSG3395 = o.extend({}, o.CRS.Earth, { code: "EPSG:3395", projection: o.Projection.Mercator, transformation: function() { var t = .5 / (Math.PI * o.Projection.Mercator.R); return new o.Transformation(t, .5, -t, .5) }() }), o.GridLayer = o.Layer.extend({ options: { pane: "tilePane", tileSize: 256, opacity: 1, zIndex: 1, updateWhenIdle: o.Browser.mobile, updateInterval: 200, attribution: null, bounds: null, minZoom: 0 }, initialize: function(t) { t = o.setOptions(this, t) }, onAdd: function() { this._initContainer(), this._levels = {}, this._tiles = {}, this._resetView(), this._update() }, beforeAdd: function(t) { t._addZoomLimit(this) }, onRemove: function(t) { o.DomUtil.remove(this._container), t._removeZoomLimit(this), this._container = null, this._tileZoom = null }, bringToFront: function() { return this._map && (o.DomUtil.toFront(this._container), this._setAutoZIndex(Math.max)), this }, bringToBack: function() { return this._map && (o.DomUtil.toBack(this._container), this._setAutoZIndex(Math.min)), this }, getAttribution: function() { return this.options.attribution }, getContainer: function() { return this._container }, setOpacity: function(t) { return this.options.opacity = t, this._updateOpacity(), this }, setZIndex: function(t) { return this.options.zIndex = t, this._updateZIndex(), this }, isLoading: function() { return this._loading }, redraw: function() { return this._map && (this._removeAllTiles(), this._update()), this }, getEvents: function() { var t = { viewreset: this._resetAll, zoom: this._resetView, moveend: this._onMoveEnd }; return this.options.updateWhenIdle || (this._onMove || (this._onMove = o.Util.throttle(this._onMoveEnd, this.options.updateInterval, this)), t.move = this._onMove), this._zoomAnimated && (t.zoomanim = this._animateZoom), t }, createTile: function() { return e.createElement("div") }, getTileSize: function() { var t = this.options.tileSize; return t instanceof o.Point ? t : new o.Point(t, t) }, _updateZIndex: function() { this._container && this.options.zIndex !== i && null !== this.options.zIndex && (this._container.style.zIndex = this.options.zIndex) }, _setAutoZIndex: function(t) { for (var e, i = this.getPane().children, n = -t(-(1 / 0), 1 / 0), o = 0, s = i.length; s > o; o++) e = i[o].style.zIndex, i[o] !== this._container && e && (n = t(n, +e)); + isFinite(n) && (this.options.zIndex = n + t(-1, 1), this._updateZIndex()) }, _updateOpacity: function() { if (this._map && !o.Browser.ielt9 && this._map._fadeAnimated) { o.DomUtil.setOpacity(this._container, this.options.opacity); var t = +new Date, + e = !1, + i = !1; for (var n in this._tiles) { var s = this._tiles[n]; if (s.current && s.loaded) { var r = Math.min(1, (t - s.loaded) / 200); + o.DomUtil.setOpacity(s.el, r), 1 > r ? e = !0 : (s.active && (i = !0), s.active = !0) } } + i && !this._noPrune && this._pruneTiles(), e && (o.Util.cancelAnimFrame(this._fadeFrame), this._fadeFrame = o.Util.requestAnimFrame(this._updateOpacity, this)) } }, _initContainer: function() { this._container || (this._container = o.DomUtil.create("div", "leaflet-layer"), this._updateZIndex(), this.options.opacity < 1 && this._updateOpacity(), this.getPane().appendChild(this._container)) }, _updateLevels: function() { var t = this._tileZoom, + e = this.options.maxZoom; for (var i in this._levels) this._levels[i].el.children.length || i === t ? this._levels[i].el.style.zIndex = e - Math.abs(t - i) : (o.DomUtil.remove(this._levels[i].el), delete this._levels[i]); var n = this._levels[t], + s = this._map; return n || (n = this._levels[t] = {}, n.el = o.DomUtil.create("div", "leaflet-tile-container leaflet-zoom-animated", this._container), n.el.style.zIndex = e, n.origin = s.project(s.unproject(s.getPixelOrigin()), t).round(), n.zoom = t, this._setZoomTransform(n, s.getCenter(), s.getZoom()), o.Util.falseFn(n.el.offsetWidth)), this._level = n, n }, _pruneTiles: function() { var t, e, i = this._map.getZoom(); if (i > this.options.maxZoom || i < this.options.minZoom) return this._removeAllTiles(); for (t in this._tiles) e = this._tiles[t], e.retain = e.current; for (t in this._tiles) + if (e = this._tiles[t], e.current && !e.active) { var n = e.coords; + this._retainParent(n.x, n.y, n.z, n.z - 5) || this._retainChildren(n.x, n.y, n.z, n.z + 2) } + for (t in this._tiles) this._tiles[t].retain || this._removeTile(t) }, _removeAllTiles: function() { for (var t in this._tiles) this._removeTile(t) }, _resetAll: function() { for (var t in this._levels) o.DomUtil.remove(this._levels[t].el), delete this._levels[t]; + this._removeAllTiles(), this._tileZoom = null, this._resetView() }, _retainParent: function(t, e, i, n) { var o = Math.floor(t / 2), + s = Math.floor(e / 2), + r = i - 1, + a = o + ":" + s + ":" + r, + h = this._tiles[a]; return h && h.active ? (h.retain = !0, !0) : (h && h.loaded && (h.retain = !0), r > n ? this._retainParent(o, s, r, n) : !1) }, _retainChildren: function(t, e, i, n) { for (var o = 2 * t; 2 * t + 2 > o; o++) + for (var s = 2 * e; 2 * e + 2 > s; s++) { var r = o + ":" + s + ":" + (i + 1), + a = this._tiles[r]; + a && a.active ? a.retain = !0 : (a && a.loaded && (a.retain = !0), n > i + 1 && this._retainChildren(o, s, i + 1, n)) } }, _resetView: function(t) { var e = t && (t.pinch || t.flyTo); + this._setView(this._map.getCenter(), this._map.getZoom(), e, e) }, _animateZoom: function(t) { this._setView(t.center, t.zoom, !0, t.noUpdate) }, _setView: function(t, e, n, o) { var s = Math.round(e); + (this.options.maxZoom !== i && s > this.options.maxZoom || this.options.minZoom !== i && s < this.options.minZoom) && (s = i); var r = s !== this._tileZoom; + (!o || r) && (this._tileZoom = s, this._abortLoading && this._abortLoading(), this._updateLevels(), this._resetGrid(), s !== i && this._update(t), n || this._pruneTiles(), this._noPrune = !!n), this._setZoomTransforms(t, e) }, _setZoomTransforms: function(t, e) { for (var i in this._levels) this._setZoomTransform(this._levels[i], t, e) }, _setZoomTransform: function(t, e, i) { var n = this._map.getZoomScale(i, t.zoom), + s = t.origin.multiplyBy(n).subtract(this._map._getNewPixelOrigin(e, i)).round(); + o.Browser.any3d ? o.DomUtil.setTransform(t.el, s, n) : o.DomUtil.setPosition(t.el, s) }, _resetGrid: function() { var t = this._map, + e = t.options.crs, + i = this._tileSize = this.getTileSize(), + n = this._tileZoom, + o = this._map.getPixelWorldBounds(this._tileZoom); + o && (this._globalTileRange = this._pxBoundsToTileRange(o)), this._wrapX = e.wrapLng && !this.options.noWrap && [Math.floor(t.project([0, e.wrapLng[0]], n).x / i.x), Math.ceil(t.project([0, e.wrapLng[1]], n).x / i.y)], this._wrapY = e.wrapLat && !this.options.noWrap && [Math.floor(t.project([e.wrapLat[0], 0], n).y / i.x), Math.ceil(t.project([e.wrapLat[1], 0], n).y / i.y)] }, _onMoveEnd: function() { this._map && !this._map._animatingZoom && this._resetView() }, _getTiledPixelBounds: function(t, e, i) { var n = this._map, + s = n.getZoomScale(e, i), + r = n.project(t, i).floor(), + a = n.getSize().divideBy(2 * s); return new o.Bounds(r.subtract(a), r.add(a)) }, _update: function(t) { var n = this._map; if (n) { var s = n.getZoom(); if (t === i && (t = n.getCenter()), this._tileZoom !== i) { var r = this._getTiledPixelBounds(t, s, this._tileZoom), + a = this._pxBoundsToTileRange(r), + h = a.getCenter(), + l = []; for (var u in this._tiles) this._tiles[u].current = !1; if (Math.abs(s - this._tileZoom) > 1) return void this._setView(t, s); for (var c = a.min.y; c <= a.max.y; c++) + for (var d = a.min.x; d <= a.max.x; d++) { var _ = new o.Point(d, c); if (_.z = this._tileZoom, this._isValidTile(_)) { var m = this._tiles[this._tileCoordsToKey(_)]; + m ? m.current = !0 : l.push(_) } } + if (l.sort(function(t, e) { return t.distanceTo(h) - e.distanceTo(h) }), 0 !== l.length) { this._loading || (this._loading = !0, this.fire("loading")); var p = e.createDocumentFragment(); for (d = 0; d < l.length; d++) this._addTile(l[d], p); + this._level.el.appendChild(p) } } } }, _isValidTile: function(t) { var e = this._map.options.crs; if (!e.infinite) { var i = this._globalTileRange; if (!e.wrapLng && (t.x < i.min.x || t.x > i.max.x) || !e.wrapLat && (t.y < i.min.y || t.y > i.max.y)) return !1 } if (!this.options.bounds) return !0; var n = this._tileCoordsToBounds(t); return o.latLngBounds(this.options.bounds).overlaps(n) }, _keyToBounds: function(t) { return this._tileCoordsToBounds(this._keyToTileCoords(t)) }, _tileCoordsToBounds: function(t) { var e = this._map, + i = this.getTileSize(), + n = t.scaleBy(i), + s = n.add(i), + r = e.wrapLatLng(e.unproject(n, t.z)), + a = e.wrapLatLng(e.unproject(s, t.z)); return new o.LatLngBounds(r, a) }, _tileCoordsToKey: function(t) { return t.x + ":" + t.y + ":" + t.z }, _keyToTileCoords: function(t) { var e = t.split(":"), + i = new o.Point(+e[0], +e[1]); return i.z = +e[2], i }, _removeTile: function(t) { var e = this._tiles[t]; + e && (o.DomUtil.remove(e.el), delete this._tiles[t], this.fire("tileunload", { tile: e.el, coords: this._keyToTileCoords(t) })) }, _initTile: function(t) { o.DomUtil.addClass(t, "leaflet-tile"); var e = this.getTileSize(); + t.style.width = e.x + "px", t.style.height = e.y + "px", t.onselectstart = o.Util.falseFn, t.onmousemove = o.Util.falseFn, o.Browser.ielt9 && this.options.opacity < 1 && o.DomUtil.setOpacity(t, this.options.opacity), o.Browser.android && !o.Browser.android23 && (t.style.WebkitBackfaceVisibility = "hidden") }, _addTile: function(t, e) { var i = this._getTilePos(t), + n = this._tileCoordsToKey(t), + s = this.createTile(this._wrapCoords(t), o.bind(this._tileReady, this, t)); + this._initTile(s), this.createTile.length < 2 && o.Util.requestAnimFrame(o.bind(this._tileReady, this, t, null, s)), o.DomUtil.setPosition(s, i), this._tiles[n] = { el: s, coords: t, current: !0 }, e.appendChild(s), this.fire("tileloadstart", { tile: s, coords: t }) }, _tileReady: function(t, e, i) { if (this._map) { e && this.fire("tileerror", { error: e, tile: i, coords: t }); var n = this._tileCoordsToKey(t); + i = this._tiles[n], i && (i.loaded = +new Date, this._map._fadeAnimated ? (o.DomUtil.setOpacity(i.el, 0), o.Util.cancelAnimFrame(this._fadeFrame), this._fadeFrame = o.Util.requestAnimFrame(this._updateOpacity, this)) : (i.active = !0, this._pruneTiles()), o.DomUtil.addClass(i.el, "leaflet-tile-loaded"), this.fire("tileload", { tile: i.el, coords: t }), this._noTilesToLoad() && (this._loading = !1, this.fire("load"))) } }, _getTilePos: function(t) { return t.scaleBy(this.getTileSize()).subtract(this._level.origin) }, _wrapCoords: function(t) { var e = new o.Point(this._wrapX ? o.Util.wrapNum(t.x, this._wrapX) : t.x, this._wrapY ? o.Util.wrapNum(t.y, this._wrapY) : t.y); return e.z = t.z, e }, _pxBoundsToTileRange: function(t) { var e = this.getTileSize(); return new o.Bounds(t.min.unscaleBy(e).floor(), t.max.unscaleBy(e).ceil().subtract([1, 1])) }, _noTilesToLoad: function() { for (var t in this._tiles) + if (!this._tiles[t].loaded) return !1; + return !0 } }), o.gridLayer = function(t) { return new o.GridLayer(t) }, o.TileLayer = o.GridLayer.extend({ options: { maxZoom: 18, subdomains: "abc", errorTileUrl: "", zoomOffset: 0, maxNativeZoom: null, tms: !1, zoomReverse: !1, detectRetina: !1, crossOrigin: !1 }, initialize: function(t, e) { this._url = t, e = o.setOptions(this, e), e.detectRetina && o.Browser.retina && e.maxZoom > 0 && (e.tileSize = Math.floor(e.tileSize / 2), e.zoomOffset++, e.minZoom = Math.max(0, e.minZoom), e.maxZoom--), "string" == typeof e.subdomains && (e.subdomains = e.subdomains.split("")), o.Browser.android || this.on("tileunload", this._onTileRemove) }, setUrl: function(t, e) { return this._url = t, e || this.redraw(), this }, createTile: function(t, i) { var n = e.createElement("img"); return o.DomEvent.on(n, "load", o.bind(this._tileOnLoad, this, i, n)), o.DomEvent.on(n, "error", o.bind(this._tileOnError, this, i, n)), this.options.crossOrigin && (n.crossOrigin = ""), n.alt = "", n.src = this.getTileUrl(t), n }, getTileUrl: function(t) { return o.Util.template(this._url, o.extend({ r: this.options.detectRetina && o.Browser.retina && this.options.maxZoom > 0 ? "@2x" : "", s: this._getSubdomain(t), x: t.x, y: this.options.tms ? this._globalTileRange.max.y - t.y : t.y, z: this._getZoomForUrl() }, this.options)) }, _tileOnLoad: function(t, e) { o.Browser.ielt9 ? setTimeout(o.bind(t, this, null, e), 0) : t(null, e) }, _tileOnError: function(t, e, i) { var n = this.options.errorTileUrl; + n && (e.src = n), t(i, e) }, getTileSize: function() { var t = this._map, + e = o.GridLayer.prototype.getTileSize.call(this), + i = this._tileZoom + this.options.zoomOffset, + n = this.options.maxNativeZoom; return null !== n && i > n ? e.divideBy(t.getZoomScale(n, i)).round() : e }, _onTileRemove: function(t) { t.tile.onload = null }, _getZoomForUrl: function() { var t = this.options, + e = this._tileZoom; return t.zoomReverse && (e = t.maxZoom - e), e += t.zoomOffset, null !== t.maxNativeZoom ? Math.min(e, t.maxNativeZoom) : e }, _getSubdomain: function(t) { var e = Math.abs(t.x + t.y) % this.options.subdomains.length; return this.options.subdomains[e] }, _abortLoading: function() { var t, e; for (t in this._tiles) this._tiles[t].coords.z !== this._tileZoom && (e = this._tiles[t].el, e.onload = o.Util.falseFn, e.onerror = o.Util.falseFn, e.complete || (e.src = o.Util.emptyImageUrl, o.DomUtil.remove(e))) } }), o.tileLayer = function(t, e) { return new o.TileLayer(t, e) }, o.TileLayer.WMS = o.TileLayer.extend({ defaultWmsParams: { service: "WMS", request: "GetMap", version: "1.1.1", layers: "", styles: "", format: "image/jpeg", transparent: !1 }, options: { crs: null, uppercase: !1 }, initialize: function(t, e) { this._url = t; var i = o.extend({}, this.defaultWmsParams); for (var n in e) n in this.options || (i[n] = e[n]); + e = o.setOptions(this, e), i.width = i.height = e.tileSize * (e.detectRetina && o.Browser.retina ? 2 : 1), this.wmsParams = i }, onAdd: function(t) { this._crs = this.options.crs || t.options.crs, this._wmsVersion = parseFloat(this.wmsParams.version); var e = this._wmsVersion >= 1.3 ? "crs" : "srs"; + this.wmsParams[e] = this._crs.code, o.TileLayer.prototype.onAdd.call(this, t) }, getTileUrl: function(t) { var e = this._tileCoordsToBounds(t), + i = this._crs.project(e.getNorthWest()), + n = this._crs.project(e.getSouthEast()), + s = (this._wmsVersion >= 1.3 && this._crs === o.CRS.EPSG4326 ? [n.y, i.x, i.y, n.x] : [i.x, n.y, n.x, i.y]).join(","), + r = o.TileLayer.prototype.getTileUrl.call(this, t); return r + o.Util.getParamString(this.wmsParams, r, this.options.uppercase) + (this.options.uppercase ? "&BBOX=" : "&bbox=") + s }, setParams: function(t, e) { return o.extend(this.wmsParams, t), e || this.redraw(), this } }), o.tileLayer.wms = function(t, e) { return new o.TileLayer.WMS(t, e) }, o.ImageOverlay = o.Layer.extend({ options: { opacity: 1, alt: "", interactive: !1 }, initialize: function(t, e, i) { this._url = t, this._bounds = o.latLngBounds(e), o.setOptions(this, i) }, onAdd: function() { this._image || (this._initImage(), this.options.opacity < 1 && this._updateOpacity()), this.options.interactive && (o.DomUtil.addClass(this._image, "leaflet-interactive"), this.addInteractiveTarget(this._image)), this.getPane().appendChild(this._image), this._reset() }, onRemove: function() { o.DomUtil.remove(this._image), this.options.interactive && this.removeInteractiveTarget(this._image) }, setOpacity: function(t) { return this.options.opacity = t, this._image && this._updateOpacity(), this }, setStyle: function(t) { return t.opacity && this.setOpacity(t.opacity), this }, bringToFront: function() { return this._map && o.DomUtil.toFront(this._image), this }, bringToBack: function() { return this._map && o.DomUtil.toBack(this._image), this }, setUrl: function(t) { return this._url = t, this._image && (this._image.src = t), this }, setBounds: function(t) { return this._bounds = t, this._map && this._reset(), this }, getAttribution: function() { return this.options.attribution }, getEvents: function() { var t = { zoom: this._reset, viewreset: this._reset }; return this._zoomAnimated && (t.zoomanim = this._animateZoom), t }, getBounds: function() { return this._bounds }, getElement: function() { return this._image }, _initImage: function() { var t = this._image = o.DomUtil.create("img", "leaflet-image-layer " + (this._zoomAnimated ? "leaflet-zoom-animated" : "")); + t.onselectstart = o.Util.falseFn, t.onmousemove = o.Util.falseFn, t.onload = o.bind(this.fire, this, "load"), this.options.crossOrigin && (t.crossOrigin = ""), t.src = this._url, t.alt = this.options.alt }, _animateZoom: function(t) { var e = this._map.getZoomScale(t.zoom), + i = this._map._latLngToNewLayerPoint(this._bounds.getNorthWest(), t.zoom, t.center); + o.DomUtil.setTransform(this._image, i, e) }, _reset: function() { var t = this._image, + e = new o.Bounds(this._map.latLngToLayerPoint(this._bounds.getNorthWest()), this._map.latLngToLayerPoint(this._bounds.getSouthEast())), + i = e.getSize(); + o.DomUtil.setPosition(t, e.min), t.style.width = i.x + "px", t.style.height = i.y + "px" }, _updateOpacity: function() { o.DomUtil.setOpacity(this._image, this.options.opacity) } }), o.imageOverlay = function(t, e, i) { return new o.ImageOverlay(t, e, i) }, o.Icon = o.Class.extend({ initialize: function(t) { o.setOptions(this, t) }, createIcon: function(t) { return this._createIcon("icon", t) }, createShadow: function(t) { return this._createIcon("shadow", t) }, _createIcon: function(t, e) { var i = this._getIconUrl(t); if (!i) { if ("icon" === t) throw new Error("iconUrl not set in Icon options (see the docs)."); return null } var n = this._createImg(i, e && "IMG" === e.tagName ? e : null); return this._setIconStyles(n, t), n }, _setIconStyles: function(t, e) { var i = this.options, + n = o.point(i[e + "Size"]), + s = o.point("shadow" === e && i.shadowAnchor || i.iconAnchor || n && n.divideBy(2, !0)); + t.className = "leaflet-marker-" + e + " " + (i.className || ""), s && (t.style.marginLeft = -s.x + "px", t.style.marginTop = -s.y + "px"), n && (t.style.width = n.x + "px", t.style.height = n.y + "px") }, _createImg: function(t, i) { return i = i || e.createElement("img"), i.src = t, i }, _getIconUrl: function(t) { return o.Browser.retina && this.options[t + "RetinaUrl"] || this.options[t + "Url"] } }), o.icon = function(t) { return new o.Icon(t) }, o.Icon.Default = o.Icon.extend({ options: { iconSize: [25, 41], iconAnchor: [12, 41], popupAnchor: [1, -34], shadowSize: [41, 41] }, _getIconUrl: function(t) { var e = t + "Url"; if (this.options[e]) return this.options[e]; var i = o.Icon.Default.imagePath; if (!i) throw new Error("Couldn't autodetect L.Icon.Default.imagePath, set it manually."); return i + "/marker-" + t + (o.Browser.retina && "icon" === t ? "-2x" : "") + ".png" } }), o.Icon.Default.imagePath = function() { var t, i, n, o, s = e.getElementsByTagName("script"), + r = /[\/^]leaflet[\-\._]?([\w\-\._]*)\.js\??/; for (t = 0, i = s.length; i > t; t++) + if (n = s[t].src || "", n.match(r)) return o = n.split(r)[0], (o ? o + "/" : "") + "images" }(), o.Marker = o.Layer.extend({ options: { pane: "markerPane", nonBubblingEvents: ["click", "dblclick", "mouseover", "mouseout", "contextmenu"], icon: new o.Icon.Default, interactive: !0, keyboard: !0, zIndexOffset: 0, opacity: 1, riseOffset: 250 }, initialize: function(t, e) { o.setOptions(this, e), this._latlng = o.latLng(t) }, onAdd: function(t) { this._zoomAnimated = this._zoomAnimated && t.options.markerZoomAnimation, this._initIcon(), this.update() }, onRemove: function() { this.dragging && this.dragging.enabled() && (this.options.draggable = !0, this.dragging.removeHooks()), this._removeIcon(), this._removeShadow() }, getEvents: function() { var t = { zoom: this.update, viewreset: this.update }; return this._zoomAnimated && (t.zoomanim = this._animateZoom), t }, getLatLng: function() { return this._latlng }, setLatLng: function(t) { var e = this._latlng; return this._latlng = o.latLng(t), this.update(), this.fire("move", { oldLatLng: e, latlng: this._latlng }) }, setZIndexOffset: function(t) { return this.options.zIndexOffset = t, this.update() }, setIcon: function(t) { return this.options.icon = t, this._map && (this._initIcon(), this.update()), this._popup && this.bindPopup(this._popup, this._popup.options), this }, getElement: function() { return this._icon }, update: function() { if (this._icon) { var t = this._map.latLngToLayerPoint(this._latlng).round(); + this._setPos(t) } return this }, _initIcon: function() { var t = this.options, + e = "leaflet-zoom-" + (this._zoomAnimated ? "animated" : "hide"), + i = t.icon.createIcon(this._icon), + n = !1; + i !== this._icon && (this._icon && this._removeIcon(), n = !0, t.title && (i.title = t.title), t.alt && (i.alt = t.alt)), o.DomUtil.addClass(i, e), t.keyboard && (i.tabIndex = "0"), this._icon = i, t.riseOnHover && this.on({ mouseover: this._bringToFront, mouseout: this._resetZIndex }); var s = t.icon.createShadow(this._shadow), + r = !1; + s !== this._shadow && (this._removeShadow(), r = !0), s && o.DomUtil.addClass(s, e), this._shadow = s, t.opacity < 1 && this._updateOpacity(), n && (this.getPane().appendChild(this._icon), this._initInteraction()), s && r && this.getPane("shadowPane").appendChild(this._shadow) }, _removeIcon: function() { this.options.riseOnHover && this.off({ mouseover: this._bringToFront, mouseout: this._resetZIndex }), o.DomUtil.remove(this._icon), this.removeInteractiveTarget(this._icon), this._icon = null }, _removeShadow: function() { this._shadow && o.DomUtil.remove(this._shadow), this._shadow = null }, _setPos: function(t) { o.DomUtil.setPosition(this._icon, t), this._shadow && o.DomUtil.setPosition(this._shadow, t), this._zIndex = t.y + this.options.zIndexOffset, this._resetZIndex() }, _updateZIndex: function(t) { this._icon.style.zIndex = this._zIndex + t }, _animateZoom: function(t) { var e = this._map._latLngToNewLayerPoint(this._latlng, t.zoom, t.center).round(); + this._setPos(e) }, _initInteraction: function() { if (this.options.interactive && (o.DomUtil.addClass(this._icon, "leaflet-interactive"), this.addInteractiveTarget(this._icon), o.Handler.MarkerDrag)) { var t = this.options.draggable; + this.dragging && (t = this.dragging.enabled(), this.dragging.disable()), this.dragging = new o.Handler.MarkerDrag(this), t && this.dragging.enable() } }, setOpacity: function(t) { return this.options.opacity = t, this._map && this._updateOpacity(), this }, _updateOpacity: function() { var t = this.options.opacity; + o.DomUtil.setOpacity(this._icon, t), this._shadow && o.DomUtil.setOpacity(this._shadow, t) }, _bringToFront: function() { this._updateZIndex(this.options.riseOffset) }, _resetZIndex: function() { this._updateZIndex(0) } }), o.marker = function(t, e) { return new o.Marker(t, e) }, o.DivIcon = o.Icon.extend({ options: { iconSize: [12, 12], className: "leaflet-div-icon", html: !1 }, createIcon: function(t) { var i = t && "DIV" === t.tagName ? t : e.createElement("div"), + n = this.options; return i.innerHTML = n.html !== !1 ? n.html : "", n.bgPos && (i.style.backgroundPosition = -n.bgPos.x + "px " + -n.bgPos.y + "px"), this._setIconStyles(i, "icon"), i }, createShadow: function() { return null } }), o.divIcon = function(t) { return new o.DivIcon(t) }, o.Map.mergeOptions({ closePopupOnClick: !0 }), o.Popup = o.Layer.extend({ options: { pane: "popupPane", minWidth: 50, maxWidth: 300, offset: [0, 7], autoPan: !0, autoPanPadding: [5, 5], closeButton: !0, autoClose: !0, zoomAnimation: !0 }, initialize: function(t, e) { o.setOptions(this, t), this._source = e }, onAdd: function(t) { this._zoomAnimated = this._zoomAnimated && this.options.zoomAnimation, this._container || this._initLayout(), t._fadeAnimated && o.DomUtil.setOpacity(this._container, 0), clearTimeout(this._removeTimeout), this.getPane().appendChild(this._container), this.update(), t._fadeAnimated && o.DomUtil.setOpacity(this._container, 1), t.fire("popupopen", { popup: this }), this._source && this._source.fire("popupopen", { popup: this }, !0) }, openOn: function(t) { return t.openPopup(this), this }, onRemove: function(t) { t._fadeAnimated ? (o.DomUtil.setOpacity(this._container, 0), this._removeTimeout = setTimeout(o.bind(o.DomUtil.remove, o.DomUtil, this._container), 200)) : o.DomUtil.remove(this._container), t.fire("popupclose", { popup: this }), this._source && this._source.fire("popupclose", { popup: this }, !0) }, getLatLng: function() { return this._latlng }, setLatLng: function(t) { return this._latlng = o.latLng(t), this._map && (this._updatePosition(), this._adjustPan()), this }, getContent: function() { return this._content }, setContent: function(t) { return this._content = t, this.update(), this }, getElement: function() { return this._container }, update: function() { this._map && (this._container.style.visibility = "hidden", this._updateContent(), this._updateLayout(), this._updatePosition(), this._container.style.visibility = "", this._adjustPan()) }, getEvents: function() { var t = { zoom: this._updatePosition, viewreset: this._updatePosition }; return this._zoomAnimated && (t.zoomanim = this._animateZoom), ("closeOnClick" in this.options ? this.options.closeOnClick : this._map.options.closePopupOnClick) && (t.preclick = this._close), this.options.keepInView && (t.moveend = this._adjustPan), t }, isOpen: function() { return !!this._map && this._map.hasLayer(this) }, bringToFront: function() { return this._map && o.DomUtil.toFront(this._container), this }, bringToBack: function() { return this._map && o.DomUtil.toBack(this._container), this }, _close: function() { this._map && this._map.closePopup(this) }, _initLayout: function() { var t = "leaflet-popup", + e = this._container = o.DomUtil.create("div", t + " " + (this.options.className || "") + " leaflet-zoom-" + (this._zoomAnimated ? "animated" : "hide")); if (this.options.closeButton) { var i = this._closeButton = o.DomUtil.create("a", t + "-close-button", e); + i.href = "#close", i.innerHTML = "×", o.DomEvent.on(i, "click", this._onCloseButtonClick, this) } var n = this._wrapper = o.DomUtil.create("div", t + "-content-wrapper", e); + this._contentNode = o.DomUtil.create("div", t + "-content", n), o.DomEvent.disableClickPropagation(n).disableScrollPropagation(this._contentNode).on(n, "contextmenu", o.DomEvent.stopPropagation), this._tipContainer = o.DomUtil.create("div", t + "-tip-container", e), this._tip = o.DomUtil.create("div", t + "-tip", this._tipContainer) }, _updateContent: function() { if (this._content) { var t = this._contentNode, + e = "function" == typeof this._content ? this._content(this._source || this) : this._content; if ("string" == typeof e) t.innerHTML = e; + else { for (; t.hasChildNodes();) t.removeChild(t.firstChild); + t.appendChild(e) } + this.fire("contentupdate") } }, _updateLayout: function() { var t = this._contentNode, + e = t.style; + e.width = "", e.whiteSpace = "nowrap"; var i = t.offsetWidth; + i = Math.min(i, this.options.maxWidth), i = Math.max(i, this.options.minWidth), e.width = i + 1 + "px", e.whiteSpace = "", e.height = ""; var n = t.offsetHeight, + s = this.options.maxHeight, + r = "leaflet-popup-scrolled"; + s && n > s ? (e.height = s + "px", o.DomUtil.addClass(t, r)) : o.DomUtil.removeClass(t, r), this._containerWidth = this._container.offsetWidth }, _updatePosition: function() { if (this._map) { var t = this._map.latLngToLayerPoint(this._latlng), + e = o.point(this.options.offset); + this._zoomAnimated ? o.DomUtil.setPosition(this._container, t) : e = e.add(t); var i = this._containerBottom = -e.y, + n = this._containerLeft = -Math.round(this._containerWidth / 2) + e.x; + this._container.style.bottom = i + "px", this._container.style.left = n + "px" } }, _animateZoom: function(t) { var e = this._map._latLngToNewLayerPoint(this._latlng, t.zoom, t.center); + o.DomUtil.setPosition(this._container, e) }, _adjustPan: function() { if (!(!this.options.autoPan || this._map._panAnim && this._map._panAnim._inProgress)) { var t = this._map, + e = this._container.offsetHeight, + i = this._containerWidth, + n = new o.Point(this._containerLeft, -e - this._containerBottom); + this._zoomAnimated && n._add(o.DomUtil.getPosition(this._container)); var s = t.layerPointToContainerPoint(n), + r = o.point(this.options.autoPanPadding), + a = o.point(this.options.autoPanPaddingTopLeft || r), + h = o.point(this.options.autoPanPaddingBottomRight || r), + l = t.getSize(), + u = 0, + c = 0; + s.x + i + h.x > l.x && (u = s.x + i - l.x + h.x), s.x - u - a.x < 0 && (u = s.x - a.x), s.y + e + h.y > l.y && (c = s.y + e - l.y + h.y), s.y - c - a.y < 0 && (c = s.y - a.y), (u || c) && t.fire("autopanstart").panBy([u, c]) } }, _onCloseButtonClick: function(t) { this._close(), o.DomEvent.stop(t) } }), o.popup = function(t, e) { return new o.Popup(t, e) }, o.Map.include({ openPopup: function(t, e, i) { return t instanceof o.Popup || (t = new o.Popup(i).setContent(t)), e && t.setLatLng(e), this.hasLayer(t) ? this : (this._popup && this._popup.options.autoClose && this.closePopup(), this._popup = t, this.addLayer(t)) }, closePopup: function(t) { return t && t !== this._popup || (t = this._popup, this._popup = null), t && this.removeLayer(t), this } }), o.Layer.include({ bindPopup: function(t, e) { return t instanceof o.Popup ? (o.setOptions(t, e), this._popup = t, t._source = this) : ((!this._popup || e) && (this._popup = new o.Popup(e, this)), this._popup.setContent(t)), this._popupHandlersAdded || (this.on({ click: this._openPopup, remove: this.closePopup, move: this._movePopup }), this._popupHandlersAdded = !0), this._originalPopupOffset = this._popup.options.offset, this }, unbindPopup: function() { return this._popup && (this.off({ click: this._openPopup, remove: this.closePopup, move: this._movePopup }), this._popupHandlersAdded = !1, this._popup = null), this }, openPopup: function(t, e) { if (t instanceof o.Layer || (e = t, t = this), t instanceof o.FeatureGroup) + for (var i in this._layers) { t = this._layers[i]; break } + return e || (e = t.getCenter ? t.getCenter() : t.getLatLng()), this._popup && this._map && (this._popup.options.offset = this._popupAnchor(t), this._popup._source = t, this._popup.update(), this._map.openPopup(this._popup, e)), this }, closePopup: function() { return this._popup && this._popup._close(), this }, togglePopup: function(t) { return this._popup && (this._popup._map ? this.closePopup() : this.openPopup(t)), this }, isPopupOpen: function() { return this._popup.isOpen() }, setPopupContent: function(t) { return this._popup && this._popup.setContent(t), this }, getPopup: function() { return this._popup }, _openPopup: function(t) { var e = t.layer || t.target; if (this._popup && this._map) return e instanceof o.Path ? void this.openPopup(t.layer || t.target, t.latlng) : void(this._map.hasLayer(this._popup) && this._popup._source === e ? this.closePopup() : this.openPopup(e, t.latlng)) }, _popupAnchor: function(t) { var e = t._getPopupAnchor ? t._getPopupAnchor() : [0, 0], + i = this._originalPopupOffset || o.Popup.prototype.options.offset; return o.point(e).add(i) }, _movePopup: function(t) { this._popup.setLatLng(t.latlng) } }), o.Marker.include({ _getPopupAnchor: function() { return this.options.icon.options.popupAnchor || [0, 0] } }), o.LayerGroup = o.Layer.extend({ + initialize: function(t) { this._layers = {}; var e, i; if (t) + for (e = 0, i = t.length; i > e; e++) this.addLayer(t[e]) }, + addLayer: function(t) { var e = this.getLayerId(t); return this._layers[e] = t, this._map && this._map.addLayer(t), this }, + removeLayer: function(t) { + var e = t in this._layers ? t : this.getLayerId(t); + return this._map && this._layers[e] && this._map.removeLayer(this._layers[e]), + delete this._layers[e], this + }, + hasLayer: function(t) { return !!t && (t in this._layers || this.getLayerId(t) in this._layers) }, + clearLayers: function() { for (var t in this._layers) this.removeLayer(this._layers[t]); return this }, + invoke: function(t) { var e, i, n = Array.prototype.slice.call(arguments, 1); for (e in this._layers) i = this._layers[e], i[t] && i[t].apply(i, n); return this }, + onAdd: function(t) { for (var e in this._layers) t.addLayer(this._layers[e]) }, + onRemove: function(t) { for (var e in this._layers) t.removeLayer(this._layers[e]) }, + eachLayer: function(t, e) { for (var i in this._layers) t.call(e, this._layers[i]); return this }, + getLayer: function(t) { return this._layers[t] }, + getLayers: function() { var t = []; for (var e in this._layers) t.push(this._layers[e]); return t }, + setZIndex: function(t) { return this.invoke("setZIndex", t) }, + getLayerId: function(t) { return o.stamp(t) } + }), o.layerGroup = function(t) { return new o.LayerGroup(t) }, o.FeatureGroup = o.LayerGroup.extend({ addLayer: function(t) { return this.hasLayer(t) ? this : (t.addEventParent(this), o.LayerGroup.prototype.addLayer.call(this, t), this.fire("layeradd", { layer: t })) }, removeLayer: function(t) { return this.hasLayer(t) ? (t in this._layers && (t = this._layers[t]), t.removeEventParent(this), o.LayerGroup.prototype.removeLayer.call(this, t), this.fire("layerremove", { layer: t })) : this }, setStyle: function(t) { return this.invoke("setStyle", t) }, bringToFront: function() { return this.invoke("bringToFront") }, bringToBack: function() { return this.invoke("bringToBack") }, getBounds: function() { var t = new o.LatLngBounds; for (var e in this._layers) { var i = this._layers[e]; + t.extend(i.getBounds ? i.getBounds() : i.getLatLng()) } return t } }), o.featureGroup = function(t) { return new o.FeatureGroup(t) }, o.Renderer = o.Layer.extend({ options: { padding: .1 }, initialize: function(t) { o.setOptions(this, t), o.stamp(this) }, onAdd: function() { this._container || (this._initContainer(), this._zoomAnimated && o.DomUtil.addClass(this._container, "leaflet-zoom-animated")), this.getPane().appendChild(this._container), this._update() }, onRemove: function() { o.DomUtil.remove(this._container) }, getEvents: function() { var t = { viewreset: this._reset, zoomstart: this._onZoomStart, zoom: this._onZoom, moveend: this._update }; return this._zoomAnimated && (t.zoomanim = this._onAnimZoom), t }, _onAnimZoom: function(t) { this._updateTransform(t.center, t.zoom) }, _onZoom: function() { this._updateTransform(this._map.getCenter(), this._map.getZoom()) }, _onZoomStart: function() { this._update() }, _updateTransform: function(t, e) { var i = this._map.getZoomScale(e, this._zoom), + n = o.DomUtil.getPosition(this._container), + s = this._map.getSize().multiplyBy(.5 + this.options.padding), + r = this._map.project(this._center, e), + a = this._map.project(t, e), + h = a.subtract(r), + l = s.multiplyBy(-i).add(n).add(s).subtract(h); + o.DomUtil.setTransform(this._container, l, i) }, _reset: function() { this._update(), this._updateTransform(this._center, this._zoom) }, _update: function() { var t = this.options.padding, + e = this._map.getSize(), + i = this._map.containerPointToLayerPoint(e.multiplyBy(-t)).round(); + this._bounds = new o.Bounds(i, i.add(e.multiplyBy(1 + 2 * t)).round()), this._center = this._map.getCenter(), this._zoom = this._map.getZoom() } }), o.Map.include({ getRenderer: function(t) { var e = t.options.renderer || this._getPaneRenderer(t.options.pane) || this.options.renderer || this._renderer; return e || (e = this._renderer = this.options.preferCanvas && o.canvas() || o.svg()), this.hasLayer(e) || this.addLayer(e), e }, _getPaneRenderer: function(t) { if ("overlayPane" === t || t === i) return !1; var e = this._paneRenderers[t]; return e === i && (e = o.SVG && o.svg({ pane: t }) || o.Canvas && o.canvas({ pane: t }), this._paneRenderers[t] = e), e } }), o.Path = o.Layer.extend({ options: { stroke: !0, color: "#3388ff", weight: 3, opacity: 1, lineCap: "round", lineJoin: "round", fillOpacity: .2, fillRule: "evenodd", interactive: !0 }, beforeAdd: function(t) { this._renderer = t.getRenderer(this) }, onAdd: function() { this._renderer._initPath(this), this._reset(), this._renderer._addPath(this) }, onRemove: function() { this._renderer._removePath(this) }, getEvents: function() { return { zoomend: this._project, moveend: this._update, viewreset: this._reset } }, redraw: function() { return this._map && this._renderer._updatePath(this), this }, setStyle: function(t) { return o.setOptions(this, t), this._renderer && this._renderer._updateStyle(this), this }, bringToFront: function() { return this._renderer && this._renderer._bringToFront(this), this }, bringToBack: function() { return this._renderer && this._renderer._bringToBack(this), this }, getElement: function() { return this._path }, _reset: function() { this._project(), this._update() }, _clickTolerance: function() { return (this.options.stroke ? this.options.weight / 2 : 0) + (o.Browser.touch ? 10 : 0) } }), o.LineUtil = { simplify: function(t, e) { if (!e || !t.length) return t.slice(); var i = e * e; return t = this._reducePoints(t, i), t = this._simplifyDP(t, i) }, pointToSegmentDistance: function(t, e, i) { return Math.sqrt(this._sqClosestPointOnSegment(t, e, i, !0)) }, closestPointOnSegment: function(t, e, i) { return this._sqClosestPointOnSegment(t, e, i) }, _simplifyDP: function(t, e) { var n = t.length, + o = typeof Uint8Array != i + "" ? Uint8Array : Array, + s = new o(n); + s[0] = s[n - 1] = 1, this._simplifyDPStep(t, s, e, 0, n - 1); var r, a = []; for (r = 0; n > r; r++) s[r] && a.push(t[r]); return a }, _simplifyDPStep: function(t, e, i, n, o) { var s, r, a, h = 0; for (r = n + 1; o - 1 >= r; r++) a = this._sqClosestPointOnSegment(t[r], t[n], t[o], !0), a > h && (s = r, h = a); + h > i && (e[s] = 1, this._simplifyDPStep(t, e, i, n, s), this._simplifyDPStep(t, e, i, s, o)) }, _reducePoints: function(t, e) { for (var i = [t[0]], n = 1, o = 0, s = t.length; s > n; n++) this._sqDist(t[n], t[o]) > e && (i.push(t[n]), o = n); return s - 1 > o && i.push(t[s - 1]), i }, clipSegment: function(t, e, i, n, o) { var s, r, a, h = n ? this._lastCode : this._getBitCode(t, i), + l = this._getBitCode(e, i); for (this._lastCode = l;;) { if (!(h | l)) return [t, e]; if (h & l) return !1; + s = h || l, r = this._getEdgeIntersection(t, e, s, i, o), a = this._getBitCode(r, i), s === h ? (t = r, h = a) : (e = r, l = a) } }, _getEdgeIntersection: function(t, e, i, n, s) { var r, a, h = e.x - t.x, + l = e.y - t.y, + u = n.min, + c = n.max; return 8 & i ? (r = t.x + h * (c.y - t.y) / l, a = c.y) : 4 & i ? (r = t.x + h * (u.y - t.y) / l, a = u.y) : 2 & i ? (r = c.x, a = t.y + l * (c.x - t.x) / h) : 1 & i && (r = u.x, a = t.y + l * (u.x - t.x) / h), new o.Point(r, a, s) }, _getBitCode: function(t, e) { var i = 0; return t.x < e.min.x ? i |= 1 : t.x > e.max.x && (i |= 2), t.y < e.min.y ? i |= 4 : t.y > e.max.y && (i |= 8), i }, _sqDist: function(t, e) { var i = e.x - t.x, + n = e.y - t.y; return i * i + n * n }, _sqClosestPointOnSegment: function(t, e, i, n) { var s, r = e.x, + a = e.y, + h = i.x - r, + l = i.y - a, + u = h * h + l * l; return u > 0 && (s = ((t.x - r) * h + (t.y - a) * l) / u, s > 1 ? (r = i.x, a = i.y) : s > 0 && (r += h * s, a += l * s)), h = t.x - r, l = t.y - a, n ? h * h + l * l : new o.Point(r, a) } }, o.Polyline = o.Path.extend({ options: { smoothFactor: 1 }, initialize: function(t, e) { o.setOptions(this, e), this._setLatLngs(t) }, getLatLngs: function() { return this._latlngs }, setLatLngs: function(t) { return this._setLatLngs(t), this.redraw() }, isEmpty: function() { return !this._latlngs.length }, closestLayerPoint: function(t) { for (var e, i, n = 1 / 0, s = null, r = o.LineUtil._sqClosestPointOnSegment, a = 0, h = this._parts.length; h > a; a++) + for (var l = this._parts[a], u = 1, c = l.length; c > u; u++) { e = l[u - 1], i = l[u]; var d = r(t, e, i, !0); + n > d && (n = d, s = r(t, e, i)) } + return s && (s.distance = Math.sqrt(n)), s }, getCenter: function() { var t, e, i, n, o, s, r, a = this._rings[0], + h = a.length; if (!h) return null; for (t = 0, e = 0; h - 1 > t; t++) e += a[t].distanceTo(a[t + 1]) / 2; if (0 === e) return this._map.layerPointToLatLng(a[0]); for (t = 0, n = 0; h - 1 > t; t++) + if (o = a[t], s = a[t + 1], i = o.distanceTo(s), n += i, n > e) return r = (n - e) / i, this._map.layerPointToLatLng([s.x - r * (s.x - o.x), s.y - r * (s.y - o.y)]) }, getBounds: function() { return this._bounds }, addLatLng: function(t, e) { return e = e || this._defaultShape(), t = o.latLng(t), e.push(t), this._bounds.extend(t), this.redraw() }, _setLatLngs: function(t) { this._bounds = new o.LatLngBounds, this._latlngs = this._convertLatLngs(t) }, _defaultShape: function() { return o.Polyline._flat(this._latlngs) ? this._latlngs : this._latlngs[0] }, _convertLatLngs: function(t) { for (var e = [], i = o.Polyline._flat(t), n = 0, s = t.length; s > n; n++) i ? (e[n] = o.latLng(t[n]), this._bounds.extend(e[n])) : e[n] = this._convertLatLngs(t[n]); return e }, _project: function() { this._rings = [], this._projectLatlngs(this._latlngs, this._rings); var t = this._clickTolerance(), + e = new o.Point(t, -t); + this._bounds.isValid() && (this._pxBounds = new o.Bounds(this._map.latLngToLayerPoint(this._bounds.getSouthWest())._subtract(e), this._map.latLngToLayerPoint(this._bounds.getNorthEast())._add(e))) }, _projectLatlngs: function(t, e) { var i, n, s = t[0] instanceof o.LatLng, + r = t.length; if (s) { for (n = [], i = 0; r > i; i++) n[i] = this._map.latLngToLayerPoint(t[i]); + e.push(n) } else + for (i = 0; r > i; i++) this._projectLatlngs(t[i], e) }, _clipPoints: function() { var t = this._renderer._bounds; if (this._parts = [], this._pxBounds && this._pxBounds.intersects(t)) { if (this.options.noClip) return void(this._parts = this._rings); var e, i, n, s, r, a, h, l = this._parts; for (e = 0, n = 0, s = this._rings.length; s > e; e++) + for (h = this._rings[e], i = 0, r = h.length; r - 1 > i; i++) a = o.LineUtil.clipSegment(h[i], h[i + 1], t, i, !0), a && (l[n] = l[n] || [], l[n].push(a[0]), (a[1] !== h[i + 1] || i === r - 2) && (l[n].push(a[1]), n++)) } }, _simplifyPoints: function() { for (var t = this._parts, e = this.options.smoothFactor, i = 0, n = t.length; n > i; i++) t[i] = o.LineUtil.simplify(t[i], e) }, _update: function() { this._map && (this._clipPoints(), this._simplifyPoints(), this._updatePath()) }, _updatePath: function() { this._renderer._updatePoly(this) } }), o.polyline = function(t, e) { return new o.Polyline(t, e) }, o.Polyline._flat = function(t) { return !o.Util.isArray(t[0]) || "object" != typeof t[0][0] && "undefined" != typeof t[0][0] }, o.PolyUtil = {}, o.PolyUtil.clipPolygon = function(t, e, i) { var n, s, r, a, h, l, u, c, d, _ = [1, 4, 2, 8], + m = o.LineUtil; for (s = 0, u = t.length; u > s; s++) t[s]._code = m._getBitCode(t[s], e); for (a = 0; 4 > a; a++) { for (c = _[a], n = [], s = 0, u = t.length, r = u - 1; u > s; r = s++) h = t[s], l = t[r], h._code & c ? l._code & c || (d = m._getEdgeIntersection(l, h, c, e, i), d._code = m._getBitCode(d, e), n.push(d)) : (l._code & c && (d = m._getEdgeIntersection(l, h, c, e, i), d._code = m._getBitCode(d, e), n.push(d)), n.push(h)); + t = n } return t }, o.Polygon = o.Polyline.extend({ options: { fill: !0 }, isEmpty: function() { return !this._latlngs.length || !this._latlngs[0].length }, getCenter: function() { var t, e, i, n, o, s, r, a, h, l = this._rings[0], + u = l.length; if (!u) return null; for (s = r = a = 0, t = 0, e = u - 1; u > t; e = t++) i = l[t], n = l[e], o = i.y * n.x - n.y * i.x, r += (i.x + n.x) * o, a += (i.y + n.y) * o, s += 3 * o; return h = 0 === s ? l[0] : [r / s, a / s], this._map.layerPointToLatLng(h) }, _convertLatLngs: function(t) { var e = o.Polyline.prototype._convertLatLngs.call(this, t), + i = e.length; return i >= 2 && e[0] instanceof o.LatLng && e[0].equals(e[i - 1]) && e.pop(), e }, _setLatLngs: function(t) { o.Polyline.prototype._setLatLngs.call(this, t), o.Polyline._flat(this._latlngs) && (this._latlngs = [this._latlngs]) }, _defaultShape: function() { return o.Polyline._flat(this._latlngs[0]) ? this._latlngs[0] : this._latlngs[0][0] }, _clipPoints: function() { var t = this._renderer._bounds, + e = this.options.weight, + i = new o.Point(e, e); if (t = new o.Bounds(t.min.subtract(i), t.max.add(i)), this._parts = [], this._pxBounds && this._pxBounds.intersects(t)) { if (this.options.noClip) return void(this._parts = this._rings); for (var n, s = 0, r = this._rings.length; r > s; s++) n = o.PolyUtil.clipPolygon(this._rings[s], t, !0), n.length && this._parts.push(n) } }, _updatePath: function() { this._renderer._updatePoly(this, !0) } }), o.polygon = function(t, e) { return new o.Polygon(t, e) }, o.Rectangle = o.Polygon.extend({ initialize: function(t, e) { o.Polygon.prototype.initialize.call(this, this._boundsToLatLngs(t), e) }, setBounds: function(t) { return this.setLatLngs(this._boundsToLatLngs(t)) }, _boundsToLatLngs: function(t) { return t = o.latLngBounds(t), [t.getSouthWest(), t.getNorthWest(), t.getNorthEast(), t.getSouthEast()] } }), o.rectangle = function(t, e) { return new o.Rectangle(t, e) }, o.CircleMarker = o.Path.extend({ options: { fill: !0, radius: 10 }, initialize: function(t, e) { o.setOptions(this, e), this._latlng = o.latLng(t), this._radius = this.options.radius }, setLatLng: function(t) { return this._latlng = o.latLng(t), this.redraw(), this.fire("move", { latlng: this._latlng }) }, getLatLng: function() { return this._latlng }, setRadius: function(t) { return this.options.radius = this._radius = t, this.redraw() }, getRadius: function() { return this._radius }, setStyle: function(t) { var e = t && t.radius || this._radius; return o.Path.prototype.setStyle.call(this, t), this.setRadius(e), this }, _project: function() { this._point = this._map.latLngToLayerPoint(this._latlng), this._updateBounds() }, _updateBounds: function() { var t = this._radius, + e = this._radiusY || t, + i = this._clickTolerance(), + n = [t + i, e + i]; + this._pxBounds = new o.Bounds(this._point.subtract(n), this._point.add(n)) }, _update: function() { this._map && this._updatePath() }, _updatePath: function() { this._renderer._updateCircle(this) }, _empty: function() { return this._radius && !this._renderer._bounds.intersects(this._pxBounds) } }), o.circleMarker = function(t, e) { return new o.CircleMarker(t, e) }, o.Circle = o.CircleMarker.extend({ initialize: function(t, e) { o.setOptions(this, e), this._latlng = o.latLng(t), this._mRadius = this.options.radius }, setRadius: function(t) { return this._mRadius = t, this.redraw() }, getRadius: function() { return this._mRadius }, getBounds: function() { var t = [this._radius, this._radiusY || this._radius]; return new o.LatLngBounds(this._map.layerPointToLatLng(this._point.subtract(t)), this._map.layerPointToLatLng(this._point.add(t))) }, setStyle: o.Path.prototype.setStyle, _project: function() { var t = this._latlng.lng, + e = this._latlng.lat, + i = this._map, + n = i.options.crs; if (n.distance === o.CRS.Earth.distance) { var s = Math.PI / 180, + r = this._mRadius / o.CRS.Earth.R / s, + a = i.project([e + r, t]), + h = i.project([e - r, t]), + l = a.add(h).divideBy(2), + u = i.unproject(l).lat, + c = Math.acos((Math.cos(r * s) - Math.sin(e * s) * Math.sin(u * s)) / (Math.cos(e * s) * Math.cos(u * s))) / s; + this._point = l.subtract(i.getPixelOrigin()), this._radius = isNaN(c) ? 0 : Math.max(Math.round(l.x - i.project([u, t - c]).x), 1), this._radiusY = Math.max(Math.round(l.y - a.y), 1) } else { var d = n.unproject(n.project(this._latlng).subtract([this._mRadius, 0])); + this._point = i.latLngToLayerPoint(this._latlng), this._radius = this._point.x - i.latLngToLayerPoint(d).x } + this._updateBounds() } }), o.circle = function(t, e, i) { return "number" == typeof e && (e = o.extend({}, i, { radius: e })), new o.Circle(t, e) }, o.SVG = o.Renderer.extend({ _initContainer: function() { this._container = o.SVG.create("svg"), this._container.setAttribute("pointer-events", "none"), this._rootGroup = o.SVG.create("g"), this._container.appendChild(this._rootGroup) }, _update: function() { if (!this._map._animatingZoom || !this._bounds) { o.Renderer.prototype._update.call(this); var t = this._bounds, + e = t.getSize(), + i = this._container; + this._svgSize && this._svgSize.equals(e) || (this._svgSize = e, i.setAttribute("width", e.x), i.setAttribute("height", e.y)), o.DomUtil.setPosition(i, t.min), i.setAttribute("viewBox", [t.min.x, t.min.y, e.x, e.y].join(" ")) } }, _initPath: function(t) { var e = t._path = o.SVG.create("path"); + t.options.className && o.DomUtil.addClass(e, t.options.className), t.options.interactive && o.DomUtil.addClass(e, "leaflet-interactive"), this._updateStyle(t) }, _addPath: function(t) { this._rootGroup.appendChild(t._path), t.addInteractiveTarget(t._path) }, _removePath: function(t) { o.DomUtil.remove(t._path), t.removeInteractiveTarget(t._path) }, _updatePath: function(t) { t._project(), t._update() }, _updateStyle: function(t) { var e = t._path, + i = t.options; + e && (i.stroke ? (e.setAttribute("stroke", i.color), e.setAttribute("stroke-opacity", i.opacity), e.setAttribute("stroke-width", i.weight), e.setAttribute("stroke-linecap", i.lineCap), e.setAttribute("stroke-linejoin", i.lineJoin), i.dashArray ? e.setAttribute("stroke-dasharray", i.dashArray) : e.removeAttribute("stroke-dasharray"), i.dashOffset ? e.setAttribute("stroke-dashoffset", i.dashOffset) : e.removeAttribute("stroke-dashoffset")) : e.setAttribute("stroke", "none"), i.fill ? (e.setAttribute("fill", i.fillColor || i.color), e.setAttribute("fill-opacity", i.fillOpacity), e.setAttribute("fill-rule", i.fillRule || "evenodd")) : e.setAttribute("fill", "none"), e.setAttribute("pointer-events", i.pointerEvents || (i.interactive ? "visiblePainted" : "none"))) }, _updatePoly: function(t, e) { this._setPath(t, o.SVG.pointsToPath(t._parts, e)) }, _updateCircle: function(t) { var e = t._point, + i = t._radius, + n = t._radiusY || i, + o = "a" + i + "," + n + " 0 1,0 ", + s = t._empty() ? "M0 0" : "M" + (e.x - i) + "," + e.y + o + 2 * i + ",0 " + o + 2 * -i + ",0 "; + this._setPath(t, s) }, _setPath: function(t, e) { t._path.setAttribute("d", e) }, _bringToFront: function(t) { o.DomUtil.toFront(t._path) }, _bringToBack: function(t) { o.DomUtil.toBack(t._path) } }), o.extend(o.SVG, { create: function(t) { return e.createElementNS("http://www.w3.org/2000/svg", t) }, pointsToPath: function(t, e) { var i, n, s, r, a, h, l = ""; for (i = 0, s = t.length; s > i; i++) { for (a = t[i], n = 0, r = a.length; r > n; n++) h = a[n], l += (n ? "L" : "M") + h.x + " " + h.y; + l += e ? o.Browser.svg ? "z" : "x" : "" } return l || "M0 0" } }), o.Browser.svg = !(!e.createElementNS || !o.SVG.create("svg").createSVGRect), o.svg = function(t) { return o.Browser.svg || o.Browser.vml ? new o.SVG(t) : null }, o.Browser.vml = !o.Browser.svg && function() { try { var t = e.createElement("div"); + t.innerHTML = ''; var i = t.firstChild; return i.style.behavior = "url(#default#VML)", i && "object" == typeof i.adj } catch (n) { return !1 } }(), o.SVG.include(o.Browser.vml ? { _initContainer: function() { this._container = o.DomUtil.create("div", "leaflet-vml-container") }, _update: function() { this._map._animatingZoom || o.Renderer.prototype._update.call(this) }, _initPath: function(t) { var e = t._container = o.SVG.create("shape"); + o.DomUtil.addClass(e, "leaflet-vml-shape " + (this.options.className || "")), e.coordsize = "1 1", t._path = o.SVG.create("path"), e.appendChild(t._path), this._updateStyle(t) }, _addPath: function(t) { var e = t._container; + this._container.appendChild(e), t.options.interactive && t.addInteractiveTarget(e) }, _removePath: function(t) { var e = t._container; + o.DomUtil.remove(e), t.removeInteractiveTarget(e) }, _updateStyle: function(t) { var e = t._stroke, + i = t._fill, + n = t.options, + s = t._container; + s.stroked = !!n.stroke, s.filled = !!n.fill, n.stroke ? (e || (e = t._stroke = o.SVG.create("stroke")), s.appendChild(e), e.weight = n.weight + "px", e.color = n.color, e.opacity = n.opacity, n.dashArray ? e.dashStyle = o.Util.isArray(n.dashArray) ? n.dashArray.join(" ") : n.dashArray.replace(/( *, *)/g, " ") : e.dashStyle = "", e.endcap = n.lineCap.replace("butt", "flat"), e.joinstyle = n.lineJoin) : e && (s.removeChild(e), t._stroke = null), n.fill ? (i || (i = t._fill = o.SVG.create("fill")), s.appendChild(i), i.color = n.fillColor || n.color, i.opacity = n.fillOpacity) : i && (s.removeChild(i), t._fill = null) }, _updateCircle: function(t) { var e = t._point.round(), + i = Math.round(t._radius), + n = Math.round(t._radiusY || i); + this._setPath(t, t._empty() ? "M0 0" : "AL " + e.x + "," + e.y + " " + i + "," + n + " 0,23592600") }, _setPath: function(t, e) { t._path.v = e }, _bringToFront: function(t) { o.DomUtil.toFront(t._container) }, _bringToBack: function(t) { o.DomUtil.toBack(t._container) } } : {}), o.Browser.vml && (o.SVG.create = function() { try { return e.namespaces.add("lvml", "urn:schemas-microsoft-com:vml"), + function(t) { return e.createElement("') } } catch (t) { return function(t) { return e.createElement("<" + t + ' xmlns="urn:schemas-microsoft.com:vml" class="lvml">') } } }()), o.Canvas = o.Renderer.extend({ onAdd: function() { o.Renderer.prototype.onAdd.call(this), this._layers = this._layers || {}, this._draw() }, _initContainer: function() { var t = this._container = e.createElement("canvas"); + o.DomEvent.on(t, "mousemove", o.Util.throttle(this._onMouseMove, 32, this), this).on(t, "click dblclick mousedown mouseup contextmenu", this._onClick, this).on(t, "mouseout", this._handleMouseOut, this), this._ctx = t.getContext("2d") }, _update: function() { if (!this._map._animatingZoom || !this._bounds) { this._drawnLayers = {}, o.Renderer.prototype._update.call(this); var t = this._bounds, + e = this._container, + i = t.getSize(), + n = o.Browser.retina ? 2 : 1; + o.DomUtil.setPosition(e, t.min), e.width = n * i.x, e.height = n * i.y, e.style.width = i.x + "px", e.style.height = i.y + "px", o.Browser.retina && this._ctx.scale(2, 2), this._ctx.translate(-t.min.x, -t.min.y) } }, _initPath: function(t) { this._layers[o.stamp(t)] = t }, _addPath: o.Util.falseFn, _removePath: function(t) { t._removed = !0, this._requestRedraw(t) }, _updatePath: function(t) { this._redrawBounds = t._pxBounds, this._draw(!0), t._project(), t._update(), this._draw(), this._redrawBounds = null }, _updateStyle: function(t) { this._requestRedraw(t) }, _requestRedraw: function(t) { if (this._map) { var e = (t.options.weight || 0) + 1; + this._redrawBounds = this._redrawBounds || new o.Bounds, this._redrawBounds.extend(t._pxBounds.min.subtract([e, e])), this._redrawBounds.extend(t._pxBounds.max.add([e, e])), this._redrawRequest = this._redrawRequest || o.Util.requestAnimFrame(this._redraw, this) } }, _redraw: function() { this._redrawRequest = null, this._draw(!0), this._draw(), this._redrawBounds = null }, _draw: function(t) { this._clear = t; var e, i = this._redrawBounds; + this._ctx.save(), i && (this._ctx.beginPath(), this._ctx.rect(i.min.x, i.min.y, i.max.x - i.min.x, i.max.y - i.min.y), this._ctx.clip()); for (var n in this._layers) e = this._layers[n], (!i || e._pxBounds.intersects(i)) && e._updatePath(), t && e._removed && (delete e._removed, delete this._layers[n]); + this._ctx.restore() }, _updatePoly: function(t, e) { var i, n, o, s, r = t._parts, + a = r.length, + h = this._ctx; if (a) { for (this._drawnLayers[t._leaflet_id] = t, h.beginPath(), i = 0; a > i; i++) { for (n = 0, o = r[i].length; o > n; n++) s = r[i][n], h[n ? "lineTo" : "moveTo"](s.x, s.y); + e && h.closePath() } + this._fillStroke(h, t) } }, _updateCircle: function(t) { if (!t._empty()) { var e = t._point, + i = this._ctx, + n = t._radius, + o = (t._radiusY || n) / n; + 1 !== o && (i.save(), i.scale(1, o)), i.beginPath(), i.arc(e.x, e.y / o, n, 0, 2 * Math.PI, !1), 1 !== o && i.restore(), this._fillStroke(i, t) } }, _fillStroke: function(t, e) { var i = this._clear, + n = e.options; + t.globalCompositeOperation = i ? "destination-out" : "source-over", n.fill && (t.globalAlpha = i ? 1 : n.fillOpacity, t.fillStyle = n.fillColor || n.color, t.fill(n.fillRule || "evenodd")), n.stroke && 0 !== n.weight && (t.globalAlpha = i ? 1 : n.opacity, e._prevWeight = t.lineWidth = i ? e._prevWeight + 1 : n.weight, t.strokeStyle = n.color, t.lineCap = n.lineCap, t.lineJoin = n.lineJoin, t.stroke()) }, _onClick: function(t) { var e = this._map.mouseEventToLayerPoint(t), + i = []; for (var n in this._layers) this._layers[n]._containsPoint(e) && (o.DomEvent._fakeStop(t), i.push(this._layers[n])); + i.length && this._fireEvent(i, t) }, _onMouseMove: function(t) { if (this._map && !this._map.dragging._draggable._moving && !this._map._animatingZoom) { var e = this._map.mouseEventToLayerPoint(t); + this._handleMouseOut(t, e), this._handleMouseHover(t, e) } }, _handleMouseOut: function(t, e) { var i = this._hoveredLayer;!i || "mouseout" !== t.type && i._containsPoint(e) || (o.DomUtil.removeClass(this._container, "leaflet-interactive"), this._fireEvent([i], t, "mouseout"), this._hoveredLayer = null) }, _handleMouseHover: function(t, e) { var i, n; if (!this._hoveredLayer) + for (i in this._drawnLayers) + if (n = this._drawnLayers[i], n.options.interactive && n._containsPoint(e)) { o.DomUtil.addClass(this._container, "leaflet-interactive"), this._fireEvent([n], t, "mouseover"), this._hoveredLayer = n; break } + this._hoveredLayer && this._fireEvent([this._hoveredLayer], t) }, _fireEvent: function(t, e, i) { this._map._fireDOMEvent(e, i || e.type, t) }, _bringToFront: o.Util.falseFn, _bringToBack: o.Util.falseFn }), o.Browser.canvas = function() { return !!e.createElement("canvas").getContext }(), o.canvas = function(t) { return o.Browser.canvas ? new o.Canvas(t) : null }, o.Polyline.prototype._containsPoint = function(t, e) { var i, n, s, r, a, h, l = this._clickTolerance(); if (!this._pxBounds.contains(t)) return !1; for (i = 0, r = this._parts.length; r > i; i++) + for (h = this._parts[i], n = 0, a = h.length, s = a - 1; a > n; s = n++) + if ((e || 0 !== n) && o.LineUtil.pointToSegmentDistance(t, h[s], h[n]) <= l) return !0; + return !1 }, o.Polygon.prototype._containsPoint = function(t) { var e, i, n, s, r, a, h, l, u = !1; if (!this._pxBounds.contains(t)) return !1; for (s = 0, h = this._parts.length; h > s; s++) + for (e = this._parts[s], r = 0, l = e.length, a = l - 1; l > r; a = r++) i = e[r], n = e[a], i.y > t.y != n.y > t.y && t.x < (n.x - i.x) * (t.y - i.y) / (n.y - i.y) + i.x && (u = !u); return u || o.Polyline.prototype._containsPoint.call(this, t, !0) }, o.CircleMarker.prototype._containsPoint = function(t) { return t.distanceTo(this._point) <= this._radius + this._clickTolerance() }, o.GeoJSON = o.FeatureGroup.extend({ initialize: function(t, e) { o.setOptions(this, e), this._layers = {}, t && this.addData(t) }, addData: function(t) { var e, i, n, s = o.Util.isArray(t) ? t : t.features; if (s) { for (e = 0, i = s.length; i > e; e++) n = s[e], (n.geometries || n.geometry || n.features || n.coordinates) && this.addData(n); return this } var r = this.options; if (r.filter && !r.filter(t)) return this; var a = o.GeoJSON.geometryToLayer(t, r); return a ? (a.feature = o.GeoJSON.asFeature(t), a.defaultOptions = a.options, this.resetStyle(a), r.onEachFeature && r.onEachFeature(t, a), this.addLayer(a)) : this }, resetStyle: function(t) { return t.options = t.defaultOptions, this._setLayerStyle(t, this.options.style), this }, setStyle: function(t) { return this.eachLayer(function(e) { this._setLayerStyle(e, t) }, this) }, _setLayerStyle: function(t, e) { "function" == typeof e && (e = e(t.feature)), t.setStyle && t.setStyle(e) } }), o.extend(o.GeoJSON, { geometryToLayer: function(t, e) { var i, n, s, r, a = "Feature" === t.type ? t.geometry : t, + h = a ? a.coordinates : null, + l = [], + u = e && e.pointToLayer, + c = e && e.coordsToLatLng || this.coordsToLatLng; if (!h && !a) return null; switch (a.type) { + case "Point": + return i = c(h), u ? u(t, i) : new o.Marker(i); + case "MultiPoint": + for (s = 0, r = h.length; r > s; s++) i = c(h[s]), l.push(u ? u(t, i) : new o.Marker(i)); return new o.FeatureGroup(l); + case "LineString": + case "MultiLineString": + return n = this.coordsToLatLngs(h, "LineString" === a.type ? 0 : 1, c), new o.Polyline(n, e); + case "Polygon": + case "MultiPolygon": + return n = this.coordsToLatLngs(h, "Polygon" === a.type ? 1 : 2, c), new o.Polygon(n, e); + case "GeometryCollection": + for (s = 0, r = a.geometries.length; r > s; s++) { var d = this.geometryToLayer({ geometry: a.geometries[s], type: "Feature", properties: t.properties }, e); + d && l.push(d) } return new o.FeatureGroup(l); + default: + throw new Error("Invalid GeoJSON object.") } }, coordsToLatLng: function(t) { return new o.LatLng(t[1], t[0], t[2]) }, coordsToLatLngs: function(t, e, i) { for (var n, o = [], s = 0, r = t.length; r > s; s++) n = e ? this.coordsToLatLngs(t[s], e - 1, i) : (i || this.coordsToLatLng)(t[s]), o.push(n); return o }, latLngToCoords: function(t) { return t.alt !== i ? [t.lng, t.lat, t.alt] : [t.lng, t.lat] }, latLngsToCoords: function(t, e, i) { for (var n = [], s = 0, r = t.length; r > s; s++) n.push(e ? o.GeoJSON.latLngsToCoords(t[s], e - 1, i) : o.GeoJSON.latLngToCoords(t[s])); return !e && i && n.push(n[0]), n }, getFeature: function(t, e) { return t.feature ? o.extend({}, t.feature, { geometry: e }) : o.GeoJSON.asFeature(e) }, asFeature: function(t) { return "Feature" === t.type ? t : { type: "Feature", properties: {}, geometry: t } } }); + var r = { toGeoJSON: function() { return o.GeoJSON.getFeature(this, { type: "Point", coordinates: o.GeoJSON.latLngToCoords(this.getLatLng()) }) } }; + o.Marker.include(r), o.Circle.include(r), o.CircleMarker.include(r), o.Polyline.prototype.toGeoJSON = function() { var t = !o.Polyline._flat(this._latlngs), + e = o.GeoJSON.latLngsToCoords(this._latlngs, t ? 1 : 0); return o.GeoJSON.getFeature(this, { type: (t ? "Multi" : "") + "LineString", coordinates: e }) }, o.Polygon.prototype.toGeoJSON = function() { var t = !o.Polyline._flat(this._latlngs), + e = t && !o.Polyline._flat(this._latlngs[0]), + i = o.GeoJSON.latLngsToCoords(this._latlngs, e ? 2 : t ? 1 : 0, !0); return t || (i = [i]), o.GeoJSON.getFeature(this, { type: (e ? "Multi" : "") + "Polygon", coordinates: i }) }, o.LayerGroup.include({ toMultiPoint: function() { var t = []; return this.eachLayer(function(e) { t.push(e.toGeoJSON().geometry.coordinates) }), o.GeoJSON.getFeature(this, { type: "MultiPoint", coordinates: t }) }, toGeoJSON: function() { var t = this.feature && this.feature.geometry && this.feature.geometry.type; if ("MultiPoint" === t) return this.toMultiPoint(); var e = "GeometryCollection" === t, + i = []; return this.eachLayer(function(t) { if (t.toGeoJSON) { var n = t.toGeoJSON(); + i.push(e ? n.geometry : o.GeoJSON.asFeature(n)) } }), e ? o.GeoJSON.getFeature(this, { geometries: i, type: "GeometryCollection" }) : { type: "FeatureCollection", features: i } } }), o.geoJson = function(t, e) { return new o.GeoJSON(t, e) }; + var a = "_leaflet_events"; + o.DomEvent = { on: function(t, e, i, n) { if ("object" == typeof e) + for (var s in e) this._on(t, s, e[s], i); + else { e = o.Util.splitWords(e); for (var r = 0, a = e.length; a > r; r++) this._on(t, e[r], i, n) } return this }, off: function(t, e, i, n) { if ("object" == typeof e) + for (var s in e) this._off(t, s, e[s], i); + else { e = o.Util.splitWords(e); for (var r = 0, a = e.length; a > r; r++) this._off(t, e[r], i, n) } return this }, _on: function(e, i, n, s) { var r = i + o.stamp(n) + (s ? "_" + o.stamp(s) : ""); if (e[a] && e[a][r]) return this; var h = function(i) { return n.call(s || e, i || t.event) }, + l = h; return o.Browser.pointer && 0 === i.indexOf("touch") ? this.addPointerListener(e, i, h, r) : o.Browser.touch && "dblclick" === i && this.addDoubleTapListener ? this.addDoubleTapListener(e, h, r) : "addEventListener" in e ? "mousewheel" === i ? (e.addEventListener("DOMMouseScroll", h, !1), e.addEventListener(i, h, !1)) : "mouseenter" === i || "mouseleave" === i ? (h = function(i) { i = i || t.event, o.DomEvent._isExternalTarget(e, i) && l(i) }, e.addEventListener("mouseenter" === i ? "mouseover" : "mouseout", h, !1)) : ("click" === i && o.Browser.android && (h = function(t) { return o.DomEvent._filterClick(t, l) }), e.addEventListener(i, h, !1)) : "attachEvent" in e && e.attachEvent("on" + i, h), e[a] = e[a] || {}, e[a][r] = h, this }, _off: function(t, e, i, n) { var s = e + o.stamp(i) + (n ? "_" + o.stamp(n) : ""), + r = t[a] && t[a][s]; return r ? (o.Browser.pointer && 0 === e.indexOf("touch") ? this.removePointerListener(t, e, s) : o.Browser.touch && "dblclick" === e && this.removeDoubleTapListener ? this.removeDoubleTapListener(t, s) : "removeEventListener" in t ? "mousewheel" === e ? (t.removeEventListener("DOMMouseScroll", r, !1), t.removeEventListener(e, r, !1)) : t.removeEventListener("mouseenter" === e ? "mouseover" : "mouseleave" === e ? "mouseout" : e, r, !1) : "detachEvent" in t && t.detachEvent("on" + e, r), t[a][s] = null, this) : this }, stopPropagation: function(t) { return t.stopPropagation ? t.stopPropagation() : t.originalEvent ? t.originalEvent._stopped = !0 : t.cancelBubble = !0, o.DomEvent._skipped(t), this }, disableScrollPropagation: function(t) { return o.DomEvent.on(t, "mousewheel MozMousePixelScroll", o.DomEvent.stopPropagation) }, disableClickPropagation: function(t) { var e = o.DomEvent.stopPropagation; return o.DomEvent.on(t, o.Draggable.START.join(" "), e), o.DomEvent.on(t, { click: o.DomEvent._fakeStop, dblclick: e }) }, preventDefault: function(t) { return t.preventDefault ? t.preventDefault() : t.returnValue = !1, this }, stop: function(t) { return o.DomEvent.preventDefault(t).stopPropagation(t) }, getMousePosition: function(t, e) { if (!e) return new o.Point(t.clientX, t.clientY); var i = e.getBoundingClientRect(); return new o.Point(t.clientX - i.left - e.clientLeft, t.clientY - i.top - e.clientTop) }, getWheelDelta: function(t) { var e = 0; return t.wheelDelta && (e = t.wheelDelta / 120), t.detail && (e = -t.detail / 3), e }, _skipEvents: {}, _fakeStop: function(t) { o.DomEvent._skipEvents[t.type] = !0 }, _skipped: function(t) { var e = this._skipEvents[t.type]; return this._skipEvents[t.type] = !1, e }, _isExternalTarget: function(t, e) { var i = e.relatedTarget; if (!i) return !0; try { for (; i && i !== t;) i = i.parentNode } catch (n) { return !1 } return i !== t }, _filterClick: function(t, e) { var i = t.timeStamp || t.originalEvent.timeStamp, + n = o.DomEvent._lastClick && i - o.DomEvent._lastClick; return n && n > 100 && 500 > n || t.target._simulatedClick && !t._simulated ? void o.DomEvent.stop(t) : (o.DomEvent._lastClick = i, void e(t)) } }, o.DomEvent.addListener = o.DomEvent.on, o.DomEvent.removeListener = o.DomEvent.off, o.Draggable = o.Evented.extend({ + statics: { START: o.Browser.touch ? ["touchstart", "mousedown"] : ["mousedown"], END: { mousedown: "mouseup", touchstart: "touchend", pointerdown: "touchend", MSPointerDown: "touchend" }, MOVE: { mousedown: "mousemove", touchstart: "touchmove", pointerdown: "touchmove", MSPointerDown: "touchmove" } }, + initialize: function(t, e, i) { this._element = t, this._dragStartTarget = e || t, this._preventOutline = i }, + enable: function() { this._enabled || (o.DomEvent.on(this._dragStartTarget, o.Draggable.START.join(" "), this._onDown, this), this._enabled = !0) }, + disable: function() { this._enabled && (o.DomEvent.off(this._dragStartTarget, o.Draggable.START.join(" "), this._onDown, this), this._enabled = !1, this._moved = !1) }, + _onDown: function(t) { if (this._moved = !1, !o.DomUtil.hasClass(this._element, "leaflet-zoom-anim") && !(o.Draggable._dragging || t.shiftKey || 1 !== t.which && 1 !== t.button && !t.touches) && this._enabled && (o.Draggable._dragging = !0, this._preventOutline && o.DomUtil.preventOutline(this._element), o.DomUtil.disableImageDrag(), o.DomUtil.disableTextSelection(), !this._moving)) { this.fire("down"); var i = t.touches ? t.touches[0] : t; + this._startPoint = new o.Point(i.clientX, i.clientY), this._startPos = this._newPos = o.DomUtil.getPosition(this._element), o.DomEvent.on(e, o.Draggable.MOVE[t.type], this._onMove, this).on(e, o.Draggable.END[t.type], this._onUp, this) } }, + _onMove: function(t) { + if (t.touches && t.touches.length > 1) return void(this._moved = !0); + var i = t.touches && 1 === t.touches.length ? t.touches[0] : t, + n = new o.Point(i.clientX, i.clientY), + s = n.subtract(this._startPoint); + (s.x || s.y) && (o.Browser.touch && Math.abs(s.x) + Math.abs(s.y) < 3 || (o.DomEvent.preventDefault(t), this._moved || (this.fire("dragstart"), this._moved = !0, this._startPos = o.DomUtil.getPosition(this._element).subtract(s), o.DomUtil.addClass(e.body, "leaflet-dragging"), this._lastTarget = t.target || t.srcElement, o.DomUtil.addClass(this._lastTarget, "leaflet-drag-target")), + this._newPos = this._startPos.add(s), this._moving = !0, o.Util.cancelAnimFrame(this._animRequest), this._lastEvent = t, this._animRequest = o.Util.requestAnimFrame(this._updatePosition, this, !0))) + }, + _updatePosition: function() { var t = { originalEvent: this._lastEvent }; + this.fire("predrag", t), o.DomUtil.setPosition(this._element, this._newPos), this.fire("drag", t) }, + _onUp: function() { o.DomUtil.removeClass(e.body, "leaflet-dragging"), this._lastTarget && (o.DomUtil.removeClass(this._lastTarget, "leaflet-drag-target"), this._lastTarget = null); for (var t in o.Draggable.MOVE) o.DomEvent.off(e, o.Draggable.MOVE[t], this._onMove, this).off(e, o.Draggable.END[t], this._onUp, this); + o.DomUtil.enableImageDrag(), o.DomUtil.enableTextSelection(), this._moved && this._moving && (o.Util.cancelAnimFrame(this._animRequest), this.fire("dragend", { distance: this._newPos.distanceTo(this._startPos) })), this._moving = !1, o.Draggable._dragging = !1 } + }), o.Handler = o.Class.extend({ initialize: function(t) { this._map = t }, enable: function() { this._enabled || (this._enabled = !0, this.addHooks()) }, disable: function() { this._enabled && (this._enabled = !1, this.removeHooks()) }, enabled: function() { return !!this._enabled } }), o.Map.mergeOptions({ dragging: !0, inertia: !o.Browser.android23, inertiaDeceleration: 3400, inertiaMaxSpeed: 1 / 0, easeLinearity: .2, worldCopyJump: !1 }), o.Map.Drag = o.Handler.extend({ addHooks: function() { if (!this._draggable) { var t = this._map; + this._draggable = new o.Draggable(t._mapPane, t._container), this._draggable.on({ down: this._onDown, dragstart: this._onDragStart, drag: this._onDrag, dragend: this._onDragEnd }, this), this._draggable.on("predrag", this._onPreDragLimit, this), t.options.worldCopyJump && (this._draggable.on("predrag", this._onPreDragWrap, this), t.on("zoomend", this._onZoomEnd, this), t.whenReady(this._onZoomEnd, this)) } + o.DomUtil.addClass(this._map._container, "leaflet-grab"), this._draggable.enable() }, removeHooks: function() { o.DomUtil.removeClass(this._map._container, "leaflet-grab"), this._draggable.disable() }, moved: function() { return this._draggable && this._draggable._moved }, _onDown: function() { this._map.stop() }, _onDragStart: function() { var t = this._map; if (this._map.options.maxBounds && this._map.options.maxBoundsViscosity) { var e = o.latLngBounds(this._map.options.maxBounds); + this._offsetLimit = o.bounds(this._map.latLngToContainerPoint(e.getNorthWest()).multiplyBy(-1), this._map.latLngToContainerPoint(e.getSouthEast()).multiplyBy(-1).add(this._map.getSize())), this._viscosity = Math.min(1, Math.max(0, this._map.options.maxBoundsViscosity)) } else this._offsetLimit = null; + t.fire("movestart").fire("dragstart"), t.options.inertia && (this._positions = [], this._times = []) }, _onDrag: function(t) { if (this._map.options.inertia) { var e = this._lastTime = +new Date, + i = this._lastPos = this._draggable._absPos || this._draggable._newPos; + this._positions.push(i), this._times.push(e), e - this._times[0] > 50 && (this._positions.shift(), this._times.shift()) } + this._map.fire("move", t).fire("drag", t) }, _onZoomEnd: function() { var t = this._map.getSize().divideBy(2), + e = this._map.latLngToLayerPoint([0, 0]); + this._initialWorldOffset = e.subtract(t).x, this._worldWidth = this._map.getPixelWorldBounds().getSize().x }, _viscousLimit: function(t, e) { return t - (t - e) * this._viscosity }, _onPreDragLimit: function() { if (this._viscosity && this._offsetLimit) { var t = this._draggable._newPos.subtract(this._draggable._startPos), + e = this._offsetLimit; + t.x < e.min.x && (t.x = this._viscousLimit(t.x, e.min.x)), t.y < e.min.y && (t.y = this._viscousLimit(t.y, e.min.y)), t.x > e.max.x && (t.x = this._viscousLimit(t.x, e.max.x)), t.y > e.max.y && (t.y = this._viscousLimit(t.y, e.max.y)), this._draggable._newPos = this._draggable._startPos.add(t) } }, _onPreDragWrap: function() { var t = this._worldWidth, + e = Math.round(t / 2), + i = this._initialWorldOffset, + n = this._draggable._newPos.x, + o = (n - e + i) % t + e - i, + s = (n + e + i) % t - e - i, + r = Math.abs(o + i) < Math.abs(s + i) ? o : s; + this._draggable._absPos = this._draggable._newPos.clone(), this._draggable._newPos.x = r }, _onDragEnd: function(t) { var e = this._map, + i = e.options, + n = !i.inertia || this._times.length < 2; if (e.fire("dragend", t), n) e.fire("moveend"); + else { var s = this._lastPos.subtract(this._positions[0]), + r = (this._lastTime - this._times[0]) / 1e3, + a = i.easeLinearity, + h = s.multiplyBy(a / r), + l = h.distanceTo([0, 0]), + u = Math.min(i.inertiaMaxSpeed, l), + c = h.multiplyBy(u / l), + d = u / (i.inertiaDeceleration * a), + _ = c.multiplyBy(-d / 2).round(); + _.x || _.y ? (_ = e._limitOffset(_, e.options.maxBounds), o.Util.requestAnimFrame(function() { e.panBy(_, { duration: d, easeLinearity: a, noMoveStart: !0, animate: !0 }) })) : e.fire("moveend") } } }), o.Map.addInitHook("addHandler", "dragging", o.Map.Drag), o.Map.mergeOptions({ doubleClickZoom: !0 }), o.Map.DoubleClickZoom = o.Handler.extend({ addHooks: function() { this._map.on("dblclick", this._onDoubleClick, this) }, removeHooks: function() { this._map.off("dblclick", this._onDoubleClick, this) }, _onDoubleClick: function(t) { var e = this._map, + i = e.getZoom(), + n = t.originalEvent.shiftKey ? Math.ceil(i) - 1 : Math.floor(i) + 1; "center" === e.options.doubleClickZoom ? e.setZoom(n) : e.setZoomAround(t.containerPoint, n) } }), o.Map.addInitHook("addHandler", "doubleClickZoom", o.Map.DoubleClickZoom), o.Map.mergeOptions({ scrollWheelZoom: !0, wheelDebounceTime: 40 }), o.Map.ScrollWheelZoom = o.Handler.extend({ addHooks: function() { o.DomEvent.on(this._map._container, { mousewheel: this._onWheelScroll, MozMousePixelScroll: o.DomEvent.preventDefault }, this), this._delta = 0 }, removeHooks: function() { o.DomEvent.off(this._map._container, { mousewheel: this._onWheelScroll, MozMousePixelScroll: o.DomEvent.preventDefault }, this) }, _onWheelScroll: function(t) { var e = o.DomEvent.getWheelDelta(t), + i = this._map.options.wheelDebounceTime; + this._delta += e, this._lastMousePos = this._map.mouseEventToContainerPoint(t), this._startTime || (this._startTime = +new Date); var n = Math.max(i - (+new Date - this._startTime), 0); + clearTimeout(this._timer), this._timer = setTimeout(o.bind(this._performZoom, this), n), o.DomEvent.stop(t) }, _performZoom: function() { var t = this._map, + e = this._delta, + i = t.getZoom(); + t.stop(), e = e > 0 ? Math.ceil(e) : Math.floor(e), e = Math.max(Math.min(e, 4), -4), e = t._limitZoom(i + e) - i, this._delta = 0, this._startTime = null, e && ("center" === t.options.scrollWheelZoom ? t.setZoom(i + e) : t.setZoomAround(this._lastMousePos, i + e)) } }), o.Map.addInitHook("addHandler", "scrollWheelZoom", o.Map.ScrollWheelZoom), o.extend(o.DomEvent, { _touchstart: o.Browser.msPointer ? "MSPointerDown" : o.Browser.pointer ? "pointerdown" : "touchstart", _touchend: o.Browser.msPointer ? "MSPointerUp" : o.Browser.pointer ? "pointerup" : "touchend", addDoubleTapListener: function(t, e, i) { + function n(t) { var e; if (e = o.Browser.pointer ? o.DomEvent._pointersCount : t.touches.length, !(e > 1)) { var i = Date.now(), + n = i - (r || i); + a = t.touches ? t.touches[0] : t, h = n > 0 && l >= n, r = i } } + + function s() { if (h && !a.cancelBubble) { if (o.Browser.pointer) { var t, i, n = {}; for (i in a) t = a[i], n[i] = t && t.bind ? t.bind(a) : t; + a = n } + a.type = "dblclick", e(a), r = null } } var r, a, h = !1, + l = 250, + u = "_leaflet_", + c = this._touchstart, + d = this._touchend; return t[u + c + i] = n, t[u + d + i] = s, t.addEventListener(c, n, !1), t.addEventListener(d, s, !1), this }, removeDoubleTapListener: function(t, e) { var i = "_leaflet_", + n = t[i + this._touchend + e]; return t.removeEventListener(this._touchstart, t[i + this._touchstart + e], !1), t.removeEventListener(this._touchend, n, !1), this } }), o.extend(o.DomEvent, { POINTER_DOWN: o.Browser.msPointer ? "MSPointerDown" : "pointerdown", POINTER_MOVE: o.Browser.msPointer ? "MSPointerMove" : "pointermove", POINTER_UP: o.Browser.msPointer ? "MSPointerUp" : "pointerup", POINTER_CANCEL: o.Browser.msPointer ? "MSPointerCancel" : "pointercancel", _pointers: {}, _pointersCount: 0, addPointerListener: function(t, e, i, n) { return "touchstart" === e ? this._addPointerStart(t, i, n) : "touchmove" === e ? this._addPointerMove(t, i, n) : "touchend" === e && this._addPointerEnd(t, i, n), this }, removePointerListener: function(t, e, i) { var n = t["_leaflet_" + e + i]; return "touchstart" === e ? t.removeEventListener(this.POINTER_DOWN, n, !1) : "touchmove" === e ? t.removeEventListener(this.POINTER_MOVE, n, !1) : "touchend" === e && (t.removeEventListener(this.POINTER_UP, n, !1), t.removeEventListener(this.POINTER_CANCEL, n, !1)), this }, _addPointerStart: function(t, i, n) { var s = o.bind(function(t) { "mouse" !== t.pointerType && t.pointerType !== t.MSPOINTER_TYPE_MOUSE && o.DomEvent.preventDefault(t), this._handlePointer(t, i) }, this); if (t["_leaflet_touchstart" + n] = s, t.addEventListener(this.POINTER_DOWN, s, !1), !this._pointerDocListener) { var r = o.bind(this._globalPointerUp, this); + e.documentElement.addEventListener(this.POINTER_DOWN, o.bind(this._globalPointerDown, this), !0), e.documentElement.addEventListener(this.POINTER_MOVE, o.bind(this._globalPointerMove, this), !0), e.documentElement.addEventListener(this.POINTER_UP, r, !0), e.documentElement.addEventListener(this.POINTER_CANCEL, r, !0), this._pointerDocListener = !0 } }, _globalPointerDown: function(t) { this._pointers[t.pointerId] = t, this._pointersCount++ }, _globalPointerMove: function(t) { this._pointers[t.pointerId] && (this._pointers[t.pointerId] = t) }, _globalPointerUp: function(t) { delete this._pointers[t.pointerId], this._pointersCount-- }, _handlePointer: function(t, e) { t.touches = []; for (var i in this._pointers) t.touches.push(this._pointers[i]); + t.changedTouches = [t], e(t) }, _addPointerMove: function(t, e, i) { var n = o.bind(function(t) { + (t.pointerType !== t.MSPOINTER_TYPE_MOUSE && "mouse" !== t.pointerType || 0 !== t.buttons) && this._handlePointer(t, e) }, this); + t["_leaflet_touchmove" + i] = n, t.addEventListener(this.POINTER_MOVE, n, !1) }, _addPointerEnd: function(t, e, i) { var n = o.bind(function(t) { this._handlePointer(t, e) }, this); + t["_leaflet_touchend" + i] = n, t.addEventListener(this.POINTER_UP, n, !1), t.addEventListener(this.POINTER_CANCEL, n, !1) } }), o.Map.mergeOptions({ touchZoom: o.Browser.touch && !o.Browser.android23, bounceAtZoomLimits: !0 }), o.Map.TouchZoom = o.Handler.extend({ addHooks: function() { o.DomEvent.on(this._map._container, "touchstart", this._onTouchStart, this) }, removeHooks: function() { o.DomEvent.off(this._map._container, "touchstart", this._onTouchStart, this) }, _onTouchStart: function(t) { var i = this._map; if (t.touches && 2 === t.touches.length && !i._animatingZoom && !this._zooming) { var n = i.mouseEventToContainerPoint(t.touches[0]), + s = i.mouseEventToContainerPoint(t.touches[1]); + this._centerPoint = i.getSize()._divideBy(2), this._startLatLng = i.containerPointToLatLng(this._centerPoint), "center" !== i.options.touchZoom && (this._pinchStartLatLng = i.containerPointToLatLng(n.add(s)._divideBy(2))), this._startDist = n.distanceTo(s), this._startZoom = i.getZoom(), this._moved = !1, this._zooming = !0, i.stop(), o.DomEvent.on(e, "touchmove", this._onTouchMove, this).on(e, "touchend", this._onTouchEnd, this), o.DomEvent.preventDefault(t) } }, _onTouchMove: function(t) { if (t.touches && 2 === t.touches.length && this._zooming) { var e = this._map, + i = e.mouseEventToContainerPoint(t.touches[0]), + n = e.mouseEventToContainerPoint(t.touches[1]), + s = i.distanceTo(n) / this._startDist; if (this._zoom = e.getScaleZoom(s, this._startZoom), "center" === e.options.touchZoom) { if (this._center = this._startLatLng, 1 === s) return } else { var r = i._add(n)._divideBy(2)._subtract(this._centerPoint); if (1 === s && 0 === r.x && 0 === r.y) return; + this._center = e.unproject(e.project(this._pinchStartLatLng).subtract(r)) } if (e.options.bounceAtZoomLimits || !(this._zoom <= e.getMinZoom() && 1 > s || this._zoom >= e.getMaxZoom() && s > 1)) { this._moved || (e._moveStart(!0), this._moved = !0), o.Util.cancelAnimFrame(this._animRequest); var a = o.bind(e._move, e, this._center, this._zoom, { pinch: !0, round: !1 }); + this._animRequest = o.Util.requestAnimFrame(a, this, !0), o.DomEvent.preventDefault(t) } } }, _onTouchEnd: function() { if (!this._moved || !this._zooming) return void(this._zooming = !1); + this._zooming = !1, o.Util.cancelAnimFrame(this._animRequest), o.DomEvent.off(e, "touchmove", this._onTouchMove).off(e, "touchend", this._onTouchEnd); var t = this._zoom; + t = this._map._limitZoom(t - this._startZoom > 0 ? Math.ceil(t) : Math.floor(t)), this._map._animateZoom(this._center, t, !0, !0) } }), o.Map.addInitHook("addHandler", "touchZoom", o.Map.TouchZoom), o.Map.mergeOptions({ tap: !0, tapTolerance: 15 }), o.Map.Tap = o.Handler.extend({ addHooks: function() { o.DomEvent.on(this._map._container, "touchstart", this._onDown, this) }, removeHooks: function() { o.DomEvent.off(this._map._container, "touchstart", this._onDown, this) }, _onDown: function(t) { if (t.touches) { if (o.DomEvent.preventDefault(t), this._fireClick = !0, t.touches.length > 1) return this._fireClick = !1, void clearTimeout(this._holdTimeout); var i = t.touches[0], + n = i.target; + this._startPos = this._newPos = new o.Point(i.clientX, i.clientY), n.tagName && "a" === n.tagName.toLowerCase() && o.DomUtil.addClass(n, "leaflet-active"), this._holdTimeout = setTimeout(o.bind(function() { this._isTapValid() && (this._fireClick = !1, this._onUp(), this._simulateEvent("contextmenu", i)) }, this), 1e3), this._simulateEvent("mousedown", i), o.DomEvent.on(e, { touchmove: this._onMove, touchend: this._onUp }, this) } }, _onUp: function(t) { if (clearTimeout(this._holdTimeout), o.DomEvent.off(e, { touchmove: this._onMove, touchend: this._onUp }, this), this._fireClick && t && t.changedTouches) { var i = t.changedTouches[0], + n = i.target; + n && n.tagName && "a" === n.tagName.toLowerCase() && o.DomUtil.removeClass(n, "leaflet-active"), this._simulateEvent("mouseup", i), this._isTapValid() && this._simulateEvent("click", i) } }, _isTapValid: function() { return this._newPos.distanceTo(this._startPos) <= this._map.options.tapTolerance }, _onMove: function(t) { var e = t.touches[0]; + this._newPos = new o.Point(e.clientX, e.clientY), this._simulateEvent("mousemove", e) }, _simulateEvent: function(i, n) { var o = e.createEvent("MouseEvents"); + o._simulated = !0, n.target._simulatedClick = !0, o.initMouseEvent(i, !0, !0, t, 1, n.screenX, n.screenY, n.clientX, n.clientY, !1, !1, !1, !1, 0, null), n.target.dispatchEvent(o) } }), o.Browser.touch && !o.Browser.pointer && o.Map.addInitHook("addHandler", "tap", o.Map.Tap), o.Map.mergeOptions({ boxZoom: !0 }), o.Map.BoxZoom = o.Handler.extend({ initialize: function(t) { this._map = t, this._container = t._container, this._pane = t._panes.overlayPane }, addHooks: function() { o.DomEvent.on(this._container, "mousedown", this._onMouseDown, this) }, removeHooks: function() { o.DomEvent.off(this._container, "mousedown", this._onMouseDown, this) }, moved: function() { return this._moved }, _resetState: function() { this._moved = !1 }, _onMouseDown: function(t) { return !t.shiftKey || 1 !== t.which && 1 !== t.button ? !1 : (this._resetState(), o.DomUtil.disableTextSelection(), o.DomUtil.disableImageDrag(), this._startPoint = this._map.mouseEventToContainerPoint(t), void o.DomEvent.on(e, { contextmenu: o.DomEvent.stop, mousemove: this._onMouseMove, mouseup: this._onMouseUp, keydown: this._onKeyDown }, this)) }, _onMouseMove: function(t) { this._moved || (this._moved = !0, this._box = o.DomUtil.create("div", "leaflet-zoom-box", this._container), o.DomUtil.addClass(this._container, "leaflet-crosshair"), this._map.fire("boxzoomstart")), this._point = this._map.mouseEventToContainerPoint(t); var e = new o.Bounds(this._point, this._startPoint), + i = e.getSize(); + o.DomUtil.setPosition(this._box, e.min), this._box.style.width = i.x + "px", this._box.style.height = i.y + "px" }, _finish: function() { this._moved && (o.DomUtil.remove(this._box), o.DomUtil.removeClass(this._container, "leaflet-crosshair")), o.DomUtil.enableTextSelection(), o.DomUtil.enableImageDrag(), o.DomEvent.off(e, { contextmenu: o.DomEvent.stop, mousemove: this._onMouseMove, mouseup: this._onMouseUp, keydown: this._onKeyDown }, this) }, _onMouseUp: function(t) { if ((1 === t.which || 1 === t.button) && (this._finish(), this._moved)) { setTimeout(o.bind(this._resetState, this), 0); var e = new o.LatLngBounds(this._map.containerPointToLatLng(this._startPoint), this._map.containerPointToLatLng(this._point)); + this._map.fitBounds(e).fire("boxzoomend", { boxZoomBounds: e }) } }, _onKeyDown: function(t) { 27 === t.keyCode && this._finish() } }), o.Map.addInitHook("addHandler", "boxZoom", o.Map.BoxZoom), o.Map.mergeOptions({ keyboard: !0, keyboardPanOffset: 80, keyboardZoomOffset: 1 }), o.Map.Keyboard = o.Handler.extend({ keyCodes: { left: [37], right: [39], down: [40], up: [38], zoomIn: [187, 107, 61, 171], zoomOut: [189, 109, 54, 173] }, initialize: function(t) { this._map = t, this._setPanOffset(t.options.keyboardPanOffset), this._setZoomOffset(t.options.keyboardZoomOffset) }, addHooks: function() { var t = this._map._container; + t.tabIndex <= 0 && (t.tabIndex = "0"), o.DomEvent.on(t, { focus: this._onFocus, blur: this._onBlur, mousedown: this._onMouseDown }, this), this._map.on({ focus: this._addHooks, blur: this._removeHooks }, this) }, removeHooks: function() { this._removeHooks(), o.DomEvent.off(this._map._container, { focus: this._onFocus, blur: this._onBlur, mousedown: this._onMouseDown }, this), this._map.off({ focus: this._addHooks, blur: this._removeHooks }, this) }, _onMouseDown: function() { if (!this._focused) { var i = e.body, + n = e.documentElement, + o = i.scrollTop || n.scrollTop, + s = i.scrollLeft || n.scrollLeft; + this._map._container.focus(), t.scrollTo(s, o) } }, _onFocus: function() { this._focused = !0, this._map.fire("focus") }, _onBlur: function() { this._focused = !1, this._map.fire("blur") }, _setPanOffset: function(t) { var e, i, n = this._panKeys = {}, + o = this.keyCodes; for (e = 0, i = o.left.length; i > e; e++) n[o.left[e]] = [-1 * t, 0]; for (e = 0, i = o.right.length; i > e; e++) n[o.right[e]] = [t, 0]; for (e = 0, i = o.down.length; i > e; e++) n[o.down[e]] = [0, t]; for (e = 0, i = o.up.length; i > e; e++) n[o.up[e]] = [0, -1 * t] }, _setZoomOffset: function(t) { var e, i, n = this._zoomKeys = {}, + o = this.keyCodes; for (e = 0, i = o.zoomIn.length; i > e; e++) n[o.zoomIn[e]] = t; for (e = 0, i = o.zoomOut.length; i > e; e++) n[o.zoomOut[e]] = -t }, _addHooks: function() { o.DomEvent.on(e, "keydown", this._onKeyDown, this) }, _removeHooks: function() { o.DomEvent.off(e, "keydown", this._onKeyDown, this) }, _onKeyDown: function(t) { if (!(t.altKey || t.ctrlKey || t.metaKey)) { var e, i = t.keyCode, + n = this._map; if (i in this._panKeys) { if (n._panAnim && n._panAnim._inProgress) return; + e = this._panKeys[i], t.shiftKey && (e = o.point(e).multiplyBy(3)), n.panBy(e), n.options.maxBounds && n.panInsideBounds(n.options.maxBounds) } else if (i in this._zoomKeys) n.setZoom(n.getZoom() + (t.shiftKey ? 3 : 1) * this._zoomKeys[i]); + else { if (27 !== i) return; + n.closePopup() } + o.DomEvent.stop(t) } } }), o.Map.addInitHook("addHandler", "keyboard", o.Map.Keyboard), o.Handler.MarkerDrag = o.Handler.extend({ initialize: function(t) { this._marker = t }, addHooks: function() { var t = this._marker._icon; + this._draggable || (this._draggable = new o.Draggable(t, t, !0)), this._draggable.on({ dragstart: this._onDragStart, drag: this._onDrag, dragend: this._onDragEnd }, this).enable(), o.DomUtil.addClass(t, "leaflet-marker-draggable") }, removeHooks: function() { this._draggable.off({ dragstart: this._onDragStart, drag: this._onDrag, dragend: this._onDragEnd }, this).disable(), this._marker._icon && o.DomUtil.removeClass(this._marker._icon, "leaflet-marker-draggable") }, moved: function() { return this._draggable && this._draggable._moved }, _onDragStart: function() { this._marker.closePopup().fire("movestart").fire("dragstart") }, _onDrag: function(t) { var e = this._marker, + i = e._shadow, + n = o.DomUtil.getPosition(e._icon), + s = e._map.layerPointToLatLng(n); + i && o.DomUtil.setPosition(i, n), e._latlng = s, t.latlng = s, e.fire("move", t).fire("drag", t) }, _onDragEnd: function(t) { this._marker.fire("moveend").fire("dragend", t) } }), o.Control = o.Class.extend({ options: { position: "topright" }, initialize: function(t) { o.setOptions(this, t) }, getPosition: function() { return this.options.position }, setPosition: function(t) { var e = this._map; return e && e.removeControl(this), this.options.position = t, e && e.addControl(this), this }, getContainer: function() { return this._container }, addTo: function(t) { this.remove(), this._map = t; var e = this._container = this.onAdd(t), + i = this.getPosition(), + n = t._controlCorners[i]; return o.DomUtil.addClass(e, "leaflet-control"), -1 !== i.indexOf("bottom") ? n.insertBefore(e, n.firstChild) : n.appendChild(e), this }, remove: function() { return this._map ? (o.DomUtil.remove(this._container), this.onRemove && this.onRemove(this._map), this._map = null, this) : this }, _refocusOnMap: function(t) { this._map && t && t.screenX > 0 && t.screenY > 0 && this._map.getContainer().focus() } }), o.control = function(t) { return new o.Control(t) }, o.Map.include({ addControl: function(t) { return t.addTo(this), this }, removeControl: function(t) { return t.remove(), this }, _initControlPos: function() { + function t(t, s) { var r = i + t + " " + i + s; + e[t + s] = o.DomUtil.create("div", r, n) } var e = this._controlCorners = {}, + i = "leaflet-", + n = this._controlContainer = o.DomUtil.create("div", i + "control-container", this._container); + t("top", "left"), t("top", "right"), t("bottom", "left"), t("bottom", "right") }, _clearControlPos: function() { o.DomUtil.remove(this._controlContainer) } }), o.Control.Zoom = o.Control.extend({ options: { position: "topleft", zoomInText: "+", zoomInTitle: "Zoom in", zoomOutText: "-", zoomOutTitle: "Zoom out" }, onAdd: function(t) { var e = "leaflet-control-zoom", + i = o.DomUtil.create("div", e + " leaflet-bar"), + n = this.options; return this._zoomInButton = this._createButton(n.zoomInText, n.zoomInTitle, e + "-in", i, this._zoomIn), this._zoomOutButton = this._createButton(n.zoomOutText, n.zoomOutTitle, e + "-out", i, this._zoomOut), this._updateDisabled(), t.on("zoomend zoomlevelschange", this._updateDisabled, this), i }, onRemove: function(t) { t.off("zoomend zoomlevelschange", this._updateDisabled, this) }, disable: function() { return this._disabled = !0, this._updateDisabled(), this }, enable: function() { return this._disabled = !1, this._updateDisabled(), this }, _zoomIn: function(t) { this._disabled || this._map.zoomIn(t.shiftKey ? 3 : 1) }, _zoomOut: function(t) { this._disabled || this._map.zoomOut(t.shiftKey ? 3 : 1) }, _createButton: function(t, e, i, n, s) { var r = o.DomUtil.create("a", i, n); return r.innerHTML = t, r.href = "#", r.title = e, o.DomEvent.on(r, "mousedown dblclick", o.DomEvent.stopPropagation).on(r, "click", o.DomEvent.stop).on(r, "click", s, this).on(r, "click", this._refocusOnMap, this), r }, _updateDisabled: function() { var t = this._map, + e = "leaflet-disabled"; + o.DomUtil.removeClass(this._zoomInButton, e), o.DomUtil.removeClass(this._zoomOutButton, e), (this._disabled || t._zoom === t.getMinZoom()) && o.DomUtil.addClass(this._zoomOutButton, e), (this._disabled || t._zoom === t.getMaxZoom()) && o.DomUtil.addClass(this._zoomInButton, e) } }), o.Map.mergeOptions({ zoomControl: !0 }), o.Map.addInitHook(function() { this.options.zoomControl && (this.zoomControl = new o.Control.Zoom, this.addControl(this.zoomControl)) }), o.control.zoom = function(t) { return new o.Control.Zoom(t) }, o.Control.Attribution = o.Control.extend({ options: { position: "bottomright", prefix: 'Leaflet' }, initialize: function(t) { o.setOptions(this, t), this._attributions = {} }, onAdd: function(t) { this._container = o.DomUtil.create("div", "leaflet-control-attribution"), o.DomEvent && o.DomEvent.disableClickPropagation(this._container); for (var e in t._layers) t._layers[e].getAttribution && this.addAttribution(t._layers[e].getAttribution()); return this._update(), this._container }, setPrefix: function(t) { return this.options.prefix = t, this._update(), this }, addAttribution: function(t) { return t ? (this._attributions[t] || (this._attributions[t] = 0), this._attributions[t]++, this._update(), this) : this }, removeAttribution: function(t) { return t ? (this._attributions[t] && (this._attributions[t]--, this._update()), this) : this }, _update: function() { if (this._map) { var t = []; for (var e in this._attributions) this._attributions[e] && t.push(e); var i = []; + this.options.prefix && i.push(this.options.prefix), t.length && i.push(t.join(", ")), this._container.innerHTML = i.join(" | ") } } }), o.Map.mergeOptions({ attributionControl: !0 }), o.Map.addInitHook(function() { this.options.attributionControl && (this.attributionControl = (new o.Control.Attribution).addTo(this)) }), o.control.attribution = function(t) { return new o.Control.Attribution(t) }, o.Control.Scale = o.Control.extend({ options: { position: "bottomleft", maxWidth: 100, metric: !0, imperial: !0 }, onAdd: function(t) { var e = "leaflet-control-scale", + i = o.DomUtil.create("div", e), + n = this.options; return this._addScales(n, e + "-line", i), t.on(n.updateWhenIdle ? "moveend" : "move", this._update, this), t.whenReady(this._update, this), i }, onRemove: function(t) { t.off(this.options.updateWhenIdle ? "moveend" : "move", this._update, this) }, _addScales: function(t, e, i) { t.metric && (this._mScale = o.DomUtil.create("div", e, i)), t.imperial && (this._iScale = o.DomUtil.create("div", e, i)) }, _update: function() { var t = this._map, + e = t.getSize().y / 2, + i = t.distance(t.containerPointToLatLng([0, e]), t.containerPointToLatLng([this.options.maxWidth, e])); + this._updateScales(i) }, _updateScales: function(t) { this.options.metric && t && this._updateMetric(t), this.options.imperial && t && this._updateImperial(t) }, _updateMetric: function(t) { var e = this._getRoundNum(t), + i = 1e3 > e ? e + " m" : e / 1e3 + " km"; + this._updateScale(this._mScale, i, e / t) }, _updateImperial: function(t) { var e, i, n, o = 3.2808399 * t; + o > 5280 ? (e = o / 5280, i = this._getRoundNum(e), this._updateScale(this._iScale, i + " mi", i / e)) : (n = this._getRoundNum(o), this._updateScale(this._iScale, n + " ft", n / o)) }, _updateScale: function(t, e, i) { t.style.width = Math.round(this.options.maxWidth * i) + "px", t.innerHTML = e }, _getRoundNum: function(t) { var e = Math.pow(10, (Math.floor(t) + "").length - 1), + i = t / e; return i = i >= 10 ? 10 : i >= 5 ? 5 : i >= 3 ? 3 : i >= 2 ? 2 : 1, e * i } }), o.control.scale = function(t) { return new o.Control.Scale(t) }, o.Control.Layers = o.Control.extend({ options: { collapsed: !0, position: "topright", autoZIndex: !0, hideSingleBase: !1 }, initialize: function(t, e, i) { o.setOptions(this, i), this._layers = {}, this._lastZIndex = 0, this._handlingClick = !1; for (var n in t) this._addLayer(t[n], n); for (n in e) this._addLayer(e[n], n, !0) }, onAdd: function(t) { return this._initLayout(), this._update(), this._map = t, t.on("zoomend", this._checkDisabledLayers, this), this._container }, onRemove: function() { this._map.off("zoomend", this._checkDisabledLayers, this) }, addBaseLayer: function(t, e) { return this._addLayer(t, e), this._update() }, addOverlay: function(t, e) { return this._addLayer(t, e, !0), this._update() }, removeLayer: function(t) { return t.off("add remove", this._onLayerChange, this), delete this._layers[o.stamp(t)], this._update() }, _initLayout: function() { var t = "leaflet-control-layers", + e = this._container = o.DomUtil.create("div", t); + e.setAttribute("aria-haspopup", !0), o.DomEvent.disableClickPropagation(e), o.Browser.touch || o.DomEvent.disableScrollPropagation(e); var i = this._form = o.DomUtil.create("form", t + "-list"); if (this.options.collapsed) { o.Browser.android || o.DomEvent.on(e, { mouseenter: this._expand, mouseleave: this._collapse }, this); var n = this._layersLink = o.DomUtil.create("a", t + "-toggle", e); + n.href = "#", n.title = "Layers", o.Browser.touch ? o.DomEvent.on(n, "click", o.DomEvent.stop).on(n, "click", this._expand, this) : o.DomEvent.on(n, "focus", this._expand, this), o.DomEvent.on(i, "click", function() { setTimeout(o.bind(this._onInputClick, this), 0) }, this), this._map.on("click", this._collapse, this) } else this._expand(); + this._baseLayersList = o.DomUtil.create("div", t + "-base", i), this._separator = o.DomUtil.create("div", t + "-separator", i), this._overlaysList = o.DomUtil.create("div", t + "-overlays", i), e.appendChild(i) }, _addLayer: function(t, e, i) { t.on("add remove", this._onLayerChange, this); var n = o.stamp(t); + this._layers[n] = { layer: t, name: e, overlay: i }, this.options.autoZIndex && t.setZIndex && (this._lastZIndex++, t.setZIndex(this._lastZIndex)) }, _update: function() { if (!this._container) return this; + o.DomUtil.empty(this._baseLayersList), o.DomUtil.empty(this._overlaysList); var t, e, i, n, s = 0; for (i in this._layers) n = this._layers[i], this._addItem(n), e = e || n.overlay, t = t || !n.overlay, s += n.overlay ? 0 : 1; return this.options.hideSingleBase && (t = t && s > 1, this._baseLayersList.style.display = t ? "" : "none"), this._separator.style.display = e && t ? "" : "none", this }, _onLayerChange: function(t) { this._handlingClick || this._update(); var e = this._layers[o.stamp(t.target)], + i = e.overlay ? "add" === t.type ? "overlayadd" : "overlayremove" : "add" === t.type ? "baselayerchange" : null; + i && this._map.fire(i, e) }, _createRadioElement: function(t, i) { var n = '", + o = e.createElement("div"); return o.innerHTML = n, o.firstChild }, _addItem: function(t) { var i, n = e.createElement("label"), + s = this._map.hasLayer(t.layer); + t.overlay ? (i = e.createElement("input"), i.type = "checkbox", i.className = "leaflet-control-layers-selector", i.defaultChecked = s) : i = this._createRadioElement("leaflet-base-layers", s), i.layerId = o.stamp(t.layer), o.DomEvent.on(i, "click", this._onInputClick, this); var r = e.createElement("span"); + r.innerHTML = " " + t.name; var a = e.createElement("div"); + n.appendChild(a), a.appendChild(i), a.appendChild(r); var h = t.overlay ? this._overlaysList : this._baseLayersList; return h.appendChild(n), this._checkDisabledLayers(), n }, _onInputClick: function() { var t, e, i, n = this._form.getElementsByTagName("input"), + o = [], + s = []; + this._handlingClick = !0; for (var r = n.length - 1; r >= 0; r--) t = n[r], e = this._layers[t.layerId].layer, i = this._map.hasLayer(e), t.checked && !i ? o.push(e) : !t.checked && i && s.push(e); for (r = 0; r < s.length; r++) this._map.removeLayer(s[r]); for (r = 0; r < o.length; r++) this._map.addLayer(o[r]); + this._handlingClick = !1, this._refocusOnMap() }, _expand: function() { o.DomUtil.addClass(this._container, "leaflet-control-layers-expanded"), this._form.style.height = null; var t = this._map._size.y - (this._container.offsetTop + 50); + t < this._form.clientHeight ? (o.DomUtil.addClass(this._form, "leaflet-control-layers-scrollbar"), this._form.style.height = t + "px") : o.DomUtil.removeClass(this._form, "leaflet-control-layers-scrollbar"), this._checkDisabledLayers() }, _collapse: function() { o.DomUtil.removeClass(this._container, "leaflet-control-layers-expanded") }, _checkDisabledLayers: function() { for (var t, e, n = this._form.getElementsByTagName("input"), o = this._map.getZoom(), s = n.length - 1; s >= 0; s--) t = n[s], e = this._layers[t.layerId].layer, t.disabled = e.options.minZoom !== i && o < e.options.minZoom || e.options.maxZoom !== i && o > e.options.maxZoom } }), o.control.layers = function(t, e, i) { return new o.Control.Layers(t, e, i) }, o.PosAnimation = o.Evented.extend({ run: function(t, e, i, n) { this.stop(), this._el = t, this._inProgress = !0, this._duration = i || .25, this._easeOutPower = 1 / Math.max(n || .5, .2), this._startPos = o.DomUtil.getPosition(t), this._offset = e.subtract(this._startPos), this._startTime = +new Date, this.fire("start"), this._animate() }, stop: function() { this._inProgress && (this._step(!0), this._complete()) }, _animate: function() { this._animId = o.Util.requestAnimFrame(this._animate, this), this._step() }, _step: function(t) { var e = +new Date - this._startTime, + i = 1e3 * this._duration; + i > e ? this._runFrame(this._easeOut(e / i), t) : (this._runFrame(1), this._complete()) }, _runFrame: function(t, e) { var i = this._startPos.add(this._offset.multiplyBy(t)); + e && i._round(), o.DomUtil.setPosition(this._el, i), this.fire("step") }, _complete: function() { o.Util.cancelAnimFrame(this._animId), this._inProgress = !1, this.fire("end") }, _easeOut: function(t) { return 1 - Math.pow(1 - t, this._easeOutPower) } }), o.Map.include({ setView: function(t, e, n) { if (e = e === i ? this._zoom : this._limitZoom(e), t = this._limitCenter(o.latLng(t), e, this.options.maxBounds), n = n || {}, this.stop(), this._loaded && !n.reset && n !== !0) { n.animate !== i && (n.zoom = o.extend({ animate: n.animate }, n.zoom), n.pan = o.extend({ animate: n.animate, duration: n.duration }, n.pan)); var s = this._zoom !== e ? this._tryAnimatedZoom && this._tryAnimatedZoom(t, e, n.zoom) : this._tryAnimatedPan(t, n.pan); if (s) return clearTimeout(this._sizeTimer), this } return this._resetView(t, e), this }, panBy: function(t, e) { if (t = o.point(t).round(), e = e || {}, !t.x && !t.y) return this.fire("moveend"); if (e.animate !== !0 && !this.getSize().contains(t)) return this._resetView(this.unproject(this.project(this.getCenter()).add(t)), this.getZoom()), this; if (this._panAnim || (this._panAnim = new o.PosAnimation, this._panAnim.on({ step: this._onPanTransitionStep, end: this._onPanTransitionEnd }, this)), e.noMoveStart || this.fire("movestart"), e.animate !== !1) { o.DomUtil.addClass(this._mapPane, "leaflet-pan-anim"); var i = this._getMapPanePos().subtract(t); + this._panAnim.run(this._mapPane, i, e.duration || .25, e.easeLinearity) } else this._rawPanBy(t), this.fire("move").fire("moveend"); return this }, _onPanTransitionStep: function() { this.fire("move") }, _onPanTransitionEnd: function() { o.DomUtil.removeClass(this._mapPane, "leaflet-pan-anim"), this.fire("moveend") }, _tryAnimatedPan: function(t, e) { var i = this._getCenterOffset(t)._floor(); return (e && e.animate) === !0 || this.getSize().contains(i) ? (this.panBy(i, e), !0) : !1 } }), o.Map.mergeOptions({ zoomAnimation: !0, zoomAnimationThreshold: 4 }); + var h = o.DomUtil.TRANSITION && o.Browser.any3d && !o.Browser.mobileOpera; + h && o.Map.addInitHook(function() { this._zoomAnimated = this.options.zoomAnimation, this._zoomAnimated && (this._createAnimProxy(), o.DomEvent.on(this._proxy, o.DomUtil.TRANSITION_END, this._catchTransitionEnd, this)) }), o.Map.include(h ? { + _createAnimProxy: function() { + var t = this._proxy = o.DomUtil.create("div", "leaflet-proxy leaflet-zoom-animated"); + this._panes.mapPane.appendChild(t), this.on("zoomanim", function(e) { var i = o.DomUtil.TRANSFORM, + n = t.style[i]; + o.DomUtil.setTransform(t, this.project(e.center, e.zoom), this.getZoomScale(e.zoom, 1)), n === t.style[i] && this._animatingZoom && this._onZoomTransitionEnd() }, this), this.on("load moveend", function() { + var e = this.getCenter(), + i = this.getZoom(); + o.DomUtil.setTransform(t, this.project(e, i), this.getZoomScale(i, 1)) + }, this) + }, + _catchTransitionEnd: function(t) { this._animatingZoom && t.propertyName.indexOf("transform") >= 0 && this._onZoomTransitionEnd() }, + _nothingToAnimate: function() { return !this._container.getElementsByClassName("leaflet-zoom-animated").length }, + _tryAnimatedZoom: function(t, e, i) { if (this._animatingZoom) return !0; if (i = i || {}, !this._zoomAnimated || i.animate === !1 || this._nothingToAnimate() || Math.abs(e - this._zoom) > this.options.zoomAnimationThreshold) return !1; var n = this.getZoomScale(e), + s = this._getCenterOffset(t)._divideBy(1 - 1 / n); return i.animate === !0 || this.getSize().contains(s) ? (o.Util.requestAnimFrame(function() { this._moveStart(!0)._animateZoom(t, e, !0) }, this), !0) : !1 }, + _animateZoom: function(t, e, i, n) { i && (this._animatingZoom = !0, this._animateToCenter = t, this._animateToZoom = e, o.DomUtil.addClass(this._mapPane, "leaflet-zoom-anim")), this.fire("zoomanim", { center: t, zoom: e, noUpdate: n }), setTimeout(o.bind(this._onZoomTransitionEnd, this), 250) }, + _onZoomTransitionEnd: function() { this._animatingZoom && (o.DomUtil.removeClass(this._mapPane, "leaflet-zoom-anim"), o.Util.requestAnimFrame(function() { this._animatingZoom = !1, this._move(this._animateToCenter, this._animateToZoom)._moveEnd(!0) }, this)) } + } : {}), o.Map.include({ flyTo: function(t, e, n) { + function s(t) { var e = (v * v - g * g + (t ? -1 : 1) * L * L * y * y) / (2 * (t ? v : g) * L * y); return Math.log(Math.sqrt(e * e + 1) - e) } + + function r(t) { return (Math.exp(t) - Math.exp(-t)) / 2 } + + function a(t) { return (Math.exp(t) + Math.exp(-t)) / 2 } + + function h(t) { return r(t) / a(t) } + + function l(t) { return g * (a(x) / a(x + P * t)) } + + function u(t) { return g * (a(x) * h(x + P * t) - r(x)) / L } + + function c(t) { return 1 - Math.pow(1 - t, 1.5) } + + function d() { var i = (Date.now() - b) / D, + n = c(i) * w; + 1 >= i ? (this._flyToFrame = o.Util.requestAnimFrame(d, this), this._move(this.unproject(_.add(m.subtract(_).multiplyBy(u(n) / y)), f), this.getScaleZoom(g / l(n), f), { flyTo: !0 })) : this._move(t, e)._moveEnd(!0) } if (n = n || {}, n.animate === !1 || !o.Browser.any3d) return this.setView(t, e, n); + this.stop(); var _ = this.project(this.getCenter()), + m = this.project(t), + p = this.getSize(), + f = this._zoom; + t = o.latLng(t), e = e === i ? f : e; var g = Math.max(p.x, p.y), + v = g * this.getZoomScale(f, e), + y = m.distanceTo(_) || 1, + P = 1.42, + L = P * P, + x = s(0), + b = Date.now(), + w = (s(1) - x) / P, + D = n.duration ? 1e3 * n.duration : 1e3 * w * .8; return this._moveStart(!0), d.call(this), this }, flyToBounds: function(t, e) { var i = this._getBoundsCenterZoom(t, e); return this.flyTo(i.center, i.zoom, e) } }), o.Map.include({ _defaultLocateOptions: { timeout: 1e4, watch: !1 }, locate: function(t) { if (t = this._locateOptions = o.extend({}, this._defaultLocateOptions, t), !("geolocation" in navigator)) return this._handleGeolocationError({ code: 0, message: "Geolocation not supported." }), this; var e = o.bind(this._handleGeolocationResponse, this), + i = o.bind(this._handleGeolocationError, this); return t.watch ? this._locationWatchId = navigator.geolocation.watchPosition(e, i, t) : navigator.geolocation.getCurrentPosition(e, i, t), this }, stopLocate: function() { return navigator.geolocation && navigator.geolocation.clearWatch && navigator.geolocation.clearWatch(this._locationWatchId), this._locateOptions && (this._locateOptions.setView = !1), this }, _handleGeolocationError: function(t) { var e = t.code, + i = t.message || (1 === e ? "permission denied" : 2 === e ? "position unavailable" : "timeout"); + this._locateOptions.setView && !this._loaded && this.fitWorld(), this.fire("locationerror", { code: e, message: "Geolocation error: " + i + "." }) }, _handleGeolocationResponse: function(t) { var e = t.coords.latitude, + i = t.coords.longitude, + n = new o.LatLng(e, i), + s = n.toBounds(t.coords.accuracy), + r = this._locateOptions; if (r.setView) { var a = this.getBoundsZoom(s); + this.setView(n, r.maxZoom ? Math.min(a, r.maxZoom) : a) } var h = { latlng: n, bounds: s, timestamp: t.timestamp }; for (var l in t.coords) "number" == typeof t.coords[l] && (h[l] = t.coords[l]); + this.fire("locationfound", h) } }) +}(window, document); \ No newline at end of file diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js index 71b098ea338..9e3a8bf66f0 100644 --- a/erpnext/public/js/setup_wizard.js +++ b/erpnext/public/js/setup_wizard.js @@ -26,8 +26,9 @@ erpnext.setup.slides_settings = [ { "label": __("Manufacturing"), "value": "Manufacturing" }, { "label": __("Retail"), "value": "Retail" }, { "label": __("Services"), "value": "Services" }, - { "label": __("Education (beta)"), "value": "Education" }, - {"label": __("Healthcare (beta)"), "value": "Healthcare"}, + { "label": __("Healthcare (beta)"), "value": "Healthcare" }, + { "label": __("Education"), "value": "Education" }, + { "label": __("Agriculture (alpha)"), "value": "Agriculture" }, {"label": __("Non Profit (beta)"), "value": "Non Profit"} ], reqd: 1 }, diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json index 09a62f4327e..f5909f415e1 100644 --- a/erpnext/setup/doctype/company/company.json +++ b/erpnext/setup/doctype/company/company.json @@ -172,7 +172,7 @@ "collapsible": 0, "columns": 0, "fieldname": "domain", - "fieldtype": "Select", + "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -183,7 +183,7 @@ "label": "Domain", "length": 0, "no_copy": 0, - "options": "Distribution\nManufacturing\nRetail\nServices\nEducation\nHealthcare\nNon Profit\nOther", + "options": "Domain", "permlevel": 0, "print_hide": 0, "print_hide_if_no_value": 0, @@ -1991,7 +1991,6 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-11-20 17:40:24.646920", "modified_by": "Administrator", "module": "Setup", "name": "Company", diff --git a/erpnext/setup/setup_wizard/install_fixtures.py b/erpnext/setup/setup_wizard/install_fixtures.py index a459b111a18..68a157855eb 100644 --- a/erpnext/setup/setup_wizard/install_fixtures.py +++ b/erpnext/setup/setup_wizard/install_fixtures.py @@ -20,6 +20,7 @@ def install(country=None): { 'doctype': 'Domain', 'domain': 'Services'}, { 'doctype': 'Domain', 'domain': 'Education'}, { 'doctype': 'Domain', 'domain': 'Healthcare'}, + { 'doctype': 'Domain', 'domain': 'Agriculture'}, { 'doctype': 'Domain', 'domain': 'Non Profit'}, # Setup Progress diff --git a/erpnext/tests/server/agriculture.txt b/erpnext/tests/server/agriculture.txt new file mode 100644 index 00000000000..3aae85a343c --- /dev/null +++ b/erpnext/tests/server/agriculture.txt @@ -0,0 +1,5 @@ +Disease +Crop +Land Unit +Crop Cycle +Soil Texture \ No newline at end of file diff --git a/erpnext/tests/ui/agriculture.txt b/erpnext/tests/ui/agriculture.txt new file mode 100644 index 00000000000..4622bc0df35 --- /dev/null +++ b/erpnext/tests/ui/agriculture.txt @@ -0,0 +1,7 @@ +erpnext/agriculture/doctype/land_unit/test_land_unit.js +erpnext/agriculture/doctype/fertilizer/test_fertilizer.js +erpnext/agriculture/doctype/water_analysis/test_water_analysis.js +erpnext/agriculture/doctype/disease/test_disease.js +erpnext/agriculture/doctype/soil_texture/test_soil_texture.js +erpnext/agriculture/doctype/crop/test_crop.js +erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.js \ No newline at end of file diff --git a/erpnext/tests/ui/tests.txt b/erpnext/tests/ui/tests.txt index 98330cede3d..3c3a8ac0e9a 100644 --- a/erpnext/tests/ui/tests.txt +++ b/erpnext/tests/ui/tests.txt @@ -135,16 +135,22 @@ erpnext/restaurant/doctype/restaurant_table/test_restaurant_table.js erpnext/restaurant/doctype/restaurant_menu/test_restaurant_menu.js erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js erpnext/projects/doctype/task/tests/test_task_tree.js -<<<<<<< 59a4e70a6ae65bce0b998cb8a7b3a96cfee07fbc erpnext/stock/doctype/item_price/test_item_price.js erpnext/stock/doctype/delivery_note/test_delivery_note_with_margin.js erpnext/selling/doctype/sales_order/tests/test_sales_order_with_margin.js erpnext/selling/doctype/quotation/tests/test_quotation_with_margin.js erpnext/accounts/doctype/sales_invoice/tests/test_sales_invoice_with_margin.js +erpnext/agriculture/doctype/land_unit/test_land_unit.js +erpnext/agriculture/doctype/fertilizer/test_fertilizer.js +erpnext/agriculture/doctype/water_analysis/test_water_analysis.js +erpnext/agriculture/doctype/disease/test_disease.js +erpnext/agriculture/doctype/soil_texture/test_soil_texture.js +erpnext/agriculture/doctype/crop/test_crop.js +erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.js erpnext/non_profit/doctype/membership_type/test_membership_type.js erpnext/non_profit/doctype/member/test_member.js erpnext/non_profit/doctype/volunteer_type/test_volunteer_type.js erpnext/non_profit/doctype/volunteer/test_volunteer.js erpnext/non_profit/doctype/donor_type/test_donor_type.js erpnext/non_profit/doctype/donor/test_donor.js -erpnext/non_profit/doctype/grant_application/test_grant_application.js +erpnext/non_profit/doctype/grant_application/test_grant_application.js \ No newline at end of file