diff --git a/pom.xml b/pom.xml
index 89120e15b262d8dcf44c39784557233bbb7774fa..52674d76843ca55e6a7e0cecf18991132f2aea52 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<groupId>no.nibio.vips.</groupId>
<artifactId>VIPSLogic</artifactId>
<packaging>war</packaging>
- <version>2024.2</version>
+ <version>2024.3</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/ForecastConfigurationController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/ForecastConfigurationController.java
index b7277f97d8fac27234bf423a10618e03372d33e9..98c8b1a8e4bc3709ece35a188505f9569e50e10a 100755
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/ForecastConfigurationController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/ForecastConfigurationController.java
@@ -1,24 +1,21 @@
/*
- * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+ * Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+ * details.
*
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Affero General Public License along with this program. If not, see
+ * <https://www.gnu.org/licenses/>.
*
*/
package no.nibio.vips.logic.controller.servlet;
-import com.ibm.icu.util.Calendar;
import java.io.IOException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -35,8 +32,12 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.ibm.icu.util.Calendar;
import no.nibio.vips.logic.controller.session.ForecastBean;
import no.nibio.vips.logic.controller.session.OrganismBean;
+import no.nibio.vips.logic.controller.session.PointOfInterestBean;
import no.nibio.vips.logic.controller.session.UserBean;
import no.nibio.vips.logic.entity.ForecastConfiguration;
import no.nibio.vips.logic.entity.ModelInformation;
@@ -55,26 +56,31 @@ import no.nibio.web.forms.FormValidator;
/**
* Handles form configuration actions
+ *
* @copyright 2020-2022 <a href="http://www.nibio.no/">NIBIO</a>
* @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class ForecastConfigurationController extends HttpServlet {
-
- @PersistenceContext(unitName="VIPSLogic-PU")
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(ForecastConfigurationController.class);
+
+ @PersistenceContext(unitName = "VIPSLogic-PU")
EntityManager em;
-
+
@EJB
ForecastBean forecastBean;
-
+
@EJB
UserBean userBean;
-
+
@EJB
OrganismBean organismBean;
+ @EJB
+ PointOfInterestBean pointOfInterestBean;
+
/**
- * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
- * methods.
+ * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
*
* @param request servlet request
* @param response servlet response
@@ -84,88 +90,79 @@ public class ForecastConfigurationController extends HttpServlet {
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
response.setContentType("text/html;charset=UTF-8");
-
+
String action = request.getParameter("action");
VipsLogicUser user = (VipsLogicUser) request.getSession().getAttribute("user");
-
+
// Default: View list of forecast configurations
// for SUPERUSERS and ORGANIZATION ADMINS
- if(action == null)
- {
+ if (action == null) {
Map<String, ModelInformation> modelInformationMap = forecastBean.getIndexedBatchableModelInformation();
- if(userBean.authorizeUser(user, VipsLogicRole.ORGANIZATION_ADMINISTRATOR, VipsLogicRole.SUPERUSER))
- {
+ if (userBean.authorizeUser(user, VipsLogicRole.ORGANIZATION_ADMINISTRATOR, VipsLogicRole.SUPERUSER)) {
// Check filtering conditions
List<String> selectedModelIds;
- try
- {
+ try {
selectedModelIds = Arrays.asList(request.getParameterValues("modelId"));
- }
- catch(NullPointerException ex)
- {
+ } catch (NullPointerException ex) {
selectedModelIds = new ArrayList(modelInformationMap.keySet());
}
-
+
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
- Date from,to;
- try
- {
+ Date from, to;
+ try {
from = format.parse(request.getParameter("from"));
to = format.parse(request.getParameter("to"));
- }
- catch(NullPointerException | ParseException ex)
- {
+ } catch (NullPointerException | ParseException ex) {
to = SystemTime.getSystemTime();
Calendar cal = Calendar.getInstance();
cal.setTime(to);
cal.add(Calendar.MONTH, -2);
from = cal.getTime();
}
-
+
List<ForecastConfiguration> forecasts;
-
- if(user.isSuperUser())
- {
+
+ if (user.isSuperUser()) {
// Filtering of organizations
List<Organization> organizations = userBean.getOrganizations();
List<Integer> selectedOrganizationIds;
- try
- {
- selectedOrganizationIds = Arrays.asList(ArrayUtil.stringArrayToIntegerArray(request.getParameterValues("organizationId")));
+ try {
+ selectedOrganizationIds = Arrays.asList(
+ ArrayUtil.stringArrayToIntegerArray(request.getParameterValues("organizationId")));
}
// No filter set -> select all organizations (default)
- catch(NullPointerException ex)
- {
+ catch (NullPointerException ex) {
selectedOrganizationIds = new ArrayList<>();
- for(Organization o:organizations)
- {
+ for (Organization o : organizations) {
selectedOrganizationIds.add(o.getOrganizationId());
}
}
- forecasts = forecastBean.getForecastConfigurations(selectedOrganizationIds, selectedModelIds, from, to);
-
+ forecasts =
+ forecastBean.getForecastConfigurations(selectedOrganizationIds, selectedModelIds, from, to);
+
request.setAttribute("organizations", organizations);
request.setAttribute("selectedOrganizationIds", selectedOrganizationIds);
-
+
request.setAttribute("allUsers", userBean.getAllUsers());
// If super user requests private forecasts for a user
- try
- {
+ try {
Integer otherUserId = Integer.valueOf(request.getParameter("otherUserId"));
- List<ForecastConfiguration> privateForecastConfigurationsForOtherUser = forecastBean.getPrivateForecastConfigurationsForUser(otherUserId);
- request.setAttribute("privateForecastConfigurationsForOtherUser", privateForecastConfigurationsForOtherUser);
+ List<ForecastConfiguration> privateForecastConfigurationsForOtherUser =
+ forecastBean.getPrivateForecastConfigurationsForUser(otherUserId);
+ request.setAttribute("privateForecastConfigurationsForOtherUser",
+ privateForecastConfigurationsForOtherUser);
request.setAttribute("otherUserId", otherUserId);
+ } catch (NumberFormatException nfe) {
}
- catch(NumberFormatException nfe) {}
- }
- else
- {
- forecasts = forecastBean.getForecastConfigurations(user.getOrganizationId(), selectedModelIds, from, to);
+ } else {
+ forecasts = forecastBean.getForecastConfigurations(user.getOrganizationId(), selectedModelIds, from,
+ to);
}
Collections.sort(forecasts);
-
+
+ request.setAttribute("currentLanguage", SessionLocaleUtil.getCurrentLocale(request).getLanguage());
request.setAttribute("forecastConfigurations", forecasts);
-
+
List<ForecastConfiguration> privateForecasts;
privateForecasts = forecastBean.getPrivateForecastConfigurationsForUser(user.getUserId());
request.setAttribute("privateForecastConfigurations", privateForecasts);
@@ -176,9 +173,7 @@ public class ForecastConfigurationController extends HttpServlet {
// If this is a redirect from a controller, with a message to be passed on
request.setAttribute("messageKey", request.getParameter("messageKey"));
request.getRequestDispatcher("/forecastConfigurationList.ftl").forward(request, response);
- }
- else
- {
+ } else {
List<ForecastConfiguration> privateForecasts;
privateForecasts = forecastBean.getPrivateForecastConfigurationsForUser(user.getUserId());
request.setAttribute("privateForecastConfigurations", privateForecasts);
@@ -186,239 +181,265 @@ public class ForecastConfigurationController extends HttpServlet {
request.setAttribute("messageKey", request.getParameter("messageKey"));
request.getRequestDispatcher("/forecastConfigurationList.ftl").forward(request, response);
}
-
+
}
-
+
// View and edit a forecast configuration
- else if(action.equals("viewForecastConfiguration"))
- {
- if(userBean.authorizeUser(user, VipsLogicRole.ORGANIZATION_ADMINISTRATOR, VipsLogicRole.SUPERUSER))
- {
- try
- {
+ else if (action.equals("viewForecastConfiguration")) {
+ if (userBean.authorizeUser(user, VipsLogicRole.ORGANIZATION_ADMINISTRATOR, VipsLogicRole.SUPERUSER)) {
+ try {
Long forecastConfigurationId = Long.valueOf(request.getParameter("forecastConfigurationId"));
- ForecastConfiguration forecastConfiguration = em.find(ForecastConfiguration.class, forecastConfigurationId);
+ ForecastConfiguration forecastConfiguration =
+ em.find(ForecastConfiguration.class, forecastConfigurationId);
boolean multipleNew = false;
// No forecastconfiguration found, assuming user want to register new
- if(forecastConfiguration == null)
- {
+ if (forecastConfiguration == null) {
forecastConfiguration = new ForecastConfiguration();
- multipleNew = request.getParameter("multipleNew") != null
- && request.getParameter("multipleNew").equals("true");
+ multipleNew = request.getParameter("multipleNew") != null
+ && request.getParameter("multipleNew").equals("true");
}
// Only superusers can view and edit forecasts from other organizations
- if(! user.isSuperUser() && forecastConfiguration.getVipsLogicUserId() != null && !forecastConfiguration.getVipsLogicUserId().getOrganizationId().equals(user.getOrganizationId()))
- {
- response.sendError(403,"Access not authorized"); // HTTP Forbidden
+ if (!user.isSuperUser() && forecastConfiguration.getVipsLogicUserId() != null
+ && !forecastConfiguration.getVipsLogicUserId().getOrganizationId()
+ .equals(user.getOrganizationId())) {
+ response.sendError(403, "Access not authorized"); // HTTP Forbidden
}
// Only superusers can view and edit private forecasts from other users
- else if(forecastConfiguration.getIsPrivate() && ! user.isSuperUser() && forecastConfiguration.getVipsLogicUserId() != null && !forecastConfiguration.getVipsLogicUserId().getUserId().equals(user.getUserId()))
- {
- response.sendError(403,"Access not authorized"); // HTTP Forbidden
- }
- else
- {
+ else if (forecastConfiguration.getIsPrivate() && !user.isSuperUser()
+ && forecastConfiguration.getVipsLogicUserId() != null
+ && !forecastConfiguration.getVipsLogicUserId().getUserId().equals(user.getUserId())) {
+ response.sendError(403, "Access not authorized"); // HTTP Forbidden
+ } else {
// TODO: More intelligent selection of locations, weather stations and users
- if(user.isSuperUser())
- {
- request.setAttribute("locationPointOfInterests", em.createNamedQuery("PointOfInterest.findAll").getResultList());
- request.setAttribute("weatherStationPointOfInterests", em.createNamedQuery("PointOfInterestWeatherStation.findAllByActivity").setParameter("active", Boolean.TRUE).getResultList());
- request.setAttribute("vipsLogicUsers", em.createNamedQuery("VipsLogicUser.findAll").getResultList());
- }
- else
- {
- request.setAttribute("locationPointOfInterests", em.createNamedQuery("PointOfInterest.findByOrganizationId").setParameter("organizationId", user.getOrganizationId()).getResultList());
- request.setAttribute("weatherStationPointOfInterests", em.createNamedQuery("PointOfInterestWeatherStation.findByActivityAndOrganizationId").setParameter("active", Boolean.TRUE).setParameter("organizationId", user.getOrganizationId()).getResultList());
- request.setAttribute("vipsLogicUsers", em.createNamedQuery("VipsLogicUser.findByOrganizationId").setParameter("organizationId", user.getOrganizationId()).getResultList());
+ if (user.isSuperUser()) {
+ request.setAttribute("locationPointOfInterests",
+ em.createNamedQuery("PointOfInterest.findAll").getResultList());
+ request.setAttribute("weatherStationPointOfInterests",
+ em.createNamedQuery("PointOfInterestWeatherStation.findAllByActivity")
+ .setParameter("active", Boolean.TRUE).getResultList());
+ request.setAttribute("vipsLogicUsers",
+ em.createNamedQuery("VipsLogicUser.findAll").getResultList());
+ } else {
+ request.setAttribute("locationPointOfInterests",
+ em.createNamedQuery("PointOfInterest.findByOrganizationId")
+ .setParameter("organizationId", user.getOrganizationId()).getResultList());
+ request.setAttribute("weatherStationPointOfInterests",
+ em.createNamedQuery("PointOfInterestWeatherStation.findByActivityAndOrganizationId")
+ .setParameter("active", Boolean.TRUE)
+ .setParameter("organizationId", user.getOrganizationId()).getResultList());
+ request.setAttribute("vipsLogicUsers",
+ em.createNamedQuery("VipsLogicUser.findByOrganizationId")
+ .setParameter("organizationId", user.getOrganizationId()).getResultList());
}
+ request.setAttribute("currentLanguage",
+ SessionLocaleUtil.getCurrentLocale(request).getLanguage());
request.setAttribute("forecastConfiguration", forecastConfiguration);
- request.setAttribute("formId", multipleNew ? "forecastConfigurationMultipleNewForm" : "forecastConfigurationForm");
+ request.setAttribute("formId",
+ multipleNew ? "forecastConfigurationMultipleNewForm" : "forecastConfigurationForm");
request.setAttribute("multipleNew", multipleNew);
request.getSession().setAttribute("availableTimeZones", SystemTime.getAvailableTimeZones());
- request.getSession().setAttribute("defaultTimeZoneId", user.getOrganizationId().getDefaultTimeZone());
+ request.getSession().setAttribute("defaultTimeZoneId",
+ user.getOrganizationId().getDefaultTimeZone());
// All organisms used for parent organism list
request.setAttribute("allCrops", em.createNamedQuery("Organism.findAllCrops").getResultList());
request.setAttribute("allPests", em.createNamedQuery("Organism.findAllPests").getResultList());
// Hierarchy categories
- request.setAttribute("hierarchyCategories", organismBean.getHierarchyCategoryNames(SessionLocaleUtil.getCurrentLocale(request)));
+ request.setAttribute("hierarchyCategories",
+ organismBean.getHierarchyCategoryNames(SessionLocaleUtil.getCurrentLocale(request)));
request.setAttribute("modelInformations", forecastBean.getBatchableModels());
request.setAttribute("messageKey", request.getParameter("messageKey"));
request.getRequestDispatcher("/forecastConfigurationForm.ftl").forward(request, response);
-
+
}
+ } catch (NullPointerException | NumberFormatException ex) {
+ response.sendError(500,
+ "Invalid forecast configurationId " + request.getParameter("forecastConfigurationId"));
}
- catch(NullPointerException | NumberFormatException ex)
- {
- response.sendError(500, "Invalid forecast configurationId " + request.getParameter("forecastConfigurationId"));
- }
- }
- else
- {
+ } else {
Long forecastConfigurationId = Long.valueOf(request.getParameter("forecastConfigurationId"));
- ForecastConfiguration forecastConfiguration = em.find(ForecastConfiguration.class, forecastConfigurationId);
- if(forecastConfiguration == null || forecastConfiguration.getVipsLogicUserId().getUserId().equals(user.getUserId()))
- {
- if(forecastConfiguration == null)
- {
+ ForecastConfiguration forecastConfiguration =
+ em.find(ForecastConfiguration.class, forecastConfigurationId);
+ if (forecastConfiguration == null
+ || forecastConfiguration.getVipsLogicUserId().getUserId().equals(user.getUserId())) {
+ if (forecastConfiguration == null) {
forecastConfiguration = new ForecastConfiguration();
forecastConfiguration.setIsPrivate(Boolean.TRUE);
}
+ request.setAttribute("currentLanguage", SessionLocaleUtil.getCurrentLocale(request).getLanguage());
request.setAttribute("forecastConfiguration", forecastConfiguration);
- request.setAttribute("locationPointOfInterests", em.createNamedQuery("PointOfInterest.findByOrganizationId").setParameter("organizationId", user.getOrganizationId()).getResultList());
- request.setAttribute("weatherStationPointOfInterests", em.createNamedQuery("PointOfInterestWeatherStation.findByActivityAndOrganizationId").setParameter("active", Boolean.TRUE).setParameter("organizationId", user.getOrganizationId()).getResultList());
- request.setAttribute("forecastConfiguration", forecastConfiguration);
- request.setAttribute("formId","forecastConfigurationForm");
+ request.setAttribute("locationPointOfInterests",
+ em.createNamedQuery("PointOfInterest.findByOrganizationId")
+ .setParameter("organizationId", user.getOrganizationId()).getResultList());
+ request.setAttribute("weatherStationPointOfInterests",
+ em.createNamedQuery("PointOfInterestWeatherStation.findByActivityAndOrganizationId")
+ .setParameter("active", Boolean.TRUE)
+ .setParameter("organizationId", user.getOrganizationId()).getResultList());
+ request.setAttribute("formId", "forecastConfigurationForm");
request.getSession().setAttribute("availableTimeZones", SystemTime.getAvailableTimeZones());
- request.getSession().setAttribute("defaultTimeZoneId", user.getOrganizationId().getDefaultTimeZone());
-
+ request.getSession().setAttribute("defaultTimeZoneId",
+ user.getOrganizationId().getDefaultTimeZone());
+
request.setAttribute("allCrops", em.createNamedQuery("Organism.findAllCrops").getResultList());
request.setAttribute("allPests", em.createNamedQuery("Organism.findAllPests").getResultList());
// Hierarchy categories
- request.setAttribute("hierarchyCategories", organismBean.getHierarchyCategoryNames(SessionLocaleUtil.getCurrentLocale(request)));
- request.setAttribute("modelInformations", em.createNamedQuery("ModelInformation.findAll").getResultList());
+ request.setAttribute("hierarchyCategories",
+ organismBean.getHierarchyCategoryNames(SessionLocaleUtil.getCurrentLocale(request)));
+ request.setAttribute("modelInformations",
+ em.createNamedQuery("ModelInformation.findAll").getResultList());
request.setAttribute("messageKey", request.getParameter("messageKey"));
+ request.setAttribute("multipleNew", false);
request.getRequestDispatcher("/forecastConfigurationForm.ftl").forward(request, response);
- }
- else
- {
- response.sendError(403,"Access not authorized");
+ } else {
+ response.sendError(403, "Access not authorized");
}
}
}
-
+
// Store forecast configuration(s)
// Authorization: SUPERUSERS and ORGANIZATION ADMINS
- else if(action.equals("forecastConfigurationFormSubmit"))
- {
- try
- {
+ else if (action.equals("forecastConfigurationFormSubmit")) {
+ try {
Long forecastConfigurationId = Long.valueOf(request.getParameter("forecastConfigurationId"));
- ForecastConfiguration forecastConfiguration = em.find(ForecastConfiguration.class, forecastConfigurationId);
+ ForecastConfiguration forecastConfiguration =
+ em.find(ForecastConfiguration.class, forecastConfigurationId);
// No forecastconfiguration found, assuming user want to register new
- if(forecastConfiguration == null)
- {
+ if (forecastConfiguration == null) {
forecastConfiguration = new ForecastConfiguration();
}
// Only superusers can view and edit forecasts from other organizations
// Regular users can only edit own forecasts
- if(
- (! user.isSuperUser() && forecastConfiguration.getVipsLogicUserId() != null && !forecastConfiguration.getVipsLogicUserId().getOrganizationId().equals(user.getOrganizationId()))
- || (! user.isSuperUser() && ! user.isOrganizationAdmin() && forecastConfiguration.getVipsLogicUserId() != null && !forecastConfiguration.getVipsLogicUserId().getUserId().equals(user.getUserId()))
- )
- {
- response.sendError(403,"Access not authorized"); // HTTP Forbidden
- }
- else
- {
- String formId = request.getParameter("multipleNew") != null && request.getParameter("multipleNew").equals("true") ?
- "forecastConfigurationMultipleNewForm"
- :"forecastConfigurationForm";
- FormValidation formValidation = FormValidator.validateForm(formId,request,getServletContext());
+ if ((!user.isSuperUser() && forecastConfiguration.getVipsLogicUserId() != null
+ && !forecastConfiguration.getVipsLogicUserId().getOrganizationId()
+ .equals(user.getOrganizationId()))
+ || (!user.isSuperUser() && !user.isOrganizationAdmin()
+ && forecastConfiguration.getVipsLogicUserId() != null
+ && !forecastConfiguration.getVipsLogicUserId().getUserId().equals(user.getUserId()))) {
+ response.sendError(403, "Access not authorized"); // HTTP Forbidden
+ } else {
+ String formId = request.getParameter("multipleNew") != null
+ && request.getParameter("multipleNew").equals("true")
+ ? "forecastConfigurationMultipleNewForm"
+ : "forecastConfigurationForm";
+ FormValidation formValidation = FormValidator.validateForm(formId, request, getServletContext());
+ LOGGER.debug("formValidation=" + formValidation.isValid());
// Also validation the model specific fields
String modelId = formValidation.getFormField("modelId").getWebValue();
- FormValidation modelFieldFormValidation = FormValidator.validateForm("models/" + modelId, request, getServletContext());
+ FormValidation modelFieldFormValidation =
+ FormValidator.validateForm("models/" + modelId, request, getServletContext());
- if(formValidation.isValid() && modelFieldFormValidation.isValid())
- {
- if(formId.equals("forecastConfigurationForm"))
- {
+ // Additional input check: If the Grid data checkbox is not checked, a
+
+ if (formValidation.isValid() && modelFieldFormValidation.isValid()) {
+ if (formId.equals("forecastConfigurationForm")) {
// Ensure regular users always enter private forecasts
- if(! userBean.authorizeUser(user, VipsLogicRole.ORGANIZATION_ADMINISTRATOR, VipsLogicRole.SUPERUSER))
- {
+ if (!userBean.authorizeUser(user, VipsLogicRole.ORGANIZATION_ADMINISTRATOR,
+ VipsLogicRole.SUPERUSER)) {
formValidation.getFormField("isPrivate").setWebValue("true");
}
- forecastConfiguration = forecastBean.storeForecastConfiguration(forecastConfiguration, formValidation.getFormFields(), modelFieldFormValidation.getFormFields());
+ forecastConfiguration = forecastBean.storeForecastConfiguration(forecastConfiguration,
+ formValidation.getFormFields(), modelFieldFormValidation.getFormFields());
// Store form config
- //forecastBean.storeForecastModelConfigurations(forecastConfiguration, modelFieldFormValidation.getFormFields());
+ // forecastBean.storeForecastModelConfigurations(forecastConfiguration,
+ // modelFieldFormValidation.getFormFields());
// TODO: Store model specific fields
// First: Delete all o
request.setAttribute("messageKey", request.getParameter("formConfigurationUpdated"));
- response.sendRedirect(new StringBuilder(Globals.PROTOCOL + "://").append(ServletUtil.getServerName(request)).append("/forecastConfiguration?action=viewForecastConfiguration&forecastConfigurationId=").append(forecastConfiguration.getForecastConfigurationId()).append("&messageKey=").append("forecastConfigurationUpdated").toString());
- }
- else
- {
- for(String optionVal:formValidation.getFormField("weatherStationPointOfInterestIds").getWebValues())
- {
+ response.sendRedirect(new StringBuilder(Globals.PROTOCOL + "://")
+ .append(ServletUtil.getServerName(request))
+ .append("/forecastConfiguration?action=viewForecastConfiguration&forecastConfigurationId=")
+ .append(forecastConfiguration.getForecastConfigurationId()).append("&messageKey=")
+ .append("forecastConfigurationUpdated").toString());
+ } else {
+ for (String optionVal : formValidation.getFormField("weatherStationPointOfInterestIds")
+ .getWebValues()) {
Integer weatherStationPointOfInterestId = Integer.valueOf(optionVal);
- forecastBean.storeNewMultipleForecastConfiguration(weatherStationPointOfInterestId, formValidation.getFormFields(), modelFieldFormValidation.getFormFields());
+ forecastBean.storeNewMultipleForecastConfiguration(weatherStationPointOfInterestId,
+ formValidation.getFormFields(), modelFieldFormValidation.getFormFields());
}
- request.setAttribute("messageKey", request.getParameter("multipleForecastConfigurationsCreated"));
- response.sendRedirect(new StringBuilder(Globals.PROTOCOL + "://").append(ServletUtil.getServerName(request)).append("/forecastConfiguration?messageKey=").append("multipleForecastConfigurationsCreated").toString());
+ request.setAttribute("messageKey",
+ request.getParameter("multipleForecastConfigurationsCreated"));
+ response.sendRedirect(new StringBuilder(Globals.PROTOCOL + "://")
+ .append(ServletUtil.getServerName(request))
+ .append("/forecastConfiguration?messageKey=")
+ .append("multipleForecastConfigurationsCreated").toString());
}
- }
- else
- {
+ } else {
// Return to form with error messages
request.setAttribute("formValidation", formValidation);
// We must get date formats!
- Map<String, FormField> formFields = FormValidator.getFormFields("forecastConfigurationForm",getServletContext());
+ Map<String, FormField> formFields =
+ FormValidator.getFormFields("forecastConfigurationForm", getServletContext());
// TODO: More intelligent selection of locations, weather stations and users
- request.setAttribute("locationPointOfInterests", em.createNamedQuery("PointOfInterest.findAll").getResultList());
- request.setAttribute("weatherStationPointOfInterests", em.createNamedQuery("PointOfInterestWeatherStation.findAll").getResultList());
- request.setAttribute("vipsLogicUsers", em.createNamedQuery("VipsLogicUser.findAll").getResultList());
+ request.setAttribute("formId", "forecastConfigurationForm");
+ request.setAttribute("allCrops", em.createNamedQuery("Organism.findAllCrops").getResultList());
+ request.setAttribute("allPests", em.createNamedQuery("Organism.findAllPests").getResultList());
+ request.setAttribute("locationPointOfInterests",
+ em.createNamedQuery("PointOfInterest.findAll").getResultList());
+ request.setAttribute("weatherStationPointOfInterests",
+ em.createNamedQuery("PointOfInterestWeatherStation.findAll").getResultList());
+ request.setAttribute("vipsLogicUsers",
+ em.createNamedQuery("VipsLogicUser.findAll").getResultList());
request.setAttribute("dateStart_dateFormat", formFields.get("dateStart").getDateFormat());
request.setAttribute("dateEnd_dateFormat", formFields.get("dateEnd").getDateFormat());
request.getSession().setAttribute("availableTimeZones", SystemTime.getAvailableTimeZones());
- request.getSession().setAttribute("defaultTimeZoneId", user.getOrganizationId().getDefaultTimeZone());
- request.setAttribute("modelInformations", em.createNamedQuery("ModelInformation.findAll").getResultList());
+ request.getSession().setAttribute("defaultTimeZoneId",
+ user.getOrganizationId().getDefaultTimeZone());
+ // Hierarchy categories
+ request.setAttribute("hierarchyCategories",
+ organismBean.getHierarchyCategoryNames(SessionLocaleUtil.getCurrentLocale(request)));
+ request.setAttribute("modelInformations",
+ em.createNamedQuery("ModelInformation.findAll").getResultList());
+ request.setAttribute("currentLanguage",
+ SessionLocaleUtil.getCurrentLocale(request).getLanguage());
request.setAttribute("forecastConfiguration", forecastConfiguration);
request.getRequestDispatcher("/forecastConfigurationForm.ftl").forward(request, response);
}
}
- }
- catch(NullPointerException | NumberFormatException | FormValidationException ex)
- {
+ } catch (NullPointerException | NumberFormatException | FormValidationException ex) {
ex.printStackTrace();
- if(ex instanceof NumberFormatException)
- {
- response.sendError(500, "Invalid forecast configurationId " + request.getParameter("forecastConfigurationId"));
- }
- else
- {
+ if (ex instanceof NumberFormatException) {
+ response.sendError(500,
+ "Invalid forecast configurationId " + request.getParameter("forecastConfigurationId"));
+ } else {
response.sendError(500, ex.getMessage());
}
}
}
// Delete forecast configuration
// Authorization: SUPERUSERS and ORGANIZATION ADMINS OR regular users owning the forecast config
- else if(action.equals("deleteForecastConfiguration"))
- {
+ else if (action.equals("deleteForecastConfiguration")) {
Long forecastConfigurationId = Long.valueOf(request.getParameter("forecastConfigurationId"));
ForecastConfiguration forecastConfiguration = em.find(ForecastConfiguration.class, forecastConfigurationId);
- if(
- userBean.authorizeUser(user, VipsLogicRole.ORGANIZATION_ADMINISTRATOR, VipsLogicRole.SUPERUSER)
- || user.getUserId().equals(forecastConfiguration.getVipsLogicUserId().getUserId())
- )
- {
+ if (userBean.authorizeUser(user, VipsLogicRole.ORGANIZATION_ADMINISTRATOR, VipsLogicRole.SUPERUSER)
+ || user.getUserId().equals(forecastConfiguration.getVipsLogicUserId().getUserId())) {
// Only superusers can delete forecasts from other organizations
- if(! user.isSuperUser() && forecastConfiguration.getVipsLogicUserId() != null && !forecastConfiguration.getVipsLogicUserId().getOrganizationId().equals(user.getOrganizationId()))
- {
- response.sendError(403,"Access not authorized"); // HTTP Forbidden
+ if (!user.isSuperUser() && forecastConfiguration.getVipsLogicUserId() != null && !forecastConfiguration
+ .getVipsLogicUserId().getOrganizationId().equals(user.getOrganizationId())) {
+ response.sendError(403, "Access not authorized"); // HTTP Forbidden
return;
}
- try
- {
+ try {
forecastBean.deleteForecastConfiguration(forecastConfigurationId);
- response.sendRedirect(new StringBuilder(Globals.PROTOCOL + "://").append(ServletUtil.getServerName(request)).append("/forecastConfiguration?").append("&messageKey=").append("forecastConfigurationDeleted").toString());
- }
- catch(NullPointerException | NumberFormatException ex)
- {
- response.sendError(500, "Invalid forecast configurationId " + request.getParameter("forecastConfigurationId"));
+ response.sendRedirect(new StringBuilder(Globals.PROTOCOL + "://")
+ .append(ServletUtil.getServerName(request)).append("/forecastConfiguration?")
+ .append("&messageKey=").append("forecastConfigurationDeleted").toString());
+ } catch (NullPointerException | NumberFormatException ex) {
+ response.sendError(500,
+ "Invalid forecast configurationId " + request.getParameter("forecastConfigurationId"));
}
-
- }
- else
- {
- response.sendError(403,"Access not authorized"); // HTTP Forbidden
+
+ } else {
+ response.sendError(403, "Access not authorized"); // HTTP Forbidden
}
}
}
- // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+ // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the
+ // code.">
/**
* Handles the HTTP <code>GET</code> method.
*
diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/LoginController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/LoginController.java
index ba830e6cc3ad88ba3f49b845648b4cdbf4a91898..e89580f9dfb6cfd6c9d54ce3b8717aff59e65f44 100755
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/LoginController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/LoginController.java
@@ -18,18 +18,14 @@
package no.nibio.vips.logic.controller.servlet;
-import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
-import java.math.BigInteger;
import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.security.SecureRandom;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
+
import javax.ejb.EJB;
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
@@ -37,6 +33,9 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.Response;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
import no.nibio.vips.logic.controller.session.UserBean;
import no.nibio.vips.logic.entity.UserAuthenticationType;
import no.nibio.vips.logic.entity.UserUuid;
@@ -47,26 +46,27 @@ import no.nibio.vips.util.ServletUtil;
/**
* Logs a user in or out
+ *
* @copyright 2013-2022 <a href="http://www.nibio.no/">NIBIO</a>
* @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class LoginController extends HttpServlet {
- //private static final String CLOSE_AND_RELOAD_PARENT = "close_and_reload_parent";
-
+ // private static final String CLOSE_AND_RELOAD_PARENT = "close_and_reload_parent";
+
private static final String RETURN_UUID_PARAMETER_NAME = "returnUUID";
-
+
@EJB
UserBean userBean;
-
+
/**
* Processes requests for both HTTP
* <code>GET</code> and
* <code>POST</code> methods.
*
- * @param request servlet request
+ * @param request servlet request
* @param response servlet response
* @throws ServletException if a servlet-specific error occurs
- * @throws IOException if an I/O error occurs
+ * @throws IOException if an I/O error occurs
*/
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
@@ -75,146 +75,124 @@ public class LoginController extends HttpServlet {
request.setAttribute("nextPage", nextPage);
// We remove the session attribute, so it doesn't stick
request.getSession().removeAttribute("nextPage");
-
+
Boolean returnUUID = getReturnUUID(request);
request.setAttribute(LoginController.RETURN_UUID_PARAMETER_NAME, returnUUID);
// We remove the session attribute, so it doesn't stick
request.getSession().removeAttribute(LoginController.RETURN_UUID_PARAMETER_NAME);
-
// A log out request
- if(request.getServletPath().contains("logout"))
- {
+ if (request.getServletPath().contains("logout")) {
+ VipsLogicUser user = request.getSession().getAttribute("user") != null ? (VipsLogicUser) request.getSession().getAttribute("user") : null;
+ // Make sure we delete the current user and their UUID
+ userBean.deleteUserUuid(user.getUserUuid());
request.getSession().removeAttribute("user");
+
+ // Check if we have a cookie to delete as well
Cookie rememberedUser = ServletUtil.getCookie(request, "rememberedUser");
- if(rememberedUser != null)
- {
+ if (rememberedUser != null) {
rememberedUser.setMaxAge(0);
response.addCookie(rememberedUser);
+ // This is likely duplication(?) - or are there cases where this makes sense?
userBean.deleteUserUuid(UUID.fromString(rememberedUser.getValue()));
}
- request.setAttribute("messageKey","logoutsuccess");
+ request.setAttribute("messageKey", "logoutsuccess");
request.getRequestDispatcher("/login.ftl").forward(request, response);
}
// A login attempt
- else if(request.getServletPath().contains("loginsubmit"))
- {
+ else if (request.getServletPath().contains("loginsubmit")) {
// Which login method?
Integer userAuthenticationTypeId = -1;
- try
- {
+ try {
userAuthenticationTypeId = Integer.valueOf(request.getParameter("userAuthenticationTypeId"));
}
// No method found, redirect to form again
- catch(NumberFormatException | NullPointerException ex)
- {
+ catch (NumberFormatException | NullPointerException ex) {
request.getRequestDispatcher("/login.ftl").forward(request, response);
return;
}
-
+
// Standard username/password login
- if(userAuthenticationTypeId.equals(UserAuthenticationType.TYPE_PASSWORD))
- {
+ if (userAuthenticationTypeId.equals(UserAuthenticationType.TYPE_PASSWORD)) {
String username = request.getParameter("username");
String password = request.getParameter("password");
try (PrintWriter out = response.getWriter()) {
-
- Map<String,String> creds = new HashMap();
+
+ Map<String, String> creds = new HashMap<>();
creds.put("username", username);
creds.put("password", password);
+ // Check user credentials
VipsLogicUser user = userBean.authenticateUser(creds);
- if(user != null && user.getUserStatusId().equals(Globals.USER_STATUS_APPROVED))
- {
+ if (user != null && user.getUserStatusId().equals(Globals.USER_STATUS_APPROVED)) {
+ UserUuid uUUID = userBean.createAndPersistUserUuid(user);
+ user.setUserUuid(uUUID.getUserUuidPK().getUserUuid());
request.getSession().setAttribute("user", user);
- UUID uUUID = this.handleRememberUser(request, response, user, returnUUID);
- if(returnUUID)
- {
- nextPage += (nextPage.contains("?") ? "&": "?") + "returnUUID=" + uUUID.toString();
+ this.handleRememberUser(request, response, user, returnUUID);
+ if (returnUUID) {
+ nextPage += (nextPage.contains("?") ? "&" : "?") + "returnUUID=" + uUUID.getUserUuidPK().getUserUuid().toString();
}
- if(nextPage.indexOf(Globals.PROTOCOL) == 0)
- {
- //System.out.println("nextPage=" + nextPage);
+ if (nextPage.indexOf(Globals.PROTOCOL) == 0) {
+ // System.out.println("nextPage=" + nextPage);
response.sendRedirect(nextPage);
- }
- else
- {
+ } else {
response.sendRedirect(new StringBuilder(Globals.PROTOCOL + "://").append(ServletUtil.getServerName(request)).append(nextPage).toString());
}
- }
- else if(user != null && user.getUserStatusId().equals(Globals.USER_STATUS_AWAITING_EMAIL_VERIFICATION))
- {
+ } else if (user != null && user.getUserStatusId().equals(Globals.USER_STATUS_AWAITING_EMAIL_VERIFICATION)) {
request.setAttribute("errorMessageKey", "emailNotVerified");
request.getRequestDispatcher("/login.ftl").forward(request, response);
- }
- else if(user != null && user.getUserStatusId().equals(Globals.USER_STATUS_AWAITING_APPROVAL))
- {
+ } else if (user != null && user.getUserStatusId().equals(Globals.USER_STATUS_AWAITING_APPROVAL)) {
request.setAttribute("errorMessageKey", "pleaseAwaitApproval");
request.getRequestDispatcher("/login.ftl").forward(request, response);
- }
- else
- {
+ } else {
request.setAttribute("errorMessageKey", "invalidcredentials");
request.getRequestDispatcher("/login.ftl").forward(request, response);
}
-
}
}
// Authentication method not recognized, redirect to standard form
- else
- {
+ else {
request.getRequestDispatcher("/login.ftl").forward(request, response);
}
}
- // Login from a remote resource. Return UUID
- else if(request.getServletPath().contains("remotelogin"))
- {
+ // Login from a remote resource, e.g. an app. Return UUID
+ else if (request.getServletPath().contains("remotelogin")) {
String username = request.getParameter("username");
String password = request.getParameter("password");
-
- Map<String,String> creds = new HashMap();
+ Map<String, String> creds = new HashMap<>();
creds.put("username", username);
creds.put("password", password);
VipsLogicUser user = userBean.authenticateUser(creds);
PrintWriter out = response.getWriter();
- if(user != null && user.getUserStatusId().equals(Globals.USER_STATUS_APPROVED))
- {
+ if (user != null && user.getUserStatusId().equals(Globals.USER_STATUS_APPROVED)) {
request.getSession().setAttribute("user", user);
- UUID uUUID = this.handleRememberUser(request, response, user, returnUUID);
+ UserUuid uUUID = userBean.createAndPersistUserUuid(user);
+ user.setUserUuid(uUUID.getUserUuidPK().getUserUuid());
+ this.handleRememberUser(request, response, user, returnUUID);
// All is well, return object
ObjectMapper mapper = new ObjectMapper();
- user.setUserUuid(uUUID);
- mapper.writeValue(out,user);
+ mapper.writeValue(out, user);
out.close();
- }
- else
- {
+ } else {
response.setStatus(Response.Status.UNAUTHORIZED.getStatusCode());
-
- if(user != null && user.getUserStatusId().equals(Globals.USER_STATUS_AWAITING_EMAIL_VERIFICATION))
- {
+
+ if (user != null && user.getUserStatusId().equals(Globals.USER_STATUS_AWAITING_EMAIL_VERIFICATION)) {
out.print(SessionLocaleUtil.getI18nText(request, "emailNotVerified"));
- }
- else if(user != null && user.getUserStatusId().equals(Globals.USER_STATUS_AWAITING_APPROVAL))
- {
+ } else if (user != null && user.getUserStatusId().equals(Globals.USER_STATUS_AWAITING_APPROVAL)) {
out.print(SessionLocaleUtil.getI18nText(request, "pleaseAwaitApproval"));
request.getRequestDispatcher("/login.ftl").forward(request, response);
- }
- else
- {
+ } else {
out.print(SessionLocaleUtil.getI18nText(request, "invalidcredentials"));
}
}
}
// No login attempt. Show form
- else
- {
- if(request.getParameter("nextPage") != null)
- {
+ else {
+ if (request.getParameter("nextPage") != null) {
request.setAttribute("checkRemember", request.getParameter("nextPage").indexOf(Globals.PROTOCOL) == 0);
}
request.setAttribute("messageKey", request.getParameter("messageKey"));
@@ -222,91 +200,81 @@ public class LoginController extends HttpServlet {
request.getRequestDispatcher("/login.ftl").forward(request, response);
}
}
-
+
/**
* Utility method (hiding noisy code)
+ *
* @param request
* @return
- * @throws UnsupportedEncodingException
+ * @throws UnsupportedEncodingException
*/
- private String getNextPage(HttpServletRequest request) throws UnsupportedEncodingException
- {
- String nextPage = request.getParameter("nextPage") != null ?
- request.getParameter("nextPage")
- : request.getSession().getAttribute("nextPage") != null ?
- URLDecoder.decode((String)request.getSession().getAttribute("nextPage"),"UTF-8")
- :null;
- if(nextPage == null)
- {
- nextPage="/";
+ private String getNextPage(HttpServletRequest request) throws UnsupportedEncodingException {
+ String nextPage = request.getParameter("nextPage") != null ? request.getParameter("nextPage")
+ : request.getSession().getAttribute("nextPage") != null ? URLDecoder.decode((String) request.getSession().getAttribute("nextPage"), "UTF-8")
+ : null;
+ if (nextPage == null) {
+ nextPage = "/";
}
-
+
return nextPage;
}
-
+
/**
* Should the generated UUID be returned to login client?
+ *
* @param request
- * @return
+ * @return
*/
- private Boolean getReturnUUID(HttpServletRequest request)
- {
- return request.getParameter(LoginController.RETURN_UUID_PARAMETER_NAME) != null ?
- request.getParameter(LoginController.RETURN_UUID_PARAMETER_NAME).equals("true")
- : request.getSession().getAttribute(LoginController.RETURN_UUID_PARAMETER_NAME) != null ?
- (Boolean) request.getSession().getAttribute(LoginController.RETURN_UUID_PARAMETER_NAME)
- : false;
+ private Boolean getReturnUUID(HttpServletRequest request) {
+ return request.getParameter(LoginController.RETURN_UUID_PARAMETER_NAME) != null ? request.getParameter(LoginController.RETURN_UUID_PARAMETER_NAME).equals("true")
+ : request.getSession().getAttribute(LoginController.RETURN_UUID_PARAMETER_NAME) != null ? (Boolean) request.getSession().getAttribute(LoginController.RETURN_UUID_PARAMETER_NAME)
+ : false;
}
-
+
/**
*
* @param request
* @param response
- * @param user
+ * @param user the VIPS user
+ * @param returnUUID has a UUID been requested to be returned to the client?
+ * @return
*/
- private UUID handleRememberUser(HttpServletRequest request, HttpServletResponse response, VipsLogicUser user, Boolean returnUUID)
- {
-
- String rememberUser = request.getParameter("rememberUser") != null ?
- request.getParameter("rememberUser")
+ private void handleRememberUser(HttpServletRequest request, HttpServletResponse response, VipsLogicUser user, Boolean returnUUID) {
+ // This is from the login form, the checkbox that you tick off to save your login
+ String rememberUser = request.getParameter("rememberUser") != null ? request.getParameter("rememberUser")
: (String) request.getSession().getAttribute("rememberUser");
request.getSession().removeAttribute("rememberUser");
- if(returnUUID || (rememberUser != null && rememberUser.equals("on")))
- {
- UserUuid uUUID = userBean.createAndPersistUserUuid(user);
- if(rememberUser != null && rememberUser.equals("on"))
- {
- Cookie rememberedUser = new Cookie("rememberedUser", uUUID.getUserUuidPK().getUserUuid().toString());
+ if (returnUUID || (rememberUser != null && rememberUser.equals("on"))) {
+
+ if (rememberUser != null && rememberUser.equals("on")) {
+ Cookie rememberedUser = new Cookie("rememberedUser", user.getUserUuid().toString());
rememberedUser.setPath("/");
rememberedUser.setMaxAge(Globals.DEFAULT_UUID_VALIDITY_DURATION_DAYS * 24 * 60 * 60);
response.addCookie(rememberedUser);
}
- return uUUID.getUserUuidPK().getUserUuid();
+ // return uUUID.getUserUuidPK().getUserUuid();
}
- else
- {
+ // Unremember the user both server side and browser side
+ else {
Cookie rememberedUser = ServletUtil.getCookie(request, "rememberedUser");
- if(rememberedUser != null)
- {
+ if (rememberedUser != null) {
rememberedUser.setMaxAge(0);
response.addCookie(rememberedUser);
userBean.deleteUserUuid(UUID.fromString(rememberedUser.getValue()));
}
- return null;
+ // return null;
}
}
-
-
-
+
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
/**
* Handles the HTTP
* <code>GET</code> method.
*
- * @param request servlet request
+ * @param request servlet request
* @param response servlet response
* @throws ServletException if a servlet-specific error occurs
- * @throws IOException if an I/O error occurs
+ * @throws IOException if an I/O error occurs
*/
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response)
@@ -318,10 +286,10 @@ public class LoginController extends HttpServlet {
* Handles the HTTP
* <code>POST</code> method.
*
- * @param request servlet request
+ * @param request servlet request
* @param response servlet response
* @throws ServletException if a servlet-specific error occurs
- * @throws IOException if an I/O error occurs
+ * @throws IOException if an I/O error occurs
*/
@Override
protected void doPost(HttpServletRequest request, HttpServletResponse response)
diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/OrganizationController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/OrganizationController.java
index b10c713a6ce7bf20ec28db65a7ac945cc21fe658..ed2e9fd72e7dd666418d13a765304fdcdd98597b 100644
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/OrganizationController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/OrganizationController.java
@@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import no.nibio.vips.gis.GISUtil;
import no.nibio.vips.gis.LonLatStringFormatException;
+import no.nibio.vips.logic.controller.session.PointOfInterestBean;
import no.nibio.vips.logic.controller.session.UserBean;
import no.nibio.vips.logic.entity.Organization;
import no.nibio.vips.logic.entity.VipsLogicUser;
@@ -46,6 +47,9 @@ public class OrganizationController extends HttpServlet {
@EJB
UserBean userBean;
+
+ @EJB
+ PointOfInterestBean poiBean;
/**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
@@ -101,6 +105,7 @@ public class OrganizationController extends HttpServlet {
request.setAttribute("countries", userBean.getCountries());
request.setAttribute("timeZones", TimeZone.getAvailableIDs());
request.setAttribute("organization", organization);
+ request.setAttribute("gridWeatherDataSources", poiBean.getGridWeatherStationDataSources());
request.getRequestDispatcher("/organizationForm.ftl").forward(request, response);
}
else if(action.equals("organizationFormSubmit"))
@@ -142,6 +147,11 @@ public class OrganizationController extends HttpServlet {
: new GISUtil().getJtsPointFromString(formValidation.getFormField("defaultMapCenter").getWebValue())
);
+ organization.setDefaultGridWeatherStationDataSource(
+ formValidation.getFormField("defaultGridWeatherStationDataSourceId").getValueAsInteger() < 0 ?
+ null
+ : poiBean.getWeatherStationDataSource(formValidation.getFormField("defaultGridWeatherStationDataSourceId").getValueAsInteger())
+ );
organization = userBean.storeOrganization(organization);
response.sendRedirect(
diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/PointOfInterestController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/PointOfInterestController.java
index 9f2d923e257ecf34d61b674b402bedac9f633291..e1a80dd79fe9824855b0c45213a5447d4cdb9556 100755
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/PointOfInterestController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/PointOfInterestController.java
@@ -298,6 +298,8 @@ public class PointOfInterestController extends HttpServlet {
{
weatherStation.setIsForecastLocation(Boolean.TRUE);
}
+
+ weatherStation.setIsPrivate(formValidation.getFormField("isPrivate").getWebValue() != null);
Double altitude = 0.0;
Point p2d = formValidation.getFormField("location").getValueAsPointWGS84();
@@ -657,6 +659,8 @@ public class PointOfInterestController extends HttpServlet {
{
poi.setIsForecastLocation(Boolean.FALSE);
}
+
+ poi.setIsPrivate(formValidation.getFormField("isPrivate").getWebValue() != null);
Double altitude = 0.0;
Point p2d = formValidation.getFormField("location").getValueAsPointWGS84();
diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/WeatherStationDataSourceController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/WeatherStationDataSourceController.java
new file mode 100644
index 0000000000000000000000000000000000000000..766d208f92d7924d4d5be151e124a313b34a2b05
--- /dev/null
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/WeatherStationDataSourceController.java
@@ -0,0 +1,231 @@
+/*
+ * Copyright (c) 2024 NIBIO <http://www.nibio.no/>.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+package no.nibio.vips.logic.controller.servlet;
+
+import java.io.IOException;
+
+import java.util.List;
+
+import javax.ejb.EJB;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import no.nibio.vips.gis.LonLatStringFormatException;
+import no.nibio.vips.logic.controller.session.PointOfInterestBean;
+import no.nibio.vips.logic.entity.VipsLogicUser;
+import no.nibio.vips.logic.entity.WeatherStationDataSource;
+import no.nibio.vips.logic.util.Globals;
+import no.nibio.vips.logic.util.SystemTime;
+import no.nibio.vips.util.ServletUtil;
+import no.nibio.web.forms.FormValidation;
+import no.nibio.web.forms.FormValidationException;
+import no.nibio.web.forms.FormValidator;;
+
+/**
+ * Handles actions regarding listing and modifying weather station data sources
+ *
+ * @copyright 2024 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
+ */
+public class WeatherStationDataSourceController extends HttpServlet{
+
+ private static Logger LOGGER = LoggerFactory.getLogger(WeatherStationDataSourceController.class);
+
+ @EJB
+ PointOfInterestBean poiBean;
+
+ /**
+ * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
+ * @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet-specific error occurs
+ * @throws IOException if an I/O error occurs
+ */
+ protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+
+ response.setContentType("text/html;charset=UTF-8");
+
+ VipsLogicUser user = (VipsLogicUser) request.getSession().getAttribute("user");
+ // Basic authorization
+ if(!user.isSuperUser() && ! user.isOrganizationAdmin()){
+ response.sendError(403,"Access not authorized");
+ return;
+ }
+ String action = request.getParameter("action");
+
+ if(action == null)
+ {
+ List<WeatherStationDataSource> wsDataSources = poiBean.getWeatherStationDataSources();
+ request.setAttribute("messageKey", request.getParameter("messageKey") != null ? request.getParameter("messageKey") : null);
+ request.setAttribute("weatherStationDataSources", wsDataSources);
+ request.getRequestDispatcher("/weatherStationDataSourceList.ftl").forward(request, response);
+ }
+ else if(action.equals("editWeatherStationDataSource") || action.equals("newWeatherStationDataSource"))
+ {
+ WeatherStationDataSource weatherStationDataSource = null;
+ try
+ {
+ weatherStationDataSource = poiBean.getWeatherStationDataSource(Integer.valueOf(request.getParameter("weatherStationDataSourceId")));
+ }
+ catch(NullPointerException | NumberFormatException ex){}
+
+ if(weatherStationDataSource == null)
+ {
+ LOGGER.debug("Could not find weather data source with ID = " + request.getParameter("weatherStationDataSourceId"));
+ weatherStationDataSource = new WeatherStationDataSource();
+ }
+
+ request.setAttribute("messageKey", request.getParameter("messageKey") != null ? request.getParameter("messageKey") : null);
+ request.setAttribute("weatherStationDataSource", weatherStationDataSource);
+ request.getRequestDispatcher("/weatherStationDataSourceForm.ftl").forward(request, response);
+ }
+ else if(action.equals("weatherStationDataSourceFormSubmit"))
+ {
+ try
+ {
+ // Check that the provided id is either -1 or it already exists
+ Integer weatherStationDataSourceId = null;
+ WeatherStationDataSource weatherStationDataSource;
+ try
+ {
+ weatherStationDataSourceId = Integer.valueOf(request.getParameter("weatherStationDataSourceId"));
+ }
+ catch(NullPointerException | NumberFormatException ex)
+ {
+ response.sendError(400,"Wrong format of id for weather station data source");
+ }
+ if(weatherStationDataSourceId < 0)
+ {
+ weatherStationDataSource = new WeatherStationDataSource();
+ }
+ else
+ {
+ weatherStationDataSource = poiBean.getWeatherStationDataSource(weatherStationDataSourceId);
+ if(weatherStationDataSource == null)
+ {
+ response.sendError(404,"Could not find weather station data source with id=" + weatherStationDataSourceId);
+ }
+ }
+ FormValidation formValidation = FormValidator.validateForm("weatherStationDataSourceForm", request, getServletContext());
+ if(formValidation.isValid())
+ {
+ weatherStationDataSource.setName(formValidation.getFormField("name").getWebValue());
+ weatherStationDataSource.setDefaultDescription(formValidation.getFormField("defaultDescription").getWebValue());
+ weatherStationDataSource.setUri(formValidation.getFormField("uri").getWebValue());
+ weatherStationDataSource.setDatafetchUriExpression(formValidation.getFormField("datafetchUriExpression").getWebValue());
+ weatherStationDataSource.setInfoUriExpression(formValidation.getFormField("infoUriExpression").getWebValue());
+ weatherStationDataSource.setIsGrid(formValidation.getFormField("isGrid").getWebValue() != null);
+ weatherStationDataSource = poiBean.storeWeatherStationDataSource(weatherStationDataSource);
+
+ response.sendRedirect(
+ Globals.PROTOCOL + "://" + ServletUtil.getServerName(request)
+ + "/weatherstationdatasource?action=editWeatherStationDataSource&weatherStationDataSourceId=" + weatherStationDataSource.getWeatherStationDataSourceId()
+ + "&messageKey=weatherStationDataSourceStored"
+ );
+ }
+ else
+ {
+ request.setAttribute("formValidation", formValidation);
+ request.setAttribute("weatherStationDataSource", weatherStationDataSource);
+ LOGGER.debug("Form NOT valid. Dispatching");
+ request.getRequestDispatcher("/weatherStationDataSourceForm.ftl").forward(request, response);
+ }
+ }
+ catch(FormValidationException ex)
+ {
+ ex.printStackTrace();
+ response.sendError(500, ex.getClass().toString() + ": " + ex.getMessage());
+ }
+ }
+ else if(action.equals("deleteWeatherStationDataSource"))
+ {
+
+ try
+ {
+ Integer weatherStationDataSourceId = Integer.valueOf(request.getParameter("weatherStationDataSourceId"));
+ WeatherStationDataSource weatherStationDataSource = poiBean.getWeatherStationDataSource(weatherStationDataSourceId);
+ if(weatherStationDataSource == null)
+ {
+ response.sendError(404,"Could not find weather station data source with id=" + weatherStationDataSourceId);
+ }
+ // Check: Can it be deleted? Not if organizations or weatherStations refer to it
+ if(poiBean.isweatherStationDataSourceDeleteable(weatherStationDataSource))
+ {
+ poiBean.deleteWeatherStationDataSource(weatherStationDataSource);
+ // Redirect to list from which the deleted item has been removed
+ response.sendRedirect(
+ Globals.PROTOCOL + "://" + ServletUtil.getServerName(request)
+ + "/weatherstationdatasource?messageKey=weatherStationDataSourceDeleted"
+ );
+ }
+ else
+ {
+ response.sendError(403,weatherStationDataSource.getName() + " is in use by one or more organizations, so it cannot be deleted. Hit the browser's back button return to your form.");
+ }
+ }
+ catch(NullPointerException | NumberFormatException ex)
+ {
+ response.sendError(400,"Wrong format of id for weather station data source");
+ }
+
+
+ }
+ }
+
+ // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+ /**
+ * Handles the HTTP <code>GET</code> method.
+ * @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet-specific error occurs
+ * @throws IOException if an I/O error occurs
+ */
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ processRequest(request, response);
+ }
+
+ /**
+ * Handles the HTTP <code>POST</code> method.
+ * @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet-specific error occurs
+ * @throws IOException if an I/O error occurs
+ */
+ @Override
+ protected void doPost(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ processRequest(request, response);
+ }
+
+ /**
+ * Returns a short description of the servlet.
+ * @return a String containing servlet description
+ */
+ @Override
+ public String getServletInfo() {
+ return "Short description";
+ }// </editor-fold>
+}
diff --git a/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java b/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java
index 6aa46f8bfcbd5603c43220f557c84de5832f1df5..b1c1744f67cf395dc13fa7cf87fab472e0f3a791 100755
--- a/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java
+++ b/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java
@@ -1,45 +1,31 @@
/*
- * Copyright (c) 2015 NIBIO <http://www.nibio.no/>.
+ * Copyright (c) 2015 NIBIO <http://www.nibio.no/>.
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+ * Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+ * details.
*
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Affero General Public License along with this program. If not, see
+ * <https://www.gnu.org/licenses/>.
*
*/
package no.nibio.vips.logic.controller.session;
-import com.fasterxml.jackson.databind.JsonNode;
-import java.util.Calendar;
-import java.util.TimeZone;
-import de.micromata.opengis.kml.v_2_2_0.Coordinate;
-import de.micromata.opengis.kml.v_2_2_0.Data;
-import de.micromata.opengis.kml.v_2_2_0.Document;
-import de.micromata.opengis.kml.v_2_2_0.ExtendedData;
-import de.micromata.opengis.kml.v_2_2_0.Kml;
-import de.micromata.opengis.kml.v_2_2_0.KmlFactory;
-import de.micromata.opengis.kml.v_2_2_0.LabelStyle;
-import de.micromata.opengis.kml.v_2_2_0.Placemark;
-import de.micromata.opengis.kml.v_2_2_0.Point;
-import de.micromata.opengis.kml.v_2_2_0.Units;
-import de.micromata.opengis.kml.v_2_2_0.Vec2;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.TimeZone;
import java.util.UUID;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -56,6 +42,21 @@ import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.Response;
+import org.apache.commons.lang.StringUtils;
+import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
+import org.slf4j.LoggerFactory;
+import com.fasterxml.jackson.databind.JsonNode;
+import de.micromata.opengis.kml.v_2_2_0.Coordinate;
+import de.micromata.opengis.kml.v_2_2_0.Data;
+import de.micromata.opengis.kml.v_2_2_0.Document;
+import de.micromata.opengis.kml.v_2_2_0.ExtendedData;
+import de.micromata.opengis.kml.v_2_2_0.Kml;
+import de.micromata.opengis.kml.v_2_2_0.KmlFactory;
+import de.micromata.opengis.kml.v_2_2_0.LabelStyle;
+import de.micromata.opengis.kml.v_2_2_0.Placemark;
+import de.micromata.opengis.kml.v_2_2_0.Point;
+import de.micromata.opengis.kml.v_2_2_0.Units;
+import de.micromata.opengis.kml.v_2_2_0.Vec2;
import no.nibio.vips.coremanager.service.ManagerResource;
import no.nibio.vips.entity.ModelConfiguration;
import no.nibio.vips.entity.ModelRunRequest;
@@ -81,9 +82,6 @@ import no.nibio.vips.logic.util.RunModelException;
import no.nibio.vips.logic.util.SystemTime;
import no.nibio.vips.util.WeatherUtil;
import no.nibio.web.forms.FormField;
-import org.apache.commons.lang.StringUtils;
-import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
-import org.slf4j.LoggerFactory;
/**
* @copyright 2013-2022 <a href="http://www.nibio.no/">NIBIO</a>
@@ -94,179 +92,163 @@ public class ForecastBean {
private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(ForecastBean.class);
- @PersistenceContext(unitName="VIPSLogic-PU")
+ @PersistenceContext(unitName = "VIPSLogic-PU")
EntityManager em;
-
+
@EJB
ForecastBean forecastBean;
-
+
@EJB
UserBean userBean;
-
+
/**
* Returns all forecast results.
- * @return
+ *
+ * @return
*/
- public List<ForecastResult> getForecastResults()
- {
+ public List<ForecastResult> getForecastResults() {
return em.createNamedQuery("ForecastResult.findAll").getResultList();
}
-
- public List<ForecastResult> getForecastResults(Long forecastConfigurationId)
- {
- //ForecastConfiguration config = this.getForecastConfiguration(forecastConfigurationId);
+
+ public List<ForecastResult> getForecastResults(Long forecastConfigurationId) {
+ // ForecastConfiguration config = this.getForecastConfiguration(forecastConfigurationId);
Query q = em.createNamedQuery("ForecastResult.findByForecastConfigurationId");
q.setParameter("forecastConfigurationId", forecastConfigurationId);
return q.getResultList();
}
-
+
/**
*
* @param forecastConfiguration
* @param user
- * @return
+ * @return
*/
- public boolean isUserAuthorizedForForecastConfiguration(ForecastConfiguration forecastConfiguration, VipsLogicUser user)
- {
+ public boolean isUserAuthorizedForForecastConfiguration(ForecastConfiguration forecastConfiguration,
+ VipsLogicUser user) {
// Public forecasts are always OK for everyone to view
- if(!forecastConfiguration.getIsPrivate())
- {
+ if (!forecastConfiguration.getIsPrivate()) {
return true;
}
// Private forecasts are only viewable by owner or super users / orgadmins
- return user != null && (user.isSuperUser() || user.isOrganizationAdmin() || user.getUserId().equals( forecastConfiguration.getVipsLogicUserId().getUserId()));
+ return user != null && (user.isSuperUser() || user.isOrganizationAdmin()
+ || user.getUserId().equals(forecastConfiguration.getVipsLogicUserId().getUserId()));
}
-
-
- public boolean isUserAuthorizedForForecastConfiguration(Long forecastConfigurationId, String userUUID)
- {
+
+
+ public boolean isUserAuthorizedForForecastConfiguration(Long forecastConfigurationId, String userUUID) {
// Authentication
ForecastConfiguration fc = em.find(ForecastConfiguration.class, forecastConfigurationId);
- if(fc == null)
- {
+ if (fc == null) {
return true;
}
- if(fc.getIsPrivate())
- {
- if(userUUID == null)
- {
+ if (fc.getIsPrivate()) {
+ if (userUUID == null) {
return false;
}
UUID uUUID = UUID.fromString(userUUID);
VipsLogicUser user = userBean.findVipsLogicUser(uUUID);
- if(user == null || ! user.getUserId().equals( fc.getVipsLogicUserId().getUserId()))
- {
+ if (user == null || !user.getUserId().equals(fc.getVipsLogicUserId().getUserId())) {
return false;
}
}
return true;
}
-
- public List<ForecastResult> getForecastResults(Long forecastConfigurationId, Integer latestDays)
- {
+
+ public List<ForecastResult> getForecastResults(Long forecastConfigurationId, Integer latestDays) {
ForecastResult mostRecentForecastResult = this.getMostRecentForecastResult(forecastConfigurationId);
- if(mostRecentForecastResult == null)
- {
+ if (mostRecentForecastResult == null) {
return null;
}
Calendar cal = Calendar.getInstance();
cal.setTime(mostRecentForecastResult.getValidTimeStart());
cal.add(Calendar.DATE, -latestDays);
Date startDate = cal.getTime();
- return this.getForecastResults(forecastConfigurationId, startDate, mostRecentForecastResult.getValidTimeStart());
-
+ return this.getForecastResults(forecastConfigurationId, startDate,
+ mostRecentForecastResult.getValidTimeStart());
+
}
-
- public List<ForecastResult> getForecastResults(Long forecastConfigurationId, Date timeStart, Date timeEnd)
- {
+
+ public List<ForecastResult> getForecastResults(Long forecastConfigurationId, Date timeStart, Date timeEnd) {
Query q = em.createNamedQuery("ForecastResult.findByForecastConfigurationIdAndPeriod");
q.setParameter("forecastConfigurationId", forecastConfigurationId);
q.setParameter("timeStart", timeStart);
q.setParameter("timeEnd", timeEnd);
- try
- {
+ try {
return q.getResultList();
- }
- catch(NoResultException ex)
- {
+ } catch (NoResultException ex) {
return null;
}
}
-
- public ForecastResult getMostRecentForecastResult(Long forecastConfigurationId)
- {
+
+ public ForecastResult getMostRecentForecastResult(Long forecastConfigurationId) {
Query q = em.createNativeQuery(
"SELECT * FROM forecast_result "
- + "WHERE forecast_configuration_id=:forecastConfigurationId "
- + "AND valid_time_start = ("
+ + "WHERE forecast_configuration_id=:forecastConfigurationId "
+ + "AND valid_time_start = ("
+ "SELECT MAX(valid_time_start) "
+ "FROM forecast_result "
+ "WHERE forecast_configuration_id=:forecastConfigurationId "
- + ");", ForecastResult.class);
-
+ + ");",
+ ForecastResult.class);
+
q.setParameter("forecastConfigurationId", forecastConfigurationId);
- try
- {
+ try {
return (ForecastResult) q.getSingleResult();
- }
- catch(NoResultException ex)
- {
+ } catch (NoResultException ex) {
return null;
}
}
-
+
/**
* Deletes all former results for this forecast configuration, stores the new ones
+ *
* @param forecastConfiguration
- * @param results
+ * @param results
*/
- public void storeResults(ForecastConfiguration forecastConfiguration, List<Result> results)
- {
- //System.out.println("forecastConfigurationId=" + forecastConfiguration.getForecastConfigurationId());
- Query q = em.createNativeQuery("DELETE FROM public.forecast_result WHERE forecast_configuration_id=:forecastConfigurationId");
+ public void storeResults(ForecastConfiguration forecastConfiguration, List<Result> results) {
+ // System.out.println("forecastConfigurationId=" + forecastConfiguration.getForecastConfigurationId());
+ Query q = em.createNativeQuery(
+ "DELETE FROM public.forecast_result WHERE forecast_configuration_id=:forecastConfigurationId");
q.setParameter("forecastConfigurationId", forecastConfiguration.getForecastConfigurationId());
q.executeUpdate();
- for(Result result:results)
- {
- ForecastResult fResult = new ForecastResult(forecastConfiguration.getForecastConfigurationId(),result);
+ for (Result result : results) {
+ ForecastResult fResult = new ForecastResult(forecastConfiguration.getForecastConfigurationId(), result);
em.persist(fResult);
}
}
-
-
+
+
/**
- * Get all PUBLIC forecast configurations for one user.
- * TODO: Should be season based, or possibly based on start/stop date
+ * Get all PUBLIC forecast configurations for one user. TODO: Should be season based, or possibly based on
+ * start/stop date
+ *
* @param userId
- * @return
+ * @return
*/
- public List<ForecastConfiguration> getForecastConfigurationsForUser(Integer userId)
- {
+ public List<ForecastConfiguration> getForecastConfigurationsForUser(Integer userId) {
VipsLogicUser user = em.find(VipsLogicUser.class, userId);
Query q = em.createNamedQuery("ForecastConfiguration.findByVipsLogicUserId");
q.setParameter("vipsLogicUserId", user);
return q.getResultList();
}
-
+
/**
- * Get all PRIVATE forecast configurations for one user.
- * TODO: Should be season based, or possibly based on start/stop date
+ * Get all PRIVATE forecast configurations for one user. TODO: Should be season based, or possibly based on
+ * start/stop date
+ *
* @param userId
- * @return
+ * @return
*/
- public List<ForecastConfiguration> getPrivateForecastConfigurationsForUser(Integer userId)
- {
+ public List<ForecastConfiguration> getPrivateForecastConfigurationsForUser(Integer userId) {
VipsLogicUser user = em.find(VipsLogicUser.class, userId);
Query q = em.createNamedQuery("ForecastConfiguration.findPrivateByVipsLogicUserId");
q.setParameter("vipsLogicUserId", user);
return q.getResultList();
}
-
-
-
-
- public List<ForecastConfiguration> getForecastConfigurationsForUserAndDate(Integer userId, Date from, Date to)
- {
+
+
+
+ public List<ForecastConfiguration> getForecastConfigurationsForUserAndDate(Integer userId, Date from, Date to) {
VipsLogicUser user = em.find(VipsLogicUser.class, userId);
Query q = em.createNamedQuery("ForecastConfiguration.findByVipsLogicUserIdAndDate");
q.setParameter("vipsLogicUserId", user);
@@ -274,17 +256,18 @@ public class ForecastBean {
q.setParameter("to", to);
return q.getResultList();
}
-
- public List<ForecastConfiguration> getForecastConfigurationsForUserAndCrops(Integer userId, List<Integer> cropOrganismIds)
- {
+
+ public List<ForecastConfiguration> getForecastConfigurationsForUserAndCrops(Integer userId,
+ List<Integer> cropOrganismIds) {
VipsLogicUser user = em.find(VipsLogicUser.class, userId);
Query q = em.createNamedQuery("ForecastConfiguration.findByVipsLogicUserIdAndCropOrganismId");
q.setParameter("vipsLogicUserId", user);
q.setParameter("cropOrganismIds", cropOrganismIds);
return q.getResultList();
}
- public List<ForecastConfiguration> getForecastConfigurationsForUserAndCropsAndDate(Integer userId, List<Integer> cropOrganismIds, Date from, Date to)
- {
+
+ public List<ForecastConfiguration> getForecastConfigurationsForUserAndCropsAndDate(Integer userId,
+ List<Integer> cropOrganismIds, Date from, Date to) {
VipsLogicUser user = em.find(VipsLogicUser.class, userId);
Query q = em.createNamedQuery("ForecastConfiguration.findByVipsLogicUserIdAndCropOrganismIdsAndDate");
q.setParameter("vipsLogicUserId", user);
@@ -293,30 +276,28 @@ public class ForecastBean {
q.setParameter("to", to);
return q.getResultList();
}
-
-
+
+
/**
* Returns _ALL_ forecasts. Not for the faint hearted
- * @return
+ *
+ * @return
*/
- public List<ForecastConfiguration> getForecastConfigurations()
- {
+ public List<ForecastConfiguration> getForecastConfigurations() {
return em.createNamedQuery("ForecastConfiguration.findAll").getResultList();
}
-
+
/**
*
- * @return
+ * @return
*/
- public List<ForecastConfiguration> getForecastConfigurations(List<String> modelIds)
- {
+ public List<ForecastConfiguration> getForecastConfigurations(List<String> modelIds) {
return em.createNamedQuery("ForecastConfiguration.findByModelIds")
.setParameter("modelIds", modelIds)
.getResultList();
}
-
- public List<ForecastConfiguration> getForecastConfigurations(Organization organization)
- {
+
+ public List<ForecastConfiguration> getForecastConfigurations(Organization organization) {
List<VipsLogicUser> organizationUsers = em
.createNamedQuery("VipsLogicUser.findByOrganizationId")
.setParameter("organizationId", organization)
@@ -326,16 +307,15 @@ public class ForecastBean {
.setParameter("vipsLogicUserIds", organizationUsers)
.getResultList();
}
-
- public List<ForecastConfiguration> getForecastConfigurations(Organization organization, List<String> modelIds, Date from, Date to)
- {
+
+ public List<ForecastConfiguration> getForecastConfigurations(Organization organization, List<String> modelIds,
+ Date from, Date to) {
List<VipsLogicUser> organizationUsers = em
.createNamedQuery("VipsLogicUser.findByOrganizationId")
.setParameter("organizationId", organization)
.getResultList();
-
- if(!organizationUsers.isEmpty())
- {
+
+ if (!organizationUsers.isEmpty()) {
return em
.createNamedQuery("ForecastConfiguration.findByVipsLogicUserIdsAndModelIdsAndDate")
.setParameter("vipsLogicUserIds", organizationUsers)
@@ -343,22 +323,19 @@ public class ForecastBean {
.setParameter("from", from)
.setParameter("to", to)
.getResultList();
- }
- else
- {
+ } else {
return new ArrayList<>();
}
}
-
- public List<ForecastConfiguration> getForecastConfigurations(List<Integer> organizationIds, List<String> modelIds, Date from, Date to)
- {
+
+ public List<ForecastConfiguration> getForecastConfigurations(List<Integer> organizationIds, List<String> modelIds,
+ Date from, Date to) {
List<VipsLogicUser> organizationUsers = em
.createNamedQuery("VipsLogicUser.findByOrganizationIds")
.setParameter("organizationIds", organizationIds)
.getResultList();
-
- if(!organizationUsers.isEmpty() && ! modelIds.isEmpty())
- {
+
+ if (!organizationUsers.isEmpty() && !modelIds.isEmpty()) {
return em
.createNamedQuery("ForecastConfiguration.findByVipsLogicUserIdsAndModelIdsAndDate")
.setParameter("vipsLogicUserIds", organizationUsers)
@@ -366,117 +343,109 @@ public class ForecastBean {
.setParameter("from", from)
.setParameter("to", to)
.getResultList();
- }
- else
- {
+ } else {
return new ArrayList<>();
}
}
-
- public List<ForecastConfiguration> getForecastConfigurations(List<Integer> organizationIds, Date from, Date to)
- {
+
+ public List<ForecastConfiguration> getForecastConfigurations(List<Integer> organizationIds, Date from, Date to) {
List<VipsLogicUser> organizationUsers = em
.createNamedQuery("VipsLogicUser.findByOrganizationIds")
.setParameter("organizationIds", organizationIds)
.getResultList();
-
-
- if(!organizationUsers.isEmpty())
- {
+
+
+ if (!organizationUsers.isEmpty()) {
return em
.createNamedQuery("ForecastConfiguration.findByVipsLogicUserIdsAndDate")
.setParameter("vipsLogicUserIds", organizationUsers)
.setParameter("from", from)
.setParameter("to", to)
.getResultList();
- }
- else
- {
+ } else {
return new ArrayList<>();
}
}
-
- public List<ForecastConfiguration> getForecastConfigurationsByWeatherStation(PointOfInterestWeatherStation weatherStation)
- {
+
+ public List<ForecastConfiguration> getForecastConfigurationsByWeatherStation(
+ PointOfInterestWeatherStation weatherStation) {
return em
- .createNamedQuery("ForecastConfiguration.findByWeatherStationPointOfInterestId", ForecastConfiguration.class)
+ .createNamedQuery("ForecastConfiguration.findByWeatherStationPointOfInterestId",
+ ForecastConfiguration.class)
.setParameter("weatherStationPointOfInterestId", weatherStation)
.getResultList();
}
-
- public List<ForecastConfiguration> getForecastConfigurationsByLocation(PointOfInterest poi)
- {
+
+ public List<ForecastConfiguration> getForecastConfigurationsByLocation(PointOfInterest poi) {
return em
.createNamedQuery("ForecastConfiguration.findByLocationPointOfInterestId", ForecastConfiguration.class)
.setParameter("locationPointOfInterestId", poi)
.getResultList();
}
-
- public List<ForecastConfiguration> getForecastConfigurations(PointOfInterestWeatherStation weatherStation,Date from, Date to)
- {
+
+ public List<ForecastConfiguration> getForecastConfigurations(PointOfInterestWeatherStation weatherStation,
+ Date from, Date to) {
return em
- .createNamedQuery("ForecastConfiguration.findByWeatherStationPointOfInterestIdAndDate", ForecastConfiguration.class)
+ .createNamedQuery("ForecastConfiguration.findByWeatherStationPointOfInterestIdAndDate",
+ ForecastConfiguration.class)
.setParameter("weatherStationPointOfInterestId", weatherStation)
.setParameter("from", from)
.setParameter("to", to)
.getResultList();
}
-
+
/**
* Deletes all forecasts and results from the given weather station
- * @param weatherStation
+ *
+ * @param weatherStation
*/
- public void deleteForecastConfigurationsForWeatherStation(PointOfInterestWeatherStation weatherStation)
- {
- List<ForecastConfiguration> forecastConfigurations = this.getForecastConfigurationsByWeatherStation(weatherStation);
- for(ForecastConfiguration forecastConfiguration:forecastConfigurations)
- {
+ public void deleteForecastConfigurationsForWeatherStation(PointOfInterestWeatherStation weatherStation) {
+ List<ForecastConfiguration> forecastConfigurations =
+ this.getForecastConfigurationsByWeatherStation(weatherStation);
+ for (ForecastConfiguration forecastConfiguration : forecastConfigurations) {
em.createNativeQuery("DELETE FROM forecast_result WHERE forecast_configuration_id=:forecastConfigurationId")
.setParameter("forecastConfigurationId", forecastConfiguration.getForecastConfigurationId())
.executeUpdate();
em.remove(forecastConfiguration);
}
}
-
+
/**
* Deletes all forecasts and results from the given location
- * @param weatherStation
+ *
+ * @param weatherStation
*/
- public void deleteForecastConfigurationsForLocation(PointOfInterest location)
- {
+ public void deleteForecastConfigurationsForLocation(PointOfInterest location) {
List<ForecastConfiguration> forecastConfigurations = this.getForecastConfigurationsByLocation(location);
- for(ForecastConfiguration forecastConfiguration:forecastConfigurations)
- {
+ for (ForecastConfiguration forecastConfiguration : forecastConfigurations) {
em.createNativeQuery("DELETE FROM forecast_result WHERE forecast_configuration_id=:forecastConfigurationId")
.setParameter("forecastConfigurationId", forecastConfiguration.getForecastConfigurationId())
.executeUpdate();
em.remove(forecastConfiguration);
}
}
-
+
/**
* Fetches one specific forecast configuration
+ *
* @param forecastConfigurationId
- * @return
+ * @return
*/
- public ForecastConfiguration getForecastConfiguration(Long forecastConfigurationId)
- {
+ public ForecastConfiguration getForecastConfiguration(Long forecastConfigurationId) {
return em.find(ForecastConfiguration.class, forecastConfigurationId);
}
-
+
/**
- * Requests all info about models currently available in VIPSCoreManager
- * Stores in local db for easy access.
+ * Requests all info about models currently available in VIPSCoreManager Stores in local db for easy access.
*/
- public TaskResult updateModelInformation()
- {
+ public TaskResult updateModelInformation() {
TaskResult taskResult = new TaskResult();
String jobReport = "";
- // Iterate all the VIPSCore instances
+ // Iterate all the VIPSCore instances
List<VipsCoreInstance> vipsCoreInstances = em.createNamedQuery("VipsCoreInstance.findAll").getResultList();
Integer instancesCompleted = 0;
- for(VipsCoreInstance vipsCoreInstance:vipsCoreInstances) {
- LOGGER.debug("Attempting to connect to " + vipsCoreInstance.getUri() );
+ for (VipsCoreInstance vipsCoreInstance : vipsCoreInstances) {
+ LOGGER.debug("Attempting to connect to " + vipsCoreInstance.getUri());
try {
Client client = ClientBuilder.newClient();
WebTarget target = client.target(vipsCoreInstance.getUri());
@@ -486,8 +455,9 @@ public class ForecastBean {
// Get all model Ids from Core Manager
Response resp = resource.printModelListJSON();
LOGGER.debug(vipsCoreInstance.getUri() + " returned status code " + String.valueOf(resp.getStatus()));
- if(resp.getStatus() != 200) {
- jobReport += vipsCoreInstance.getUri() + " returned status code " + String.valueOf(resp.getStatus()) + "\n";
+ if (resp.getStatus() != 200) {
+ jobReport += vipsCoreInstance.getUri() + " returned status code " + String.valueOf(resp.getStatus())
+ + "\n";
continue;
}
@@ -509,36 +479,34 @@ public class ForecastBean {
// Retrieve and store information
Response r = resource.printModelName(modelId);
modelInformation.setDefaultName(r.readEntity(String.class));
- //r.close();
+ // r.close();
r = resource.printModelDescription(modelId);
modelInformation.setDefaultDescription(r.readEntity(String.class));
- //r.close();
+ // r.close();
r = resource.printModelLicense(modelId);
modelInformation.setLicense(r.readEntity(String.class));
- //r.close();
+ // r.close();
r = resource.printModelCopyright(modelId);
modelInformation.setCopyrightHolder(r.readEntity(String.class));
- //r.close();
+ // r.close();
r = resource.printModelUsage(modelId);
modelInformation.setUsage(r.readEntity(String.class));
- //r.close();
+ // r.close();
r = resource.printModelSampleConfig(modelId);
modelInformation.setSampleConfig(r.readEntity(String.class));
- //r.close();
+ // r.close();
modelInformation.setDateLastRegistered(new Date());
}
resp.close();
client.close();
instancesCompleted++;
- }
- catch(ProcessingException ex)
- {
+ } catch (ProcessingException ex) {
jobReport += ex.getMessage() + "\n";
}
@@ -547,267 +515,261 @@ public class ForecastBean {
taskResult.setMessage(jobReport);
return taskResult;
}
-
+
/**
*
* @return All registered models accessible by ModelId as key
*/
- public Map<String,ModelInformation> getIndexedModelInformation()
- {
+ public Map<String, ModelInformation> getIndexedModelInformation() {
Map<String, ModelInformation> retVal = new HashMap<>();
- for(ModelInformation mi: (List<ModelInformation>) em.createNamedQuery("ModelInformation.findAll").getResultList())
- {
+ for (ModelInformation mi : (List<ModelInformation>) em.createNamedQuery("ModelInformation.findAll")
+ .getResultList()) {
retVal.put(mi.getModelId(), mi);
}
return retVal;
}
-
+
/**
*
* @return All registered models that has its own preprocessor accessible by ModelId as key
*/
- public Map<String,ModelInformation> getIndexedBatchableModelInformation()
- {
+ public Map<String, ModelInformation> getIndexedBatchableModelInformation() {
Map<String, ModelInformation> retVal = new HashMap<>();
this.getBatchableModels().forEach((mi) -> {
retVal.put(mi.getModelId(), mi);
});
return retVal;
}
-
- public ModelInformation getModelInformation(String modelId)
- {
- try
- {
- return em.createNamedQuery("ModelInformation.findByModelId", ModelInformation.class).setParameter("modelId", modelId).getSingleResult();
- }
- catch(NoResultException ex)
- {
+
+ public ModelInformation getModelInformation(String modelId) {
+ try {
+ return em.createNamedQuery("ModelInformation.findByModelId", ModelInformation.class)
+ .setParameter("modelId", modelId).getSingleResult();
+ } catch (NoResultException ex) {
return null;
}
}
-
+
/**
* Stores a forecast configuration, including model specific form fields
+ *
* @param forecastConfiguration
* @param formFields
* @param modelSpecificFormFields
* @return the updated (or freshly created, with brand new Id) forecast configuration
*/
- public ForecastConfiguration storeForecastConfiguration(ForecastConfiguration forecastConfiguration, Map<String, FormField> formFields, Map<String, FormField> modelSpecificFormFields)
- {
+ public ForecastConfiguration storeForecastConfiguration(ForecastConfiguration forecastConfiguration,
+ Map<String, FormField> formFields, Map<String, FormField> modelSpecificFormFields) {
forecastConfiguration.setModelId(formFields.get("modelId").getWebValue());
- forecastConfiguration.setCropOrganismId(em.find(Organism.class, formFields.get("cropOrganismId").getValueAsInteger()));
- forecastConfiguration.setPestOrganismId(em.find(Organism.class, formFields.get("pestOrganismId").getValueAsInteger()));
+ forecastConfiguration
+ .setCropOrganismId(em.find(Organism.class, formFields.get("cropOrganismId").getValueAsInteger()));
+ forecastConfiguration
+ .setPestOrganismId(em.find(Organism.class, formFields.get("pestOrganismId").getValueAsInteger()));
forecastConfiguration.setIsPrivate(formFields.get("isPrivate").getWebValue() != null);
- PointOfInterest locationPoi = em.find(PointOfInterest.class, formFields.get("locationPointOfInterestId").getValueAsInteger());
+ forecastConfiguration.setUseGridWeatherData(formFields.get("useGridWeatherData").getWebValue() != null
+ && formFields.get("useGridWeatherData").getWebValue().equals("true"));
+ PointOfInterest locationPoi =
+ em.find(PointOfInterest.class, formFields.get("locationPointOfInterestId").getValueAsInteger());
forecastConfiguration.setLocationPointOfInterestId(locationPoi);
- PointOfInterest weatherStationPoi = em.find(PointOfInterestWeatherStation.class, formFields.get("weatherStationPointOfInterestId").getValueAsInteger());
+ PointOfInterest weatherStationPoi = em.find(PointOfInterestWeatherStation.class,
+ formFields.get("weatherStationPointOfInterestId").getValueAsInteger());
forecastConfiguration.setWeatherStationPointOfInterestId(weatherStationPoi);
String timeZone = formFields.get("timeZone").getWebValue();
forecastConfiguration.setTimeZone(timeZone);
forecastConfiguration.setDateStart(formFields.get("dateStart").getValueAsDate());
forecastConfiguration.setDateEnd(formFields.get("dateEnd").getValueAsDate());
- VipsLogicUser forecastConfigurationUser = em.find(VipsLogicUser.class, formFields.get("vipsLogicUserId").getValueAsInteger());
+ VipsLogicUser forecastConfigurationUser =
+ em.find(VipsLogicUser.class, formFields.get("vipsLogicUserId").getValueAsInteger());
forecastConfiguration.setVipsCoreUserId(forecastConfigurationUser);
-
+
forecastConfiguration = em.merge(forecastConfiguration);
-
+
// Reset all model configurations, then store the new ones
// As for now: We keep the old ones.
// Reason: If anybody screws up by changing a form, old configurations could get lost
- /*List<ForecastModelConfiguration> configsToRemove = em.createNamedQuery("ForecastModelConfiguration.findByForecastConfigurationId").setParameter("forecastConfigurationId", forecastConfiguration.getForecastConfigurationId()).getResultList();
- for(ForecastModelConfiguration configToRemove: configsToRemove)
- {
- em.remove(configToRemove);
- }
- em.flush();*/
-
+ /*
+ * List<ForecastModelConfiguration> configsToRemove =
+ * em.createNamedQuery("ForecastModelConfiguration.findByForecastConfigurationId").setParameter(
+ * "forecastConfigurationId", forecastConfiguration.getForecastConfigurationId()).getResultList();
+ * for(ForecastModelConfiguration configToRemove: configsToRemove) { em.remove(configToRemove); } em.flush();
+ */
+
// Store new values
- for(FormField field : modelSpecificFormFields.values())
- {
+ for (FormField field : modelSpecificFormFields.values()) {
String deCamelizedFieldName = getDeCamelizedFieldName(forecastConfiguration.getModelId(), field.getName());
- ForecastModelConfiguration forecastModelConfiguration = new ForecastModelConfiguration(forecastConfiguration.getForecastConfigurationId(), deCamelizedFieldName);
+ ForecastModelConfiguration forecastModelConfiguration = new ForecastModelConfiguration(
+ forecastConfiguration.getForecastConfigurationId(), deCamelizedFieldName);
forecastModelConfiguration.setParameterValue(field.getWebValue());
em.merge(forecastModelConfiguration);
}
-
+
return forecastConfiguration;
}
-
+
/**
*
* @param modelId
* @param camelCaseName
* @return MODELID_CAMEL_CASE_NAME
*/
- public String getDeCamelizedFieldName(String modelId, String camelCaseName)
- {
+ public String getDeCamelizedFieldName(String modelId, String camelCaseName) {
StringBuilder deCamelizedFieldName = new StringBuilder(modelId.toUpperCase());
- for(String phrase : camelCaseName.split("(?=\\p{Lu})"))
- {
+ for (String phrase : camelCaseName.split("(?=\\p{Lu})")) {
deCamelizedFieldName.append("_").append(phrase.toUpperCase());
}
-
+
return deCamelizedFieldName.toString();
}
-
-
- public List<ForecastModelConfiguration> getForecastModelConfigurations(Long forecastConfigurationId)
- {
- return em.createNamedQuery("ForecastModelConfiguration.findByForecastConfigurationId").setParameter("forecastConfigurationId", forecastConfigurationId).getResultList();
+
+
+ public List<ForecastModelConfiguration> getForecastModelConfigurations(Long forecastConfigurationId) {
+ return em.createNamedQuery("ForecastModelConfiguration.findByForecastConfigurationId")
+ .setParameter("forecastConfigurationId", forecastConfigurationId).getResultList();
}
-
+
/**
* Deletes a forecast configuration and all results
- * @param forecastConfigurationId
+ *
+ * @param forecastConfigurationId
*/
- public void deleteForecastConfiguration(Long forecastConfigurationId)
- {
+ public void deleteForecastConfiguration(Long forecastConfigurationId) {
// The entity relationship between ForecastConfiguration and ForecastResult
- // is not explicit in EJB model, but in the database there is a foreign key
+ // is not explicit in EJB model, but in the database there is a foreign key
// in forecast_result (and in forecast summary) referencing the forecast_configuration
// Explicit deletion of forecast_results rows is therefore necessary.
ForecastConfiguration forecastConfiguration = em.find(ForecastConfiguration.class, forecastConfigurationId);
- Query q = em.createNativeQuery("DELETE FROM public.forecast_result WHERE forecast_configuration_id=:forecastConfigurationId");
+ Query q = em.createNativeQuery(
+ "DELETE FROM public.forecast_result WHERE forecast_configuration_id=:forecastConfigurationId");
q.setParameter("forecastConfigurationId", forecastConfiguration.getForecastConfigurationId());
q.executeUpdate();
- q = em.createNativeQuery("DELETE FROM public.forecast_summary WHERE forecast_configuration_id=:forecastConfigurationId");
+ q = em.createNativeQuery(
+ "DELETE FROM public.forecast_summary WHERE forecast_configuration_id=:forecastConfigurationId");
q.setParameter("forecastConfigurationId", forecastConfiguration.getForecastConfigurationId());
q.executeUpdate();
// Entries in ForecastNotificationLog referencing the ForecastConfiguration must also be deleted
- q = em.createNativeQuery("DELETE FROM messaging.forecast_notification_log WHERE forecast_configuration_id=:forecastConfigurationId");
+ q = em.createNativeQuery(
+ "DELETE FROM messaging.forecast_notification_log WHERE forecast_configuration_id=:forecastConfigurationId");
q.setParameter("forecastConfigurationId", forecastConfiguration.getForecastConfigurationId());
q.executeUpdate();
em.remove(forecastConfiguration);
-
+
}
-
- public List<ForecastConfiguration> getForecastConfigurationsValidAtTime(Organization organization, Date time)
- {
+
+ public List<ForecastConfiguration> getForecastConfigurationsValidAtTime(Organization organization, Date time) {
Query q = em.createNativeQuery(
- "SELECT * FROM public.forecast_configuration "
+ "SELECT * FROM public.forecast_configuration "
+ "WHERE vips_logic_user_id IN (SELECT user_id FROM public.vips_logic_user WHERE organization_id=:organizationId) "
+ "AND :time BETWEEN date_start AND date_end "
- + "ORDER BY weather_station_point_of_interest_id ASC "
- ,ForecastConfiguration.class);
+ + "ORDER BY weather_station_point_of_interest_id ASC ",
+ ForecastConfiguration.class);
q.setParameter("organizationId", organization.getOrganizationId());
q.setParameter("time", time);
return q.getResultList();
}
-
- public void runForecast(ForecastConfiguration forecastConfiguration) throws PreprocessorException, RunModelException
- {
- ModelRunPreprocessor preprocessor = ModelRunPreprocessorFactory.getModelRunPreprocessor(forecastConfiguration.getModelId());
- if(preprocessor != null)
- {
- ModelConfiguration config = preprocessor.getModelConfiguration(forecastConfiguration);
- ModelRunRequest request = new ModelRunRequest(config);
- Map<String,String> loginInfo = new HashMap<>();
-
- // VIPSLogic logs in on behalf of client
- ModelInformation modelInformation = em.find(ModelInformation.class, config.getModelId());
- if(modelInformation.getVipsCoreInstanceId() == null)
- {
- throw new RunModelException("ERROR: Model " + modelInformation.getDefaultName() + "(" + config.getModelId() + ") is not connected to a VIPSCoreInstance. Please check your server configuration.");
- }
- loginInfo.put("username",modelInformation.getVipsCoreInstanceId().getUsername());
- //loginInfo.put("username","wrongusername");
- loginInfo.put("password",modelInformation.getVipsCoreInstanceId().getPassword());
- request.setLoginInfo(loginInfo);
- // We tell which client this is (the db Id in VIPSCoreManager)
- Integer VIPSCoreUserId = forecastConfiguration.getVipsLogicUserId().getVipsCoreUserIdWithFallback();
- if(VIPSCoreUserId == null)
- {
- throw new PreprocessorException("No user id found for forecast #" + forecastConfiguration.getForecastConfigurationId() +
- ". Possible reason: The user's organization ("
- + forecastConfiguration.getVipsLogicUserId().getOrganizationId().getOrganizationName()
- + ") hasn't got a VIPSCoreUserId.");
- }
- //System.out.println("VIPSCoreUserId = " + VIPSCoreUserId + ", name=" + forecastConfiguration.getVipsLogicUserId().getLastName());
- request.setVipsCoreUserId(VIPSCoreUserId);
- //System.out.println("RunModel for wsId " + forecastConfiguration.getWeatherStationPointOfInterestId());
- //System.out.println(config.toJSON());
- /* DEBUG STUFF */
- /*ObjectMapper mapper = new ObjectMapper();
- try
- {
- System.out.println(mapper.writeValueAsString(request));
- }
- catch(JsonProcessingException ex)
- {
- ex.printStackTrace();
- }*/
-
- Response resp = this.getManagerResource(modelInformation).runModel(config.getModelId(), request);
- if(resp.getStatus() == Response.Status.OK.getStatusCode())
- {
- //System.out.println(resp.readEntity(String.class));
- List<Result> results = (List<Result>) resp.readEntity(new GenericType<List<Result>>(){});
- //System.out.println("ForecastConfigId=" + forecastConfiguration.getForecastConfigurationId() + ", resultsize=" + results.size());
- // We delete all former results before we store the new ones
- forecastBean.storeResults(forecastConfiguration,results);
- }
- else
- {
- throw new RunModelException(resp.readEntity(String.class));
- }
- //System.out.println("Finished runModel for wsId" + forecastConfiguration.getWeatherStationPointOfInterestId());
-
- }
- else
- {
- throw new PreprocessorException("Could not find model with id=|" + forecastConfiguration.getModelId() + "|");
+
+ public void runForecast(ForecastConfiguration forecastConfiguration)
+ throws PreprocessorException, RunModelException {
+ ModelRunPreprocessor preprocessor =
+ ModelRunPreprocessorFactory.getModelRunPreprocessor(forecastConfiguration.getModelId());
+ if (preprocessor != null) {
+ ModelConfiguration config = preprocessor.getModelConfiguration(forecastConfiguration);
+ ModelRunRequest request = new ModelRunRequest(config);
+ Map<String, String> loginInfo = new HashMap<>();
+
+ // VIPSLogic logs in on behalf of client
+ ModelInformation modelInformation = em.find(ModelInformation.class, config.getModelId());
+ if (modelInformation.getVipsCoreInstanceId() == null) {
+ throw new RunModelException(
+ "ERROR: Model " + modelInformation.getDefaultName() + "(" + config.getModelId()
+ + ") is not connected to a VIPSCoreInstance. Please check your server configuration.");
+ }
+ loginInfo.put("username", modelInformation.getVipsCoreInstanceId().getUsername());
+ // loginInfo.put("username","wrongusername");
+ loginInfo.put("password", modelInformation.getVipsCoreInstanceId().getPassword());
+ request.setLoginInfo(loginInfo);
+ // We tell which client this is (the db Id in VIPSCoreManager)
+ Integer VIPSCoreUserId = forecastConfiguration.getVipsLogicUserId().getVipsCoreUserIdWithFallback();
+ if (VIPSCoreUserId == null) {
+ throw new PreprocessorException(
+ "No user id found for forecast #" + forecastConfiguration.getForecastConfigurationId() +
+ ". Possible reason: The user's organization ("
+ + forecastConfiguration.getVipsLogicUserId().getOrganizationId().getOrganizationName()
+ + ") hasn't got a VIPSCoreUserId.");
+ }
+ // System.out.println("VIPSCoreUserId = " + VIPSCoreUserId + ", name=" +
+ // forecastConfiguration.getVipsLogicUserId().getLastName());
+ request.setVipsCoreUserId(VIPSCoreUserId);
+ // System.out.println("RunModel for wsId " + forecastConfiguration.getWeatherStationPointOfInterestId());
+ // System.out.println(config.toJSON());
+ /* DEBUG STUFF */
+ /*
+ * ObjectMapper mapper = new ObjectMapper(); try { System.out.println(mapper.writeValueAsString(request)); }
+ * catch(JsonProcessingException ex) { ex.printStackTrace(); }
+ */
+
+ Response resp = this.getManagerResource(modelInformation).runModel(config.getModelId(), request);
+ if (resp.getStatus() == Response.Status.OK.getStatusCode()) {
+ // System.out.println(resp.readEntity(String.class));
+ List<Result> results = (List<Result>) resp.readEntity(new GenericType<List<Result>>() {});
+ // System.out.println("ForecastConfigId=" + forecastConfiguration.getForecastConfigurationId() + ",
+ // resultsize=" + results.size());
+ // We delete all former results before we store the new ones
+ forecastBean.storeResults(forecastConfiguration, results);
+ } else {
+ throw new RunModelException(resp.readEntity(String.class));
+ }
+ // System.out.println("Finished runModel for wsId" +
+ // forecastConfiguration.getWeatherStationPointOfInterestId());
+
+ } else {
+ throw new PreprocessorException(
+ "Could not find model with id=|" + forecastConfiguration.getModelId() + "|");
}
}
-
- public List<Result> runForecast(ModelConfiguration config, Integer VIPSCoreUserId) throws RunModelException
- {
+
+ public List<Result> runForecast(ModelConfiguration config, Integer VIPSCoreUserId) throws RunModelException {
ModelInformation modelInformation = em.find(ModelInformation.class, config.getModelId());
- if(modelInformation.getVipsCoreInstanceId() == null)
- {
- throw new RunModelException("ERROR: Model " + modelInformation.getDefaultName() + "(" + config.getModelId() + ") is not connected to a VIPSCoreInstance. Please check your server configuration.");
+ if (modelInformation.getVipsCoreInstanceId() == null) {
+ throw new RunModelException("ERROR: Model " + modelInformation.getDefaultName() + "(" + config.getModelId()
+ + ") is not connected to a VIPSCoreInstance. Please check your server configuration.");
}
ModelRunRequest request = new ModelRunRequest(config);
- Map<String,String> loginInfo = new HashMap<>();
+ Map<String, String> loginInfo = new HashMap<>();
// VIPSLogic logs in on behalf of client
- loginInfo.put("username",modelInformation.getVipsCoreInstanceId().getUsername());
- //loginInfo.put("username","wrongusername");
- loginInfo.put("password",modelInformation.getVipsCoreInstanceId().getPassword());
+ loginInfo.put("username", modelInformation.getVipsCoreInstanceId().getUsername());
+ // loginInfo.put("username","wrongusername");
+ loginInfo.put("password", modelInformation.getVipsCoreInstanceId().getPassword());
request.setLoginInfo(loginInfo);
- //System.out.println("VIPSCoreUserId = " + VIPSCoreUserId + ", name=" + forecastConfiguration.getVipsLogicUserId().getLastName());
+ // System.out.println("VIPSCoreUserId = " + VIPSCoreUserId + ", name=" +
+ // forecastConfiguration.getVipsLogicUserId().getLastName());
request.setVipsCoreUserId(VIPSCoreUserId);
- //System.out.println("RunModel for wsId" + forecastConfiguration.getWeatherStationPointOfInterestId());
+ // System.out.println("RunModel for wsId" + forecastConfiguration.getWeatherStationPointOfInterestId());
Response resp = this.getManagerResource(modelInformation).runModel(config.getModelId(), request);
- if(resp.getStatus() == Response.Status.OK.getStatusCode())
- {
- List<Result> results = (List<Result>) resp.readEntity(new GenericType<List<Result>>(){});
- return results;
- }
- else
- {
+ if (resp.getStatus() == Response.Status.OK.getStatusCode()) {
+ return resp.readEntity(new GenericType<>() {});
+ } else {
throw new RunModelException(resp.readEntity(String.class));
}
}
-
+
/**
* Get the interface for REST resources in VIPSCoreManager
- * @return
+ *
+ * @return
*/
- private ManagerResource getManagerResource(ModelInformation modelInformation)
- {
+ private ManagerResource getManagerResource(ModelInformation modelInformation) {
Client client = ClientBuilder.newClient();
WebTarget target = client.target(modelInformation.getVipsCoreInstanceId().getUri());
ResteasyWebTarget rTarget = (ResteasyWebTarget) target;
ManagerResource resource = rTarget.proxy(ManagerResource.class);
return resource;
}
-
- public Kml getForecastsAggregateKml(List<Integer> organizationIds, List<Integer> cropOrganismIds, Date theDate, String serverName, VipsLogicUser user)
- {
- //String iconPath = Globals.PROTOCOL + "://" + serverName + "/public/images/";
- //String iconPath = "//" + serverName + "/public/images/";
+
+ public Kml getForecastsAggregateKml(List<Integer> organizationIds, List<Integer> cropOrganismIds, Date theDate,
+ String serverName, VipsLogicUser user) {
+ // String iconPath = Globals.PROTOCOL + "://" + serverName + "/public/images/";
+ // String iconPath = "//" + serverName + "/public/images/";
String iconPath = "https://logic.vips.nibio.no/public/images/";
// Initialization
final Vec2 hotspot = new Vec2()
@@ -817,66 +779,60 @@ public class ForecastBean {
.withYunits(Units.FRACTION);
final Kml kml = KmlFactory.createKml();
final Document document = kml.createAndSetDocument()
- .withName("Forecast results - aggregates").withDescription("Worst forecasts for each POI");
+ .withName("Forecast results - aggregates").withDescription("Worst forecasts for each POI");
LabelStyle noLabel = new LabelStyle().withScale(0.0);
-
+
Calendar cal = Calendar.getInstance();
cal.setTime(SystemTime.getSystemTime());
-
- for(int i=0;i<=4;i++)
- {
-
+
+ for (int i = 0; i <= 4; i++) {
+
document.createAndAddStyle()
- .withId("warning_type_" + i)
- .withLabelStyle(noLabel)
- .createAndSetIconStyle()
+ .withId("warning_type_" + i)
+ .withLabelStyle(noLabel)
+ .createAndSetIconStyle()
.withScale(1)
.withHotSpot(hotspot)
.createAndSetIcon()
- .withHref(iconPath + "station_icon_status_" +
- (cal.get(Calendar.MONTH) <= 1 ? "winter" :
- cal.get(Calendar.MONTH) == Calendar.DECEMBER ? "xmas" : i)
- + ".png");
+ .withHref(iconPath + "station_icon_status_" +
+ (cal.get(Calendar.MONTH) <= 1 ? "winter"
+ : cal.get(Calendar.MONTH) == Calendar.DECEMBER ? "xmas" : i)
+ + ".png");
}
-
- // Run through forecast configurations
- //Date benchmark = new Date();
+
+ // Run through forecast configurations
+ // Date benchmark = new Date();
List<PointOfInterest> poisWithAggregate = new ArrayList<>();
- if(organizationIds.size() == 1 && organizationIds.get(0).equals(-1))
- {
- em.createNamedQuery("Organization.findAll",Organization.class).getResultStream().forEach(
- org-> poisWithAggregate.addAll(getPointOfInterestForecastsAggregate(org.getOrganizationId(), cropOrganismIds, theDate, user))
- );
- }
- else
- {
+ if (organizationIds.size() == 1 && organizationIds.get(0).equals(-1)) {
+ em.createNamedQuery("Organization.findAll", Organization.class).getResultStream().forEach(
+ org -> poisWithAggregate.addAll(getPointOfInterestForecastsAggregate(org.getOrganizationId(),
+ cropOrganismIds, theDate, user)));
+ } else {
organizationIds.stream().forEach(
- orgId-> poisWithAggregate.addAll(getPointOfInterestForecastsAggregate(orgId, cropOrganismIds, theDate, user))
- );
+ orgId -> poisWithAggregate
+ .addAll(getPointOfInterestForecastsAggregate(orgId, cropOrganismIds, theDate, user)));
}
-
- //System.out.println(this.getClass().getName() + " DEBUG: getPointOfInterestForecastsAggregate took " + (new Date().getTime() - benchmark.getTime()) + " ms to complete.");
-
+
+ // System.out.println(this.getClass().getName() + " DEBUG: getPointOfInterestForecastsAggregate took " + (new
+ // Date().getTime() - benchmark.getTime()) + " ms to complete.");
+
GISEntityUtil gisUtil = new GISEntityUtil();
- for(PointOfInterest poiWithAggregate:poisWithAggregate)
- {
+ for (PointOfInterest poiWithAggregate : poisWithAggregate) {
// If it's an inactive weather station, we don't produce a placemark
- if(poiWithAggregate instanceof PointOfInterestWeatherStation
- && ((PointOfInterestWeatherStation) poiWithAggregate).getActive().equals(Boolean.FALSE)
- )
- {
+ if (poiWithAggregate instanceof PointOfInterestWeatherStation
+ && ((PointOfInterestWeatherStation) poiWithAggregate).getActive().equals(Boolean.FALSE)) {
continue;
}
-
+
// Adding infoUri (direct link to weather station information) as extra attribute
String infoUriValue = "";
- if(poiWithAggregate instanceof PointOfInterestWeatherStation)
- {
- String infoUriExpression = ((PointOfInterestWeatherStation) poiWithAggregate).getWeatherStationDataSourceId().getInfoUriExpression();
- if(!infoUriExpression.isEmpty())
- {
- infoUriValue = String.format(infoUriExpression, ((PointOfInterestWeatherStation) poiWithAggregate).getWeatherStationRemoteId());
+ if (poiWithAggregate instanceof PointOfInterestWeatherStation) {
+ String infoUriExpression = ((PointOfInterestWeatherStation) poiWithAggregate)
+ .getWeatherStationDataSourceId().getInfoUriExpression();
+ if (!infoUriExpression.isEmpty()) {
+ infoUriValue = String.format(infoUriExpression,
+ ((PointOfInterestWeatherStation) poiWithAggregate).getWeatherStationRemoteId());
}
}
Data infoUri = new Data(infoUriValue);
@@ -888,43 +844,44 @@ public class ForecastBean {
dataList.add(stationName);
ExtendedData extendedData = document.createAndSetExtendedData()
.withData(dataList);
-
+
final Placemark placemark = document.createAndAddPlacemark()
- //.withName(poiWithAggregate.getName())
- .withDescription("<![CDATA[Mangler informasjon om varsler for " + poiWithAggregate.getName() + "]]>")
- .withStyleUrl("#warning_type_"
- + (poiWithAggregate.getProperties().get("forecastsAggregate") != null ? poiWithAggregate.getProperties().get("forecastsAggregate") : "0")
- )
- .withId(poiWithAggregate.getPointOfInterestId().toString())
- .withExtendedData(extendedData);
-
-
+ // .withName(poiWithAggregate.getName())
+ .withDescription(
+ "<![CDATA[Mangler informasjon om varsler for " + poiWithAggregate.getName() + "]]>")
+ .withStyleUrl("#warning_type_"
+ + (poiWithAggregate.getProperties().get("forecastsAggregate") != null
+ ? poiWithAggregate.getProperties().get("forecastsAggregate")
+ : "0"))
+ .withId(poiWithAggregate.getPointOfInterestId().toString())
+ .withExtendedData(extendedData);
+
+
final Point point = placemark.createAndSetPoint();
List<Coordinate> coord = point.createAndSetCoordinates();
-
+
coord.add(gisUtil.getKMLCoordinateFromJTSCoordinate(poiWithAggregate.getGisGeom().getCoordinate()));
}
- //System.out.println(kml.marshal());
+ // System.out.println(kml.marshal());
return kml;
}
-
+
/**
- * The table forecast_result_cache always should contain the forecast
- * results from TODAY (The system's time, which is configurable)
+ * The table forecast_result_cache always should contain the forecast results from TODAY (The system's time, which
+ * is configurable)
*/
- public void updateForecastResultCacheTable()
- {
- // Because we might be in completely different time zones,
+ public void updateForecastResultCacheTable() {
+ // Because we might be in completely different time zones,
// Today must stretch from UTC 00:00 -12h to UTC 24:00 +12h, ie 48 hours
Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
cal.setTime(SystemTime.getSystemTime());
cal.set(Calendar.HOUR_OF_DAY, 12);
- cal.set(Calendar.MINUTE,0);
- cal.set(Calendar.SECOND,0);
+ cal.set(Calendar.MINUTE, 0);
+ cal.set(Calendar.SECOND, 0);
cal.set(Calendar.MILLISECOND, 0);
cal.add(Calendar.DATE, -1);
Date startTime = cal.getTime();
- cal.add(Calendar.DATE,2);
+ cal.add(Calendar.DATE, 2);
Date endTime = cal.getTime();
String transactionSQL = new StringBuilder()
.append("BEGIN;")
@@ -940,55 +897,53 @@ public class ForecastBean {
.append(" );")
.append("END;")
.toString();
-
+
Query query = em.createNativeQuery(transactionSQL);
query.setParameter("startTime", startTime);
query.setParameter("endTime", endTime);
query.setParameter("currentDate", SystemTime.getSystemTime());
query.executeUpdate();
}
-
+
/**
- * The table forecast_summary should contain forecast summaries
- * from +/- 10 days related to TODAY (The system's time, which is configurable)
+ * The table forecast_summary should contain forecast summaries from +/- 10 days related to TODAY (The system's
+ * time, which is configurable)
*/
- public void updateForecastSummaryTable(Date currentDate)
- {
- //
+ public void updateForecastSummaryTable(Date currentDate) {
+ //
// Collect all forecasts that are active TODAY
- // This
+ // This
List<ForecastConfiguration> activeForecasts = em.createNamedQuery("ForecastConfiguration.findAllActiveAtDate")
.setParameter("currentDate", currentDate).getResultList();
-
+
// Loop through them
List<Long> activeForecastIds = new ArrayList<>();
Query deleteQ = em.createNativeQuery(
- "DELETE FROM forecast_summary "
- + "WHERE forecast_configuration_id = :forecastConfigurationId");
+ "DELETE FROM forecast_summary "
+ + "WHERE forecast_configuration_id = :forecastConfigurationId");
Query findQ = em.createNamedQuery("ForecastResult.findByForecastConfigurationIdAndPeriod");
- for(ForecastConfiguration forecastConfiguration:activeForecasts)
- {
+ for (ForecastConfiguration forecastConfiguration : activeForecasts) {
activeForecastIds.add(forecastConfiguration.getForecastConfigurationId());
- //System.out.println("forecastConfig id=" + forecastConfiguration.getForecastConfigurationId());
+ // System.out.println("forecastConfig id=" + forecastConfiguration.getForecastConfigurationId());
// Delete previous summaries for the specific forecast (one at a time,
// to prevent loss of data in case of software error)
-
+
deleteQ.setParameter("forecastConfigurationId", forecastConfiguration.getForecastConfigurationId())
- .executeUpdate();
-
- // Get all results that are within +/- 10 days from TODAY (taking
+ .executeUpdate();
+
+ // Get all results that are within +/- 10 days from TODAY (taking
// time zone into account)
- TimeZone forecastTimeZone = forecastConfiguration.getTimeZone() != null ?
- TimeZone.getTimeZone(forecastConfiguration.getTimeZone())
- : TimeZone.getTimeZone(forecastConfiguration.getVipsLogicUserId().getOrganizationId().getDefaultTimeZone())
- ;
+ TimeZone forecastTimeZone = forecastConfiguration.getTimeZone() != null
+ ? TimeZone.getTimeZone(forecastConfiguration.getTimeZone())
+ : TimeZone.getTimeZone(
+ forecastConfiguration.getVipsLogicUserId().getOrganizationId().getDefaultTimeZone());
Calendar cal = Calendar.getInstance(forecastTimeZone);
cal.setTime(currentDate);
cal.add(Calendar.DATE, -10);
cal.set(Calendar.HOUR_OF_DAY, 0);
- cal.set(Calendar.MINUTE,0);
- cal.set(Calendar.SECOND,0);
- cal.set(Calendar.MILLISECOND,0);
+ cal.set(Calendar.MINUTE, 0);
+ cal.set(Calendar.SECOND, 0);
+ cal.set(Calendar.MILLISECOND, 0);
Date tenDaysAgo = cal.getTime();
cal.add(Calendar.DATE, 20);
Date tenDaysAhead = cal.getTime();
@@ -997,174 +952,166 @@ public class ForecastBean {
.setParameter("timeEnd", tenDaysAhead)
.setParameter("forecastConfigurationId", forecastConfiguration.getForecastConfigurationId())
.getResultList();
-
+
// Loop through each day (take timezone into account!), find worst warning
Collections.sort(results);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
format.setTimeZone(forecastTimeZone);
Map<String, Integer> resultDailyAggregate = new HashMap<>();
- for(ForecastResult result:results)
- {
+ for (ForecastResult result : results) {
String dayStamp = format.format(result.getValidTimeStart());
Integer currentWorstCode = resultDailyAggregate.get(dayStamp);
- resultDailyAggregate.put(dayStamp,
- Math.max(
- currentWorstCode != null ? currentWorstCode : 0,
- result.getWarningStatus()
- )
- );
-
+ resultDailyAggregate.put(dayStamp,
+ Math.max(
+ currentWorstCode != null ? currentWorstCode : 0,
+ result.getWarningStatus()));
+
}
- for(String dayStamp: resultDailyAggregate.keySet())
- {
+ for (String dayStamp : resultDailyAggregate.keySet()) {
Date aggregateDay;
try {
// PostgreSQL date is a mess. Need to convert to default timezone to get it right
- aggregateDay = new WeatherUtil().changeDateTimeZone(format.parse(dayStamp), forecastTimeZone, TimeZone.getDefault());
+ aggregateDay = new WeatherUtil().changeDateTimeZone(format.parse(dayStamp), forecastTimeZone,
+ TimeZone.getDefault());
ForecastSummaryPK summaryPK = new ForecastSummaryPK(
- forecastConfiguration.getForecastConfigurationId(),
- aggregateDay
- );
+ forecastConfiguration.getForecastConfigurationId(),
+ aggregateDay);
ForecastSummary summary = new ForecastSummary(summaryPK);
summary.setSummaryCreatedTime(new Date());
summary.setWarningStatus(resultDailyAggregate.get(dayStamp));
em.persist(summary);
} catch (ParseException ex) {
Logger.getLogger(ForecastBean.class.getName()).log(Level.SEVERE, null, ex);
- System.out.println(this.getClass().getName() + " [updateForecastSummaryTable]: Error parsing date " + dayStamp);
+ System.out.println(this.getClass().getName() + " [updateForecastSummaryTable]: Error parsing date "
+ + dayStamp);
}
-
+
}
- //em.flush();
+ // em.flush();
}
-
- if(activeForecastIds != null && ! activeForecastIds.isEmpty())
- {
+
+ if (activeForecastIds != null && !activeForecastIds.isEmpty()) {
// Delete all summaries from not active forecasts
em.createNativeQuery("DELETE FROM forecast_summary "
+ "WHERE forecast_configuration_id NOT IN :activeForecastIds")
.setParameter("activeForecastIds", activeForecastIds)
.executeUpdate();
- }
- else
- {
+ } else {
em.createNativeQuery("TRUNCATE forecast_summary").executeUpdate();
}
}
-
- public List<ForecastConfiguration> getForecastConfigurationWithSummaries(List<Long> forecastConfigurationIds)
- {
+
+ public List<ForecastConfiguration> getForecastConfigurationWithSummaries(List<Long> forecastConfigurationIds) {
List<ForecastConfiguration> retVal = em.createNamedQuery("ForecastConfiguration.findByForecastConfigurationIds")
.setParameter("forecastConfigurationIds", forecastConfigurationIds)
.getResultList();
- for(ForecastConfiguration config: retVal)
- {
+ for (ForecastConfiguration config : retVal) {
Query q = em.createNamedQuery("ForecastSummary.findByForecastConfigurationId");
config.setForecastSummaries(
q.setParameter("forecastConfigurationId", config.getForecastConfigurationId())
- .getResultList()
- );
+ .getResultList());
}
return retVal;
}
-
+
/**
* Finds the forecast configuration summaries for a given organization and that this user has access to
+ *
* @param organizationId
- * @return
+ * @return
*/
- public List<ForecastConfiguration> getForecastConfigurationSummaries(Integer organizationId, VipsLogicUser user)
- {
+ public List<ForecastConfiguration> getForecastConfigurationSummaries(Integer organizationId, VipsLogicUser user) {
List<ForecastSummary> summaries = em.createNamedQuery("ForecastSummary.findByOrganizationId")
.setParameter("organizationId", em.find(Organization.class, organizationId))
.getResultList();
Map<Long, List<ForecastSummary>> mappedSummaries = new HashMap<>();
summaries.forEach((s) -> {
- List<ForecastSummary> summaryForForecast = mappedSummaries.get(s.getForecastSummaryPK().getForecastConfigurationId()) != null ?
- mappedSummaries.get(s.getForecastSummaryPK().getForecastConfigurationId()) :
- new ArrayList<>();
+ List<ForecastSummary> summaryForForecast =
+ mappedSummaries.get(s.getForecastSummaryPK().getForecastConfigurationId()) != null
+ ? mappedSummaries.get(s.getForecastSummaryPK().getForecastConfigurationId())
+ : new ArrayList<>();
summaryForForecast.add(s);
mappedSummaries.put(s.getForecastSummaryPK().getForecastConfigurationId(), summaryForForecast);
});
- if(mappedSummaries.size() > 0)
- {
- List<ForecastConfiguration> configurations = em.createNamedQuery("ForecastConfiguration.findByForecastConfigurationIds").setParameter("forecastConfigurationIds", mappedSummaries.keySet()).getResultList();
+ if (mappedSummaries.size() > 0) {
+ List<ForecastConfiguration> configurations =
+ em.createNamedQuery("ForecastConfiguration.findByForecastConfigurationIds")
+ .setParameter("forecastConfigurationIds", mappedSummaries.keySet()).getResultList();
// Do some authorization.
- configurations = configurations.stream().filter(fc -> this.isUserAuthorizedForForecastConfiguration(fc, user)).collect(Collectors.toList());
-
+ configurations = configurations.stream()
+ .filter(fc -> this.isUserAuthorizedForForecastConfiguration(fc, user)).collect(Collectors.toList());
+
configurations.forEach((conf) -> {
-
+
conf.setForecastSummaries(mappedSummaries.get(conf.getForecastConfigurationId()));
});
return configurations;
- }
- else
- {
+ } else {
return new ArrayList<>();
}
}
/**
- * Selects the "worst" (highest infection risk) warning status for forecasts
- * running at the pois connected to the given organization
+ * Selects the "worst" (highest infection risk) warning status for forecasts running at the pois connected to the
+ * given organization
+ *
* @param organizationId Filter for organization
* @param cropOrganismIds Filter for crops
- * @param theDate Filter for date. If theDate=systemDate, data is fetched from the caching table forecast_result_cache
+ * @param theDate Filter for date. If theDate=systemDate, data is fetched from the caching table
+ * forecast_result_cache
* @param user if not null: Include private forecasts for this user
- * @return
+ * @return
*/
private List<PointOfInterest> getPointOfInterestForecastsAggregate(
- Integer organizationId,
- List<Integer> cropOrganismIds,
+ Integer organizationId,
+ List<Integer> cropOrganismIds,
Date theDate,
- VipsLogicUser user
- ) {
+ VipsLogicUser user) {
// TODO: More precise gathering of POIs...
List<PointOfInterest> pois;
- if(organizationId != null && organizationId > 0)
- {
+ if (organizationId != null && organizationId > 0) {
pois = em.createNamedQuery("PointOfInterest.findForecastLocationsByOrganizationId")
- .setParameter("organizationId", em.find(Organization.class, organizationId))
- .getResultList();
- }
- else
- {
+ .setParameter("organizationId", em.find(Organization.class, organizationId))
+ .getResultList();
+ } else {
pois = em.createNamedQuery("PointOfInterest.findAll").getResultList();
}
-
+
String dateFormat = "yyyy-MM-dd";
SimpleDateFormat format = new SimpleDateFormat(dateFormat);
// If theDate=systemDate, data is fetched from the caching table forecast_result_cache
- String tableName = (format.format(theDate).equals(format.format(SystemTime.getSystemTime()))) ? "forecast_result_cache" : "forecast_result";
- //this.updateForecastResultCacheTable();
+ String tableName =
+ (format.format(theDate).equals(format.format(SystemTime.getSystemTime()))) ? "forecast_result_cache"
+ : "forecast_result";
+ // this.updateForecastResultCacheTable();
Calendar cal = Calendar.getInstance();
cal.setTime(theDate);
WeatherUtil wUtil = new WeatherUtil();
- for(PointOfInterest poi: pois)
- {
+ for (PointOfInterest poi : pois) {
Date midnight = wUtil.normalizeToExactDate(theDate, TimeZone.getTimeZone(poi.getTimeZone()));
cal.setTime(theDate);
cal.add(Calendar.DATE, 1);
Date nextMidnight = cal.getTime();
-
+
String sql = "SELECT max(warning_status) FROM " + tableName + " \n" +
- "WHERE forecast_configuration_id IN( \n" +
- " SELECT forecast_configuration_id \n" +
- " FROM forecast_configuration \n" +
- " WHERE forecast_configuration_id > 0 \n" +
-
- (user == null ?
- " AND is_private IS FALSE \n"
- :" AND (is_private IS FALSE OR (is_private IS TRUE AND vips_logic_user_id=:vipsLogicUserId))"
- ) +
- " AND location_point_of_interest_id=:locationPointOfInterestId \n" +
- (cropOrganismIds != null && ! cropOrganismIds.isEmpty() ? " AND crop_organism_id IN (" + StringUtils.join(cropOrganismIds, ",") + ") " : "") +
- ")\n" +
- "AND valid_time_start between :midnight AND :nextMidnight";
- //System.out.println(poi.getName() + " SQL=" + sql);
+ "WHERE forecast_configuration_id IN( \n" +
+ " SELECT forecast_configuration_id \n" +
+ " FROM forecast_configuration \n" +
+ " WHERE forecast_configuration_id > 0 \n" +
+
+ (user == null ? " AND is_private IS FALSE \n"
+ : " AND (is_private IS FALSE OR (is_private IS TRUE AND vips_logic_user_id=:vipsLogicUserId))")
+ +
+ " AND location_point_of_interest_id=:locationPointOfInterestId \n" +
+ (cropOrganismIds != null && !cropOrganismIds.isEmpty()
+ ? " AND crop_organism_id IN (" + StringUtils.join(cropOrganismIds, ",") + ") "
+ : "")
+ +
+ ")\n" +
+ "AND valid_time_start between :midnight AND :nextMidnight";
+ // System.out.println(poi.getName() + " SQL=" + sql);
Query q = em.createNativeQuery(sql);
- if(user != null)
- {
+ if (user != null) {
q.setParameter("vipsLogicUserId", user);
}
q.setParameter("locationPointOfInterestId", poi.getPointOfInterestId());
@@ -1172,152 +1119,148 @@ public class ForecastBean {
q.setParameter("nextMidnight", nextMidnight);
Integer result = (Integer) q.getSingleResult();
poi.getProperties().put("forecastsAggregate", result);
-
+
}
return pois;
}
/**
* Returns the latest forecast results for given point of interest
+ *
* @param poiId
- * @return
+ * @return
*/
public Map<String, Object> getLatestForecastResultsForPoi(Integer poiId) {
Map<String, Object> retVal = new HashMap<>();
-
+
PointOfInterest poi = em.find(PointOfInterest.class, poiId);
- List<ForecastConfiguration> forecastConfigurations =
- em.createNamedQuery("ForecastConfiguration.findByLocationPointOfInterestId")
- .setParameter("locationPointOfInterestId", poi)
- .getResultList();
-
- HashMap<Long,ForecastConfiguration> mappedForecastConfigurations = new HashMap<>();
-
+ List<ForecastConfiguration> forecastConfigurations =
+ em.createNamedQuery("ForecastConfiguration.findByLocationPointOfInterestId")
+ .setParameter("locationPointOfInterestId", poi)
+ .getResultList();
+
+ HashMap<Long, ForecastConfiguration> mappedForecastConfigurations = new HashMap<>();
+
List<ForecastResult> results = new ArrayList<>();
- for(ForecastConfiguration forecastConfiguration:forecastConfigurations)
- {
- if(forecastConfiguration.getIsPrivate())
- {
+ for (ForecastConfiguration forecastConfiguration : forecastConfigurations) {
+ if (forecastConfiguration.getIsPrivate()) {
continue;
}
mappedForecastConfigurations.put(forecastConfiguration.getForecastConfigurationId(), forecastConfiguration);
Query q = em.createNativeQuery(
"SELECT * FROM forecast_result WHERE forecast_configuration_id = :forecastConfigurationId "
- + "AND valid_time_start = (SELECT max(valid_time_start) FROM forecast_result WHERE forecast_configuration_id = :forecastConfigurationId)",
- ForecastResult.class
- );
+ + "AND valid_time_start = (SELECT max(valid_time_start) FROM forecast_result WHERE forecast_configuration_id = :forecastConfigurationId)",
+ ForecastResult.class);
q.setParameter("forecastConfigurationId", forecastConfiguration.getForecastConfigurationId());
- try
- {
- results.add((ForecastResult)q.getSingleResult());
- }
- catch(NoResultException ex)
- {
+ try {
+ results.add((ForecastResult) q.getSingleResult());
+ } catch (NoResultException ex) {
// This means that the forecast exists, but that there have not been any valid forecast results created
// For example, it might be too early to start any calculation
}
}
-
+
retVal.put("forecastConfigurations", mappedForecastConfigurations);
retVal.put("results", results);
retVal.put("pointOfInterest", poi);
-
+
return retVal;
-
+
}
- public ForecastConfiguration storeNewMultipleForecastConfiguration(Integer weatherStationPointOfInterestId,Map<String, FormField> formFields, Map<String, FormField> modelSpecificFormFields) {
+ public ForecastConfiguration storeNewMultipleForecastConfiguration(Integer weatherStationPointOfInterestId,
+ Map<String, FormField> formFields, Map<String, FormField> modelSpecificFormFields) {
ForecastConfiguration forecastConfiguration = new ForecastConfiguration();
forecastConfiguration.setModelId(formFields.get("modelId").getWebValue());
- forecastConfiguration.setCropOrganismId(em.find(Organism.class, formFields.get("cropOrganismId").getValueAsInteger()));
- forecastConfiguration.setPestOrganismId(em.find(Organism.class, formFields.get("pestOrganismId").getValueAsInteger()));
+ forecastConfiguration
+ .setCropOrganismId(em.find(Organism.class, formFields.get("cropOrganismId").getValueAsInteger()));
+ forecastConfiguration
+ .setPestOrganismId(em.find(Organism.class, formFields.get("pestOrganismId").getValueAsInteger()));
forecastConfiguration.setIsPrivate(formFields.get("isPrivate").getWebValue() != null);
// In the multiple form, location and weatherstation is the same
PointOfInterest locationPoi = em.find(PointOfInterest.class, weatherStationPointOfInterestId);
forecastConfiguration.setLocationPointOfInterestId(locationPoi);
- PointOfInterest weatherStationPoi = em.find(PointOfInterestWeatherStation.class, weatherStationPointOfInterestId);
+ PointOfInterest weatherStationPoi =
+ em.find(PointOfInterestWeatherStation.class, weatherStationPointOfInterestId);
forecastConfiguration.setWeatherStationPointOfInterestId(weatherStationPoi);
String timeZone = formFields.get("timeZone").getWebValue();
forecastConfiguration.setTimeZone(timeZone);
forecastConfiguration.setDateStart(formFields.get("dateStart").getValueAsDate());
forecastConfiguration.setDateEnd(formFields.get("dateEnd").getValueAsDate());
- VipsLogicUser forecastConfigurationUser = em.find(VipsLogicUser.class, formFields.get("vipsLogicUserId").getValueAsInteger());
+ VipsLogicUser forecastConfigurationUser =
+ em.find(VipsLogicUser.class, formFields.get("vipsLogicUserId").getValueAsInteger());
forecastConfiguration.setVipsCoreUserId(forecastConfigurationUser);
-
+
forecastConfiguration = em.merge(forecastConfiguration);
-
+
// Store new values
- for(FormField field : modelSpecificFormFields.values())
- {
+ for (FormField field : modelSpecificFormFields.values()) {
String deCamelizedFieldName = getDeCamelizedFieldName(forecastConfiguration.getModelId(), field.getName());
- ForecastModelConfiguration forecastModelConfiguration = new ForecastModelConfiguration(forecastConfiguration.getForecastConfigurationId(), deCamelizedFieldName);
+ ForecastModelConfiguration forecastModelConfiguration = new ForecastModelConfiguration(
+ forecastConfiguration.getForecastConfigurationId(), deCamelizedFieldName);
forecastModelConfiguration.setParameterValue(field.getWebValue());
em.merge(forecastModelConfiguration);
}
-
+
return forecastConfiguration;
}
public List<ForecastConfiguration> getPrivateForecastConfigurationSummaries(VipsLogicUser user) {
- List<ForecastConfiguration> forecastConfigurations = this.getPrivateForecastConfigurationsForUser(user.getUserId());
+ List<ForecastConfiguration> forecastConfigurations =
+ this.getPrivateForecastConfigurationsForUser(user.getUserId());
// TODO: Filter forecastconfigurations based on criteria (activity, crops, geography etc)
List<ForecastConfiguration> filteredConfigs = new ArrayList<>();
Query q = em.createNamedQuery("ForecastSummary.findByForecastConfigurationId");
- for(ForecastConfiguration config: forecastConfigurations)
- {
+ for (ForecastConfiguration config : forecastConfigurations) {
config.setForecastSummaries(
-
+
q.setParameter("forecastConfigurationId", config.getForecastConfigurationId())
- .getResultList()
- );
- if(config.getForecastSummaries() != null && !config.getForecastSummaries().isEmpty())
- {
+ .getResultList());
+ if (config.getForecastSummaries() != null && !config.getForecastSummaries().isEmpty()) {
filteredConfigs.add(config);
}
}
return filteredConfigs;
}
-
+
/**
*
* @return only the models that have an existing preprocessor in VIPSLogic
*/
- public List<ModelInformation> getBatchableModels()
- {
+ public List<ModelInformation> getBatchableModels() {
List<ModelInformation> modelInfos = em.createNamedQuery("ModelInformation.findAll").getResultList();
return modelInfos.stream()
- .filter(modelInfo -> ModelRunPreprocessorFactory.getModelRunPreprocessor(modelInfo.getModelId()) != null)
+ .filter(modelInfo -> ModelRunPreprocessorFactory
+ .getModelRunPreprocessor(modelInfo.getModelId()) != null)
.collect(Collectors.toList());
}
public void deleteAllPrivateForecastConfigurationsForUser(VipsLogicUser user) {
-
+
em.createNativeQuery(
"DELETE FROM public.forecast_result WHERE forecast_configuration_id IN "
- + "("
- + " SELECT forecast_configuration_id "
- + " FROM public.forecast_configuration "
- + " WHERE is_private IS TRUE "
- + " AND vips_logic_user_id = :userId "
- + ")"
- )
- .setParameter("userId", user.getUserId())
- .executeUpdate();
-
+ + "("
+ + " SELECT forecast_configuration_id "
+ + " FROM public.forecast_configuration "
+ + " WHERE is_private IS TRUE "
+ + " AND vips_logic_user_id = :userId "
+ + ")")
+ .setParameter("userId", user.getUserId())
+ .executeUpdate();
+
em.createNativeQuery(
"DELETE FROM public.forecast_configuration "
- + " WHERE is_private IS TRUE "
- + " AND vips_logic_user_id = :userId"
- )
- .setParameter("userId", user.getUserId())
- .executeUpdate();
+ + " WHERE is_private IS TRUE "
+ + " AND vips_logic_user_id = :userId")
+ .setParameter("userId", user.getUserId())
+ .executeUpdate();
}
/**
*
* @param modelId
* @param year
- * @return
+ * @return
*/
public List<ForecastConfiguration> getForecastConfigurationsForModel(String modelId, Integer year) {
return em.createNamedQuery("ForecastConfiguration.findByModelIdAndYear")
diff --git a/src/main/java/no/nibio/vips/logic/controller/session/PointOfInterestBean.java b/src/main/java/no/nibio/vips/logic/controller/session/PointOfInterestBean.java
index 7c82e925fe6a7c595ecd996b5fbbcab09b7f0182..22229cf81bc468edeed0512b3f2a87923bec3c42 100755
--- a/src/main/java/no/nibio/vips/logic/controller/session/PointOfInterestBean.java
+++ b/src/main/java/no/nibio/vips/logic/controller/session/PointOfInterestBean.java
@@ -263,10 +263,54 @@ public class PointOfInterestBean {
return kml;
}
+ public WeatherStationDataSource getWeatherStationDataSource(Integer weatherStationDataSourceId)
+ {
+ return em.find(WeatherStationDataSource.class, weatherStationDataSourceId);
+ }
+
public List<WeatherStationDataSource> getWeatherStationDataSources() {
return em.createNamedQuery("WeatherStationDataSource.findAll").getResultList();
}
+ public List<WeatherStationDataSource> getGridWeatherStationDataSources() {
+ return em.createNamedQuery("WeatherStationDataSource.findGridSources").getResultList();
+ }
+
+ /**
+ * Checks if the weather station data source can be deleted from the system. Criteria:
+ * <ul>
+ * <li>Not referenced from public.point_of_interest_weather_station</li>
+ * <li>Not referenced from public.organization</li>
+ * </ul>
+ * @param weatherStationDataSource
+ * @return
+ */
+ public Boolean isweatherStationDataSourceDeleteable(WeatherStationDataSource weatherStationDataSource)
+ {
+ Query poiRefQuery = em.createQuery("SELECT COUNT(*) FROM PointOfInterestWeatherStation poiws where poiws.weatherStationDataSourceId = :weatherStationDataSourceId");
+ Long weatherStationReferences = (Long) poiRefQuery.setParameter("weatherStationDataSourceId", weatherStationDataSource).getSingleResult();
+ if(weatherStationReferences > 0)
+ {
+ return false;
+ }
+
+ Query orgRefQuery = em.createQuery("SELECT COUNT(*) FROM Organization o where o.defaultGridWeatherStationDataSource = :weatherStationDataSourceId");
+ Long organizationReferences = (Long) orgRefQuery.setParameter("weatherStationDataSourceId", weatherStationDataSource).getSingleResult();
+ return organizationReferences == 0;
+ }
+
+ public void deleteWeatherStationDataSource(WeatherStationDataSource weatherStationDataSource)
+ {
+ WeatherStationDataSource sourceToDelete = em.find(WeatherStationDataSource.class, weatherStationDataSource.getWeatherStationDataSourceId());
+ em.remove(sourceToDelete);
+ }
+
+ public WeatherStationDataSource storeWeatherStationDataSource(WeatherStationDataSource weatherStationDataSource)
+ {
+ weatherStationDataSource = em.merge(weatherStationDataSource);
+ return weatherStationDataSource;
+ }
+
public PointOfInterestWeatherStation storeWeatherStation(PointOfInterestWeatherStation weatherStation) {
weatherStation = em.merge(weatherStation);
return weatherStation;
diff --git a/src/main/java/no/nibio/vips/logic/controller/session/SessionControllerGetter.java b/src/main/java/no/nibio/vips/logic/controller/session/SessionControllerGetter.java
index 399bd43b255d37c6acd20106083a2fdec34849f6..be60d07964cf56c465790019eed7d95559208aa7 100644
--- a/src/main/java/no/nibio/vips/logic/controller/session/SessionControllerGetter.java
+++ b/src/main/java/no/nibio/vips/logic/controller/session/SessionControllerGetter.java
@@ -34,7 +34,7 @@ public class SessionControllerGetter {
// This obviously has to be changed when changing the application name in Maven
// TODO: Refactor out to System properties (e.g. in standalone.xml in JBoss/WildFly)
- public static final String JNDI_PATH = "java:global/VIPSLogic-2024.2/";
+ public static final String JNDI_PATH = "java:global/VIPSLogic-2024.3/";
public static SchedulingBean getSchedulingBean()
{
diff --git a/src/main/java/no/nibio/vips/logic/entity/ForecastConfiguration.java b/src/main/java/no/nibio/vips/logic/entity/ForecastConfiguration.java
index a17f2fbadaa35794dd3de13e10a6883d024776f7..7be6c11a3b2a35155dc61cf1421ca573a8c7dfba 100755
--- a/src/main/java/no/nibio/vips/logic/entity/ForecastConfiguration.java
+++ b/src/main/java/no/nibio/vips/logic/entity/ForecastConfiguration.java
@@ -50,7 +50,7 @@ import org.hibernate.annotations.TypeDef;
import org.hibernate.annotations.TypeDefs;
/**
- * @copyright 2014-2016 <a href="http://www.nibio.no/">NIBIO</a>
+ * @copyright 2014-2024 <a href="http://www.nibio.no/">NIBIO</a>
* @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
@Entity
@@ -123,7 +123,17 @@ public class ForecastConfiguration implements Serializable, Comparable {
private Organism pestOrganismId;
@Column(name = "is_private")
private Boolean isPrivate;
+ @Column(name = "use_grid_weather_data")
+ private Boolean useGridWeatherData;
+ public Boolean getUseGridWeatherData() {
+ return useGridWeatherData != null ? useGridWeatherData : Boolean.FALSE;
+ }
+
+ public void setUseGridWeatherData(Boolean useGridWeatherData) {
+ this.useGridWeatherData = useGridWeatherData;
+ }
+
@Type(type = "IntegerArray")
@Column(name = "grid_weather_station_point_of_interest_ids")
private Integer[] gridWeatherStationPointOfInterestIds;
@@ -247,6 +257,29 @@ public class ForecastConfiguration implements Serializable, Comparable {
* @return the weatherStationPointOfInterestId
*/
public PointOfInterest getWeatherStationPointOfInterestId() {
+ if( this.getUseGridWeatherData() && this.getVipsLogicUserId().getOrganizationId().getDefaultGridWeatherStationDataSource() != null)
+ {
+ // Create a "weather station" with coordinates from the location
+ // And the default grid weather data source for the current organization (get location owner's organization)
+ PointOfInterestWeatherStation gridStation = new PointOfInterestWeatherStation();
+ gridStation.setLatitude(this.getLocationPointOfInterestId().getLatitude());
+ gridStation.setLongitude(this.getLocationPointOfInterestId().getLongitude());
+ gridStation.setName("GRID-punkt for " + this.getLocationPointOfInterestId().getName()); // TODO Translate!!!
+ gridStation.setTimeZone(this.getLocationPointOfInterestId().getTimeZone());
+ gridStation.setWeatherStationDataSourceId(this.getVipsLogicUserId().getOrganizationId().getDefaultGridWeatherStationDataSource());
+ gridStation.setUser(this.getVipsLogicUserId());
+ gridStation.setWeatherForecastProviderId(null);
+ gridStation.setWeatherStationRemoteId(gridStation.getLongitude() + "_" + gridStation.getLatitude());
+ gridStation.setGisGeom(this.getLocationPointOfInterestId().getGisGeom());
+ gridStation.setAltitude(this.getLocationPointOfInterestId().getAltitude());
+ gridStation.setCountryCode(this.getLocationPointOfInterestId().getCountryCode());
+ gridStation.setIsForecastLocation(true);
+ gridStation.setPointOfInterestTypeId(PointOfInterestType.POINT_OF_INTEREST_TYPE_WEATHER_STATION);
+ gridStation.setUser(this.getVipsLogicUserId());
+ gridStation.setProperties(this.getLocationPointOfInterestId().getProperties());
+ return gridStation;
+ }
+
return weatherStationPointOfInterestId;
}
diff --git a/src/main/java/no/nibio/vips/logic/entity/Organization.java b/src/main/java/no/nibio/vips/logic/entity/Organization.java
index 4e5d1bd8be98829b6d203075f4f563e9e030607b..4e5d7e67b0154adde1a7b7ca33c8fba2bd6b438f 100755
--- a/src/main/java/no/nibio/vips/logic/entity/Organization.java
+++ b/src/main/java/no/nibio/vips/logic/entity/Organization.java
@@ -111,6 +111,21 @@ public class Organization implements Serializable {
@OneToOne
@JsonIgnore
private VipsLogicUser archiveUser;
+
+ @JoinColumn(name = "default_grid_weather_station_data_source_id", referencedColumnName = "weather_station_data_source_id")
+ @ManyToOne
+ private WeatherStationDataSource defaultGridWeatherStationDataSource;
+
+ public WeatherStationDataSource getDefaultGridWeatherStationDataSource() {
+ return defaultGridWeatherStationDataSource;
+ }
+
+ public void setDefaultGridWeatherStationDataSource(WeatherStationDataSource defaultGridWeatherStationDataSource) {
+ this.defaultGridWeatherStationDataSource = defaultGridWeatherStationDataSource;
+ }
+
+
+
public Organization() {
}
diff --git a/src/main/java/no/nibio/vips/logic/entity/PointOfInterest.java b/src/main/java/no/nibio/vips/logic/entity/PointOfInterest.java
index 33aaf8a0e4d5dcbe88baf9394b921bed4de517c0..1994194e6297c20f3c8f1ca459f539f0283955d7 100755
--- a/src/main/java/no/nibio/vips/logic/entity/PointOfInterest.java
+++ b/src/main/java/no/nibio/vips/logic/entity/PointOfInterest.java
@@ -91,8 +91,17 @@ public class PointOfInterest implements Serializable, Comparable {
private Boolean isForecastLocation;
private Integer pointOfInterestTypeId;
private Date lastEditedTime;
+ private Boolean isPrivate;
-
+ @Column(name = "is_private")
+ public Boolean getIsPrivate() {
+ return isPrivate;
+ }
+
+ public void setIsPrivate(Boolean isPrivate) {
+ this.isPrivate = isPrivate;
+ }
+
// For attaching ad-hoc properties
// e.g. Worst warning for map
private Map<String, Object> properties;
diff --git a/src/main/java/no/nibio/vips/logic/entity/WeatherStationDataSource.java b/src/main/java/no/nibio/vips/logic/entity/WeatherStationDataSource.java
index 9fe247f205036fd792eebe65ab0e6342a2625510..b31bd3aad0c4a63cf73652253fc942660688f974 100755
--- a/src/main/java/no/nibio/vips/logic/entity/WeatherStationDataSource.java
+++ b/src/main/java/no/nibio/vips/logic/entity/WeatherStationDataSource.java
@@ -40,6 +40,7 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
@NamedQueries({
@NamedQuery(name = "WeatherStationDataSource.findAll", query = "SELECT w FROM WeatherStationDataSource w"),
+ @NamedQuery(name = "WeatherStationDataSource.findGridSources", query = "SELECT w FROM WeatherStationDataSource w WHERE w.isGrid IS TRUE"),
@NamedQuery(name = "WeatherStationDataSource.findByWeatherStationDataSourceId", query = "SELECT w FROM WeatherStationDataSource w WHERE w.weatherStationDataSourceId = :weatherStationDataSourceId"),
@NamedQuery(name = "WeatherStationDataSource.findByName", query = "SELECT w FROM WeatherStationDataSource w WHERE w.name = :name"),
@NamedQuery(name = "WeatherStationDataSource.findByDefaultDescription", query = "SELECT w FROM WeatherStationDataSource w WHERE w.defaultDescription = :defaultDescription"),
@@ -68,6 +69,18 @@ public class WeatherStationDataSource implements Serializable {
@Size(max = 1024)
@Column(name = "info_uri_expression")
private String infoUriExpression;
+ @Column(name = "is_grid")
+ private Boolean isGrid;
+
+
+
+ public Boolean getIsGrid() {
+ return isGrid;
+ }
+
+ public void setIsGrid(Boolean isGrid) {
+ this.isGrid = isGrid;
+ }
public WeatherStationDataSource() {
}
diff --git a/src/main/java/no/nibio/vips/logic/modules/barleynetblotch/BarleyNetBlotchModelService.java b/src/main/java/no/nibio/vips/logic/modules/barleynetblotch/BarleyNetBlotchModelService.java
index 58b9c26ed68b2b13de307c5f059fac87327f9f3c..1d30bc9b07ed320f5bd8aa4d583d4859e002356c 100755
--- a/src/main/java/no/nibio/vips/logic/modules/barleynetblotch/BarleyNetBlotchModelService.java
+++ b/src/main/java/no/nibio/vips/logic/modules/barleynetblotch/BarleyNetBlotchModelService.java
@@ -19,11 +19,8 @@
package no.nibio.vips.logic.modules.barleynetblotch;
import com.webcohesion.enunciate.metadata.Facet;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.TimeZone;
+
+import java.util.*;
import javax.ejb.EJB;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
@@ -38,10 +35,7 @@ import no.nibio.vips.entity.ModelConfiguration;
import no.nibio.vips.entity.Result;
import no.nibio.vips.entity.WeatherObservation;
import no.nibio.vips.logic.controller.session.ForecastBean;
-import no.nibio.vips.logic.entity.Organism;
-import no.nibio.vips.logic.entity.Organization;
-import no.nibio.vips.logic.entity.PointOfInterestWeatherStation;
-import no.nibio.vips.logic.entity.Preparation;
+import no.nibio.vips.logic.entity.*;
import no.nibio.vips.logic.util.RunModelException;
import no.nibio.vips.logic.util.SystemTime;
import no.nibio.vips.observation.ObservationImpl;
@@ -50,6 +44,7 @@ import no.nibio.vips.util.ParseRESTParamUtil;
import no.nibio.vips.util.WeatherElements;
import no.nibio.vips.util.weather.WeatherDataSourceException;
import no.nibio.vips.util.weather.WeatherDataSourceUtil;
+import org.slf4j.LoggerFactory;
/**
* @copyright 2015 <a href="http://www.nibio.no/">NIBIO</a>
@@ -58,6 +53,8 @@ import no.nibio.vips.util.weather.WeatherDataSourceUtil;
@Path("rest/barleynetblotchmodel")
@Facet("restricted")
public class BarleyNetBlotchModelService {
+ private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(BarleyNetBlotchModelService.class);
+
private final static String VIPSCOREMANAGER_URL = System.getProperty("no.nibio.vips.logic.VIPSCOREMANAGER_URL");
@PersistenceContext(unitName="VIPSLogic-PU")
@@ -140,6 +137,9 @@ public class BarleyNetBlotchModelService {
public Response runModel(
@PathParam("organizationId") Integer organizationId,
@QueryParam("timeZone") String timeZoneStr,
+ @QueryParam("weatherDataSourceType") String weatherDataSourceType,
+ @QueryParam("latitude") String latitude,
+ @QueryParam("longitude") String longitude,
@QueryParam("weatherStationId") Integer weatherStationId,
@QueryParam("sowingDate") String sowingDateStr,
@QueryParam("cropId") Integer cropOrganismId,
@@ -168,54 +168,74 @@ public class BarleyNetBlotchModelService {
Date sprayingDate = parseUtil.parseISODate(sprayingDateStr, timeZone);
Integer preparationId = parseUtil.parseInteger(preparationIdStr);
Double preparationDose = parseUtil.parseDouble(preparationDoseStr);
-
+ Double latitudeDouble = parseUtil.parseDouble(latitude);
+ Double longitudeDouble = parseUtil.parseDouble(longitude);
+
+ if(weatherDataSourceType == null) {
+ return Response.status(Response.Status.BAD_REQUEST).entity("WeatherDataSourceType (grid or weather station) is required").build();
+ }
+
+ // Must get the VIPSCore user id for this organization
+ Organization org = em.find(Organization.class, organizationId);
+ Integer VIPSCoreUserId = org.getDefaultVipsCoreUserId();
+
// Build model configuration
ModelConfiguration config = new ModelConfiguration();
config.setModelId("BARLEYNETB");
- // Get weather data from weather station
- PointOfInterestWeatherStation weatherStation = em.find(PointOfInterestWeatherStation.class, weatherStationId);
+
WeatherDataSourceUtil wsdUtil = new WeatherDataSourceUtil();
-
- // End date for weather data depends on season
- // We try to add 5 months to the sowing date. If thats in the future,
- // We add 10 days to today
- Date dateOfLastWeatherData;
- Calendar cal = Calendar.getInstance(timeZone);
- cal.setTime(sowingDate);
- cal.add(Calendar.MONTH, 5);
- Date fiveMonthsAfterSowingDate = cal.getTime();
- if(fiveMonthsAfterSowingDate.after(SystemTime.getSystemTime()))
- {
- cal.setTime(SystemTime.getSystemTime());
- cal.add(Calendar.DATE, 10);
- dateOfLastWeatherData = cal.getTime();
- }
- else
- {
- dateOfLastWeatherData = fiveMonthsAfterSowingDate;
- }
+ Date endDateForWeatherData = calculateEndDateForWeatherData(timeZone, sowingDate);
- List<WeatherObservation> observations;
- try {
- observations = wsdUtil.getWeatherObservations(
+ List<WeatherObservation> observations = new ArrayList<>();
+ if ("weatherstation".equals(weatherDataSourceType.trim())) {
+ PointOfInterestWeatherStation weatherStation =
+ em.find(PointOfInterestWeatherStation.class, weatherStationId);
+ LOGGER.info("Run model with weatherdata from weatherstation {}", weatherStation.getName());
+ try {
+ observations = wsdUtil.getWeatherObservations(
weatherStation,
WeatherObservation.LOG_INTERVAL_ID_1H,
- new String[]{
+ new String[] {
WeatherElements.TEMPERATURE_MEAN,
WeatherElements.PRECIPITATION
},
- sowingDate,
- dateOfLastWeatherData
- );
- } catch (WeatherDataSourceException ex) {
- return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(ex.getMessage()).build();
- }
-
- if(observations == null || observations.isEmpty())
- {
- return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity("Could not find weather data for weather station with id=" + weatherStationId).build();
+ sowingDate,
+ endDateForWeatherData
+ );
+ } catch (WeatherDataSourceException ex) {
+ return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(ex.getMessage()).build();
+ }
+ if (observations == null || observations.isEmpty()) {
+ return Response.status(Response.Status.INTERNAL_SERVER_ERROR)
+ .entity("Could not find weather data for weather station with id=" + weatherStationId).build();
+ }
+ } else if("grid".equals(weatherDataSourceType.trim())) {
+ LOGGER.info("Run model with weatherdata for latitude={} and longitude={}", latitude, longitude);
+ String datafetchUriExpression =
+ org.getDefaultGridWeatherStationDataSource().getDatafetchUriExpression();
+ try {
+ observations = wsdUtil.getWeatherObservations(String.format(datafetchUriExpression, longitude + "_" + latitude),
+ WeatherObservation.LOG_INTERVAL_ID_1H,
+ new String[] {
+ WeatherElements.TEMPERATURE_MEAN,
+ WeatherElements.PRECIPITATION
+ },
+ sowingDate,
+ endDateForWeatherData,
+ timeZone,
+ Boolean.FALSE,
+ new HashSet<>(Collections.singletonList(WeatherObservation.LOG_INTERVAL_ID_1H))
+ );
+ } catch (WeatherDataSourceException ex) {
+ LOGGER.error("Exception while getting observations for lat={} lon={}", latitude, longitude, ex);
+ return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(ex.getMessage()).build();
+ }
+ if (observations == null || observations.isEmpty()) {
+ return Response.status(Response.Status.INTERNAL_SERVER_ERROR)
+ .entity(String.format("Could not find weather data for lat=%s lon=%s between %s and %s", latitude, longitude, sowingDate, endDateForWeatherData)).build();
+ }
}
-
+
// Mandatory parameters
config.setConfigParameter("observations", observations);
config.setConfigParameter("timeZone", timeZone.getID());
@@ -241,11 +261,6 @@ public class BarleyNetBlotchModelService {
config.setConfigParameter("spraying", spraying);
}
-
- // Must get the VIPSCore user id for this organization
- Organization org = em.find(Organization.class, organizationId);
- Integer VIPSCoreUserId = org.getDefaultVipsCoreUserId();
-
List<Result> results;
try
{
@@ -257,6 +272,32 @@ public class BarleyNetBlotchModelService {
}
return Response.ok().entity(results).build();
}
-
-
+
+ /**
+ * End date for weather data depends on season. We try to add 5 months to the sowing date.
+ * If the resulting date is in the future, we add 10 days to today.
+ *
+ * @param timeZone The current timezone
+ * @param sowingDate The sowing date
+ * @return The end date for weather data
+ */
+ private static Date calculateEndDateForWeatherData(TimeZone timeZone, Date sowingDate) {
+ Date dateOfLastWeatherData;
+ Calendar cal = Calendar.getInstance(timeZone);
+ cal.setTime(sowingDate);
+ cal.add(Calendar.MONTH, 5);
+ Date fiveMonthsAfterSowingDate = cal.getTime();
+ if(fiveMonthsAfterSowingDate.after(SystemTime.getSystemTime()))
+ {
+ cal.setTime(SystemTime.getSystemTime());
+ cal.add(Calendar.DATE, 10);
+ dateOfLastWeatherData = cal.getTime();
+ }
+ else
+ {
+ dateOfLastWeatherData = fiveMonthsAfterSowingDate;
+ }
+ return dateOfLastWeatherData;
+ }
+
}
diff --git a/src/main/java/no/nibio/vips/logic/scheduling/VipsLogicTaskFactory.java b/src/main/java/no/nibio/vips/logic/scheduling/VipsLogicTaskFactory.java
index 66ae454af9550f24ce0552d5de6bb17d9cd2e87f..bf4bb80ee5e27f560c1ae23298fdc6b4385bc7c5 100755
--- a/src/main/java/no/nibio/vips/logic/scheduling/VipsLogicTaskFactory.java
+++ b/src/main/java/no/nibio/vips/logic/scheduling/VipsLogicTaskFactory.java
@@ -49,7 +49,7 @@ public class VipsLogicTaskFactory {
public static final int RUN_FORECAST_CONFIGURATIONS_BY_ID_TASK = 9;
- private final static int[] ALL_TASK_IDS = {1,2,3,4,5,6,7,8,9};
+ private final static int[] ALL_TASK_IDS = {1,2,3,4,5,6,7,9};
private final static int[] ORGANIZATION_ADMIN_TASK_IDS = {7};
diff --git a/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/AppleScabModelPreprocessor.java b/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/AppleScabModelPreprocessor.java
index 374785eb0666c660d5b7d2800a67beb629064f17..230ffcb73ab8db055e90f5b57b72005caf1551c1 100755
--- a/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/AppleScabModelPreprocessor.java
+++ b/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/AppleScabModelPreprocessor.java
@@ -27,6 +27,10 @@ import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.TimeZone;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import no.nibio.vips.entity.ModelConfiguration;
import no.nibio.vips.entity.WeatherObservation;
import no.nibio.vips.logic.entity.ForecastConfiguration;
@@ -48,17 +52,13 @@ import no.nibio.vips.util.weather.WeatherDataSourceUtil;
* @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class AppleScabModelPreprocessor extends ModelRunPreprocessor{
-
- private final boolean DEBUG = false;
+ private static Logger LOGGER = LoggerFactory.getLogger(AppleScabModelPreprocessor.class);
public final static String APPLESCABM_START_DATE_ASCOSPORE_MATURITY = "APPLESCABM_START_DATE_ASCOSPORE_MATURITY";
@Override
public ModelConfiguration getModelConfiguration(ForecastConfiguration configuration) throws PreprocessorException
{
- if(DEBUG)
- {
- System.out.println("getModelConfiguration");
- }
+ LOGGER.debug("AppleScabModelPreprocessor.getModelConfiguration() called");
//configuration.getDateStart();
PointOfInterestWeatherStation weatherStation = (PointOfInterestWeatherStation) configuration.getWeatherStationPointOfInterestId();
// What timezone is the calculation for
@@ -92,10 +92,8 @@ public class AppleScabModelPreprocessor extends ModelRunPreprocessor{
// Use Jackson to parse JSON from server
// Weather data collections
- if(DEBUG)
- {
- System.out.println("Getting weather data at " + new Date().toString());
- }
+ LOGGER.debug("Getting weather data at " + new Date().toString());
+
WeatherDataSourceUtil wdsUtil = new WeatherDataSourceUtil();
List<WeatherObservation> observations;
try {
@@ -135,22 +133,17 @@ public class AppleScabModelPreprocessor extends ModelRunPreprocessor{
// We do nothing
}
-
- if(DEBUG)
- {
- System.out.println("Finished getting weather data at " + new Date().toString());
- }
+ LOGGER.debug("Finished getting weather data at " + new Date().toString());
+
try {
observations = validateAndSanitizeObservations(observations, startDateAscosporeMaturity);
} catch (ConfigValidationException | WeatherObservationListException ex) {
//ex.printStackTrace();
throw new PreprocessorException(ex.getMessage());
}
- if(DEBUG)
- {
- System.out.println("Observations=" + observations.toString());
- }
+ //LOGGER.debug("Observations=" + observations.toString());
+
// Create the complete model configuration object
ModelConfiguration retVal = new ModelConfiguration();
@@ -176,11 +169,7 @@ public class AppleScabModelPreprocessor extends ModelRunPreprocessor{
* @throws WeatherObservationListException
*/
private List<WeatherObservation> validateAndSanitizeObservations(List<WeatherObservation> observations, Date firstTimeStamp) throws ConfigValidationException, WeatherObservationListException {
- if(DEBUG)
- {
- System.out.println("validateAndSanitizeObservations");
- }
-
+
WeatherUtil wUtil = new WeatherUtil();
// First we remove all duplicates
@@ -241,14 +230,7 @@ public class AppleScabModelPreprocessor extends ModelRunPreprocessor{
// Problems with weather observations
- // Holes in series
- if(DEBUG)
- {
- System.out.println("checkForAndFixHourlyTimeSeriesHoles");
- //System.out.println(wUtil.dumpWeatherObservationList(RR));
- }
-
-
+
// Unequal length of lists
if (
@@ -257,6 +239,7 @@ public class AppleScabModelPreprocessor extends ModelRunPreprocessor{
|| RR.size() != TM.size()
)
{
+ LOGGER.debug("Unequal lists lengt: RR=" + RR.size() + ", TM=" + TM.size() + ", BT=" + BT.size());
UM = wUtil.fixHourlyValuesForParameters(
UM,
new HashSet(Arrays.asList("UM")),
diff --git a/src/main/java/no/nibio/vips/logic/scheduling/tasks/RunAllForecastConfigurationsTask.java b/src/main/java/no/nibio/vips/logic/scheduling/tasks/RunAllForecastConfigurationsTask.java
index 7a5cf687a4e6fa2e3e9c1de4827fe9b4c94b3953..7f08a0391eb1dce9730b5d8935a9892f62606fbc 100755
--- a/src/main/java/no/nibio/vips/logic/scheduling/tasks/RunAllForecastConfigurationsTask.java
+++ b/src/main/java/no/nibio/vips/logic/scheduling/tasks/RunAllForecastConfigurationsTask.java
@@ -24,6 +24,10 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import javax.ejb.EJB;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import no.nibio.vips.i18n.I18nImpl;
import no.nibio.vips.logic.controller.session.ForecastBean;
import no.nibio.vips.logic.controller.session.PointOfInterestBean;
@@ -46,6 +50,8 @@ import no.nibio.web.forms.FormField;
* @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class RunAllForecastConfigurationsTask extends VipsLogicTask{
+
+ private static Logger LOGGER = LoggerFactory.getLogger(RunAllForecastConfigurationsTask.class);
private I18nImpl i18n;
//private boolean DEBUG=true;
@@ -91,24 +97,34 @@ public class RunAllForecastConfigurationsTask extends VipsLogicTask{
noForecastConfigurationsFound = false;
for(ForecastConfiguration forecastConfiguration:currentForecastConfigurations)
{
- if(
- weatherStationPointOfInterestId == null
- || weatherStationPointOfInterestId <= 0
- || (forecastConfiguration.getWeatherStationPointOfInterestId() != null && forecastConfiguration.getWeatherStationPointOfInterestId().getPointOfInterestId().equals(weatherStationPointOfInterestId))
+ if(forecastConfiguration.getUseGridWeatherData() && forecastConfiguration.getWeatherStationPointOfInterestId() == null)
+ {
+ errorMessage.append(
+ SchedulingUtil.createSchedulingMessageHTML(
+ "Error with forecast #" + forecastConfiguration.getForecastConfigurationId() + " (" + forecastConfiguration.getLocationPointOfInterestId().getName() + " - " + modelInformationMap.get(forecastConfiguration.getModelId()).getDefaultName() + ")",
+ "The forecast is configured to use gridded weather data, but the organization " + forecastConfiguration.getVipsLogicUserId().getOrganizationId().getOrganizationName() + " has not set its gridded weather data source. Please contact the system administrator.",
+ SchedulingUtil.MESSAGE_STATUS_WARNING
)
+ );
+ totalNumberofForecastConfigurations++;
+ }
+ else if(
+ weatherStationPointOfInterestId == null
+ || weatherStationPointOfInterestId <= 0
+ || (
+ forecastConfiguration.getWeatherStationPointOfInterestId() != null
+ && forecastConfiguration.getWeatherStationPointOfInterestId().getPointOfInterestId() != null
+ && forecastConfiguration.getWeatherStationPointOfInterestId().getPointOfInterestId().equals(weatherStationPointOfInterestId)
+ )
+ )
+
{
try
{
totalNumberofForecastConfigurations++;
- //System.out.println("Running forecast #" + forecastConfiguration.getForecastConfigurationId());
+ LOGGER.debug("Running forecast #" + forecastConfiguration.getForecastConfigurationId());
SessionControllerGetter.getForecastBean().runForecast(forecastConfiguration);
- /*
- if(DEBUG && totalNumberofForecastConfigurations == 2)
- {
- throw new RunModelException("This is a test!!!");
- }*/
numberOfCompletedForecastConfigurations++;
- //System.out.println("All went well");
}
catch (PreprocessorException | RunModelException ex)
{
@@ -119,38 +135,32 @@ public class RunAllForecastConfigurationsTask extends VipsLogicTask{
ex.getMessage(),
SchedulingUtil.MESSAGE_STATUS_DANGER)
);
- //System.out.println("########################### Error caught: " + errorMessage);
- //System.out.println("numberOfCompletedForecastConfigurations=" + numberOfCompletedForecastConfigurations);
- //System.out.println("totalNumberofForecastConfigurations=" + totalNumberofForecastConfigurations);
- //continue;
}
}
if(totalNumberofForecastConfigurations > 0)
{
noForecastConfigurationsFound = false;
- double completeness = (double) numberOfCompletedForecastConfigurations/totalNumberofForecastConfigurations;
- tec.setCompleteness(completeness);
+ tec.setCompleteness(Double.valueOf(numberOfCompletedForecastConfigurations)/Double.valueOf(totalNumberofForecastConfigurations));
}
else
{
noForecastConfigurationsFound = true;
- //System.out.println("noForecastConfigurationsFound == true!!");
+
}
- //System.out.println("Current completeness=" + tec.getTaskExecutor().getCompleteness());
}
}
}
+
if(noForecastConfigurationsFound)
{
tec.setCompleteness(1.0);
tec.setStatusMessage("No current forecast configurations were found");
}
- //System.out.println("Total completeness=" + tec.getTaskExecutor().getCompleteness());
- if(tec.getTaskExecutor().getCompleteness() != 1.0)
+ if(tec.getTaskExecutor().getCompleteness() != 1.0 || ! errorMessage.isEmpty())
{
//System.out.println("Error detected, RuntimeException thrown just after this");
tec.setStatusMessage(errorMessage.toString());
diff --git a/src/main/java/no/nibio/vips/logic/service/LogicService.java b/src/main/java/no/nibio/vips/logic/service/LogicService.java
index 06efafeb032ff4465cc2613219bdd0a07b9fe514..ccb2553b1bf774034cec5f4ca25773906d05ad55 100755
--- a/src/main/java/no/nibio/vips/logic/service/LogicService.java
+++ b/src/main/java/no/nibio/vips/logic/service/LogicService.java
@@ -18,27 +18,32 @@
package no.nibio.vips.logic.service;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.ibm.icu.util.ULocale;
-import com.webcohesion.enunciate.metadata.Facet;
-import com.webcohesion.enunciate.metadata.rs.TypeHint;
-
import java.io.IOException;
-import java.util.*;
-
-import de.micromata.opengis.kml.v_2_2_0.Kml;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.UUID;
import java.util.stream.Collectors;
import javax.ejb.EJB;
import javax.persistence.NonUniqueResultException;
import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.*;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.WebTarget;
@@ -46,12 +51,42 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
+import org.apache.commons.validator.routines.EmailValidator;
+import org.jboss.resteasy.annotations.GZIP;
+import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
+import org.jboss.resteasy.spi.HttpRequest;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ibm.icu.util.ULocale;
+import com.webcohesion.enunciate.metadata.Facet;
+import com.webcohesion.enunciate.metadata.rs.TypeHint;
+import de.micromata.opengis.kml.v_2_2_0.Kml;
import no.nibio.vips.coremanager.service.ManagerResource;
import no.nibio.vips.entity.WeatherObservation;
import no.nibio.vips.logic.authenticate.PasswordValidationException;
-import no.nibio.vips.logic.controller.servlet.UserController;
-import no.nibio.vips.logic.controller.session.*;
-import no.nibio.vips.logic.entity.*;
+import no.nibio.vips.logic.controller.session.DeleteUserException;
+import no.nibio.vips.logic.controller.session.ForecastBean;
+import no.nibio.vips.logic.controller.session.MessageBean;
+import no.nibio.vips.logic.controller.session.OrganismBean;
+import no.nibio.vips.logic.controller.session.PointOfInterestBean;
+import no.nibio.vips.logic.controller.session.UserBean;
+import no.nibio.vips.logic.entity.CropCategory;
+import no.nibio.vips.logic.entity.CropPest;
+import no.nibio.vips.logic.entity.ForecastConfiguration;
+import no.nibio.vips.logic.entity.ForecastModelConfiguration;
+import no.nibio.vips.logic.entity.ForecastResult;
+import no.nibio.vips.logic.entity.Message;
+import no.nibio.vips.logic.entity.MessageTag;
+import no.nibio.vips.logic.entity.ModelInformation;
+import no.nibio.vips.logic.entity.Organism;
+import no.nibio.vips.logic.entity.Organization;
+import no.nibio.vips.logic.entity.PointOfInterest;
+import no.nibio.vips.logic.entity.PointOfInterestType;
+import no.nibio.vips.logic.entity.PointOfInterestWeatherStation;
+import no.nibio.vips.logic.entity.UserAuthentication;
+import no.nibio.vips.logic.entity.UserAuthenticationType;
+import no.nibio.vips.logic.entity.VipsLogicRole;
+import no.nibio.vips.logic.entity.VipsLogicUser;
import no.nibio.vips.logic.i18n.SessionLocaleUtil;
import no.nibio.vips.logic.util.Globals;
import no.nibio.vips.logic.util.SystemTime;
@@ -60,11 +95,6 @@ import no.nibio.vips.util.CSVPrintUtil;
import no.nibio.vips.util.ServletUtil;
import no.nibio.vips.util.SolarRadiationUtil;
import no.nibio.web.forms.FormValidationException;
-import org.jboss.resteasy.annotations.GZIP;
-import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
-import org.jboss.resteasy.spi.HttpRequest;
-
-import org.apache.commons.validator.routines.EmailValidator;
/**
* @copyright 2013-2023 <a href="http://www.nibio.no/">NIBIO</a>
@@ -1313,6 +1343,15 @@ public class LogicService {
{
return Response.ok().entity(userBean.getOrganizations()).build();
}
+
+ @GET
+ @Path("organization/{organizationId}")
+ @Produces("application/json;charset=UTF-8")
+ @TypeHint(Organization[].class)
+ public Response getOrganizations(@PathParam("organizationId") Integer organizationId)
+ {
+ return Response.ok().entity(userBean.getOrganization(organizationId)).build();
+ }
@GET
@Path("model/{modelId}")
diff --git a/src/main/java/no/nibio/vips/logic/service/ModelFormService.java b/src/main/java/no/nibio/vips/logic/service/ModelFormService.java
index c1c739baa829e0672830c473feb08357555712f5..de319c70a2fe5305e3d7901ee0f14a8f658f4305 100644
--- a/src/main/java/no/nibio/vips/logic/service/ModelFormService.java
+++ b/src/main/java/no/nibio/vips/logic/service/ModelFormService.java
@@ -19,13 +19,11 @@
package no.nibio.vips.logic.service;
import com.webcohesion.enunciate.metadata.rs.TypeHint;
+import no.nibio.vips.logic.entity.*;
import org.locationtech.jts.geom.Coordinate;
import com.webcohesion.enunciate.metadata.Facet;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.TimeZone;
+
+import java.util.*;
import javax.ejb.EJB;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
@@ -34,17 +32,10 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Response;
import no.nibio.vips.entity.ModelConfiguration;
import no.nibio.vips.entity.Result;
-import no.nibio.vips.entity.WeatherObservation;
import no.nibio.vips.gis.GISUtil;
import no.nibio.vips.logic.controller.session.ForecastBean;
import no.nibio.vips.logic.controller.session.PointOfInterestBean;
import no.nibio.vips.logic.controller.session.UserBean;
-import no.nibio.vips.logic.entity.ForecastConfiguration;
-import no.nibio.vips.logic.entity.ForecastModelConfiguration;
-import no.nibio.vips.logic.entity.ForecastModelConfigurationPK;
-import no.nibio.vips.logic.entity.Organization;
-import no.nibio.vips.logic.entity.PointOfInterestWeatherStation;
-import no.nibio.vips.logic.entity.WeatherStationDataSource;
import no.nibio.vips.logic.scheduling.model.PreprocessorException;
import no.nibio.vips.logic.scheduling.model.preprocessor.SeptoriaHumidityModelPreprocessor;
import no.nibio.vips.logic.util.RunModelException;
@@ -52,7 +43,8 @@ import no.nibio.vips.logic.util.SystemTime;
import no.nibio.vips.util.ParseRESTParamUtil;
import no.nibio.vips.util.WeatherUtil;
import no.nibio.vips.util.XDate;
-import no.nibio.vips.util.weather.WeatherDataSourceUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This is a collection of (one) service(s) for models run from forms (not as part of batch)
@@ -62,7 +54,8 @@ import no.nibio.vips.util.weather.WeatherDataSourceUtil;
@Path("rest/modelform")
@Facet("restricted")
public class ModelFormService {
-
+ private static final Logger LOGGER = LoggerFactory.getLogger(ModelFormService.class);
+
@EJB
UserBean userBean;
@EJB
@@ -100,6 +93,10 @@ public class ModelFormService {
@TypeHint(Result.class)
public Response runSeptoriaHumidityModel(
@QueryParam("organizationId_countryCode") String organizationId_countryCode,
+ @QueryParam("weatherDataSourceType") String weatherDataSourceType,
+ @QueryParam("latitude") String latitudeStr,
+ @QueryParam("longitude") String longitudeStr,
+ @QueryParam("timezone") String timezoneStr,
@QueryParam("weatherStationId") String weatherStationId, // Could be special ID from Danish system,
@QueryParam("dateSpraying1") String dateSpraying1,
@QueryParam("dateSpraying2") String dateSpraying2,
@@ -119,7 +116,9 @@ public class ModelFormService {
){
try
{
+ ParseRESTParamUtil pUtil = new ParseRESTParamUtil();
ForecastConfiguration fConf = new ForecastConfiguration();
+
fConf.setModelId("SEPTORIAHU");
Set<ForecastModelConfiguration> fModelConf = new HashSet<>();
@@ -139,16 +138,54 @@ public class ModelFormService {
fModelConf.add(this.getForecastModelConfiguration(fConf.getModelId(),"sprayingProtectionDays", String.valueOf(sprayingProtectionDays)));
fModelConf.add(this.getForecastModelConfiguration(fConf.getModelId(),"leafLifeTime", String.valueOf(leafLifeTime)));
fConf.setForecastModelConfigurationSet(fModelConf);
-
- // Data parsing
- Integer organizationId = Integer.valueOf(organizationId_countryCode.split("_")[0]);
- Organization organization = userBean.getOrganization(organizationId);
- fConf.setTimeZone(organization.getDefaultTimeZone());
- TimeZone timeZone = TimeZone.getTimeZone(organization.getDefaultTimeZone());
- ParseRESTParamUtil pUtil = new ParseRESTParamUtil();
+ PointOfInterestWeatherStation ws = null;
+
+ // Default organization is Norway
+ Organization organization = userBean.getOrganization(1);
+ VipsLogicUser vipsLogicUser = userBean.getVipsLogicUser(organization.getDefaultVipsCoreUserId());
+ String timezoneForWeatherData = organization.getDefaultTimeZone();
+
+ // If source of weather data is a weather station
+ if("weatherstation".equals(weatherDataSourceType)) {
+ String[] organizationIdCountryCode = organizationId_countryCode.split("_");
+ organization = userBean.getOrganization(Integer.parseInt(organizationIdCountryCode[0]));
+ String countryCode = organizationIdCountryCode[1];
+ timezoneForWeatherData = organization.getDefaultTimeZone();
+ if(countryCode.equalsIgnoreCase("dk")) {
+ // Create a synthetic weather station to pass into the system
+ // Weather station id is a UTM32N coordinate, e.g. E552700N6322400
+ String[] parts = weatherStationId.split("N");
+ int UTM32vE = Integer.parseInt(parts[0].substring(1));
+ int UTM32vN = Integer.parseInt(parts[1]);
+ GISUtil gisUtil = new GISUtil();
+ Coordinate UTMc = new Coordinate(UTM32vE, UTM32vN);
+ Coordinate coordinate = gisUtil.convertCoordinate(UTMc, "EPSG:32632", "EPSG:4326");
+ WeatherStationDataSource wsds = pointOfInterestBean.getWeatherStationDataSource("DMI PointWeb");
+ ws = new PointOfInterestWeatherStation();
+ ws.setWeatherStationDataSourceId(wsds);
+ ws.setWeatherStationRemoteId(
+ coordinate.y + "," + coordinate.x);// For some reason, The transformation switches X/Y
+ ws.setTimeZone(timezoneForWeatherData);
+ } else {
+ // Weather station id maps to a regular weather station
+ ws = (PointOfInterestWeatherStation) pointOfInterestBean.getPointOfInterest(Integer.valueOf(weatherStationId));
+ }
+ } else if("grid".equals(weatherDataSourceType)) {
+ fConf.setUseGridWeatherData(true);
+ timezoneForWeatherData = timezoneStr;
+ ws = new PointOfInterestWeatherStation();
+ ws.setLatitude(pUtil.parseDouble(latitudeStr));
+ ws.setLongitude(pUtil.parseDouble(longitudeStr));
+ ws.setTimeZone(timezoneForWeatherData);
+ }
+
+ fConf.setVipsCoreUserId(vipsLogicUser);
+ fConf.setTimeZone(timezoneForWeatherData);
+
+ TimeZone timeZone = TimeZone.getTimeZone(timezoneForWeatherData);
// Start time is gs31, easy
- Date gs31 = pUtil.parseISODate(dateGs31,timeZone);
+ Date gs31 = pUtil.parseISODate(dateGs31, timeZone);
XDate startTime = new XDate(gs31);
startTime.addDays(-1);
// End time is whatever comes first of the day after tomorrow or Gs75
@@ -163,47 +200,22 @@ public class ModelFormService {
fConf.setDateStart(startTime);
fConf.setDateEnd(endTime);
- String countryCode = organizationId_countryCode.split("_")[1];
- List<WeatherObservation> observations;
- WeatherDataSourceUtil wdsUtil = new WeatherDataSourceUtil();
- PointOfInterestWeatherStation ws;
- if(countryCode.toLowerCase().equals("dk")){
- // Create a synthetic weather station to pass into the system
- // Weather station id is a UTM32N coordinate, e.g. E552700N6322400
- String[] parts = weatherStationId.split("N");
- Integer UTM32vE = Integer.valueOf(parts[0].substring(1));
- Integer UTM32vN = Integer.valueOf(parts[1]);
- GISUtil gisUtil = new GISUtil();
- Coordinate UTMc = new Coordinate(UTM32vE, UTM32vN);
- Coordinate coordinate = gisUtil.convertCoordinate(UTMc, "EPSG:32632", "EPSG:4326");
- WeatherStationDataSource wsds = pointOfInterestBean.getWeatherStationDataSource("DMI PointWeb");
- ws = new PointOfInterestWeatherStation();
- ws.setWeatherStationDataSourceId(wsds);
- ws.setWeatherStationRemoteId(coordinate.y + "," + coordinate.x);// For some reason, The transformation switches X/Y
- ws.setTimeZone(organization.getDefaultTimeZone());
-
- //observations.stream().forEach(obs->System.out.println(obs.toString()));
- }
- else
- {
- // Weather station id maps to a regular weather station
- ws = (PointOfInterestWeatherStation) pointOfInterestBean.getPointOfInterest(Integer.valueOf(weatherStationId));
- }
- fConf.setWeatherStationPointOfInterestId(ws);
fConf.setLocationPointOfInterestId(ws);
-
+ fConf.setWeatherStationPointOfInterestId(ws);
+
ModelConfiguration mConf = new SeptoriaHumidityModelPreprocessor().getModelConfiguration(fConf);
Integer VIPSCoreUserId = organization.getDefaultVipsCoreUserId();
- List<Result>results = forecastBean.runForecast(mConf, VIPSCoreUserId);
+ List<Result> results = forecastBean.runForecast(mConf, VIPSCoreUserId);
return Response.ok().entity(results).build();
}
- catch(PreprocessorException |RunModelException ex)
+ catch(PreprocessorException | RunModelException ex)
{
+ LOGGER.error("Exception occurred when attempting to run the septoria humidity model", ex);
return Response.serverError().entity(ex.getMessage()).build();
- }
+ }
}
private ForecastModelConfiguration getForecastModelConfiguration(String modelId, String key, String value)
diff --git a/src/main/java/no/nibio/vips/logic/service/POIService.java b/src/main/java/no/nibio/vips/logic/service/POIService.java
index 19132a3b9146e71697b99567cb723a0acd7140b9..987896a20dc74646fbf89e94fadb9b832daa83be 100644
--- a/src/main/java/no/nibio/vips/logic/service/POIService.java
+++ b/src/main/java/no/nibio/vips/logic/service/POIService.java
@@ -19,25 +19,19 @@ package no.nibio.vips.logic.service;
import java.io.IOException;
import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import javax.ws.rs.*;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
+import com.fasterxml.jackson.core.JsonProcessingException;
import no.nibio.vips.logic.controller.session.PointOfInterestBean;
+import no.nibio.vips.logic.entity.helpers.PointOfInterestFactory;
import org.jboss.resteasy.spi.HttpRequest;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.Point;
@@ -46,9 +40,8 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.webcohesion.enunciate.metadata.Facet;
import com.webcohesion.enunciate.metadata.rs.TypeHint;
-import java.util.Arrays;
+
import java.util.stream.Collectors;
-import javax.ws.rs.QueryParam;
import no.nibio.vips.gis.GISUtil;
import no.nibio.vips.logic.entity.Country;
@@ -102,7 +95,68 @@ public class POIService {
PointOfInterest retVal = SessionControllerGetter.getPointOfInterestBean().getPointOfInterest(pointOfInterestId);
return Response.ok().entity(retVal).build();
}
-
+
+ @POST
+ @Consumes("application/json;charset=UTF-8")
+ @Produces("application/json;charset=UTF-8")
+ public Response postPoi(String poiJson) {
+ ObjectMapper oM = new ObjectMapper();
+ Map<Object, Object> poiMap;
+ try {
+ poiMap = oM.readValue(poiJson, new TypeReference<HashMap<Object, Object>>() {});
+ } catch (JsonProcessingException e) {
+ LOGGER.error(e.getMessage(), e);
+ return Response.status(Status.BAD_REQUEST).entity("Unable to parse input").build();
+ }
+
+ VipsLogicUser user = SessionControllerGetter.getUserBean().getUserFromUUID(httpServletRequest);
+ if (user == null) {
+ LOGGER.error("No user found for UUID in Authorization");
+ return Response.status(Status.UNAUTHORIZED).build();
+ }
+ LOGGER.error("Remember to check for roles as well, if necessary!");
+
+ PointOfInterestBean poiBean = SessionControllerGetter.getPointOfInterestBean();
+ Integer poiTypeId = poiMap.get("pointOfInterestTypeId") != null ? Integer.parseInt(poiMap.get("pointOfInterestTypeId").toString()) : null;
+ if(poiTypeId == null) {
+ return Response.status(Status.BAD_REQUEST).entity("pointOfInterestTypeId is required").build();
+ }
+ String poiName = poiMap.get("name") != null ? poiMap.get("name").toString() : null;
+ Double poiLongitude = poiMap.get("longitude") != null ? Double.valueOf(poiMap.get("longitude").toString()): null;
+ Double poiLatitude = poiMap.get("latitude") != null ? Double.valueOf(poiMap.get("latitude").toString()): null;
+ Double poiAltitude = 0.0;
+
+ PointOfInterest poiToSave = PointOfInterestFactory.getPointOfInterest(poiTypeId);
+ poiToSave.setName(poiName);
+ poiToSave.setLongitude(poiLongitude);
+ poiToSave.setLatitude(poiLatitude);
+ poiToSave.setAltitude(poiAltitude);
+ poiToSave.setLastEditedTime(new Date());
+ poiToSave.setUser(user);
+ poiToSave.setCountryCode(user.getOrganizationId().getCountryCode());
+ poiToSave.setTimeZone(user.getOrganizationId().getDefaultTimeZone());
+ poiToSave.setIsForecastLocation(Boolean.FALSE);
+ poiToSave.setIsPrivate(Boolean.TRUE);
+
+ if (poiLongitude != null && poiLatitude != null) {
+ GISUtil gisUtil = new GISUtil();
+ Coordinate coordinate = new Coordinate(poiLongitude, poiLatitude, poiAltitude);
+ Point p3d = gisUtil.createPointWGS84(coordinate);
+ poiToSave.setGisGeom(p3d);
+ }
+ poiToSave = poiBean.storePoi(poiToSave);
+
+ if (poiToSave != null) {
+ return Response.status(Response.Status.CREATED)
+ .entity(poiToSave)
+ .build();
+ } else {
+ return Response.status(Response.Status.INTERNAL_SERVER_ERROR)
+ .entity("Failed to create PointOfInterest " + poiName)
+ .build();
+ }
+ }
+
/**
* @param organizationId Id of the organization in question
* @param poiTypesStr Comma separated list of poiTypes
@@ -124,6 +178,19 @@ public class POIService {
return Response.ok().entity(SessionControllerGetter.getPointOfInterestBean().getPoisAsGeoJson(pois)).build();
}
+ @POST
+ @Path("geojson")
+ @Produces("application/json;charset=UTF-8")
+ @Consumes(MediaType.APPLICATION_JSON)
+ public Response getPoisGeoJson(Set<Integer> ids) {
+ // Retrieve POIs from data source
+ List<PointOfInterest> pois = SessionControllerGetter.getPointOfInterestBean().getPois(ids);
+ if (pois == null || pois.isEmpty()) {
+ return Response.noContent().build();
+ }
+ return Response.ok(SessionControllerGetter.getPointOfInterestBean().getPoisAsGeoJson(pois)).build();
+ }
+
/**
* Find a POI (Point of interest) by name
*
diff --git a/src/main/java/no/nibio/vips/util/weather/WeatherDataSourceUtil.java b/src/main/java/no/nibio/vips/util/weather/WeatherDataSourceUtil.java
index dd9eb671e3f25f4825265a19beb7154542e1467b..30b120b4e47eb54d3c0df15e9c2ddaab6794b3f0 100755
--- a/src/main/java/no/nibio/vips/util/weather/WeatherDataSourceUtil.java
+++ b/src/main/java/no/nibio/vips/util/weather/WeatherDataSourceUtil.java
@@ -73,6 +73,7 @@ public class WeatherDataSourceUtil {
*/
public List<WeatherObservation> getWeatherObservations(PointOfInterestWeatherStation station, Integer logIntervalId, String[] elementMeasurementTypes, Date startTime, Date endTime, Boolean ignoreErrors, Set<Integer> toleratedLogIntervalIds) throws WeatherDataSourceException {
// Get measured (and possibly forecasted, depending on the data source) observations
+ LOGGER.info("Get weather observations for {} with URL {}", station.getName(), station.getDataFetchUri());
List<WeatherObservation> observations = this.getWeatherObservations(station.getDataFetchUri(), logIntervalId, elementMeasurementTypes, startTime, endTime, TimeZone.getTimeZone(station.getTimeZone()), ignoreErrors, toleratedLogIntervalIds);
Collections.sort(observations);
// Append forecasts, if available
diff --git a/src/main/java/no/nibio/web/forms/FormValidator.java b/src/main/java/no/nibio/web/forms/FormValidator.java
index 65214d7edbc41e02477cbba2e8a2532528797d02..d6d0ef0fdfeab610818d29eff8987ae1f08ab447 100755
--- a/src/main/java/no/nibio/web/forms/FormValidator.java
+++ b/src/main/java/no/nibio/web/forms/FormValidator.java
@@ -44,6 +44,7 @@ import no.nibio.vips.logic.controller.session.SessionControllerGetter;
import no.nibio.vips.logic.controller.session.UserBean;
import no.nibio.vips.logic.i18n.SessionLocaleUtil;
import org.apache.commons.validator.routines.EmailValidator;
+import org.slf4j.LoggerFactory;
/**
* Uses form configuration set in JSON files in [WARFILE]/formdefinitions/, or
@@ -57,6 +58,8 @@ import org.apache.commons.validator.routines.EmailValidator;
* @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class FormValidator {
+
+ private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(FormValidator.class);
@EJB
UserBean userBean;
@@ -340,6 +343,7 @@ public class FormValidator {
{
field.setValid(false);
field.setValidationMessage(resourceBundle.getString("fieldIsRequired"));
+ LOGGER.debug(field.getName() + " with a value of " + field.getWebValue() + " is considered to be NULL");
}
}
diff --git a/src/main/resources/db/migration/V18__UseGridWeatherData.sql b/src/main/resources/db/migration/V18__UseGridWeatherData.sql
new file mode 100644
index 0000000000000000000000000000000000000000..0775bd72877061f15cbcc5f4316a5dec35e79ef9
--- /dev/null
+++ b/src/main/resources/db/migration/V18__UseGridWeatherData.sql
@@ -0,0 +1,3 @@
+-- Adding this property when adding support for gridded weather datasources in VIPS
+ALTER TABLE forecast_configuration
+ADD COLUMN use_grid_weather_data BOOLEAN DEFAULT FALSE;
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V19__Add_Organization_Property_Default_Grid_DataSource.sql b/src/main/resources/db/migration/V19__Add_Organization_Property_Default_Grid_DataSource.sql
new file mode 100644
index 0000000000000000000000000000000000000000..b254b3e45832acef2b0e85af03c170362322435b
--- /dev/null
+++ b/src/main/resources/db/migration/V19__Add_Organization_Property_Default_Grid_DataSource.sql
@@ -0,0 +1,3 @@
+-- Adding this property when adding support for gridded weather datasources in VIPS
+ALTER TABLE organization
+ADD COLUMN default_grid_weather_station_data_source_id INTEGER REFERENCES weather_station_data_source(weather_station_data_source_id) DEFAULT NULL;
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V20__Add_Datasource_Property_IsGrid.sql b/src/main/resources/db/migration/V20__Add_Datasource_Property_IsGrid.sql
new file mode 100644
index 0000000000000000000000000000000000000000..468128cbcf53a0e66d5b8373095debb8491592b7
--- /dev/null
+++ b/src/main/resources/db/migration/V20__Add_Datasource_Property_IsGrid.sql
@@ -0,0 +1,3 @@
+-- Adding this property when adding support for gridded weather datasources in VIPS
+ALTER TABLE weather_station_data_source
+ADD COLUMN is_grid BOOLEAN DEFAULT FALSE;
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V21__Add_POI_Property_IsPrivate.sql b/src/main/resources/db/migration/V21__Add_POI_Property_IsPrivate.sql
new file mode 100644
index 0000000000000000000000000000000000000000..abc442d80985e6130b570ac1d5471843d7509148
--- /dev/null
+++ b/src/main/resources/db/migration/V21__Add_POI_Property_IsPrivate.sql
@@ -0,0 +1,12 @@
+-- Adding this property when adding support for private POIs/weather datasources in VIPS
+ALTER TABLE point_of_interest
+ADD COLUMN is_private BOOLEAN DEFAULT FALSE;
+
+-- Set all POIS not owned by a superuser or admin to is_private = TRUE
+UPDATE point_of_interest
+SET is_private=TRUE
+WHERE user_id NOT IN
+(
+ SELECT DISTINCT user_id FROM user_vips_logic_role
+ WHERE vips_logic_role_id IN (1,2)
+);
\ No newline at end of file
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
index 532895e14fbd20b5fa9b871d174e0ab5b463168f..dd150cdced77c7dd4aaac5afb066c59a27b12336 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
@@ -1,21 +1,21 @@
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
#
-# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
-#
-# This file is part of VIPSLogic.
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
-#
+ # Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
+ #
+ # This file is part of VIPSLogic.
+ # This program is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU Affero General Public License as published by
+ # the Free Software Foundation, either version 3 of the License, or
+ # (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU Affero General Public License for more details.
+ #
+ # You should have received a copy of the GNU Affero General Public License
+ # along with this program. If not, see <https://www.gnu.org/licenses/>.
+ #
ALTERNARIA = Alternaria Model
APPLESCABM = Apple scab model
@@ -72,7 +72,7 @@ active = Active
activeWeatherStations = Active weather stations
-addMultipleNew = Add multiple new
+addNewForMultipleWeatherStations=Add new for multiple weather stations
addNew = Add new
@@ -1058,6 +1058,17 @@ privacyStatement=Privacy statement
privacyStatementFileName=Privacy_statement_NIBIO-VIPS.pdf
thresholdDSVMax=DSV threshold for high infection risk
thresholdDSVTempMin=Minimum temperature for DSV calculation
+useGridWeatherData=Use grid weather data
+doNotUse=Do not use
+defaultGridWeatherStationDataSource=Gridded weather data source
+weatherStationDataSources=Weather station data sources
+newWeatherStationDataSource=New weather (station) data source
+editWeatherStationDataSource=Edit weather (station) data source
+datafetchUriExpression=URI template for requesting data
+infoUriExpression=Template for request for station information
+isGridWeatherDataSource=This is a grid based weather data source
+weatherStationDataSourceStored=Weather (station) data source was successfully stored
+weatherStationDataSourceDeleted=The weather (station) data source was successfully deleted
observationTimeSeriesId=Timeseries
observationTimeSeriesLabel=Timeseries label
observationId=Observation
@@ -1070,3 +1081,6 @@ unregisteredUser=Unregistered user
downloadedTime=Time of download
observationCount=Observation count
+weatherDatasource=Weather datasource
+useWeatherStation=Use weather station
+multipleNewWarningMsg=This form is for adding the same forecast configuration to many weather stations simultaneously.
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties
deleted file mode 100755
index 87647c45dde3c281d5d68f2586191610a2faee80..0000000000000000000000000000000000000000
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties
+++ /dev/null
@@ -1,1048 +0,0 @@
-#
- # Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
- #
- # This file is part of VIPSLogic.
- # This program is free software: you can redistribute it and/or modify
- # it under the terms of the GNU Affero General Public License as published by
- # the Free Software Foundation, either version 3 of the License, or
- # (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU Affero General Public License for more details.
- #
- # You should have received a copy of the GNU Affero General Public License
- # along with this program. If not, see <https://www.gnu.org/licenses/>.
- #
-isPositiveRegistration=Pest presence confirmed
-ALTERNARIA = Alternaria Model
-
-APPLESCABM = Apple scab model
-
-BARLEYNETB = Barley net blotch model
-
-BREMIALACT = Bremia lactucae model
-
-CYDIAPOMON = Cydia pomonella model
-
-DELIARADIC = Delia radicum model
-
-DELIARFOBO = Delia radicum/floralis observation model for old crops
-
-DELIARFOBS = Delia radicum/floralis observation model
-
-DELIARFOBY = Delia radicum/floralis observation model for young crops
-
-DOWNCASTMO = DOWNCAST model
-
-FINNCEREAL = Model for Pyrenophora teres, Drechslera tritici-repentis and Stagonospora nodorum
-
-GRASSDRYMO = Grass drying model
-
-LYGUSRUGUL = Lygus rugulipennis model
-
-MAMESTRABR = Mamestra brassicae model
-
-Mail = Email
-
-NAERSTADMO = N\u00e6rstad's model
-
-NEGPROGMOD = Negative prognosis model
-
-OATFLOWERM = Oat flowering model
-
-PLASMOVITI = Downy Mildew model
-
-PSILAROBSE = Psila rosae observation model
-
-PSILARTEMP = Psila rosae Temperature Model
-
-RAINYDAYSM = Rainy days model
-
-SEPAPIICOL = Septoria apiicola model
-
-SEPTREFHUM = Septoria reference humidity model
-
-Sms = SMS
-
-VIPSLogicTitle = VIPS administration system
-
-active = Active
-
-activeWeatherStations = Active weather stations
-
-addMultipleNew = Add multiple new
-
-addNew = Add new
-
-address = Address
-
-advisor = Advisor
-
-all = All
-
-allCategories = All categories
-
-allCrops = All crops
-
-allOrganizations = All organizations
-
-allPests = All pests
-
-allSystems = All systems
-
-altitude = Altitude
-
-appleFruitMoth = Apple fruit moth
-
-appleFruitMothChangeSeasonConfirm = Are you sure you want to change season? All unsaved data for the current season will be lost.
-
-approvalApplication = Approval application
-
-approvalApplicationHelp = Describe what you want to do as a registered user. E.g. write messages, register observations, etc.
-
-approved = Approved
-
-approvesSmsBilling = Approves billing for SMS messages
-
-approvesSmsBillingDescription = By checking this option, you confirm that you accept the billing costs for receiving SMS messages from our subscription services. This consent can be terminated at any time, either by unchecking this checkbox or by sending VIPS STOP to your country's short number. Number for Norway is 1963.
-
-archiveUserId = Archive user
-
-attachIdToExistingUser = Add this login to my existing user
-
-attachIdToExistingUserReceipt = The id was successfully connected to the user. You may now log in with it
-
-availableFor = Available for
-
-availableTranslations = Available translations
-
-back = Back
-
-barkbeetle = Barkbilleoverv\u00e5king
-
-body = Body
-
-broadcastMessage = Broadcast the message
-
-browse = Browse
-
-calculationEnd = Calculation end
-
-calculationStart = Calculation start
-
-cancel = Cancel
-
-changeDate = Change date
-
-children = Children
-
-city = City
-
-clearAll = Clear all
-
-clearOne = Clear one
-
-clusterStored = The cluster information was stored
-
-completenessAtFinish = Completeness at finish
-
-configureAndRunManually = Configure and run manually
-
-confirmCancel = Do you really want to cancel?
-
-confirmDelete = Do you really want to delete?
-
-confirmEmailFailure = Your email address was not confirmed. Please contact the system administrator.
-
-confirmEmailReceipt = Your email was successfully confirmed. You will be notified as soon as the organization administrator approves your application.
-
-confirmLeaveForm = Do you really want to leave this form? All changes are left behind.
-
-confirmReloadForm = Do you really want to reload this form. All unsaved changes will be lost.
-
-country = Country
-
-createPasswordResetCodeAndSendToUserBody = You have requested to reset your current password for username {0} in VIPSLogic, and create a new one. Please follow this link to proceed: {1}
-
-createPasswordResetCodeAndSendToUserSubject = Create new password in VIPSLogic
-
-cropCategoriesFor = Crop categories for
-
-cropCategory = Crop category
-
-cropCategoryIds = Crop categories
-
-cropCategoryUpdated = Crop category was updated
-
-cropOrganismId = Crop
-
-cropOrganismIds = Crops
-
-cropPestUpdated = Crop pest was updated
-
-cropSusceptibility = Crop susceptibility
-
-crops = Crops
-
-currentDate = Current date
-
-dataSource = Data source
-
-dataSourceMissing = Data source is missing
-
-dataSourceName = Data source name
-
-date2ndUpperLeafEmerging = Date 2nd upper leaf emerging
-
-date3rdUpperLeafEmerging = Date 3rd upper leaf emerging
-
-dateEnd = Date end
-
-dateGs31 = Date GS 31
-
-dateGs75 = Date GS 75
-
-datePub = Date published
-
-datePubPeriod = Period of publication
-
-dateSpraying1 = Spraying date 1
-
-dateSpraying2 = Spraying date 2
-
-dateStart = Date start
-
-dateUpperLeafEmerging = Date upper leaf emerging
-
-dateValidTo = Valid to date
-
-days = Days
-
-defaultLocale = Default language
-
-defaultMapCenter = Default map center
-
-defaultMapZoom = Default map zoom
-
-defaultTimeZone = Default time zone
-
-defaultVipsCoreUserId = Default VIPSCore user ID
-
-degreeOfParasitation = Degree of parasitation
-
-delete = Delete
-
-deleteIllustration = Delete illustration
-
-deletePoi = Delete point of interest
-
-deleteUser = Delete user
-
-deleteUserDescription = You must transfer the user's resouces to another user before deleting is possible
-
-deleteWeatherStation = Delete weather station
-
-deleteWeatherStationPreviewExplanation = The weather station that you want to delete has the resources below connected to it. When you delete the weather station, you also delete these resources.
-
-denominator = Denominator
-
-description = Description
-
-details = Details
-
-digit = Digit
-
-doesNotMatchDateFormat = Does not match format {0}
-
-doesNotMatchFormatX = Does not match format {0}
-
-edit = Edit
-
-editCropPests = Edit pests for crop
-
-editMessage = Edit message
-
-editObservation = Edit observation
-
-editOrganization = Edit organization
-
-editPoi = Edit Point Of Interest
-
-editWeatherStation = Edit weather station
-
-elementMeasurementTypes = Measurement types
-
-email = Email
-
-emailAddressIsAlreadyInUse = Email address is already in use
-
-emailNotRegistered = The email address is not registered
-
-emailNotUnique = The email address is not unique. Please contact the VIPSLogic administrator to sort this out.
-
-emailNotVerified = You must verify your email address before the user approval process can proceed
-
-endTime = End time
-
-exceedsMaxLengthOf = Exceeds max length of {0}
-
-externalForecastProviders = External forecast providers
-
-externalResourceIdentifier = External resource identifier
-
-externalResources = External resources
-
-factoryId = Factory id
-
-farmer = Farmer
-
-farms = Farms
-
-fieldIsRequired = Field is required
-
-fieldSowingDate = Field sowing date
-
-fields = Fields
-
-traps = Traps
-
-filter = Filter
-
-filterList = Filter list
-
-filterMessages = Filter messages
-
-firstName = First name
-
-forecastConfigurationDeleted = Forecast configuration was deleted
-
-forecastConfigurationId = Forecast configuration
-
-forecastConfigurationIds = Forecast configuration ids
-
-forecastConfigurationUpdated = Forecast configuration was updated
-
-forecastNotificationMessageBodyTpl_1 = This is for {0} in {1} at location {2} at date {3}. Details: {4}
-
-forecastNotificationMessageBodyTpl_2 = This is for {0} in {1} at location {2} at date {3}.Read more: {4}
-
-forecastNotificationMessageHeadingTpl_1 = Notification of high risk of infection
-
-forecastNotificationMessageHeadingTpl_2 = Notification of moderate infection risk
-
-forecastNotifications = Forecast notifications
-
-forecastNotificationsDescription = Forecast notifications are issued when a specific forecast (a model running for a location) changes its status to a higher risk level. E.g. green to yellow or yellow to red status.
-
-forecasts = Forecasts
-
-forgottenPassword = Forgotten password
-
-freeSms = Free SMS
-
-from = From
-
-general = General
-
-genericPlaces = Generic places
-
-greeting = Dobro do\u0161li u
-
-groupMembers = Group members
-
-heading = Heading
-
-help = Help
-
-helpMessageFormCropCategoryIds = No crop selection means visibility regardless of user's crop preferences
-
-hierarchyCategoryId = Hierarchy category
-
-higherThanMaximum = Higher than the maximum ({0})
-
-illustration = Illustration
-
-inactiveWeatherStations = Inactive weather stations
-
-includeAllChildCrops = Include all child crops
-
-indexText = VIPSLogic is the common administration system for VIPS. This is where you configure users, weather stations and forecasts, and where you report observations and write messages, and more.
-
-informAdminOfConfirmedEmailBody = The user''s last name is {0}. The approval information is as follows: {1}. \\nFollow this link to edit this user: {2} \\n Follow this link to approve automatically: {3}
-
-informAdminOfConfirmedEmailSubject = New user has confirmed email and is now ready for approval
-
-internal = Internal
-
-invalidFormat = Invalid format
-
-invalidcredentials = Invalid username and/or password
-
-isCrop = Is crop
-
-isForecastLocation = Is forecast location
-
-isPest = Is pest
-
-isPrivate = Is private
-
-isQuantified = Is quantified
-
-isRequiredField = Required field
-
-language = Language
-
-lastEditedBy = Last edited by
-
-lastName = Last name
-
-lastUpdated = Last updated
-
-latinName = Latin name
-
-latitude = Latitude
-
-leadParagraph = Lead paragraph
-
-leafLifeTime = Leaf life time (days)
-
-leaveForm = Leave form
-
-listCrops = List all crops
-
-listPests = List all pests
-
-listSelectedCropCategoryOnTop = List crops from selected category on top
-
-localName = Local name
-
-location = Location
-
-locationIsPrivate = Location is private
-
-locationIsPublic = Location is public
-
-locationPointOfInterestId = Location
-
-logInterval = Log interval
-
-logInterval1d = 1 day
-
-logInterval1h = 1 hour
-
-loggedinas = Prijavi se kao
-
-login = Log in
-
-loginCredentials = Login credentials
-
-logout = Log out
-
-logoutsuccess = You are now logged out. Welcome back!
-
-longitude = Longitude
-
-lowerThanMinimum = Lower than the minimum ({0})
-
-lowercase = Lower case
-
-mapDataIsRequired = Map data is required
-
-mapDrawTypeLabel = What do you want to draw
-
-maskObservationWith = Mask observation with
-
-messageDeleted = Message was deleted
-
-messageFormat = Message format
-
-messageIllustrationCaptionLocale = Caption
-
-messageNotifications = Message notifications
-
-messageNotificationsDescription = A message notification is issued when a news message is published for a specific crop group.
-
-messageTags = Message tags
-
-messageUpdated = Message was updated
-
-messages = Messages
-
-meter = Meter
-
-missing = Missing
-
-missingInDatabase = Missing in database
-
-missingSeparatorComma = Missing separator comma
-
-missingUsernameAndPassword = Missing username and password
-
-missingValues = Missing values
-
-modelId = Forecasting model
-
-modelName = Model name
-
-multipleForecastConfigurationsCreated = The forecast configurations were successfully created
-
-myAccount = My account
-
-name = Name
-
-nameAlreadyExists = The name already exists
-
-newGroup = New group
-
-newIllustration = New illustration
-
-newMessage = New message
-
-newObservation = New observation
-
-newObservationSite = New observation site
-
-newObservationSitePoint = New observation site point
-
-newOrganism = New organism
-
-newOrganization = New organization
-
-newPoi = New Point Of Interest
-
-newUser = New user
-
-newUserCredentialsHelpText = Please enter a user name for the new user. An auto generated password will be sent to the user's email address.
-
-newWeatherStation = New weather station
-
-noDescriptionFound = No description found
-
-noMapDataEntered = No map data entered
-
-noPrivateForecastsFoundForUser = No private forecasts found for user
-
-noResultsFoundForCriteria = No results were found for the given search criteria
-
-noTasksRunning = No tasks running
-
-noWhitespaceAllowed = No whitespace allowed
-
-none = None
-
-notificationSubscriptionDescription = You can subscribe to different kinds of notifications below. Choose the format for notification, for instance email or SMS
-
-notificationSubscriptions = Notification subscriptions
-
-notificationSubscriptionsUpdated = Notification subscriptions was successfully updated
-
-numberRequired = A number is required
-
-observationData = Observation data
-
-observationDataField_counting1 = Counting 1
-
-observationDataField_counting2 = Counting 2
-
-observationDataField_trapCountCropEdge = Number of trap counts at field's edge
-
-observationDataField_trapCountCropInside = Number of trap counts inside the field
-
-observationDeleted = Observation was deleted
-
-observationHeading = Observation heading
-
-observationMap = Observation map
-
-observationMethodDescription_KNOCKING = Knocking description (TODO)
-
-observationMethodDescription_NOT_REGISTERED = The observation method is not registered
-
-observationMethodId = Observation method
-
-observationMethodTitle_COUNTING = Counting
-
-observationMethodTitle_HARVESTING = Harvesting
-
-observationMethodTitle_KNOCKING = Knocking
-
-observationMethodTitle_NOT_REGISTERED = Not registered
-
-observationMethodTitle_VISUAL = Visual
-
-observationNotifications = Observation notifications
-
-observationNotificationsDescription = An observation notification is issued when a field observation is made of a pest or disease in a specific crop group.
-
-observationSiteName = Observation site name
-
-observationSitePointName = Observation site point name
-
-observationSitePoints = Observation site pointsObservasjonsstedspunkter
-
-observationSiteStored = Observation site was successfully updated
-
-observationStored = Observation was stored
-
-observationText = Observation text
-
-observations = Observations
-
-observedDateOfFirstCatch = Observed date of first catch
-
-observedValue = Observed value
-
-observer = Observer
-
-older = Older
-
-or = Or
-
-organism = Organism
-
-organismDeleted = Organism was deleted
-
-organismId = Organism id
-
-organismNotDeleted = Organism was not deleted
-
-organismRegistered = Organism was registered
-
-organismUpdated = Organism was updated
-
-organisms = Organisms
-
-organizationGroupDeleted = The organization group was deleted
-
-organizationGroupList = Organization groups
-
-organizationGroupStored = Organization group was stored
-
-organizationId = Organization
-
-organizationStored = Organization was stored
-
-organizations = Organizations
-
-organizationsArchiveUser = The organization's standard archive user
-
-other = Other
-
-parentOrganismId = Parent organism
-
-password = Password
-
-password2 = Repeat password
-
-passwordResetCodeExpired = The password reset code has expired.
-
-passwordResetCodeNotFound = The password reset code was not found
-
-passwordResetSuccess = Password was successfully created. Please log in.
-
-passwordsDoNotMatch = Passwords do not match
-
-pending = Pending
-
-pestOrganismId = Pest
-
-pestOrganismIds = Pests
-
-phone = Telephone
-
-pleaseAwaitApproval = Please await your user approval
-
-pleaseSelect = Please select
-
-pleaseSpecifyOther = If other, please specify
-
-pleaselogin = Please log in
-
-poi = Point of interest
-
-poiDeleted = Point of interest was deleted
-
-poiStored = Poi was stored
-
-point = point
-
-pointOfInterestType = Point of Interest Type
-
-pointOfInterestType_0 = Unspecified
-
-pointOfInterestType_1 = Weather station
-
-pointOfInterestType_2 = Farm
-
-pointOfInterestType_3 = Field
-
-pointOfInterestType_4 = Region
-
-pois = Points Of Interest
-
-polygon = Polygon
-
-position = Position
-
-postalCode = Postal code
-
-preferredLocale = Preferred locale
-
-previousCrop = Previous crop
-
-privateForecasts = Private forecasts
-
-privateForecastsForOtherUser = Private forecasts for other user
-
-progress = Progress
-
-publicForecasts = Public forecasts
-
-publiclyAvailable = Publicly available
-
-reference = Reference
-
-registerNewUser = Register new user
-
-registerNewUserExplanation = Please fill out the form to apply for a user account. By registering as a user in VIPS, you accept our <a href="/public/documentation/Privacy_statement_NIBIO-VIPS.pdf" target="new">privacy statement.</a>
-
-registerNewUserReceipt = Thanks. You should receive an email requesting you to validate your email address. After following the instructions there, the organization admin will hopefully approve your application shortly.
-
-registrationOf = Registration of
-
-registrationShortcuts = Registration shortcuts
-
-rejected = Rejected
-
-remarks = Remarks
-
-rememberLogin = Remember login
-
-remoteloginfailed = Remote login failed
-
-replaceIllustration = Replace illustration
-
-researcher = Researcher
-
-reset = Reset
-
-resetPassword = Reset and create new password
-
-resetPasswordFormExplanation = Please enter your new password
-
-resetPasswordRequest = Request to reset password
-
-resetPasswordRequestAccepted = Your request has been accepted. An email with further instructions have been sent to the registered email address.
-
-resetPasswordRequestFormExplanation = An email will be sent to the address you enter here, with a link to reset your current password and enter a new one.
-
-runTask = Run task
-
-runningTasks = Running tasks
-
-scheduledTasks = Scheduled tasks
-
-scheduling = Scheduling
-
-schedulingOverview = Scheduling overview
-
-schedulingStarted = Scheduling started
-
-schedulingStopped = Scheduling was stopped
-
-schedulingStoppedExplanation = The scheduling system is stopped. None of the tasks in the list below will be run, unless scheduling is started again.
-
-season = Season
-
-seasonEnd = Season end
-
-seasonStart = Season start
-
-select = Select
-
-sendUserApprovalConfirmationBody = We are happy to confirm that your user account for VIPSLogic has been approved. Please log in here: {0}
-
-sendUserApprovalConfirmationSubject = Your user account has been approved
-
-sendUsernameAndPasswordToUserBody = Here is your username and password for logging in to VIPSLogic (http://{2}):\nUsername: {0}\nPassword: {1}
-
-sendUsernameAndPasswordToUserSubject = Username and password for VIPSLogic
-
-showMeWhereIAm = Show me where I Am
-
-signInWith = Sign in with
-
-slidingHoursAhead = Reference period, forwards (hours)
-
-slidingHoursPast = Reference period, backwards (hours)
-
-specificFieldsForX = Specific fields for {0}
-
-sprayingDate01 = Spraying Date 01
-
-sprayingDate02 = Spraying Date 02
-
-sprayingDate03 = Spraying Date 03
-
-sprayingDate04 = Spraying Date 04
-
-sprayingProtectionDays = Expected protection period (days) after spraying
-
-startDateAscosporeMaturity = Start date for ascospore maturation
-
-startDateDayDegreeAccumulation = Start date for day degree accumulation
-
-startDateGrowth = Start date for growth
-
-startScheduling = Start scheduling
-
-startTime = Start time
-
-status = Status
-
-statusRemarks = Status remarks
-
-statusTypeId = Status
-
-statusTypeIdTitle_1 = Pending
-
-statusTypeIdTitle_2 = Rejected
-
-statusTypeIdTitle_3 = Approved
-
-stopScheduling = Stop scheduling
-
-submit = Submit
-
-suggestedUserRole = Suggested user role
-
-surveillanceMessageInformation = If you want to create a message about an observation, please use the observation registration form
-
-systemTime = System time
-
-taskHistory = Task history
-
-taskHistoryDate = Date for task history
-
-taskHistoryDetails = Task history details
-
-taskHistoryStatusFailedCompletely = Failed completely
-
-taskHistoryStatusFailedPartly = Failed partly
-
-taskHistoryStatusOK = OK
-
-taskXWasLaunched = Task "{0}" was launched
-
-task_DeleteAllExpiredUserUuidsTask_description = Cleaning up the database of UUIDs, which is used for remembering client logins
-
-task_DeleteAllExpiredUserUuidsTask_name = Delete all expired user UUIDs
-
-task_RunAllForecastConfigurationsForOrganizationTask_description = Test
-
-task_RunAllForecastConfigurationsForOrganizationTask_name = Run all forecasts for one organization
-
-task_RunAllForecastConfigurationsTask_description = Runs all current forecasts for all organizations
-
-task_RunAllForecastConfigurationsTask_name = Run all forecast configurations
-
-task_RunForecastConfigurationsByIdTask_description = Run all forecast configurations corresponding to ids in a comma separated list
-
-task_RunForecastConfigurationsByIdTask_name = Run forecast configurations by id
-
-task_RunGridModelsTask_description = Test
-
-task_RunGridModelsTask_name = Run grid models
-
-task_SendForecastEventNotificationsTask_description = Checks to see if there has been changes in forecasts to YELLOW or RED status. If so, finds subscribers to such events and sends notifications
-
-task_SendForecastEventNotificationsTask_name = Send forecast event notifications
-
-task_UpdateForecastResultCacheTableTask_description = To speed up certain tasks, for instance aggregating warnings for today, the table forecast_result_cache should contain only today's forecast results. Today = SystemTime.
-
-task_UpdateForecastResultCacheTableTask_name = Update forecast result cache table
-
-task_UpdateForecastSummaryTableTask_description = This task updates the table for summaries
-
-task_UpdateForecastSummaryTableTask_name = Update table of forecast summaries
-
-task_UpdateModelInformationTask_description = Fetches information about models from VIPSCoreManager and stores in VIPSLogic
-
-task_UpdateModelInformationTask_name = Update model information
-
-tasks = Tasks
-
-test = Test
-
-thousandBerrySample = Thousand berry sample
-
-thresholdHumidPeriodHours = Threshold Number of consecutive humid hours
-
-thresholdLeafWetness = Threshold leaf wetness (min/h)
-
-thresholdPrecipitation = Threshold precipitation (mm)
-
-thresholdRelativeHumidity = Threshold relative humidty (%)
-
-tillageMethod = Tillage method
-
-timeOfObservation = Time of observation
-
-timeZone = Time zone
-
-timestamp = Timestamp
-
-to = To
-
-toTheTop = To the top
-
-tooManySeparatorCommas = Too many separator commas
-
-tradeName = Trade name
-
-transferAndDelete = Transfer and delete
-
-transferResources = Transfer resources
-
-type = Type
-
-unknownOrganismId = Unknown Organism Id
-
-unknownTranslationKey = Unknown translation key: {0}
-
-up = Up
-
-uppercase = Upper case
-
-user = User
-
-userAccountInformation = User account information
-
-userApproved = The user was approved
-
-userCreatedAndInformed = User was created. An email with username and password was sent to the user's email
-
-userDeleted = User was deleted
-
-userOrganizationGroupsListDescription = Organization groups can be used to share resources like points of interest
-
-userRegistrationEmailVerificationMessageBody = We have received a request to register a new user at VIPSLogic (http://{0}/). Please confirm your email by clicking this link: {1}\n\nThank you
-
-userRegistrationEmailVerificationMessageSubject = Email verification needed
-
-userResources = User resources
-
-userStatusId = Approval status
-
-userStatus_1 = Awaiting email validation
-
-userStatus_2 = Awaiting approval
-
-userStatus_3 = Rejected
-
-userStatus_4 = Approved
-
-userStatus_5 = Disabled
-
-userUpdated = User was updated
-
-username = User name
-
-usernameExists = Username {0} exists
-
-users = Users
-
-viewAllTasks = View all tasks
-
-viewForecastConfiguration = View forecast configuration
-
-viewFullScreen = Full screen view
-
-viewOthersObservations = View observations made by others
-
-vipsLogicRole_1 = Superuser
-
-vipsLogicRole_10 = Bark beetle administrator
-
-vipsLogicRole_11 = Bark beetle county admin
-
-vipsLogicRole_2 = Organization administrator
-
-vipsLogicRole_3 = Observer
-
-vipsLogicRole_4 = Observation authority
-
-vipsLogicRole_5 = Message author
-
-vipsLogicRole_6 = Apple Fruit Moth Administrator
-
-vipsLogicRole_7 = Organism editor
-
-vipsLogicRole_8 = Apple Fruit Moth Rowanberry Cluster Counter
-
-vipsLogicRole_9 = Bark beetle registrator
-
-vipsLogicRoles = User roles
-
-vipsLogicUserId = User
-
-vipswebUrl = VIPSWeb URL
-
-warningStatus = Warning status
-
-warningStatus_0 = No forecast available
-
-warningStatus_1 = Missing data
-
-warningStatus_2 = No risk of infection
-
-warningStatus_3 = Medium risk of infection
-
-warningStatus_4 = High risk of infection
-
-warning_fieldNotFoundInFormDefinition = WARNING: field {0} not found in form definition. The system does not know how to validate it. Continue anyway?
-
-weatherForecastProvider = Weather forecast service
-
-weatherStationDeleted = Weather station was deleted
-
-weatherStationForecastConfigurations = Forecasts connected to the weather station
-
-weatherStationPointOfInterestId = Weather station
-
-weatherStationPointOfInterestIds = Weather stations
-
-weatherStationRemoteId = Remote Id for weather station
-
-weatherStationRemoteIdMissing = Remote Id for weather station is missing
-
-weatherStationStored = Weather station information was stored
-
-weatherStations = Weather stations
-
-xIsNotAfterY = {0} is not after {1}
-
-xIsNotEqualToY = {0} is not equal to {1}
-
-your = Your
-biofixDate=Biofix date
-heatRequirements=Heat requirements
-dd_lower=Day degree lower cutoffs
-dd_upper=Day degree upper cutoffs
-observedPhase=Observed phase at biofix date
-YSTEMBTEMP=Yellow Stemborer Temperature Model
-addIllustration=Add illustration
-allRoles=All roles
-allStatuses=All statuses
-LEAFBLOTCH=Leaf blotch model
-universalMessageSettingsLink_tpl=To edit your VIPS notification subscriptions, please use this link: {0}
-pointOfInterestType_5=Trap
-sowingDate=Sowing date
-pointOfInterestType_6=Apiary site
-pointOfInterestType_7=Nursery
-privacyStatement=Privacy statement
-privacyStatementFileName=Privacy_statement_NIBIO-VIPS.pdf
-thresholdDSVMax=DSV threshold for high infection risk
-thresholdDSVTempMin=Minimum temperature for DSV calculation
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties
deleted file mode 100755
index 351048a470187ba55766c9205a30a2a9403a2f17..0000000000000000000000000000000000000000
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties
+++ /dev/null
@@ -1,1046 +0,0 @@
-#
- # Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
- #
- # This file is part of VIPSLogic.
- # This program is free software: you can redistribute it and/or modify
- # it under the terms of the GNU Affero General Public License as published by
- # the Free Software Foundation, either version 3 of the License, or
- # (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU Affero General Public License for more details.
- #
- # You should have received a copy of the GNU Affero General Public License
- # along with this program. If not, see <https://www.gnu.org/licenses/>.
- #
-isPositiveRegistration=Pest presence confirmed
-ALTERNARIA = Alternaria Model
-
-APPLESCABM = Apple scab model
-
-BARLEYNETB = Barley net blotch model
-
-BREMIALACT = Bremia lactucae model
-
-CYDIAPOMON = Cydia pomonella model
-
-DELIARADIC = Delia radicum model
-
-DELIARFOBO = Delia radicum/floralis observation model for old crops
-
-DELIARFOBS = Delia radicum/floralis observation model
-
-DELIARFOBY = Delia radicum/floralis observation model for young crops
-
-DOWNCASTMO = DOWNCAST model
-
-FINNCEREAL = Model for Pyrenophora teres, Drechslera tritici-repentis and Stagonospora nodorum
-
-GRASSDRYMO = Grass drying model
-
-LYGUSRUGUL = Lygus rugulipennis model
-
-MAMESTRABR = Mamestra brassicae model
-
-Mail = Email
-
-NAERSTADMO = N\u00e6rstad's model
-
-NEGPROGMOD = Negative prognosis model
-
-OATFLOWERM = Oat flowering model
-
-PLASMOVITI = Downy Mildew model
-
-PSILAROBSE = Psila rosae observation model
-
-PSILARTEMP = Psila rosae Temperature Model
-
-RAINYDAYSM = Rainy days model
-
-SEPAPIICOL = Septoria apiicola model
-
-SEPTREFHUM = Septoria reference humidity model
-
-Sms = SMS
-
-VIPSLogicTitle = VIPS administration system
-
-active = Active
-
-activeWeatherStations = Active weather stations
-
-addMultipleNew = Add multiple new
-
-addNew = Add new
-
-address = Address
-
-advisor = Advisor
-
-all = All
-
-allCategories = All categories
-
-allCrops = All crops
-
-allOrganizations = All organizations
-
-allPests = All pests
-
-allSystems = All systems
-
-altitude = Altitude
-
-appleFruitMoth = Apple fruit moth
-
-appleFruitMothChangeSeasonConfirm = Are you sure you want to change season? All unsaved data for the current season will be lost.
-
-approvalApplication = Approval application
-
-approvalApplicationHelp = Describe what you want to do as a registered user. E.g. write messages, register observations, etc.
-
-approved = Approved
-
-approvesSmsBilling = Approves billing for SMS messages
-
-approvesSmsBillingDescription = By checking this option, you confirm that you accept the billing costs for receiving SMS messages from our subscription services. This consent can be terminated at any time, either by unchecking this checkbox or by sending VIPS STOP to your country's short number. Number for Norway is 1963.
-
-archiveUserId = Archive user
-
-attachIdToExistingUser = Add this login to my existing user
-
-attachIdToExistingUserReceipt = The id was successfully connected to the user. You may now log in with it
-
-availableFor = Available for
-
-availableTranslations = Available translations
-
-back = Back
-
-barkbeetle = Barkbilleoverv\u00e5king
-
-body = Body
-
-broadcastMessage = Broadcast the message
-
-browse = Browse
-
-calculationEnd = Calculation end
-
-calculationStart = Calculation start
-
-cancel = Cancel
-
-changeDate = Change date
-
-children = Children
-
-city = City
-
-clearAll = Clear all
-
-clearOne = Clear one
-
-clusterStored = The cluster information was stored
-
-completenessAtFinish = Completeness at finish
-
-configureAndRunManually = Configure and run manually
-
-confirmCancel = Do you really want to cancel?
-
-confirmDelete = Do you really want to delete?
-
-confirmEmailFailure = Your email address was not confirmed. Please contact the system administrator.
-
-confirmEmailReceipt = Your email was successfully confirmed. You will be notified as soon as the organization administrator approves your application.
-
-confirmLeaveForm = Do you really want to leave this form? All changes are left behind.
-
-confirmReloadForm = Do you really want to reload this form. All unsaved changes will be lost.
-
-country = Country
-
-createPasswordResetCodeAndSendToUserBody = You have requested to reset your current password for username {0} in VIPSLogic, and create a new one. Please follow this link to proceed: {1}
-
-createPasswordResetCodeAndSendToUserSubject = Create new password in VIPSLogic
-
-cropCategoriesFor = Crop categories for
-
-cropCategory = Crop category
-
-cropCategoryIds = Crop categories
-
-cropCategoryUpdated = Crop category was updated
-
-cropOrganismId = Crop
-
-cropOrganismIds = Crops
-
-cropPestUpdated = Crop pest was updated
-
-cropSusceptibility = Crop susceptibility
-
-crops = Crops
-
-currentDate = Current date
-
-dataSource = Data source
-
-dataSourceMissing = Data source is missing
-
-dataSourceName = Data source name
-
-date2ndUpperLeafEmerging = Date 2nd upper leaf emerging
-
-date3rdUpperLeafEmerging = Date 3rd upper leaf emerging
-
-dateEnd = Date end
-
-dateGs31 = Date GS 31
-
-dateGs75 = Date GS 75
-
-datePub = Date published
-
-datePubPeriod = Period of publication
-
-dateSpraying1 = Spraying date 1
-
-dateSpraying2 = Spraying date 2
-
-dateStart = Date start
-
-dateUpperLeafEmerging = Date upper leaf emerging
-
-dateValidTo = Valid to date
-
-days = Days
-
-defaultLocale = Default language
-
-defaultMapCenter = Default map center
-
-defaultMapZoom = Default map zoom
-
-defaultTimeZone = Default time zone
-
-defaultVipsCoreUserId = Default VIPSCore user ID
-
-degreeOfParasitation = Degree of parasitation
-
-delete = Delete
-
-deleteIllustration = Delete illustration
-
-deletePoi = Delete point of interest
-
-deleteUser = Delete user
-
-deleteUserDescription = You must transfer the user's resouces to another user before deleting is possible
-
-deleteWeatherStation = Delete weather station
-
-deleteWeatherStationPreviewExplanation = The weather station that you want to delete has the resources below connected to it. When you delete the weather station, you also delete these resources.
-
-denominator = Denominator
-
-description = Description
-
-details = Details
-
-digit = Digit
-
-doesNotMatchDateFormat = Does not match format {0}
-
-doesNotMatchFormatX = Does not match format {0}
-
-edit = Edit
-
-editCropPests = Edit pests for crop
-
-editMessage = Edit message
-
-editObservation = Edit observation
-
-editOrganization = Edit organization
-
-editPoi = Edit Point Of Interest
-
-editWeatherStation = Edit weather station
-
-elementMeasurementTypes = Measurement types
-
-email = Email
-
-emailAddressIsAlreadyInUse = Email address is already in use
-
-emailNotRegistered = The email address is not registered
-
-emailNotUnique = The email address is not unique. Please contact the VIPSLogic administrator to sort this out.
-
-emailNotVerified = You must verify your email address before the user approval process can proceed
-
-endTime = End time
-
-exceedsMaxLengthOf = Exceeds max length of {0}
-
-externalForecastProviders = External forecast providers
-
-externalResourceIdentifier = External resource identifier
-
-externalResources = External resources
-
-factoryId = Factory id
-
-farmer = Farmer
-
-farms = Farms
-
-fieldIsRequired = Field is required
-
-fieldSowingDate = Field sowing date
-
-fields = Fields
-
-traps = Traps
-
-filter = Filter
-
-filterList = Filter list
-
-filterMessages = Filter messages
-
-firstName = First name
-
-forecastConfigurationDeleted = Forecast configuration was deleted
-
-forecastConfigurationId = Forecast configuration
-
-forecastConfigurationIds = Forecast configuration ids
-
-forecastConfigurationUpdated = Forecast configuration was updated
-
-forecastNotificationMessageBodyTpl_1 = This is for {0} in {1} at location {2} at date {3}. Details: {4}
-
-forecastNotificationMessageBodyTpl_2 = This is for {0} in {1} at location {2} at date {3}.Read more: {4}
-
-forecastNotificationMessageHeadingTpl_1 = Notification of high risk of infection
-
-forecastNotificationMessageHeadingTpl_2 = Notification of moderate infection risk
-
-forecastNotifications = Forecast notifications
-
-forecastNotificationsDescription = Forecast notifications are issued when a specific forecast (a model running for a location) changes its status to a higher risk level. E.g. green to yellow or yellow to red status.
-
-forecasts = Forecasts
-
-forgottenPassword = Forgotten password
-
-freeSms = Free SMS
-
-from = From
-
-general = General
-
-genericPlaces = Generic places
-
-greeting = Dobro do\u0161li u
-
-groupMembers = Group members
-
-heading = Heading
-
-help = Help
-
-helpMessageFormCropCategoryIds = No crop selection means visibility regardless of user's crop preferences
-
-hierarchyCategoryId = Hierarchy category
-
-higherThanMaximum = Higher than the maximum ({0})
-
-illustration = Illustration
-
-inactiveWeatherStations = Inactive weather stations
-
-includeAllChildCrops = Include all child crops
-
-indexText = VIPSLogic is the common administration system for VIPS. This is where you configure users, weather stations and forecasts, and where you report observations and write messages, and more.
-
-informAdminOfConfirmedEmailBody = The user''s last name is {0}. The approval information is as follows: {1}. \\nFollow this link to edit this user: {2} \\n Follow this link to approve automatically: {3}
-
-informAdminOfConfirmedEmailSubject = New user has confirmed email and is now ready for approval
-
-internal = Internal
-
-invalidFormat = Invalid format
-
-isCrop = Is crop
-
-isForecastLocation = Is forecast location
-
-isPest = Is pest
-
-isPrivate = Is private
-
-isQuantified = Is quantified
-
-isRequiredField = Required field
-
-language = Language
-
-lastEditedBy = Last edited by
-
-lastName = Last name
-
-lastUpdated = Last updated
-
-latinName = Latin name
-
-latitude = Latitude
-
-leadParagraph = Lead paragraph
-
-leafLifeTime = Leaf life time (days)
-
-leaveForm = Leave form
-
-listCrops = List all crops
-
-listPests = List all pests
-
-listSelectedCropCategoryOnTop = List crops from selected category on top
-
-localName = Local name
-
-location = Location
-
-locationIsPrivate = Location is private
-
-locationIsPublic = Location is public
-
-locationPointOfInterestId = Location
-
-logInterval = Log interval
-
-logInterval1d = 1 day
-
-logInterval1h = 1 hour
-
-loggedinas = Logged in as
-
-login = Log in
-
-loginCredentials = Login credentials
-
-logout = Log out
-
-logoutsuccess = You are now logged out. Welcome back!
-
-longitude = Longitude
-
-lowerThanMinimum = Lower than the minimum ({0})
-
-lowercase = Lower case
-
-mapDataIsRequired = Map data is required
-
-mapDrawTypeLabel = What do you want to draw
-
-maskObservationWith = Mask observation with
-
-messageDeleted = Message was deleted
-
-messageFormat = Message format
-
-messageIllustrationCaptionLocale = Caption
-
-messageNotifications = Message notifications
-
-messageNotificationsDescription = A message notification is issued when a news message is published for a specific crop group.
-
-messageTags = Message tags
-
-messageUpdated = Message was updated
-
-messages = Messages
-
-meter = Meter
-
-missing = Missing
-
-missingInDatabase = Missing in database
-
-missingSeparatorComma = Missing separator comma
-
-missingUsernameAndPassword = Missing username and password
-
-missingValues = Missing values
-
-modelId = Forecasting model
-
-modelName = Model name
-
-multipleForecastConfigurationsCreated = The forecast configurations were successfully created
-
-myAccount = My account
-
-name = Name
-
-nameAlreadyExists = The name already exists
-
-newGroup = New group
-
-newIllustration = New illustration
-
-newMessage = New message
-
-newObservation = New observation
-
-newObservationSite = New observation site
-
-newObservationSitePoint = New observation site point
-
-newOrganism = New organism
-
-newOrganization = New organization
-
-newPoi = New Point Of Interest
-
-newUser = New user
-
-newUserCredentialsHelpText = Please enter a user name for the new user. An auto generated password will be sent to the user's email address.
-
-newWeatherStation = New weather station
-
-noDescriptionFound = No description found
-
-noMapDataEntered = No map data entered
-
-noPrivateForecastsFoundForUser = No private forecasts found for user
-
-noResultsFoundForCriteria = No results were found for the given search criteria
-
-noTasksRunning = No tasks running
-
-noWhitespaceAllowed = No whitespace allowed
-
-none = None
-
-notificationSubscriptionDescription = You can subscribe to different kinds of notifications below. Choose the format for notification, for instance email or SMS
-
-notificationSubscriptions = Notification subscriptions
-
-notificationSubscriptionsUpdated = Notification subscriptions was successfully updated
-
-numberRequired = A number is required
-
-observationData = Observation data
-
-observationDataField_counting1 = Counting 1
-
-observationDataField_counting2 = Counting 2
-
-observationDataField_trapCountCropEdge = Number of trap catches at field's edge
-
-observationDataField_trapCountCropInside = Number of trap catches inside the field
-
-observationDeleted = Observation was deleted
-
-observationHeading = Observation heading
-
-observationMap = Observation map
-
-observationMethodDescription_KNOCKING = Knocking description (TODO)
-
-observationMethodDescription_NOT_REGISTERED = The observation method is not registered
-
-observationMethodId = Observation method
-
-observationMethodTitle_COUNTING = Counting
-
-observationMethodTitle_HARVESTING = Harvesting
-
-observationMethodTitle_KNOCKING = Knocking
-
-observationMethodTitle_NOT_REGISTERED = Not registered
-
-observationMethodTitle_VISUAL = Visual
-
-observationNotifications = Observation notifications
-
-observationNotificationsDescription = An observation notification is issued when a field observation is made of a pest or disease in a specific crop group.
-
-observationSiteName = Observation site name
-
-observationSitePointName = Observation site point name
-
-observationSitePoints = Observation site points
-
-observationSiteStored = Observation site was successfully updated
-
-observationStored = Observation was stored
-
-observationText = Observation text
-
-observations = Observations
-
-observedDateOfFirstCatch = Observed date of first catch
-
-observedValue = Observed value
-
-observer = Observer
-
-older = Older
-
-or = Or
-
-organism = Organism
-
-organismDeleted = Organism was deleted
-
-organismId = Organism id
-
-organismNotDeleted = Organism was not deleted
-
-organismRegistered = Organism was registered
-
-organismUpdated = Organism was updated
-
-organisms = Organisms
-
-organizationGroupDeleted = The organization group was deleted
-
-organizationGroupList = Organization groups
-
-organizationGroupStored = Organization group was stored
-
-organizationId = Organization
-
-organizationStored = Organization was stored
-
-organizations = Organizations
-
-organizationsArchiveUser = The organization's standard archive user
-
-other = Other
-
-parentOrganismId = Parent organism
-
-password = Password
-
-password2 = Repeat password
-
-passwordResetCodeExpired = The password reset code has expired.
-
-passwordResetCodeNotFound = The password reset code was not found
-
-passwordResetSuccess = Password was successfully created. Please log in.
-
-passwordsDoNotMatch = Passwords do not match
-
-pending = Pending
-
-pestOrganismId = Pest
-
-pestOrganismIds = Pests
-
-phone = Telephone
-
-pleaseAwaitApproval = Please await your user approval
-
-pleaseSelect = Please select
-
-pleaseSpecifyOther = If other, please specify
-
-pleaselogin = Please log in
-
-poi = Point of interest
-
-poiDeleted = Point of interest was deleted
-
-poiStored = Poi was stored
-
-point = point
-
-pointOfInterestType = Point of Interest Type
-
-pointOfInterestType_0 = Unspecified
-
-pointOfInterestType_1 = Weather station
-
-pointOfInterestType_2 = Farm
-
-pointOfInterestType_3 = Field
-
-pointOfInterestType_4 = Region
-
-pois = Points Of Interest
-
-polygon = Polygon
-
-position = Position
-
-postalCode = Postal code
-
-preferredLocale = Preferred locale
-
-previousCrop = Previous crop
-
-privateForecasts = Private forecasts
-
-privateForecastsForOtherUser = Private forecasts for other user
-
-progress = Progress
-
-publicForecasts = Public forecasts
-
-publiclyAvailable = Publicly available
-
-reference = Reference
-
-registerNewUser = Register new user
-
-registerNewUserExplanation = Please fill out the form to apply for a user account. By registering as a user in VIPS, you accept our <a href="/public/documentation/Privacy_statement_NIBIO-VIPS.pdf" target="new">privacy statement.</a>
-
-registerNewUserReceipt = Thanks. You should receive an email requesting you to validate your email address. After following the instructions there, the organization admin will hopefully approve your application shortly.
-
-registrationOf = Registration of
-
-registrationShortcuts = Registration shortcuts
-
-rejected = Rejected
-
-remarks = Remarks
-
-rememberLogin = Remember login
-
-remoteloginfailed = Remote login failed
-
-replaceIllustration = Replace illustration
-
-researcher = Researcher
-
-reset = Reset
-
-resetPassword = Reset and create new password
-
-resetPasswordFormExplanation = Please enter your new password
-
-resetPasswordRequest = Request to reset password
-
-resetPasswordRequestAccepted = Your request has been accepted. An email with further instructions have been sent to the registered email address.
-
-resetPasswordRequestFormExplanation = An email will be sent to the address you enter here, with a link to reset your current password and enter a new one.
-
-runTask = Run task
-
-runningTasks = Running tasks
-
-scheduledTasks = Scheduled tasks
-
-scheduling = Scheduling
-
-schedulingOverview = Scheduling overview
-
-schedulingStarted = Scheduling started
-
-schedulingStopped = Scheduling was stopped
-
-schedulingStoppedExplanation = The scheduling system is stopped. None of the tasks in the list below will be run, unless scheduling is started again.
-
-season = Season
-
-seasonEnd = Season end
-
-seasonStart = Season start
-
-select = Select
-
-sendUserApprovalConfirmationBody = We are happy to confirm that your user account for VIPSLogic has been approved. Please log in here: {0}
-
-sendUserApprovalConfirmationSubject = Your user account has been approved
-
-sendUsernameAndPasswordToUserBody = Here is your username and password for logging in to VIPSLogic (http://{2}):\nUsername: {0}\nPassword: {1}
-
-sendUsernameAndPasswordToUserSubject = Username and password for VIPSLogic
-
-showMeWhereIAm = Show me where I Am
-
-signInWith = Sign in with
-
-slidingHoursAhead = Reference period, forwards (hours)
-
-slidingHoursPast = Reference period, backwards (hours)
-
-specificFieldsForX = Specific fields for {0}
-
-sprayingDate01 = Spraying Date 01
-
-sprayingDate02 = Spraying Date 02
-
-sprayingDate03 = Spraying Date 03
-
-sprayingDate04 = Spraying Date 04
-
-sprayingProtectionDays = Expected protection period (days) after spraying
-
-startDateAscosporeMaturity = Start date for ascospore maturation
-
-startDateDayDegreeAccumulation = Start date for day degree accumulation
-
-startDateGrowth = Start date for growth
-
-startScheduling = Start scheduling
-
-startTime = Start time
-
-status = Status
-
-statusRemarks = Status remarks
-
-statusTypeId = Status
-
-statusTypeIdTitle_1 = Pending
-
-statusTypeIdTitle_2 = Rejected
-
-statusTypeIdTitle_3 = Approved
-
-stopScheduling = Stop scheduling
-
-submit = Submit
-
-suggestedUserRole = Suggested user role
-
-surveillanceMessageInformation = If you want to create a message about an observation, please use the observation registration form
-
-systemTime = System time
-
-taskHistory = Task history
-
-taskHistoryDate = Date for task history
-
-taskHistoryDetails = Task history details
-
-taskHistoryStatusFailedCompletely = Failed completely
-
-taskHistoryStatusFailedPartly = Failed partly
-
-taskHistoryStatusOK = OK
-
-taskXWasLaunched = Task "{0}" was launched
-
-task_DeleteAllExpiredUserUuidsTask_description = Cleaning up the database of UUIDs, which is used for remembering client logins
-
-task_DeleteAllExpiredUserUuidsTask_name = Delete all expired user UUIDs
-
-task_RunAllForecastConfigurationsForOrganizationTask_description = Test
-
-task_RunAllForecastConfigurationsForOrganizationTask_name = Run all forecasts for one organization
-
-task_RunAllForecastConfigurationsTask_description = Runs all current forecasts for all organizations
-
-task_RunAllForecastConfigurationsTask_name = Run all forecast configurations
-
-task_RunForecastConfigurationsByIdTask_description = Run all forecast configurations corresponding to ids in a comma separated list
-
-task_RunForecastConfigurationsByIdTask_name = Run forecast configurations by id
-
-task_RunGridModelsTask_description = Test
-
-task_RunGridModelsTask_name = Run grid models
-
-task_SendForecastEventNotificationsTask_description = Checks to see if there has been changes in forecasts to YELLOW or RED status. If so, finds subscribers to such events and sends notifications
-
-task_SendForecastEventNotificationsTask_name = Send forecast event notifications
-
-task_UpdateForecastResultCacheTableTask_description = To speed up certain tasks, for instance aggregating warnings for today, the table forecast_result_cache should contain only today's forecast results. Today = SystemTime.
-
-task_UpdateForecastResultCacheTableTask_name = Update forecast result cache table
-
-task_UpdateForecastSummaryTableTask_description = This task updates the table for summaries
-
-task_UpdateForecastSummaryTableTask_name = Update table of forecast summaries
-
-task_UpdateModelInformationTask_description = Fetches information about models from VIPSCoreManager and stores in VIPSLogic
-
-task_UpdateModelInformationTask_name = Update model information
-
-tasks = Tasks
-
-test = Test
-
-thousandBerrySample = Thousand berry sample
-
-thresholdHumidPeriodHours = Threshold Number of consecutive humid hours
-
-thresholdLeafWetness = Threshold leaf wetness (min/h)
-
-thresholdPrecipitation = Threshold precipitation (mm)
-
-thresholdRelativeHumidity = Threshold relative humidty (%)
-
-tillageMethod = Tillage method
-
-timeOfObservation = Time of observation
-
-timeZone = Time zone
-
-timestamp = Timestamp
-
-to = To
-
-toTheTop = To the top
-
-tooManySeparatorCommas = Too many separator commas
-
-tradeName = Trade name
-
-transferAndDelete = Transfer and delete
-
-transferResources = Transfer resources
-
-type = Type
-
-unknownOrganismId = Unknown Organism Id
-
-unknownTranslationKey = Unknown translation key: {0}
-
-up = Up
-
-uppercase = Upper case
-
-user = User
-
-userAccountInformation = User account information
-
-userApproved = The user was approved
-
-userCreatedAndInformed = User was created. An email with username and password was sent to the user's email
-
-userDeleted = User was deleted
-
-userOrganizationGroupsListDescription = Organization groups can be used to share resources like points of interest
-
-userRegistrationEmailVerificationMessageBody = We have received a request to register a new user at VIPSLogic (http://{0}/). Please confirm your email by clicking this link: {1}\n\nAfter confirming your email, a VIPS admin will review your registration and (hopefully) enable your account. Please contact us if this takes longer than a day or two.\n\nThank you
-
-userRegistrationEmailVerificationMessageSubject = Email verification needed
-
-userResources = User resources
-
-userStatusId = Approval status
-
-userStatus_1 = Awaiting email validation
-
-userStatus_2 = Awaiting approval
-
-userStatus_3 = Rejected
-
-userStatus_4 = Approved
-
-userStatus_5 = Disabled
-
-userUpdated = User was updated
-
-username = User name
-
-usernameExists = Username {0} exists
-
-users = Users
-
-viewAllTasks = View all tasks
-
-viewForecastConfiguration = View forecast configuration
-
-viewFullScreen = Full screen view
-
-viewOthersObservations = View observations made by others
-
-vipsLogicRole_1 = Superuser
-
-vipsLogicRole_10 = Bark beetle administrator
-
-vipsLogicRole_11 = Bark beetle county admin
-
-vipsLogicRole_2 = Organization administrator
-
-vipsLogicRole_3 = Observer
-
-vipsLogicRole_4 = Observation authority
-
-vipsLogicRole_5 = Message author
-
-vipsLogicRole_6 = Apple Fruit Moth Administrator
-
-vipsLogicRole_7 = Organism editor
-
-vipsLogicRole_8 = Apple Fruit Moth Rowanberry Cluster Counter
-
-vipsLogicRole_9 = Bark beetle registrator
-
-vipsLogicRoles = User roles
-
-vipsLogicUserId = User
-
-vipswebUrl = VIPSWeb URL
-
-warningStatus = Warning status
-
-warningStatus_0 = No forecast available
-
-warningStatus_1 = Missing data
-
-warningStatus_2 = No risk of infection
-
-warningStatus_3 = Medium risk of infection
-
-warningStatus_4 = High risk of infection
-
-warning_fieldNotFoundInFormDefinition = WARNING: field {0} not found in form definition. The system does not know how to validate it. Continue anyway?
-
-weatherForecastProvider = Weather forecast service
-
-weatherStationDeleted = Weather station was deleted
-
-weatherStationForecastConfigurations = Forecasts connected to the weather station
-
-weatherStationPointOfInterestId = Weather station
-
-weatherStationPointOfInterestIds = Weather stations
-
-weatherStationRemoteId = Remote Id for weather station
-
-weatherStationRemoteIdMissing = Remote Id for weather station is missing
-
-weatherStationStored = Weather station information was stored
-
-weatherStations = Weather stations
-
-xIsNotAfterY = {0} is not after {1}
-
-xIsNotEqualToY = {0} is not equal to {1}
-
-your = Your
-biofixDate=Biofix date
-heatRequirements=Heat requirements
-dd_lower=Day degree lower cutoffs
-dd_upper=Day degree upper cutoffs
-observedPhase=Observed phase at biofix date
-YSTEMBTEMP=Yellow Stemborer Temperature Model
-addIllustration=Add illustration
-allRoles=All roles
-allStatuses=All statuses
-LEAFBLOTCH=Leaf blotch model
-universalMessageSettingsLink_tpl=To edit your notification subscriptions, please use this link: {0}
-pointOfInterestType_5=Trap
-sowingDate=Sowing date
-pointOfInterestType_6=Apiary site
-pointOfInterestType_7=Nursery
-privacyStatement=Privacy statement
-privacyStatementFileName=Privacy_statement_NIBIO-VIPS.pdf
-thresholdDSVMax=DSV threshold for high infection risk
-thresholdDSVTempMin=Minimum temperature for DSV calculation
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
index 24728fee46f5f10c94ffa13944a6227f467095b6..ae2b3ac16deb47f630e9c5dee526e81916a31c36 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
@@ -70,11 +70,11 @@ VIPSLogicTitle = Administrasjonssystem
active = Aktiv
-activeWeatherStations = Aktive m\u00e5lestasjoner
+activeWeatherStations = Aktive v\u00e6rstasjoner
-addMultipleNew = Legg til nye
+addNewForMultipleWeatherStations=Legg til nytt varsel for flere v\u00e6rstasjoner samtidig
-addNew = Legg til ny
+addNew = Legg til nytt
address = Adresse
@@ -244,9 +244,9 @@ deleteUser = Slett bruker
deleteUserDescription = Du m\u00e5 overf\u00f8re brukerens ressurser til en annen bruker f\u00f8r brukeren kan slettes
-deleteWeatherStation = Slett m\u00e5lestasjon
+deleteWeatherStation = Slett v\u00e6rstasjon
-deleteWeatherStationPreviewExplanation = M\u00e5lestasjonen du \u00f8nsker \u00e5 slette har knyttet til seg de ressursene som er nevnt nedenfor. N\u00e5r du sletter m\u00e5lestasjonen, vil ogs\u00e5 disse ressursene bli slettet.
+deleteWeatherStationPreviewExplanation = V\u00e6rstasjonen du \u00f8nsker \u00e5 slette har knyttet til seg de ressursene som er nevnt nedenfor. N\u00e5r du sletter v\u00e6rstasjonen, vil ogs\u00e5 disse ressursene bli slettet.
denominator = Denominator
@@ -272,9 +272,9 @@ editOrganization = Rediger organisasjon
editPoi = Rediger sted
-editWeatherStation = Rediger m\u00e5lestasjon
+editWeatherStation = Rediger v\u00e6rstasjon
-elementMeasurementTypes = M\u00e5leparametre
+elementMeasurementTypes = V\u00e6rparametre
email = E-post
@@ -366,11 +366,11 @@ higherThanMaximum = Kan ikke v\u00e6re h\u00f8yere enn {0}
illustration = Illustrasjon
-inactiveWeatherStations = Inaktive m\u00e5lestasjoner
+inactiveWeatherStations = Inaktive v\u00e6rstasjoner
includeAllChildCrops = Inkluder alle underarter, sorter og varianter
-indexText = VIPSLogic er felles administrasjonssystem for VIPS. Her konfigurerer du brukere, m\u00e5lestasjoner og varsler, og her registrerer du observasjoner og skriver meldinger, med mere. Bruk menyen i toppen for \u00e5 komme i gang.
+indexText = VIPSLogic er felles administrasjonssystem for VIPS. Her konfigurerer du brukere, v\u00e6rstasjoner og varsler, og her registrerer du observasjoner og skriver meldinger, med mere. Bruk menyen i toppen for \u00e5 komme i gang.
informAdminOfConfirmedEmailBody = Brukerens etternavn er {0}. Oppgitt brukerinformasjon er som f\u00f8lger: {1} F\u00f8lg denne lenken for \u00e5 redigere og godkjenne: {2}. \\nF\u00f8lg denne lenken for \u00e5 godkjenne automatisk: {3}
@@ -518,7 +518,7 @@ newUser = Ny bruker
newUserCredentialsHelpText = \nVennligst skriv inn et brukernavn for den nye brukeren. Et autogenerert passord sendes til brukerens epostadresse.
-newWeatherStation = Ny m\u00e5lestasjon
+newWeatherStation = Ny v\u00e6rstasjon
noDescriptionFound = Ingen beskrivelse funnet
@@ -682,7 +682,7 @@ pointOfInterestType = Stedstype
pointOfInterestType_0 = Uspesifisert
-pointOfInterestType_1 = M\u00e5lestasjon
+pointOfInterestType_1 = V\u00e6rstasjon
pointOfInterestType_2 = G\u00e5rd
@@ -1016,21 +1016,21 @@ warning_fieldNotFoundInFormDefinition = Advarsel: feltet {0} ble ikke funnet i s
weatherForecastProvider = V\u00e6rvarslingstjeneste
-weatherStationDeleted = M\u00e5lestasjonen ble slettet
+weatherStationDeleted = V\u00e6rstasjonen ble slettet
-weatherStationForecastConfigurations = Varsler knyttet til m\u00e5lestasjonen
+weatherStationForecastConfigurations = Varsler knyttet til v\u00e6rstasjonen
-weatherStationPointOfInterestId = M\u00e5lestasjon
+weatherStationPointOfInterestId = V\u00e6rstasjon
-weatherStationPointOfInterestIds = M\u00e5lestasjoner
+weatherStationPointOfInterestIds = V\u00e6rstasjoner
-weatherStationRemoteId = Fjern-Id for m\u00e5lestasjon
+weatherStationRemoteId = Fjern-Id for v\u00e6rstasjon
-weatherStationRemoteIdMissing = Fjern-Id for m\u00e5lestasjon mangler
+weatherStationRemoteIdMissing = Fjern-Id for v\u00e6rstasjon mangler
-weatherStationStored = Informasjon om m\u00e5lestasjon ble lagret
+weatherStationStored = Informasjon om v\u00e6rstasjon ble lagret
-weatherStations = M\u00e5lestasjoner
+weatherStations = V\u00e6rstasjoner
xIsNotAfterY = {0} er ikke etter {1}
@@ -1057,6 +1057,17 @@ privacyStatement=Personvernerkl\u00e6ring
privacyStatementFileName=Personvernerklaering_NIBIO-VIPS.pdf
thresholdDSVMax=DSV-terskel for h\u00f8y infeksjonsrisiko
thresholdDSVTempMin=Minimumstemperatur for beregning av DSV
+useGridWeatherData=Bruk v\u00e6rdata for mitt steds posisjon
+doNotUse=Ikke bruk
+defaultGridWeatherStationDataSource=GRID-basert v\u00e6rdatakilde
+weatherStationDataSources=V\u00e6r(stasjons)datakilder
+newWeatherStationDataSource=Ny v\u00e6r(stasjons)datakilde
+editWeatherStationDataSource=Rediger v\u00e6r(stasjons)datakilde
+datafetchUriExpression=URI-mal for v\u00e6rdataforesp\u00f8rsel
+infoUriExpression=Mal for henvendelse om stasjonsinformasjon
+isGridWeatherDataSource=Er en grid-basert v\u00e6rdatakilde
+weatherStationDataSourceStored=V\u00e6r(stasjons)datakilden ble lagret
+weatherStationDataSourceDeleted=V\u00e6r(stasjons)datakilden ble slettet
observationTimeSeriesId=Tidsserie-Id
observationTimeSeriesLabel=Tidsserie
observationId=Observasjon-Id
@@ -1069,3 +1080,6 @@ unregisteredUser=Uregistrert bruker
downloadedTime=Tidspunkt for nedlasting
observationCount=Antall observasjoner
+weatherDatasource=V\u00e6rdatakilde
+useWeatherStation=Bruk v\u00e6rstasjon
+multipleNewWarningMsg=Dette skjemaet er en snarvei for \u00e5 opprette likelydende varsel p\u00e5 flere v\u00e6rstasjoner. <a href="/forecastConfiguration?action=viewForecastConfiguration&forecastConfigurationId=-1">Klikk her</a> hvis du vil opprette bare ett varsel.
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties
deleted file mode 100755
index 1a791041100981ea65f2c5acf16d66132a05823d..0000000000000000000000000000000000000000
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties
+++ /dev/null
@@ -1,1048 +0,0 @@
-#
- # Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
- #
- # This file is part of VIPSLogic.
- # This program is free software: you can redistribute it and/or modify
- # it under the terms of the GNU Affero General Public License as published by
- # the Free Software Foundation, either version 3 of the License, or
- # (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU Affero General Public License for more details.
- #
- # You should have received a copy of the GNU Affero General Public License
- # along with this program. If not, see <https://www.gnu.org/licenses/>.
- #
-isPositiveRegistration=Pest presence confirmed
-ALTERNARIA = Alternaria Model
-
-APPLESCABM = Apple scab model
-
-BARLEYNETB = Barley net blotch model
-
-BREMIALACT = Bremia lactucae model
-
-CYDIAPOMON = Cydia pomonella model
-
-DELIARADIC = Delia radicum model
-
-DELIARFOBO = Delia radicum/floralis observation model for old crops
-
-DELIARFOBS = Delia radicum/floralis observation model
-
-DELIARFOBY = Delia radicum/floralis observation model for young crops
-
-DOWNCASTMO = DOWNCAST model
-
-FINNCEREAL = Model for Pyrenophora teres, Drechslera tritici-repentis and Stagonospora nodorum
-
-GRASSDRYMO = Grass drying model
-
-LYGUSRUGUL = Lygus rugulipennis model
-
-MAMESTRABR = Mamestra brassicae model
-
-Mail = Email
-
-NAERSTADMO = N\u00e6rstad's model
-
-NEGPROGMOD = Negative prognosis model
-
-OATFLOWERM = Oat flowering model
-
-PLASMOVITI = Downy Mildew model
-
-PSILAROBSE = Psila rosae observation model
-
-PSILARTEMP = Psila rosae Temperature Model
-
-RAINYDAYSM = Rainy days model
-
-SEPAPIICOL = Septoria apiicola model
-
-SEPTREFHUM = Septoria reference humidity model
-
-Sms = SMS
-
-VIPSLogicTitle = VIPS administration system
-
-active = Active
-
-activeWeatherStations = Active weather stations
-
-addMultipleNew = Add multiple new
-
-addNew = Add new
-
-address = Address
-
-advisor = Advisor
-
-all = All
-
-allCategories = All categories
-
-allCrops = All crops
-
-allOrganizations = All organizations
-
-allPests = All pests
-
-allSystems = All systems
-
-altitude = Altitude
-
-appleFruitMoth = Apple fruit moth
-
-appleFruitMothChangeSeasonConfirm = Are you sure you want to change season? All unsaved data for the current season will be lost.
-
-approvalApplication = Approval application
-
-approvalApplicationHelp = Describe what you want to do as a registered user. E.g. write messages, register observations, etc.
-
-approved = Approved
-
-approvesSmsBilling = Approves billing for SMS messages
-
-approvesSmsBillingDescription = By checking this option, you confirm that you accept the billing costs for receiving SMS messages from our subscription services. This consent can be terminated at any time, either by unchecking this checkbox or by sending VIPS STOP to your country's short number. Number for Norway is 1963.
-
-archiveUserId = Archive user
-
-attachIdToExistingUser = Add this login to my existing user
-
-attachIdToExistingUserReceipt = The id was successfully connected to the user. You may now log in with it
-
-availableFor = Available for
-
-availableTranslations = Available translations
-
-back = Back
-
-barkbeetle = Barkbilleoverv\u00e5king
-
-body = Body
-
-broadcastMessage = Broadcast the message
-
-browse = Browse
-
-calculationEnd = Calculation end
-
-calculationStart = Calculation start
-
-cancel = Cancel
-
-changeDate = Change date
-
-children = Children
-
-city = City
-
-clearAll = Clear all
-
-clearOne = Clear one
-
-clusterStored = The cluster information was stored
-
-completenessAtFinish = Completeness at finish
-
-configureAndRunManually = Configure and run manually
-
-confirmCancel = Do you really want to cancel?
-
-confirmDelete = Do you really want to delete?
-
-confirmEmailFailure = Your email address was not confirmed. Please contact the system administrator.
-
-confirmEmailReceipt = Your email was successfully confirmed. You will be notified as soon as the organization administrator approves your application.
-
-confirmLeaveForm = Do you really want to leave this form? All changes are left behind.
-
-confirmReloadForm = Do you really want to reload this form. All unsaved changes will be lost.
-
-country = Country
-
-createPasswordResetCodeAndSendToUserBody = You have requested to reset your current password for username {0} in VIPSLogic, and create a new one. Please follow this link to proceed: {1}
-
-createPasswordResetCodeAndSendToUserSubject = Create new password in VIPSLogic
-
-cropCategoriesFor = Crop categories for
-
-cropCategory = Crop category
-
-cropCategoryIds = Crop categories
-
-cropCategoryUpdated = Crop category was updated
-
-cropOrganismId = Crop
-
-cropOrganismIds = Crops
-
-cropPestUpdated = Crop pest was updated
-
-cropSusceptibility = Crop susceptibility
-
-crops = Crops
-
-currentDate = Current date
-
-dataSource = Data source
-
-dataSourceMissing = Data source is missing
-
-dataSourceName = Data source name
-
-date2ndUpperLeafEmerging = Date 2nd upper leaf emerging
-
-date3rdUpperLeafEmerging = Date 3rd upper leaf emerging
-
-dateEnd = Date end
-
-dateGs31 = Date GS 31
-
-dateGs75 = Date GS 75
-
-datePub = Date published
-
-datePubPeriod = Period of publication
-
-dateSpraying1 = Spraying date 1
-
-dateSpraying2 = Spraying date 2
-
-dateStart = Date start
-
-dateUpperLeafEmerging = Date upper leaf emerging
-
-dateValidTo = Valid to date
-
-days = Days
-
-defaultLocale = Default language
-
-defaultMapCenter = Default map center
-
-defaultMapZoom = Default map zoom
-
-defaultTimeZone = Default time zone
-
-defaultVipsCoreUserId = Default VIPSCore user ID
-
-degreeOfParasitation = Degree of parasitation
-
-delete = Delete
-
-deleteIllustration = Delete illustration
-
-deletePoi = Delete point of interest
-
-deleteUser = Delete user
-
-deleteUserDescription = You must transfer the user's resouces to another user before deleting is possible
-
-deleteWeatherStation = Delete weather station
-
-deleteWeatherStationPreviewExplanation = The weather station that you want to delete has the resources below connected to it. When you delete the weather station, you also delete these resources.
-
-denominator = Denominator
-
-description = Description
-
-details = Details
-
-digit = Digit
-
-doesNotMatchDateFormat = Does not match format {0}
-
-doesNotMatchFormatX = Does not match format {0}
-
-edit = Edit
-
-editCropPests = Edit pests for crop
-
-editMessage = Edit message
-
-editObservation = Edit observation
-
-editOrganization = Edit organization
-
-editPoi = Edit Point Of Interest
-
-editWeatherStation = Edit weather station
-
-elementMeasurementTypes = Measurement types
-
-email = Email
-
-emailAddressIsAlreadyInUse = Email address is already in use
-
-emailNotRegistered = The email address is not registered
-
-emailNotUnique = The email address is not unique. Please contact the VIPSLogic administrator to sort this out.
-
-emailNotVerified = You must verify your email address before the user approval process can proceed
-
-endTime = End time
-
-exceedsMaxLengthOf = Exceeds max length of {0}
-
-externalForecastProviders = External forecast providers
-
-externalResourceIdentifier = External resource identifier
-
-externalResources = External resources
-
-factoryId = Factory id
-
-farmer = Farmer
-
-farms = Farms
-
-fieldIsRequired = Field is required
-
-fieldSowingDate = Field sowing date
-
-fields = Fields
-
-traps = Traps
-
-filter = Filter
-
-filterList = Filter list
-
-filterMessages = Filter messages
-
-firstName = First name
-
-forecastConfigurationDeleted = Forecast configuration was deleted
-
-forecastConfigurationId = Forecast configuration
-
-forecastConfigurationIds = Forecast configuration ids
-
-forecastConfigurationUpdated = Forecast configuration was updated
-
-forecastNotificationMessageBodyTpl_1 = This is for {0} in {1} at location {2} at date {3}. Details: {4}
-
-forecastNotificationMessageBodyTpl_2 = This is for {0} in {1} at location {2} at date {3}.Read more: {4}
-
-forecastNotificationMessageHeadingTpl_1 = Notification of high risk of infection
-
-forecastNotificationMessageHeadingTpl_2 = Notification of moderate infection risk
-
-forecastNotifications = Forecast notifications
-
-forecastNotificationsDescription = Forecast notifications are issued when a specific forecast (a model running for a location) changes its status to a higher risk level. E.g. green to yellow or yellow to red status.
-
-forecasts = Forecasts
-
-forgottenPassword = Forgotten password
-
-freeSms = Free SMS
-
-from = From
-
-general = General
-
-genericPlaces = Generic places
-
-greeting = Dobro do\u0161li u
-
-groupMembers = Group members
-
-heading = Heading
-
-help = Help
-
-helpMessageFormCropCategoryIds = No crop selection means visibility regardless of user's crop preferences
-
-hierarchyCategoryId = Hierarchy category
-
-higherThanMaximum = Higher than the maximum ({0})
-
-illustration = Illustration
-
-inactiveWeatherStations = Inactive weather stations
-
-includeAllChildCrops = Include all child crops
-
-indexText = VIPSLogic is the common administration system for VIPS. This is where you configure users, weather stations and forecasts, and where you report observations and write messages, and more.
-
-informAdminOfConfirmedEmailBody = The user''s last name is {0}. The approval information is as follows: {1}. \\nFollow this link to edit this user: {2} \\n Follow this link to approve automatically: {3}
-
-informAdminOfConfirmedEmailSubject = New user has confirmed email and is now ready for approval
-
-internal = Internal
-
-invalidFormat = Invalid format
-
-invalidcredentials = Invalid username and/or password
-
-isCrop = Is crop
-
-isForecastLocation = Is forecast location
-
-isPest = Is pest
-
-isPrivate = Is private
-
-isQuantified = Is quantified
-
-isRequiredField = Required field
-
-language = Language
-
-lastEditedBy = Last edited by
-
-lastName = Last name
-
-lastUpdated = Last updated
-
-latinName = Latin name
-
-latitude = Latitude
-
-leadParagraph = Lead paragraph
-
-leafLifeTime = Leaf life time (days)
-
-leaveForm = Leave form
-
-listCrops = List all crops
-
-listPests = List all pests
-
-listSelectedCropCategoryOnTop = List crops from selected category on top
-
-localName = Local name
-
-location = Location
-
-locationIsPrivate = Location is private
-
-locationIsPublic = Location is public
-
-locationPointOfInterestId = Location
-
-logInterval = Log interval
-
-logInterval1d = 1 day
-
-logInterval1h = 1 hour
-
-loggedinas = Logged in as
-
-login = Log in
-
-loginCredentials = Login credentials
-
-logout = Log out
-
-logoutsuccess = You are now logged out. Welcome back!
-
-longitude = Longitude
-
-lowerThanMinimum = Lower than the minimum ({0})
-
-lowercase = Lower case
-
-mapDataIsRequired = Map data is required
-
-mapDrawTypeLabel = What do you want to draw
-
-maskObservationWith = Mask observation with
-
-messageDeleted = Message was deleted
-
-messageFormat = Message format
-
-messageIllustrationCaptionLocale = Caption
-
-messageNotifications = Message notifications
-
-messageNotificationsDescription = A message notification is issued when a news message is published for a specific crop group.
-
-messageTags = Message tags
-
-messageUpdated = Message was updated
-
-messages = Messages
-
-meter = Meter
-
-missing = Missing
-
-missingInDatabase = Missing in database
-
-missingSeparatorComma = Missing separator comma
-
-missingUsernameAndPassword = Missing username and password
-
-missingValues = Missing values
-
-modelId = Forecasting model
-
-modelName = Model name
-
-multipleForecastConfigurationsCreated = The forecast configurations were successfully created
-
-myAccount = My account
-
-name = Name
-
-nameAlreadyExists = The name already exists
-
-newGroup = New group
-
-newIllustration = New illustration
-
-newMessage = New message
-
-newObservation = New observation
-
-newObservationSite = New observation site
-
-newObservationSitePoint = New observation site point
-
-newOrganism = New organism
-
-newOrganization = New organization
-
-newPoi = New Point Of Interest
-
-newUser = New user
-
-newUserCredentialsHelpText = Please enter a user name for the new user. An auto generated password will be sent to the user's email address.
-
-newWeatherStation = New weather station
-
-noDescriptionFound = No description found
-
-noMapDataEntered = No map data entered
-
-noPrivateForecastsFoundForUser = No private forecasts found for user
-
-noResultsFoundForCriteria = No results were found for the given search criteria
-
-noTasksRunning = No tasks running
-
-noWhitespaceAllowed = No whitespace allowed
-
-none = None
-
-notificationSubscriptionDescription = You can subscribe to different kinds of notifications below. Choose the format for notification, for instance email or SMS
-
-notificationSubscriptions = Notification subscriptions
-
-notificationSubscriptionsUpdated = Notification subscriptions was successfully updated
-
-numberRequired = A number is required
-
-observationData = Observation data
-
-observationDataField_counting1 = Counting 1
-
-observationDataField_counting2 = Counting 2
-
-observationDataField_trapCountCropEdge = Number of trap counts at field's edge
-
-observationDataField_trapCountCropInside = Number of trap counts inside the field
-
-observationDeleted = Observation was deleted
-
-observationHeading = Observation heading
-
-observationMap = Observation map
-
-observationMethodDescription_KNOCKING = Knocking description (TODO)
-
-observationMethodDescription_NOT_REGISTERED = The observation method is not registered
-
-observationMethodId = Observation method
-
-observationMethodTitle_COUNTING = Counting
-
-observationMethodTitle_HARVESTING = Harvesting
-
-observationMethodTitle_KNOCKING = Knocking
-
-observationMethodTitle_NOT_REGISTERED = Not registered
-
-observationMethodTitle_VISUAL = Visual
-
-observationNotifications = Observation notifications
-
-observationNotificationsDescription = An observation notification is issued when a field observation is made of a pest or disease in a specific crop group.
-
-observationSiteName = Observation site name
-
-observationSitePointName = Observation site point name
-
-observationSitePoints = Observation site points
-
-observationSiteStored = Observation site was successfully updated
-
-observationStored = Observation was stored
-
-observationText = Observation text
-
-observations = Observations
-
-observedDateOfFirstCatch = Observed date of first catch
-
-observedValue = Observed value
-
-observer = Observer
-
-older = Older
-
-or = Or
-
-organism = Organism
-
-organismDeleted = Organism was deleted
-
-organismId = Organism id
-
-organismNotDeleted = Organism was not deleted
-
-organismRegistered = Organism was registered
-
-organismUpdated = Organism was updated
-
-organisms = Organisms
-
-organizationGroupDeleted = The organization group was deleted
-
-organizationGroupList = Organization groups
-
-organizationGroupStored = Organization group was stored
-
-organizationId = Organization
-
-organizationStored = Organization was stored
-
-organizations = Organizations
-
-organizationsArchiveUser = The organization's standard archive user
-
-other = Other
-
-parentOrganismId = Parent organism
-
-password = Password
-
-password2 = Repeat password
-
-passwordResetCodeExpired = The password reset code has expired.
-
-passwordResetCodeNotFound = The password reset code was not found
-
-passwordResetSuccess = Password was successfully created. Please log in.
-
-passwordsDoNotMatch = Passwords do not match
-
-pending = Pending
-
-pestOrganismId = Pest
-
-pestOrganismIds = Pests
-
-phone = Telephone
-
-pleaseAwaitApproval = Please await your user approval
-
-pleaseSelect = Please select
-
-pleaseSpecifyOther = If other, please specify
-
-pleaselogin = Please log in
-
-poi = Point of interest
-
-poiDeleted = Point of interest was deleted
-
-poiStored = Poi was stored
-
-point = point
-
-pointOfInterestType = Point of Interest Type
-
-pointOfInterestType_0 = Unspecified
-
-pointOfInterestType_1 = Weather station
-
-pointOfInterestType_2 = Farm
-
-pointOfInterestType_3 = Field
-
-pointOfInterestType_4 = Region
-
-pois = Points Of Interest
-
-polygon = Polygon
-
-position = Position
-
-postalCode = Postal code
-
-preferredLocale = Preferred locale
-
-previousCrop = Previous crop
-
-privateForecasts = Private forecasts
-
-privateForecastsForOtherUser = Private forecasts for other user
-
-progress = Progress
-
-publicForecasts = Public forecasts
-
-publiclyAvailable = Publicly available
-
-reference = Reference
-
-registerNewUser = Register new user
-
-registerNewUserExplanation = Please fill out the form to apply for a user account. By registering as a user in VIPS, you accept our <a href="/public/documentation/Privacy_statement_NIBIO-VIPS.pdf" target="new">privacy statement.</a>
-
-registerNewUserReceipt = Thanks. You should receive an email requesting you to validate your email address. After following the instructions there, the organization admin will hopefully approve your application shortly.
-
-registrationOf = Registration of
-
-registrationShortcuts = Registration shortcuts
-
-rejected = Rejected
-
-remarks = Remarks
-
-rememberLogin = Remember login
-
-remoteloginfailed = Remote login failed
-
-replaceIllustration = Replace illustration
-
-researcher = Researcher
-
-reset = Reset
-
-resetPassword = Reset and create new password
-
-resetPasswordFormExplanation = Please enter your new password
-
-resetPasswordRequest = Request to reset password
-
-resetPasswordRequestAccepted = Your request has been accepted. An email with further instructions have been sent to the registered email address.
-
-resetPasswordRequestFormExplanation = An email will be sent to the address you enter here, with a link to reset your current password and enter a new one.
-
-runTask = Run task
-
-runningTasks = Running tasks
-
-scheduledTasks = Scheduled tasks
-
-scheduling = Scheduling
-
-schedulingOverview = Scheduling overview
-
-schedulingStarted = Scheduling started
-
-schedulingStopped = Scheduling was stopped
-
-schedulingStoppedExplanation = The scheduling system is stopped. None of the tasks in the list below will be run, unless scheduling is started again.
-
-season = Season
-
-seasonEnd = Season end
-
-seasonStart = Season start
-
-select = Select
-
-sendUserApprovalConfirmationBody = We are happy to confirm that your user account for VIPSLogic has been approved. Please log in here: {0}
-
-sendUserApprovalConfirmationSubject = Your user account has been approved
-
-sendUsernameAndPasswordToUserBody = Here is your username and password for logging in to VIPSLogic (http://{2}):\nUsername: {0}\nPassword: {1}
-
-sendUsernameAndPasswordToUserSubject = Username and password for VIPSLogic
-
-showMeWhereIAm = Show me where I Am
-
-signInWith = Sign in with
-
-slidingHoursAhead = Reference period, forwards (hours)
-
-slidingHoursPast = Reference period, backwards (hours)
-
-specificFieldsForX = Specific fields for {0}
-
-sprayingDate01 = Spraying Date 01
-
-sprayingDate02 = Spraying Date 02
-
-sprayingDate03 = Spraying Date 03
-
-sprayingDate04 = Spraying Date 04
-
-sprayingProtectionDays = Expected protection period (days) after spraying
-
-startDateAscosporeMaturity = Start date for ascospore maturation
-
-startDateDayDegreeAccumulation = Start date for day degree accumulation
-
-startDateGrowth = Start date for growth
-
-startScheduling = Start scheduling
-
-startTime = Start time
-
-status = Status
-
-statusRemarks = Status remarks
-
-statusTypeId = Status
-
-statusTypeIdTitle_1 = Pending
-
-statusTypeIdTitle_2 = Rejected
-
-statusTypeIdTitle_3 = Approved
-
-stopScheduling = Stop scheduling
-
-submit = Submit
-
-suggestedUserRole = Suggested user role
-
-surveillanceMessageInformation = If you want to create a message about an observation, please use the observation registration form
-
-systemTime = System time
-
-taskHistory = Task history
-
-taskHistoryDate = Date for task history
-
-taskHistoryDetails = Task history details
-
-taskHistoryStatusFailedCompletely = Failed completely
-
-taskHistoryStatusFailedPartly = Failed partly
-
-taskHistoryStatusOK = OK
-
-taskXWasLaunched = Task "{0}" was launched
-
-task_DeleteAllExpiredUserUuidsTask_description = Cleaning up the database of UUIDs, which is used for remembering client logins
-
-task_DeleteAllExpiredUserUuidsTask_name = Delete all expired user UUIDs
-
-task_RunAllForecastConfigurationsForOrganizationTask_description = Test
-
-task_RunAllForecastConfigurationsForOrganizationTask_name = Run all forecasts for one organization
-
-task_RunAllForecastConfigurationsTask_description = Runs all current forecasts for all organizations
-
-task_RunAllForecastConfigurationsTask_name = Run all forecast configurations
-
-task_RunForecastConfigurationsByIdTask_description = Run all forecast configurations corresponding to ids in a comma separated list
-
-task_RunForecastConfigurationsByIdTask_name = Run forecast configurations by id
-
-task_RunGridModelsTask_description = Test
-
-task_RunGridModelsTask_name = Run grid models
-
-task_SendForecastEventNotificationsTask_description = Checks to see if there has been changes in forecasts to YELLOW or RED status. If so, finds subscribers to such events and sends notifications
-
-task_SendForecastEventNotificationsTask_name = Send forecast event notifications
-
-task_UpdateForecastResultCacheTableTask_description = To speed up certain tasks, for instance aggregating warnings for today, the table forecast_result_cache should contain only today's forecast results. Today = SystemTime.
-
-task_UpdateForecastResultCacheTableTask_name = Update forecast result cache table
-
-task_UpdateForecastSummaryTableTask_description = This task updates the table for summaries
-
-task_UpdateForecastSummaryTableTask_name = Update table of forecast summaries
-
-task_UpdateModelInformationTask_description = Fetches information about models from VIPSCoreManager and stores in VIPSLogic
-
-task_UpdateModelInformationTask_name = Update model information
-
-tasks = Tasks
-
-test = Test
-
-thousandBerrySample = Thousand berry sample
-
-thresholdHumidPeriodHours = Threshold Number of consecutive humid hours
-
-thresholdLeafWetness = Threshold leaf wetness (min/h)
-
-thresholdPrecipitation = Threshold precipitation (mm)
-
-thresholdRelativeHumidity = Threshold relative humidty (%)
-
-tillageMethod = Tillage method
-
-timeOfObservation = Time of observation
-
-timeZone = Time zone
-
-timestamp = Timestamp
-
-to = To
-
-toTheTop = To the top
-
-tooManySeparatorCommas = Too many separator commas
-
-tradeName = Trade name
-
-transferAndDelete = Transfer and delete
-
-transferResources = Transfer resources
-
-type = Type
-
-unknownOrganismId = Unknown Organism Id
-
-unknownTranslationKey = Unknown translation key: {0}
-
-up = Up
-
-uppercase = Upper case
-
-user = User
-
-userAccountInformation = User account information
-
-userApproved = The user was approved
-
-userCreatedAndInformed = User was created. An email with username and password was sent to the user's email
-
-userDeleted = User was deleted
-
-userOrganizationGroupsListDescription = Organization groups can be used to share resources like points of interest
-
-userRegistrationEmailVerificationMessageBody = We have received a request to register a new user at VIPSLogic (http://{0}/). Please confirm your email by clicking this link: {1}\n\nThank you
-
-userRegistrationEmailVerificationMessageSubject = Email verification needed
-
-userResources = User resources
-
-userStatusId = Approval status
-
-userStatus_1 = Awaiting email validation
-
-userStatus_2 = Awaiting approval
-
-userStatus_3 = Rejected
-
-userStatus_4 = Approved
-
-userStatus_5 = Disabled
-
-userUpdated = User was updated
-
-username = User name
-
-usernameExists = Username {0} exists
-
-users = Users
-
-viewAllTasks = View all tasks
-
-viewForecastConfiguration = View forecast configuration
-
-viewFullScreen = Full screen view
-
-viewOthersObservations = View observations made by others
-
-vipsLogicRole_1 = Superuser
-
-vipsLogicRole_10 = Bark beetle administrator
-
-vipsLogicRole_11 = Bark beetle county admin
-
-vipsLogicRole_2 = Organization administrator
-
-vipsLogicRole_3 = Observer
-
-vipsLogicRole_4 = Observation authority
-
-vipsLogicRole_5 = Message author
-
-vipsLogicRole_6 = Apple Fruit Moth Administrator
-
-vipsLogicRole_7 = Organism editor
-
-vipsLogicRole_8 = Apple Fruit Moth Rowanberry Cluster Counter
-
-vipsLogicRole_9 = Bark beetle registrator
-
-vipsLogicRoles = User roles
-
-vipsLogicUserId = User
-
-vipswebUrl = VIPSWeb URL
-
-warningStatus = Warning status
-
-warningStatus_0 = No forecast available
-
-warningStatus_1 = Missing data
-
-warningStatus_2 = No risk of infection
-
-warningStatus_3 = Medium risk of infection
-
-warningStatus_4 = High risk of infection
-
-warning_fieldNotFoundInFormDefinition = WARNING: field {0} not found in form definition. The system does not know how to validate it. Continue anyway?
-
-weatherForecastProvider = Weather forecast service
-
-weatherStationDeleted = Weather station was deleted
-
-weatherStationForecastConfigurations = Forecasts connected to the weather station
-
-weatherStationPointOfInterestId = Weather station
-
-weatherStationPointOfInterestIds = Weather stations
-
-weatherStationRemoteId = Remote Id for weather station
-
-weatherStationRemoteIdMissing = Remote Id for weather station is missing
-
-weatherStationStored = Weather station information was stored
-
-weatherStations = Weather stations
-
-xIsNotAfterY = {0} is not after {1}
-
-xIsNotEqualToY = {0} is not equal to {1}
-
-your = Your
-biofixDate=Biofix date
-heatRequirements=Heat requirements
-dd_lower=Day degree lower cutoffs
-dd_upper=Day degree upper cutoffs
-observedPhase=Observed phase at biofix date
-YSTEMBTEMP=Yellow Stemborer Temperature Model
-addIllustration=Add illustration
-allRoles=All roles
-allStatuses=All statuses
-LEAFBLOTCH=Leaf blotch model
-universalMessageSettingsLink_tpl=To edit your notification subscriptions, please use this link: {0}
-pointOfInterestType_5=Trap
-sowingDate=Sowing date
-pointOfInterestType_6=Apiary site
-pointOfInterestType_7=Nursery
-privacyStatement=Privacy statement
-privacyStatementFileName=Privacy_statement_NIBIO-VIPS.pdf
-thresholdDSVMax=DSV threshold for high infection risk
-thresholdDSVTempMin=Minimum temperature for DSV calculation
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties
index 0384f07d5ec425c9d03406f2c84337117731f304..2807f026bb812b2d7a917edb2e77e29a3342711f 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties
@@ -15,7 +15,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
#
-isPositiveRegistration=Pest presence confirmed
ALTERNARIA = Alternaria Model
APPLESCABM = \u82f9\u679c\u9ed1\u661f\u75c5\u6a21\u578b
@@ -72,7 +71,7 @@ active = \u6709\u6548\u7684
activeWeatherStations = \u6709\u6548\u6c14\u8c61\u7ad9
-addMultipleNew = \u6dfb\u52a0\u591a\u4e2a\u65b0\u7684
+addNewForMultipleWeatherStations=\u6dfb\u52a0\u591a\u4e2a\u65b0\u7684
addNew = \u6dfb\u52a0\u65b0\u7684
@@ -174,6 +173,8 @@ cropCategory = \u4f5c\u7269\u7c7b\u578b
cropCategoryIds = \u4f5c\u7269\u7c7b\u578b
+cropCategoryUpdated = Crop category was updated
+
cropOrganismId = \u4f5c\u7269
cropOrganismIds = \u4f5c\u7269
@@ -236,6 +237,8 @@ deleteIllustration = \u5220\u9664\u56fe
deletePoi = Delete point of interest
+deletePoiPreviewExplanation = The point of interest that you want to delete has the resources below connected to it. When you delete the POI, you also delete these resources.
+
deleteUser = \u5220\u9664\u7528\u6237
deleteUserDescription = \u5728\u5220\u9664\u4e4b\u524d\u4f60\u5fc5\u987b\u5c06\u7528\u6237\u8d44\u6e90\u8f6c\u79fb\u5230\u5176\u4ed6\u7528\u6237
@@ -380,12 +383,16 @@ invalidcredentials = \u65e0\u6548\u7528\u6237\u540d\u6216\u5bc6\u7801
isCrop = \u662f\u4f5c\u7269?
+isForecastLocation = Is forecast location
+
isPest = \u662f\u5bb3\u866b?
isPrivate = \u662f\u79c1\u4eba\u7684
isQuantified = \u662f\u5b9a\u91cf\u7684
+isPositiveRegistration=Pest presence confirmed
+
isRequiredField = Required field
language = \u8bed\u8a00
@@ -542,14 +549,22 @@ observationDataField_counting1 = \u8ba1\u6570 1
observationDataField_counting2 = \u8ba1\u6570 2
+observationDataField_number = Number
+
observationDataField_trapCountCropEdge = Number of trap counts at field's edge
observationDataField_trapCountCropInside = Number of trap counts inside the field
+observationDataField_unit = Measuring unit
+
+allObservations = All observations
+
observationDeleted = \u89c2\u6d4b\u88ab\u5220\u9664
observationHeading = \u89c2\u6d4b\u6807\u9898
+observationMap = Observation map
+
observationMethodDescription_KNOCKING = \u6572\u51fb\u63cf\u8ff0 (TODO)
observationMethodDescription_NOT_REGISTERED = \u89c2\u6d4b\u65b9\u6cd5\u672a\u6ce8\u518c
@@ -1040,3 +1055,20 @@ privacyStatement=Privacy statement
privacyStatementFileName=Privacy_statement_NIBIO-VIPS.pdf
thresholdDSVMax=DSV threshold for high infection risk
thresholdDSVTempMin=Minimum temperature for DSV calculation
+isBroadcast=Is broadcast
+yes=Yes
+no=No
+useGridWeatherData=Use grid weather data
+doNotUse=Do not use
+defaultGridWeatherStationDataSource=Gridded weather data source
+weatherStationDataSources=Weather station data sources
+newWeatherStationDataSource=New weather (station) data source
+editWeatherStationDataSource=Edit weather (station) data source
+datafetchUriExpression=URI template for requesting data
+infoUriExpression=Template for request for station information
+isGridWeatherDataSource=This is a grid based weather data source
+weatherStationDataSourceStored=Weather (station) data source was successfully stored
+weatherStationDataSourceDeleted=The weather (station) data source was successfully deleted
+weatherDatasource=Weather datasource
+useWeatherStation=Use weather station
+multipleNewWarningMsg=This form is for adding the same forecast configuration to many weather stations simultaneously.
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 62d85f54fb23655a8bafb80e6f02925b270da5a8..2f2ca6f05c3225d9c37a4a9b10fd4695bd726ee3 100755
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -79,6 +79,10 @@
<servlet-name>CropCategoryController</servlet-name>
<servlet-class>no.nibio.vips.logic.controller.servlet.CropCategoryController</servlet-class>
</servlet>
+ <servlet>
+ <servlet-name>WeatherStationDataSourceController</servlet-name>
+ <servlet-class>no.nibio.vips.logic.controller.servlet.WeatherStationDataSourceController</servlet-class>
+ </servlet>
<servlet>
<servlet-name>JSEnvironment</servlet-name>
<servlet-class>no.nibio.vips.logic.web.js.JSEnvironment</servlet-class>
@@ -156,6 +160,10 @@
<servlet-name>CropCategoryController</servlet-name>
<url-pattern>/organism/cropcategory</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>WeatherStationDataSourceController</servlet-name>
+ <url-pattern>/weatherstationdatasource</url-pattern>
+ </servlet-mapping>
<servlet-mapping>
<servlet-name>JSEnvironment</servlet-name>
<url-pattern>/js/environment.js</url-pattern>
diff --git a/src/main/webapp/css/3rdparty/leaflet.css b/src/main/webapp/css/3rdparty/leaflet.css
new file mode 100644
index 0000000000000000000000000000000000000000..93477790a88403ce49993ae396495545933ebc13
--- /dev/null
+++ b/src/main/webapp/css/3rdparty/leaflet.css
@@ -0,0 +1,662 @@
+/* https://unpkg.com/leaflet@1.9.4/dist/leaflet.css */
+/* required styles */
+
+.leaflet-pane,
+.leaflet-tile,
+.leaflet-marker-icon,
+.leaflet-marker-shadow,
+.leaflet-tile-container,
+.leaflet-pane > svg,
+.leaflet-pane > canvas,
+.leaflet-zoom-box,
+.leaflet-image-layer,
+.leaflet-layer {
+ position: absolute;
+ left: 0;
+ top: 0;
+ }
+.leaflet-container {
+ overflow: hidden;
+ }
+.leaflet-tile,
+.leaflet-marker-icon,
+.leaflet-marker-shadow {
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ user-select: none;
+ -webkit-user-drag: none;
+ }
+/* Prevents IE11 from highlighting tiles in blue */
+.leaflet-tile::selection {
+ background: transparent;
+}
+/* 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 {
+ max-width: none !important;
+ max-height: none !important;
+ }
+.leaflet-container .leaflet-marker-pane img,
+.leaflet-container .leaflet-shadow-pane img,
+.leaflet-container .leaflet-tile-pane img,
+.leaflet-container img.leaflet-image-layer,
+.leaflet-container .leaflet-tile {
+ max-width: none !important;
+ max-height: none !important;
+ width: auto;
+ padding: 0;
+ }
+
+.leaflet-container img.leaflet-tile {
+ /* See: https://bugs.chromium.org/p/chromium/issues/detail?id=600120 */
+ mix-blend-mode: plus-lighter;
+}
+
+.leaflet-container.leaflet-touch-zoom {
+ -ms-touch-action: pan-x pan-y;
+ touch-action: pan-x pan-y;
+ }
+.leaflet-container.leaflet-touch-drag {
+ -ms-touch-action: pinch-zoom;
+ /* Fallback for FF which doesn't support pinch-zoom */
+ touch-action: none;
+ touch-action: pinch-zoom;
+}
+.leaflet-container.leaflet-touch-drag.leaflet-touch-zoom {
+ -ms-touch-action: none;
+ touch-action: none;
+}
+.leaflet-container {
+ -webkit-tap-highlight-color: transparent;
+}
+.leaflet-container a {
+ -webkit-tap-highlight-color: rgba(51, 181, 229, 0.4);
+}
+.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-tooltip-pane { z-index: 650; }
+.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: visiblePainted; /* IE 9-10 doesn't have auto */
+ 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-popup {
+ opacity: 0;
+ -webkit-transition: opacity 0.2s linear;
+ -moz-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;
+ }
+svg.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);
+ 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;
+ transition: none;
+ }
+
+.leaflet-zoom-anim .leaflet-zoom-hide {
+ visibility: hidden;
+ }
+
+
+/* cursors */
+
+.leaflet-interactive {
+ cursor: pointer;
+ }
+.leaflet-grab {
+ cursor: -webkit-grab;
+ cursor: -moz-grab;
+ cursor: 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;
+ cursor: grabbing;
+ }
+
+/* marker & overlays interactivity */
+.leaflet-marker-icon,
+.leaflet-marker-shadow,
+.leaflet-image-layer,
+.leaflet-pane > svg path,
+.leaflet-tile-container {
+ pointer-events: none;
+ }
+
+.leaflet-marker-icon.leaflet-interactive,
+.leaflet-image-layer.leaflet-interactive,
+.leaflet-pane > svg path.leaflet-interactive,
+svg.leaflet-image-layer.leaflet-interactive path {
+ pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
+ pointer-events: auto;
+ }
+
+/* visual tweaks */
+
+.leaflet-container {
+ background: #ddd;
+ outline-offset: 1px;
+ }
+.leaflet-container a {
+ color: #0078A8;
+ }
+.leaflet-zoom-box {
+ border: 2px dotted #38f;
+ background: rgba(255,255,255,0.5);
+ }
+
+
+/* general typography */
+.leaflet-container {
+ font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ font-size: 0.75rem;
+ line-height: 1.5;
+ }
+
+
+/* general toolbar styles */
+
+.leaflet-bar {
+ box-shadow: 0 1px 5px rgba(0,0,0,0.65);
+ border-radius: 4px;
+ }
+.leaflet-bar a {
+ 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,
+.leaflet-bar a:focus {
+ 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;
+ }
+.leaflet-touch .leaflet-bar a:first-child {
+ border-top-left-radius: 2px;
+ border-top-right-radius: 2px;
+ }
+.leaflet-touch .leaflet-bar a:last-child {
+ border-bottom-left-radius: 2px;
+ border-bottom-right-radius: 2px;
+ }
+
+/* zoom control */
+
+.leaflet-control-zoom-in,
+.leaflet-control-zoom-out {
+ font: bold 18px 'Lucida Console', Monaco, monospace;
+ text-indent: 1px;
+ }
+
+.leaflet-touch .leaflet-control-zoom-in, .leaflet-touch .leaflet-control-zoom-out {
+ font-size: 22px;
+ }
+
+
+/* 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(images/layers.png);
+ width: 36px;
+ height: 36px;
+ }
+.leaflet-retina .leaflet-control-layers-toggle {
+ background-image: url(images/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;
+ overflow-x: hidden;
+ padding-right: 5px;
+ }
+.leaflet-control-layers-selector {
+ margin-top: 2px;
+ position: relative;
+ top: 1px;
+ }
+.leaflet-control-layers label {
+ display: block;
+ font-size: 13px;
+ font-size: 1.08333em;
+ }
+.leaflet-control-layers-separator {
+ height: 0;
+ border-top: 1px solid #ddd;
+ margin: 5px -10px 5px -6px;
+ }
+
+/* Default icon URLs */
+.leaflet-default-icon-path { /* used only in path-guessing heuristic, see L.Icon.Default */
+ background-image: url(images/marker-icon.png);
+ }
+
+
+/* attribution and scale controls */
+
+.leaflet-container .leaflet-control-attribution {
+ background: #fff;
+ background: rgba(255, 255, 255, 0.8);
+ margin: 0;
+ }
+.leaflet-control-attribution,
+.leaflet-control-scale-line {
+ padding: 0 5px;
+ color: #333;
+ line-height: 1.4;
+ }
+.leaflet-control-attribution a {
+ text-decoration: none;
+ }
+.leaflet-control-attribution a:hover,
+.leaflet-control-attribution a:focus {
+ text-decoration: underline;
+ }
+.leaflet-attribution-flag {
+ display: inline !important;
+ vertical-align: baseline !important;
+ width: 1em;
+ height: 0.6669em;
+ }
+.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;
+ white-space: nowrap;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ background: rgba(255, 255, 255, 0.8);
+ text-shadow: 1px 1px #fff;
+ }
+.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;
+ margin-bottom: 20px;
+ }
+.leaflet-popup-content-wrapper {
+ padding: 1px;
+ text-align: left;
+ border-radius: 12px;
+ }
+.leaflet-popup-content {
+ margin: 13px 24px 13px 20px;
+ line-height: 1.3;
+ font-size: 13px;
+ font-size: 1.08333em;
+ min-height: 1px;
+ }
+.leaflet-popup-content p {
+ margin: 17px 0;
+ margin: 1.3em 0;
+ }
+.leaflet-popup-tip-container {
+ width: 40px;
+ height: 20px;
+ position: absolute;
+ left: 50%;
+ margin-top: -1px;
+ margin-left: -20px;
+ overflow: hidden;
+ pointer-events: none;
+ }
+.leaflet-popup-tip {
+ width: 17px;
+ height: 17px;
+ padding: 1px;
+
+ margin: -10px auto 0;
+ pointer-events: auto;
+
+ -webkit-transform: rotate(45deg);
+ -moz-transform: rotate(45deg);
+ -ms-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;
+ border: none;
+ text-align: center;
+ width: 24px;
+ height: 24px;
+ font: 16px/24px Tahoma, Verdana, sans-serif;
+ color: #757575;
+ text-decoration: none;
+ background: transparent;
+ }
+.leaflet-container a.leaflet-popup-close-button:hover,
+.leaflet-container a.leaflet-popup-close-button:focus {
+ color: #585858;
+ }
+.leaflet-popup-scrolled {
+ overflow: auto;
+ }
+
+.leaflet-oldie .leaflet-popup-content-wrapper {
+ -ms-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-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;
+ }
+
+
+/* Tooltip */
+/* Base styles for the element that has a tooltip */
+.leaflet-tooltip {
+ position: absolute;
+ padding: 6px;
+ background-color: #fff;
+ border: 1px solid #fff;
+ border-radius: 3px;
+ color: #222;
+ white-space: nowrap;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+ pointer-events: none;
+ box-shadow: 0 1px 3px rgba(0,0,0,0.4);
+ }
+.leaflet-tooltip.leaflet-interactive {
+ cursor: pointer;
+ pointer-events: auto;
+ }
+.leaflet-tooltip-top:before,
+.leaflet-tooltip-bottom:before,
+.leaflet-tooltip-left:before,
+.leaflet-tooltip-right:before {
+ position: absolute;
+ pointer-events: none;
+ border: 6px solid transparent;
+ background: transparent;
+ content: "";
+ }
+
+/* Directions */
+
+.leaflet-tooltip-bottom {
+ margin-top: 6px;
+}
+.leaflet-tooltip-top {
+ margin-top: -6px;
+}
+.leaflet-tooltip-bottom:before,
+.leaflet-tooltip-top:before {
+ left: 50%;
+ margin-left: -6px;
+ }
+.leaflet-tooltip-top:before {
+ bottom: 0;
+ margin-bottom: -12px;
+ border-top-color: #fff;
+ }
+.leaflet-tooltip-bottom:before {
+ top: 0;
+ margin-top: -12px;
+ margin-left: -6px;
+ border-bottom-color: #fff;
+ }
+.leaflet-tooltip-left {
+ margin-left: -6px;
+}
+.leaflet-tooltip-right {
+ margin-left: 6px;
+}
+.leaflet-tooltip-left:before,
+.leaflet-tooltip-right:before {
+ top: 50%;
+ margin-top: -6px;
+ }
+.leaflet-tooltip-left:before {
+ right: 0;
+ margin-right: -12px;
+ border-left-color: #fff;
+ }
+.leaflet-tooltip-right:before {
+ left: 0;
+ margin-left: -12px;
+ border-right-color: #fff;
+ }
+
+/* Printing */
+
+@media print {
+ /* Prevent printers from removing background-images of controls. */
+ .leaflet-control {
+ -webkit-print-color-adjust: exact;
+ print-color-adjust: exact;
+ }
+ }
diff --git a/src/main/webapp/css/mapModal.css b/src/main/webapp/css/mapModal.css
new file mode 100644
index 0000000000000000000000000000000000000000..40990f46c4d456ba5612050c98205438245b592d
--- /dev/null
+++ b/src/main/webapp/css/mapModal.css
@@ -0,0 +1,78 @@
+.map-modal {
+ display: none;
+ position: fixed;
+ z-index: 1000;
+ left: 50%;
+ top: 50%;
+ width: 90%;
+ height: 90%;
+ overflow: hidden;
+ background-color: rgba(0, 0, 0, 0.9);
+ transform: translate(-50%, -50%);
+ border: 2px solid #fff;
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
+ border-radius: 15px;
+}
+
+.map-modal.show {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+#selected-point-info-panel {
+ width: 160px;
+ background: white;
+ padding: 0 10px 10px 10px;
+ border-radius: 5px;
+ box-shadow: 0 0 15px rgba(0, 0, 0, 0.2);
+ z-index: 1100;
+}
+
+.map-button {
+ font-size: 24px;
+}
+
+.legend-item {
+ display: flex;
+ align-items: center;
+ margin-bottom: 5px;
+}
+
+.legend-item i {
+ margin-right: 8px;
+ width: 18px;
+ height: 18px;
+ display: inline-block;
+}
+
+.info.legend {
+ background-color: white;
+ padding: 10px;
+ font-size: 14px;
+ line-height: 20px;
+ color: #555;
+ border-radius: 5px;
+ box-shadow: 0 0 15px rgba(0,0,0,0.2);
+ cursor: default !important;
+}
+
+#confirm-button {
+ margin-top: 10px;
+}
+
+.leaflet-container {
+ cursor: default !important;
+ font-size: 12px;
+}
+
+#open-map-modal-icon {
+ font-size: 30px;
+ margin-left: 15px;
+ cursor: pointer;
+}
+
+#new-point-form {
+ z-index: 1200;
+ position: absolute;
+}
diff --git a/src/main/webapp/formdefinitions/forecastConfigurationForm.json b/src/main/webapp/formdefinitions/forecastConfigurationForm.json
index 95c43c592f962e33cfe7900f5c63fd43a3058314..ca6fd66a4cf07d58acbed4e9a62d86c9c23b3769 100755
--- a/src/main/webapp/formdefinitions/forecastConfigurationForm.json
+++ b/src/main/webapp/formdefinitions/forecastConfigurationForm.json
@@ -57,6 +57,11 @@
"dataType" : "STRING",
"required" : false
},
+ {
+ "name" : "useGridWeatherData",
+ "dataType" : "STRING",
+ "required" : false
+ },
{
"name" : "locationPointOfInterestId",
"dataType" : "INTEGER",
diff --git a/src/main/webapp/formdefinitions/organizationForm.json b/src/main/webapp/formdefinitions/organizationForm.json
index acc63d9e460de6b61f08b83b7870926d11bfce3f..4ff9c999cf3cdd406e5b6db626f46b8564ebdf61 100644
--- a/src/main/webapp/formdefinitions/organizationForm.json
+++ b/src/main/webapp/formdefinitions/organizationForm.json
@@ -95,6 +95,12 @@
"name" : "defaultMapCenter",
"dataType" : "STRING",
"required" : false
+ },
+ {
+ "name": "defaultGridWeatherStationDataSourceId",
+ "dataType": "INTEGER",
+ "fieldType": "SELECT_SINGLE",
+ "required": false
}
]
diff --git a/src/main/webapp/formdefinitions/poiForm.json b/src/main/webapp/formdefinitions/poiForm.json
index 6aa6e956f28c279cad1d247f5e35be0069ed9921..83a8b2f07cdc65cf3f1e72e061d7bb177ea0ab3c 100755
--- a/src/main/webapp/formdefinitions/poiForm.json
+++ b/src/main/webapp/formdefinitions/poiForm.json
@@ -86,6 +86,11 @@
"name" : "isForecastLocation",
"dataType" : "STRING",
"required" : false
+ },
+ {
+ "name" : "isPrivate",
+ "dataType" : "STRING",
+ "required" : false
}
]
}
diff --git a/src/main/webapp/formdefinitions/weatherStationDataSourceForm.json b/src/main/webapp/formdefinitions/weatherStationDataSourceForm.json
new file mode 100644
index 0000000000000000000000000000000000000000..35cf480345f1f784dba1cd19c2b555b553245fbe
--- /dev/null
+++ b/src/main/webapp/formdefinitions/weatherStationDataSourceForm.json
@@ -0,0 +1,59 @@
+{
+ "_licenseNote": [
+ "Copyright (c) 2024 NIBIO <http://www.nibio.no/>. ",
+ "",
+ "This file is part of VIPSLogic. ",
+
+ "This program is free software: you can redistribute it and/or modify",
+ "it under the terms of the GNU Affero General Public License as published by",
+ "the Free Software Foundation, either version 3 of the License, or",
+ "(at your option) any later version.",
+
+ "This program is distributed in the hope that it will be useful,",
+ "but WITHOUT ANY WARRANTY; without even the implied warranty of",
+ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the",
+ "GNU Affero General Public License for more details.",
+
+ "You should have received a copy of the GNU Affero General Public License",
+ "along with this program. If not, see <https://www.gnu.org/licenses/>."
+ ],
+ "_comment" : "Structure of the organizationForm and how to validate it",
+ "fields": [
+ {
+ "name" : "weatherStationDataSourceId",
+ "dataType" : "INTEGER",
+ "required" : true
+ },
+ {
+ "name" : "name",
+ "dataType" : "STRING",
+ "required" : true
+ },
+ {
+ "name" : "defaultDescription",
+ "dataType" : "STRING",
+ "required" : false
+ },
+ {
+ "name" : "uri",
+ "dataType" : "STRING",
+ "required" : false
+ },
+ {
+ "name" : "datafetchUriExpression",
+ "dataType" : "STRING",
+ "required" : true
+ },
+ {
+ "name" : "infoUriExpression",
+ "dataType" : "STRING",
+ "required" : false
+ },
+ {
+ "name" : "isGrid",
+ "dataType" : "STRING",
+ "required" : false
+ }
+
+ ]
+}
diff --git a/src/main/webapp/formdefinitions/weatherStationForm.json b/src/main/webapp/formdefinitions/weatherStationForm.json
index c4540a5267b1559eafb1ea817be29cd8f613bc6b..3b0af8f3afed9554273194d7592f241735cbd4c0 100755
--- a/src/main/webapp/formdefinitions/weatherStationForm.json
+++ b/src/main/webapp/formdefinitions/weatherStationForm.json
@@ -87,6 +87,11 @@
"dataType" : "STRING",
"fieldType" : "MULTIPLE_MAP",
"required" : false
+ },
+ {
+ "name" : "isPrivate",
+ "dataType" : "STRING",
+ "required" : false
}
]
diff --git a/src/main/webapp/js/3rdparty/leaflet-src.esm.js b/src/main/webapp/js/3rdparty/leaflet-src.esm.js
new file mode 100644
index 0000000000000000000000000000000000000000..8f91d5ddfc78ef05576efd425aac920040a28c94
--- /dev/null
+++ b/src/main/webapp/js/3rdparty/leaflet-src.esm.js
@@ -0,0 +1,14419 @@
+/* @preserve
+ * Leaflet 1.9.4, a JS library for interactive maps. https://leafletjs.com
+ * (c) 2010-2023 Vladimir Agafonkin, (c) 2010-2011 CloudMade
+ */
+
+var version = "1.9.4";
+
+/*
+ * @namespace Util
+ *
+ * Various utility functions, used by Leaflet internally.
+ */
+
+// @function extend(dest: Object, src?: Object): Object
+// Merges the properties of the `src` object (or multiple objects) into `dest` object and returns the latter. Has an `L.extend` shortcut.
+function extend(dest) {
+ var i, j, len, src;
+
+ for (j = 1, len = arguments.length; j < len; j++) {
+ src = arguments[j];
+ for (i in src) {
+ dest[i] = src[i];
+ }
+ }
+ return dest;
+}
+
+// @function create(proto: Object, properties?: Object): Object
+// Compatibility polyfill for [Object.create](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/create)
+var create$2 = Object.create || (function () {
+ function F() {}
+ return function (proto) {
+ F.prototype = proto;
+ return new F();
+ };
+})();
+
+// @function bind(fn: Function, …): Function
+// Returns a new function bound to the arguments passed, like [Function.prototype.bind](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Function/bind).
+// Has a `L.bind()` shortcut.
+function bind(fn, obj) {
+ var slice = Array.prototype.slice;
+
+ if (fn.bind) {
+ return fn.bind.apply(fn, slice.call(arguments, 1));
+ }
+
+ var args = slice.call(arguments, 2);
+
+ return function () {
+ return fn.apply(obj, args.length ? args.concat(slice.call(arguments)) : arguments);
+ };
+}
+
+// @property lastId: Number
+// Last unique ID used by [`stamp()`](#util-stamp)
+var lastId = 0;
+
+// @function stamp(obj: Object): Number
+// Returns the unique ID of an object, assigning it one if it doesn't have it.
+function stamp(obj) {
+ if (!('_leaflet_id' in obj)) {
+ obj['_leaflet_id'] = ++lastId;
+ }
+ return obj._leaflet_id;
+}
+
+// @function throttle(fn: Function, time: Number, context: Object): Function
+// Returns a function which executes function `fn` with the given scope `context`
+// (so that the `this` keyword refers to `context` inside `fn`'s code). The function
+// `fn` will be called no more than one time per given amount of `time`. The arguments
+// received by the bound function will be any arguments passed when binding the
+// function, followed by any arguments passed when invoking the bound function.
+// Has an `L.throttle` shortcut.
+function throttle(fn, time, context) {
+ var lock, args, wrapperFn, later;
+
+ later = function () {
+ // reset lock and call if queued
+ lock = false;
+ if (args) {
+ wrapperFn.apply(context, args);
+ args = false;
+ }
+ };
+
+ wrapperFn = function () {
+ if (lock) {
+ // called too soon, queue to call later
+ args = arguments;
+
+ } else {
+ // call and lock until later
+ fn.apply(context, arguments);
+ setTimeout(later, time);
+ lock = true;
+ }
+ };
+
+ return wrapperFn;
+}
+
+// @function wrapNum(num: Number, range: Number[], includeMax?: Boolean): Number
+// Returns the number `num` modulo `range` in such a way so it lies within
+// `range[0]` and `range[1]`. The returned value will be always smaller than
+// `range[1]` unless `includeMax` is set to `true`.
+function wrapNum(x, range, includeMax) {
+ var max = range[1],
+ min = range[0],
+ d = max - min;
+ return x === max && includeMax ? x : ((x - min) % d + d) % d + min;
+}
+
+// @function falseFn(): Function
+// Returns a function which always returns `false`.
+function falseFn() { return false; }
+
+// @function formatNum(num: Number, precision?: Number|false): Number
+// Returns the number `num` rounded with specified `precision`.
+// The default `precision` value is 6 decimal places.
+// `false` can be passed to skip any processing (can be useful to avoid round-off errors).
+function formatNum(num, precision) {
+ if (precision === false) { return num; }
+ var pow = Math.pow(10, precision === undefined ? 6 : precision);
+ return Math.round(num * pow) / pow;
+}
+
+// @function trim(str: String): String
+// Compatibility polyfill for [String.prototype.trim](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String/Trim)
+function trim(str) {
+ return str.trim ? str.trim() : str.replace(/^\s+|\s+$/g, '');
+}
+
+// @function splitWords(str: String): String[]
+// Trims and splits the string on whitespace and returns the array of parts.
+function splitWords(str) {
+ return trim(str).split(/\s+/);
+}
+
+// @function setOptions(obj: Object, options: Object): Object
+// Merges the given properties to the `options` of the `obj` object, returning the resulting options. See `Class options`. Has an `L.setOptions` shortcut.
+function setOptions(obj, options) {
+ if (!Object.prototype.hasOwnProperty.call(obj, 'options')) {
+ obj.options = obj.options ? create$2(obj.options) : {};
+ }
+ for (var i in options) {
+ obj.options[i] = options[i];
+ }
+ return obj.options;
+}
+
+// @function getParamString(obj: Object, existingUrl?: String, uppercase?: Boolean): String
+// Converts an object into a parameter URL string, e.g. `{a: "foo", b: "bar"}`
+// translates to `'?a=foo&b=bar'`. If `existingUrl` is set, the parameters will
+// be appended at the end. If `uppercase` is `true`, the parameter names will
+// be uppercased (e.g. `'?A=foo&B=bar'`)
+function getParamString(obj, existingUrl, uppercase) {
+ var params = [];
+ for (var i in obj) {
+ params.push(encodeURIComponent(uppercase ? i.toUpperCase() : i) + '=' + encodeURIComponent(obj[i]));
+ }
+ return ((!existingUrl || existingUrl.indexOf('?') === -1) ? '?' : '&') + params.join('&');
+}
+
+var templateRe = /\{ *([\w_ -]+) *\}/g;
+
+// @function template(str: String, data: Object): String
+// Simple templating facility, accepts a template string of the form `'Hello {a}, {b}'`
+// and a data object like `{a: 'foo', b: 'bar'}`, returns evaluated string
+// `('Hello foo, bar')`. You can also specify functions instead of strings for
+// data values — they will be evaluated passing `data` as an argument.
+function template(str, data) {
+ return str.replace(templateRe, function (str, key) {
+ var value = data[key];
+
+ if (value === undefined) {
+ throw new Error('No value provided for variable ' + str);
+
+ } else if (typeof value === 'function') {
+ value = value(data);
+ }
+ return value;
+ });
+}
+
+// @function isArray(obj): Boolean
+// Compatibility polyfill for [Array.isArray](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array/isArray)
+var isArray = Array.isArray || function (obj) {
+ return (Object.prototype.toString.call(obj) === '[object Array]');
+};
+
+// @function indexOf(array: Array, el: Object): Number
+// Compatibility polyfill for [Array.prototype.indexOf](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf)
+function indexOf(array, el) {
+ for (var i = 0; i < array.length; i++) {
+ if (array[i] === el) { return i; }
+ }
+ return -1;
+}
+
+// @property emptyImageUrl: String
+// Data URI string containing a base64-encoded empty GIF image.
+// Used as a hack to free memory from unused images on WebKit-powered
+// mobile devices (by setting image `src` to this string).
+var emptyImageUrl = 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=';
+
+// inspired by https://paulirish.com/2011/requestanimationframe-for-smart-animating/
+
+function getPrefixed(name) {
+ return window['webkit' + name] || window['moz' + name] || window['ms' + name];
+}
+
+var lastTime = 0;
+
+// fallback for IE 7-8
+function timeoutDefer(fn) {
+ var time = +new Date(),
+ timeToCall = Math.max(0, 16 - (time - lastTime));
+
+ lastTime = time + timeToCall;
+ return window.setTimeout(fn, timeToCall);
+}
+
+var requestFn = window.requestAnimationFrame || getPrefixed('RequestAnimationFrame') || timeoutDefer;
+var cancelFn = window.cancelAnimationFrame || getPrefixed('CancelAnimationFrame') ||
+ getPrefixed('CancelRequestAnimationFrame') || function (id) { window.clearTimeout(id); };
+
+// @function requestAnimFrame(fn: Function, context?: Object, immediate?: Boolean): Number
+// Schedules `fn` to be executed when the browser repaints. `fn` is bound to
+// `context` if given. When `immediate` is set, `fn` is called immediately if
+// the browser doesn't have native support for
+// [`window.requestAnimationFrame`](https://developer.mozilla.org/docs/Web/API/window/requestAnimationFrame),
+// otherwise it's delayed. Returns a request ID that can be used to cancel the request.
+function requestAnimFrame(fn, context, immediate) {
+ if (immediate && requestFn === timeoutDefer) {
+ fn.call(context);
+ } else {
+ return requestFn.call(window, bind(fn, context));
+ }
+}
+
+// @function cancelAnimFrame(id: Number): undefined
+// Cancels a previous `requestAnimFrame`. See also [window.cancelAnimationFrame](https://developer.mozilla.org/docs/Web/API/window/cancelAnimationFrame).
+function cancelAnimFrame(id) {
+ if (id) {
+ cancelFn.call(window, id);
+ }
+}
+
+var Util = {
+ __proto__: null,
+ extend: extend,
+ create: create$2,
+ bind: bind,
+ get lastId () { return lastId; },
+ stamp: stamp,
+ throttle: throttle,
+ wrapNum: wrapNum,
+ falseFn: falseFn,
+ formatNum: formatNum,
+ trim: trim,
+ splitWords: splitWords,
+ setOptions: setOptions,
+ getParamString: getParamString,
+ template: template,
+ isArray: isArray,
+ indexOf: indexOf,
+ emptyImageUrl: emptyImageUrl,
+ requestFn: requestFn,
+ cancelFn: cancelFn,
+ requestAnimFrame: requestAnimFrame,
+ cancelAnimFrame: cancelAnimFrame
+};
+
+// @class Class
+// @aka L.Class
+
+// @section
+// @uninheritable
+
+// Thanks to John Resig and Dean Edwards for inspiration!
+
+function Class() {}
+
+Class.extend = function (props) {
+
+ // @function extend(props: Object): Function
+ // [Extends the current class](#class-inheritance) given the properties to be included.
+ // Returns a Javascript function that is a class constructor (to be called with `new`).
+ var NewClass = function () {
+
+ setOptions(this);
+
+ // call the constructor
+ if (this.initialize) {
+ this.initialize.apply(this, arguments);
+ }
+
+ // call all constructor hooks
+ this.callInitHooks();
+ };
+
+ var parentProto = NewClass.__super__ = this.prototype;
+
+ var proto = create$2(parentProto);
+ proto.constructor = NewClass;
+
+ NewClass.prototype = proto;
+
+ // inherit parent's statics
+ for (var i in this) {
+ if (Object.prototype.hasOwnProperty.call(this, i) && i !== 'prototype' && i !== '__super__') {
+ NewClass[i] = this[i];
+ }
+ }
+
+ // mix static properties into the class
+ if (props.statics) {
+ extend(NewClass, props.statics);
+ }
+
+ // mix includes into the prototype
+ if (props.includes) {
+ checkDeprecatedMixinEvents(props.includes);
+ extend.apply(null, [proto].concat(props.includes));
+ }
+
+ // mix given properties into the prototype
+ extend(proto, props);
+ delete proto.statics;
+ delete proto.includes;
+
+ // merge options
+ if (proto.options) {
+ proto.options = parentProto.options ? create$2(parentProto.options) : {};
+ extend(proto.options, props.options);
+ }
+
+ proto._initHooks = [];
+
+ // add method for calling all hooks
+ proto.callInitHooks = function () {
+
+ if (this._initHooksCalled) { return; }
+
+ if (parentProto.callInitHooks) {
+ parentProto.callInitHooks.call(this);
+ }
+
+ this._initHooksCalled = true;
+
+ for (var i = 0, len = proto._initHooks.length; i < len; i++) {
+ proto._initHooks[i].call(this);
+ }
+ };
+
+ return NewClass;
+};
+
+
+// @function include(properties: Object): this
+// [Includes a mixin](#class-includes) into the current class.
+Class.include = function (props) {
+ var parentOptions = this.prototype.options;
+ extend(this.prototype, props);
+ if (props.options) {
+ this.prototype.options = parentOptions;
+ this.mergeOptions(props.options);
+ }
+ return this;
+};
+
+// @function mergeOptions(options: Object): this
+// [Merges `options`](#class-options) into the defaults of the class.
+Class.mergeOptions = function (options) {
+ extend(this.prototype.options, options);
+ return this;
+};
+
+// @function addInitHook(fn: Function): this
+// Adds a [constructor hook](#class-constructor-hooks) to the class.
+Class.addInitHook = function (fn) { // (Function) || (String, args...)
+ var args = Array.prototype.slice.call(arguments, 1);
+
+ var init = typeof fn === 'function' ? fn : function () {
+ this[fn].apply(this, args);
+ };
+
+ this.prototype._initHooks = this.prototype._initHooks || [];
+ this.prototype._initHooks.push(init);
+ return this;
+};
+
+function checkDeprecatedMixinEvents(includes) {
+ /* global L: true */
+ if (typeof L === 'undefined' || !L || !L.Mixin) { return; }
+
+ includes = isArray(includes) ? includes : [includes];
+
+ for (var i = 0; i < includes.length; i++) {
+ if (includes[i] === L.Mixin.Events) {
+ console.warn('Deprecated include of L.Mixin.Events: ' +
+ 'this property will be removed in future releases, ' +
+ 'please inherit from L.Evented instead.', new Error().stack);
+ }
+ }
+}
+
+/*
+ * @class Evented
+ * @aka L.Evented
+ * @inherits Class
+ *
+ * A set of methods shared between event-powered classes (like `Map` and `Marker`). Generally, events allow you to execute some function when something happens with an object (e.g. the user clicks on the map, causing the map to fire `'click'` event).
+ *
+ * @example
+ *
+ * ```js
+ * map.on('click', function(e) {
+ * alert(e.latlng);
+ * } );
+ * ```
+ *
+ * Leaflet deals with event listeners by reference, so if you want to add a listener and then remove it, define it as a function:
+ *
+ * ```js
+ * function onClick(e) { ... }
+ *
+ * map.on('click', onClick);
+ * map.off('click', onClick);
+ * ```
+ */
+
+var Events = {
+ /* @method on(type: String, fn: Function, context?: Object): this
+ * Adds a listener function (`fn`) to a particular event type of the object. You can optionally specify the context of the listener (object the this keyword will point to). You can also pass several space-separated types (e.g. `'click dblclick'`).
+ *
+ * @alternative
+ * @method on(eventMap: Object): this
+ * Adds a set of type/listener pairs, e.g. `{click: onClick, mousemove: onMouseMove}`
+ */
+ on: function (types, fn, context) {
+
+ // types can be a map of types/handlers
+ if (typeof types === 'object') {
+ for (var type in types) {
+ // we don't process space-separated events here for performance;
+ // it's a hot path since Layer uses the on(obj) syntax
+ this._on(type, types[type], fn);
+ }
+
+ } else {
+ // types can be a string of space-separated words
+ types = splitWords(types);
+
+ for (var i = 0, len = types.length; i < len; i++) {
+ this._on(types[i], fn, context);
+ }
+ }
+
+ return this;
+ },
+
+ /* @method off(type: String, fn?: Function, context?: Object): this
+ * Removes a previously added listener function. If no function is specified, it will remove all the listeners of that particular event from the object. Note that if you passed a custom context to `on`, you must pass the same context to `off` in order to remove the listener.
+ *
+ * @alternative
+ * @method off(eventMap: Object): this
+ * Removes a set of type/listener pairs.
+ *
+ * @alternative
+ * @method off: this
+ * Removes all listeners to all events on the object. This includes implicitly attached events.
+ */
+ off: function (types, fn, context) {
+
+ if (!arguments.length) {
+ // clear all listeners if called without arguments
+ delete this._events;
+
+ } else if (typeof types === 'object') {
+ for (var type in types) {
+ this._off(type, types[type], fn);
+ }
+
+ } else {
+ types = splitWords(types);
+
+ var removeAll = arguments.length === 1;
+ for (var i = 0, len = types.length; i < len; i++) {
+ if (removeAll) {
+ this._off(types[i]);
+ } else {
+ this._off(types[i], fn, context);
+ }
+ }
+ }
+
+ return this;
+ },
+
+ // attach listener (without syntactic sugar now)
+ _on: function (type, fn, context, _once) {
+ if (typeof fn !== 'function') {
+ console.warn('wrong listener type: ' + typeof fn);
+ return;
+ }
+
+ // check if fn already there
+ if (this._listens(type, fn, context) !== false) {
+ return;
+ }
+
+ if (context === this) {
+ // Less memory footprint.
+ context = undefined;
+ }
+
+ var newListener = {fn: fn, ctx: context};
+ if (_once) {
+ newListener.once = true;
+ }
+
+ this._events = this._events || {};
+ this._events[type] = this._events[type] || [];
+ this._events[type].push(newListener);
+ },
+
+ _off: function (type, fn, context) {
+ var listeners,
+ i,
+ len;
+
+ if (!this._events) {
+ return;
+ }
+
+ listeners = this._events[type];
+ if (!listeners) {
+ return;
+ }
+
+ if (arguments.length === 1) { // remove all
+ if (this._firingCount) {
+ // Set all removed listeners to noop
+ // so they are not called if remove happens in fire
+ for (i = 0, len = listeners.length; i < len; i++) {
+ listeners[i].fn = falseFn;
+ }
+ }
+ // clear all listeners for a type if function isn't specified
+ delete this._events[type];
+ return;
+ }
+
+ if (typeof fn !== 'function') {
+ console.warn('wrong listener type: ' + typeof fn);
+ return;
+ }
+
+ // find fn and remove it
+ var index = this._listens(type, fn, context);
+ if (index !== false) {
+ var listener = listeners[index];
+ if (this._firingCount) {
+ // set the removed listener to noop so that's not called if remove happens in fire
+ listener.fn = falseFn;
+
+ /* copy array in case events are being fired */
+ this._events[type] = listeners = listeners.slice();
+ }
+ listeners.splice(index, 1);
+ }
+ },
+
+ // @method fire(type: String, data?: Object, propagate?: Boolean): this
+ // Fires an event of the specified type. You can optionally provide a data
+ // object — the first argument of the listener function will contain its
+ // properties. The event can optionally be propagated to event parents.
+ fire: function (type, data, propagate) {
+ if (!this.listens(type, propagate)) { return this; }
+
+ var event = extend({}, data, {
+ type: type,
+ target: this,
+ sourceTarget: data && data.sourceTarget || this
+ });
+
+ if (this._events) {
+ var listeners = this._events[type];
+ if (listeners) {
+ this._firingCount = (this._firingCount + 1) || 1;
+ for (var i = 0, len = listeners.length; i < len; i++) {
+ var l = listeners[i];
+ // off overwrites l.fn, so we need to copy fn to a var
+ var fn = l.fn;
+ if (l.once) {
+ this.off(type, fn, l.ctx);
+ }
+ fn.call(l.ctx || this, event);
+ }
+
+ this._firingCount--;
+ }
+ }
+
+ if (propagate) {
+ // propagate the event to parents (set with addEventParent)
+ this._propagateEvent(event);
+ }
+
+ return this;
+ },
+
+ // @method listens(type: String, propagate?: Boolean): Boolean
+ // @method listens(type: String, fn: Function, context?: Object, propagate?: Boolean): Boolean
+ // Returns `true` if a particular event type has any listeners attached to it.
+ // The verification can optionally be propagated, it will return `true` if parents have the listener attached to it.
+ listens: function (type, fn, context, propagate) {
+ if (typeof type !== 'string') {
+ console.warn('"string" type argument expected');
+ }
+
+ // we don't overwrite the input `fn` value, because we need to use it for propagation
+ var _fn = fn;
+ if (typeof fn !== 'function') {
+ propagate = !!fn;
+ _fn = undefined;
+ context = undefined;
+ }
+
+ var listeners = this._events && this._events[type];
+ if (listeners && listeners.length) {
+ if (this._listens(type, _fn, context) !== false) {
+ return true;
+ }
+ }
+
+ if (propagate) {
+ // also check parents for listeners if event propagates
+ for (var id in this._eventParents) {
+ if (this._eventParents[id].listens(type, fn, context, propagate)) { return true; }
+ }
+ }
+ return false;
+ },
+
+ // returns the index (number) or false
+ _listens: function (type, fn, context) {
+ if (!this._events) {
+ return false;
+ }
+
+ var listeners = this._events[type] || [];
+ if (!fn) {
+ return !!listeners.length;
+ }
+
+ if (context === this) {
+ // Less memory footprint.
+ context = undefined;
+ }
+
+ for (var i = 0, len = listeners.length; i < len; i++) {
+ if (listeners[i].fn === fn && listeners[i].ctx === context) {
+ return i;
+ }
+ }
+ return false;
+
+ },
+
+ // @method once(…): this
+ // Behaves as [`on(…)`](#evented-on), except the listener will only get fired once and then removed.
+ once: function (types, fn, context) {
+
+ // types can be a map of types/handlers
+ if (typeof types === 'object') {
+ for (var type in types) {
+ // we don't process space-separated events here for performance;
+ // it's a hot path since Layer uses the on(obj) syntax
+ this._on(type, types[type], fn, true);
+ }
+
+ } else {
+ // types can be a string of space-separated words
+ types = splitWords(types);
+
+ for (var i = 0, len = types.length; i < len; i++) {
+ this._on(types[i], fn, context, true);
+ }
+ }
+
+ return this;
+ },
+
+ // @method addEventParent(obj: Evented): this
+ // Adds an event parent - an `Evented` that will receive propagated events
+ addEventParent: function (obj) {
+ this._eventParents = this._eventParents || {};
+ this._eventParents[stamp(obj)] = obj;
+ return this;
+ },
+
+ // @method removeEventParent(obj: Evented): this
+ // Removes an event parent, so it will stop receiving propagated events
+ removeEventParent: function (obj) {
+ if (this._eventParents) {
+ delete this._eventParents[stamp(obj)];
+ }
+ return this;
+ },
+
+ _propagateEvent: function (e) {
+ for (var id in this._eventParents) {
+ this._eventParents[id].fire(e.type, extend({
+ layer: e.target,
+ propagatedFrom: e.target
+ }, e), true);
+ }
+ }
+};
+
+// aliases; we should ditch those eventually
+
+// @method addEventListener(…): this
+// Alias to [`on(…)`](#evented-on)
+Events.addEventListener = Events.on;
+
+// @method removeEventListener(…): this
+// Alias to [`off(…)`](#evented-off)
+
+// @method clearAllEventListeners(…): this
+// Alias to [`off()`](#evented-off)
+Events.removeEventListener = Events.clearAllEventListeners = Events.off;
+
+// @method addOneTimeEventListener(…): this
+// Alias to [`once(…)`](#evented-once)
+Events.addOneTimeEventListener = Events.once;
+
+// @method fireEvent(…): this
+// Alias to [`fire(…)`](#evented-fire)
+Events.fireEvent = Events.fire;
+
+// @method hasEventListeners(…): Boolean
+// Alias to [`listens(…)`](#evented-listens)
+Events.hasEventListeners = Events.listens;
+
+var Evented = Class.extend(Events);
+
+/*
+ * @class Point
+ * @aka L.Point
+ *
+ * Represents a point with `x` and `y` coordinates in pixels.
+ *
+ * @example
+ *
+ * ```js
+ * var point = L.point(200, 300);
+ * ```
+ *
+ * All Leaflet methods and options that accept `Point` objects also accept them in a simple Array form (unless noted otherwise), so these lines are equivalent:
+ *
+ * ```js
+ * map.panBy([200, 300]);
+ * map.panBy(L.point(200, 300));
+ * ```
+ *
+ * Note that `Point` does not inherit from Leaflet's `Class` object,
+ * which means new classes can't inherit from it, and new methods
+ * can't be added to it with the `include` function.
+ */
+
+function Point(x, y, round) {
+ // @property x: Number; The `x` coordinate of the point
+ this.x = (round ? Math.round(x) : x);
+ // @property y: Number; The `y` coordinate of the point
+ this.y = (round ? Math.round(y) : y);
+}
+
+var trunc = Math.trunc || function (v) {
+ return v > 0 ? Math.floor(v) : Math.ceil(v);
+};
+
+Point.prototype = {
+
+ // @method clone(): Point
+ // Returns a copy of the current point.
+ clone: function () {
+ return new Point(this.x, this.y);
+ },
+
+ // @method add(otherPoint: Point): Point
+ // Returns the result of addition of the current and the given points.
+ add: function (point) {
+ // non-destructive, returns a new point
+ return this.clone()._add(toPoint(point));
+ },
+
+ _add: function (point) {
+ // destructive, used directly for performance in situations where it's safe to modify existing point
+ this.x += point.x;
+ this.y += point.y;
+ return this;
+ },
+
+ // @method subtract(otherPoint: Point): Point
+ // Returns the result of subtraction of the given point from the current.
+ subtract: function (point) {
+ return this.clone()._subtract(toPoint(point));
+ },
+
+ _subtract: function (point) {
+ this.x -= point.x;
+ this.y -= point.y;
+ return this;
+ },
+
+ // @method divideBy(num: Number): Point
+ // Returns the result of division of the current point by the given number.
+ divideBy: function (num) {
+ return this.clone()._divideBy(num);
+ },
+
+ _divideBy: function (num) {
+ this.x /= num;
+ this.y /= num;
+ return this;
+ },
+
+ // @method multiplyBy(num: Number): Point
+ // Returns the result of multiplication of the current point by the given number.
+ multiplyBy: function (num) {
+ return this.clone()._multiplyBy(num);
+ },
+
+ _multiplyBy: function (num) {
+ this.x *= num;
+ this.y *= num;
+ return this;
+ },
+
+ // @method scaleBy(scale: Point): Point
+ // Multiply each coordinate of the current point by each coordinate of
+ // `scale`. In linear algebra terms, multiply the point by the
+ // [scaling matrix](https://en.wikipedia.org/wiki/Scaling_%28geometry%29#Matrix_representation)
+ // defined by `scale`.
+ scaleBy: function (point) {
+ return new Point(this.x * point.x, this.y * point.y);
+ },
+
+ // @method unscaleBy(scale: Point): Point
+ // Inverse of `scaleBy`. Divide each coordinate of the current point by
+ // each coordinate of `scale`.
+ unscaleBy: function (point) {
+ return new Point(this.x / point.x, this.y / point.y);
+ },
+
+ // @method round(): Point
+ // Returns a copy of the current point with rounded coordinates.
+ round: function () {
+ return this.clone()._round();
+ },
+
+ _round: function () {
+ this.x = Math.round(this.x);
+ this.y = Math.round(this.y);
+ return this;
+ },
+
+ // @method floor(): Point
+ // Returns a copy of the current point with floored coordinates (rounded down).
+ floor: function () {
+ return this.clone()._floor();
+ },
+
+ _floor: function () {
+ this.x = Math.floor(this.x);
+ this.y = Math.floor(this.y);
+ return this;
+ },
+
+ // @method ceil(): Point
+ // Returns a copy of the current point with ceiled coordinates (rounded up).
+ ceil: function () {
+ return this.clone()._ceil();
+ },
+
+ _ceil: function () {
+ this.x = Math.ceil(this.x);
+ this.y = Math.ceil(this.y);
+ return this;
+ },
+
+ // @method trunc(): Point
+ // Returns a copy of the current point with truncated coordinates (rounded towards zero).
+ trunc: function () {
+ return this.clone()._trunc();
+ },
+
+ _trunc: function () {
+ this.x = trunc(this.x);
+ this.y = trunc(this.y);
+ return this;
+ },
+
+ // @method distanceTo(otherPoint: Point): Number
+ // Returns the cartesian distance between the current and the given points.
+ distanceTo: function (point) {
+ point = toPoint(point);
+
+ var x = point.x - this.x,
+ y = point.y - this.y;
+
+ return Math.sqrt(x * x + y * y);
+ },
+
+ // @method equals(otherPoint: Point): Boolean
+ // Returns `true` if the given point has the same coordinates.
+ equals: function (point) {
+ point = toPoint(point);
+
+ return point.x === this.x &&
+ point.y === this.y;
+ },
+
+ // @method contains(otherPoint: Point): Boolean
+ // Returns `true` if both coordinates of the given point are less than the corresponding current point coordinates (in absolute values).
+ contains: function (point) {
+ point = toPoint(point);
+
+ return Math.abs(point.x) <= Math.abs(this.x) &&
+ Math.abs(point.y) <= Math.abs(this.y);
+ },
+
+ // @method toString(): String
+ // Returns a string representation of the point for debugging purposes.
+ toString: function () {
+ return 'Point(' +
+ formatNum(this.x) + ', ' +
+ formatNum(this.y) + ')';
+ }
+};
+
+// @factory L.point(x: Number, y: Number, round?: Boolean)
+// Creates a Point object with the given `x` and `y` coordinates. If optional `round` is set to true, rounds the `x` and `y` values.
+
+// @alternative
+// @factory L.point(coords: Number[])
+// Expects an array of the form `[x, y]` instead.
+
+// @alternative
+// @factory L.point(coords: Object)
+// Expects a plain object of the form `{x: Number, y: Number}` instead.
+function toPoint(x, y, round) {
+ if (x instanceof Point) {
+ return x;
+ }
+ if (isArray(x)) {
+ return new Point(x[0], x[1]);
+ }
+ if (x === undefined || x === null) {
+ return x;
+ }
+ if (typeof x === 'object' && 'x' in x && 'y' in x) {
+ return new Point(x.x, x.y);
+ }
+ return new Point(x, y, round);
+}
+
+/*
+ * @class Bounds
+ * @aka L.Bounds
+ *
+ * Represents a rectangular area in pixel coordinates.
+ *
+ * @example
+ *
+ * ```js
+ * var p1 = L.point(10, 10),
+ * p2 = L.point(40, 60),
+ * bounds = L.bounds(p1, p2);
+ * ```
+ *
+ * All Leaflet methods that accept `Bounds` objects also accept them in a simple Array form (unless noted otherwise), so the bounds example above can be passed like this:
+ *
+ * ```js
+ * otherBounds.intersects([[10, 10], [40, 60]]);
+ * ```
+ *
+ * Note that `Bounds` does not inherit from Leaflet's `Class` object,
+ * which means new classes can't inherit from it, and new methods
+ * can't be added to it with the `include` function.
+ */
+
+function Bounds(a, b) {
+ if (!a) { return; }
+
+ var points = b ? [a, b] : a;
+
+ for (var i = 0, len = points.length; i < len; i++) {
+ this.extend(points[i]);
+ }
+}
+
+Bounds.prototype = {
+ // @method extend(point: Point): this
+ // Extends the bounds to contain the given point.
+
+ // @alternative
+ // @method extend(otherBounds: Bounds): this
+ // Extend the bounds to contain the given bounds
+ extend: function (obj) {
+ var min2, max2;
+ if (!obj) { return this; }
+
+ if (obj instanceof Point || typeof obj[0] === 'number' || 'x' in obj) {
+ min2 = max2 = toPoint(obj);
+ } else {
+ obj = toBounds(obj);
+ min2 = obj.min;
+ max2 = obj.max;
+
+ if (!min2 || !max2) { return this; }
+ }
+
+ // @property min: Point
+ // The top left corner of the rectangle.
+ // @property max: Point
+ // The bottom right corner of the rectangle.
+ if (!this.min && !this.max) {
+ this.min = min2.clone();
+ this.max = max2.clone();
+ } else {
+ this.min.x = Math.min(min2.x, this.min.x);
+ this.max.x = Math.max(max2.x, this.max.x);
+ this.min.y = Math.min(min2.y, this.min.y);
+ this.max.y = Math.max(max2.y, this.max.y);
+ }
+ return this;
+ },
+
+ // @method getCenter(round?: Boolean): Point
+ // Returns the center point of the bounds.
+ getCenter: function (round) {
+ return toPoint(
+ (this.min.x + this.max.x) / 2,
+ (this.min.y + this.max.y) / 2, round);
+ },
+
+ // @method getBottomLeft(): Point
+ // Returns the bottom-left point of the bounds.
+ getBottomLeft: function () {
+ return toPoint(this.min.x, this.max.y);
+ },
+
+ // @method getTopRight(): Point
+ // Returns the top-right point of the bounds.
+ getTopRight: function () { // -> Point
+ return toPoint(this.max.x, this.min.y);
+ },
+
+ // @method getTopLeft(): Point
+ // Returns the top-left point of the bounds (i.e. [`this.min`](#bounds-min)).
+ getTopLeft: function () {
+ return this.min; // left, top
+ },
+
+ // @method getBottomRight(): Point
+ // Returns the bottom-right point of the bounds (i.e. [`this.max`](#bounds-max)).
+ getBottomRight: function () {
+ return this.max; // right, bottom
+ },
+
+ // @method getSize(): Point
+ // Returns the size of the given bounds
+ getSize: function () {
+ return this.max.subtract(this.min);
+ },
+
+ // @method contains(otherBounds: Bounds): Boolean
+ // Returns `true` if the rectangle contains the given one.
+ // @alternative
+ // @method contains(point: Point): Boolean
+ // Returns `true` if the rectangle contains the given point.
+ contains: function (obj) {
+ var min, max;
+
+ if (typeof obj[0] === 'number' || obj instanceof Point) {
+ obj = toPoint(obj);
+ } else {
+ obj = toBounds(obj);
+ }
+
+ if (obj instanceof Bounds) {
+ min = obj.min;
+ max = obj.max;
+ } else {
+ min = max = obj;
+ }
+
+ return (min.x >= this.min.x) &&
+ (max.x <= this.max.x) &&
+ (min.y >= this.min.y) &&
+ (max.y <= this.max.y);
+ },
+
+ // @method intersects(otherBounds: Bounds): Boolean
+ // Returns `true` if the rectangle intersects the given bounds. Two bounds
+ // intersect if they have at least one point in common.
+ intersects: function (bounds) { // (Bounds) -> Boolean
+ bounds = toBounds(bounds);
+
+ var min = this.min,
+ max = this.max,
+ min2 = bounds.min,
+ max2 = bounds.max,
+ xIntersects = (max2.x >= min.x) && (min2.x <= max.x),
+ yIntersects = (max2.y >= min.y) && (min2.y <= max.y);
+
+ return xIntersects && yIntersects;
+ },
+
+ // @method overlaps(otherBounds: Bounds): Boolean
+ // Returns `true` if the rectangle overlaps the given bounds. Two bounds
+ // overlap if their intersection is an area.
+ overlaps: function (bounds) { // (Bounds) -> Boolean
+ bounds = toBounds(bounds);
+
+ var min = this.min,
+ max = this.max,
+ min2 = bounds.min,
+ max2 = bounds.max,
+ xOverlaps = (max2.x > min.x) && (min2.x < max.x),
+ yOverlaps = (max2.y > min.y) && (min2.y < max.y);
+
+ return xOverlaps && yOverlaps;
+ },
+
+ // @method isValid(): Boolean
+ // Returns `true` if the bounds are properly initialized.
+ isValid: function () {
+ return !!(this.min && this.max);
+ },
+
+
+ // @method pad(bufferRatio: Number): Bounds
+ // Returns bounds created by extending or retracting the current bounds by a given ratio in each direction.
+ // For example, a ratio of 0.5 extends the bounds by 50% in each direction.
+ // Negative values will retract the bounds.
+ pad: function (bufferRatio) {
+ var min = this.min,
+ max = this.max,
+ heightBuffer = Math.abs(min.x - max.x) * bufferRatio,
+ widthBuffer = Math.abs(min.y - max.y) * bufferRatio;
+
+
+ return toBounds(
+ toPoint(min.x - heightBuffer, min.y - widthBuffer),
+ toPoint(max.x + heightBuffer, max.y + widthBuffer));
+ },
+
+
+ // @method equals(otherBounds: Bounds): Boolean
+ // Returns `true` if the rectangle is equivalent to the given bounds.
+ equals: function (bounds) {
+ if (!bounds) { return false; }
+
+ bounds = toBounds(bounds);
+
+ return this.min.equals(bounds.getTopLeft()) &&
+ this.max.equals(bounds.getBottomRight());
+ },
+};
+
+
+// @factory L.bounds(corner1: Point, corner2: Point)
+// Creates a Bounds object from two corners coordinate pairs.
+// @alternative
+// @factory L.bounds(points: Point[])
+// Creates a Bounds object from the given array of points.
+function toBounds(a, b) {
+ if (!a || a instanceof Bounds) {
+ return a;
+ }
+ return new Bounds(a, b);
+}
+
+/*
+ * @class LatLngBounds
+ * @aka L.LatLngBounds
+ *
+ * Represents a rectangular geographical area on a map.
+ *
+ * @example
+ *
+ * ```js
+ * var corner1 = L.latLng(40.712, -74.227),
+ * corner2 = L.latLng(40.774, -74.125),
+ * bounds = L.latLngBounds(corner1, corner2);
+ * ```
+ *
+ * All Leaflet methods that accept LatLngBounds objects also accept them in a simple Array form (unless noted otherwise), so the bounds example above can be passed like this:
+ *
+ * ```js
+ * map.fitBounds([
+ * [40.712, -74.227],
+ * [40.774, -74.125]
+ * ]);
+ * ```
+ *
+ * Caution: if the area crosses the antimeridian (often confused with the International Date Line), you must specify corners _outside_ the [-180, 180] degrees longitude range.
+ *
+ * Note that `LatLngBounds` does not inherit from Leaflet's `Class` object,
+ * which means new classes can't inherit from it, and new methods
+ * can't be added to it with the `include` function.
+ */
+
+function LatLngBounds(corner1, corner2) { // (LatLng, LatLng) or (LatLng[])
+ if (!corner1) { return; }
+
+ var latlngs = corner2 ? [corner1, corner2] : corner1;
+
+ for (var i = 0, len = latlngs.length; i < len; i++) {
+ this.extend(latlngs[i]);
+ }
+}
+
+LatLngBounds.prototype = {
+
+ // @method extend(latlng: LatLng): this
+ // Extend the bounds to contain the given point
+
+ // @alternative
+ // @method extend(otherBounds: LatLngBounds): this
+ // Extend the bounds to contain the given bounds
+ extend: function (obj) {
+ var sw = this._southWest,
+ ne = this._northEast,
+ sw2, ne2;
+
+ if (obj instanceof LatLng) {
+ sw2 = obj;
+ ne2 = obj;
+
+ } else if (obj instanceof LatLngBounds) {
+ sw2 = obj._southWest;
+ ne2 = obj._northEast;
+
+ if (!sw2 || !ne2) { return this; }
+
+ } else {
+ return obj ? this.extend(toLatLng(obj) || toLatLngBounds(obj)) : this;
+ }
+
+ if (!sw && !ne) {
+ this._southWest = new LatLng(sw2.lat, sw2.lng);
+ this._northEast = new LatLng(ne2.lat, ne2.lng);
+ } else {
+ sw.lat = Math.min(sw2.lat, sw.lat);
+ sw.lng = Math.min(sw2.lng, sw.lng);
+ ne.lat = Math.max(ne2.lat, ne.lat);
+ ne.lng = Math.max(ne2.lng, ne.lng);
+ }
+
+ return this;
+ },
+
+ // @method pad(bufferRatio: Number): LatLngBounds
+ // Returns bounds created by extending or retracting the current bounds by a given ratio in each direction.
+ // For example, a ratio of 0.5 extends the bounds by 50% in each direction.
+ // Negative values will retract the bounds.
+ pad: function (bufferRatio) {
+ var sw = this._southWest,
+ ne = this._northEast,
+ heightBuffer = Math.abs(sw.lat - ne.lat) * bufferRatio,
+ widthBuffer = Math.abs(sw.lng - ne.lng) * bufferRatio;
+
+ return new LatLngBounds(
+ new LatLng(sw.lat - heightBuffer, sw.lng - widthBuffer),
+ new LatLng(ne.lat + heightBuffer, ne.lng + widthBuffer));
+ },
+
+ // @method getCenter(): LatLng
+ // Returns the center point of the bounds.
+ getCenter: function () {
+ return new LatLng(
+ (this._southWest.lat + this._northEast.lat) / 2,
+ (this._southWest.lng + this._northEast.lng) / 2);
+ },
+
+ // @method getSouthWest(): LatLng
+ // Returns the south-west point of the bounds.
+ getSouthWest: function () {
+ return this._southWest;
+ },
+
+ // @method getNorthEast(): LatLng
+ // Returns the north-east point of the bounds.
+ getNorthEast: function () {
+ return this._northEast;
+ },
+
+ // @method getNorthWest(): LatLng
+ // Returns the north-west point of the bounds.
+ getNorthWest: function () {
+ return new LatLng(this.getNorth(), this.getWest());
+ },
+
+ // @method getSouthEast(): LatLng
+ // Returns the south-east point of the bounds.
+ getSouthEast: function () {
+ return new LatLng(this.getSouth(), this.getEast());
+ },
+
+ // @method getWest(): Number
+ // Returns the west longitude of the bounds
+ getWest: function () {
+ return this._southWest.lng;
+ },
+
+ // @method getSouth(): Number
+ // Returns the south latitude of the bounds
+ getSouth: function () {
+ return this._southWest.lat;
+ },
+
+ // @method getEast(): Number
+ // Returns the east longitude of the bounds
+ getEast: function () {
+ return this._northEast.lng;
+ },
+
+ // @method getNorth(): Number
+ // Returns the north latitude of the bounds
+ getNorth: function () {
+ return this._northEast.lat;
+ },
+
+ // @method contains(otherBounds: LatLngBounds): Boolean
+ // Returns `true` if the rectangle contains the given one.
+
+ // @alternative
+ // @method contains (latlng: LatLng): Boolean
+ // Returns `true` if the rectangle contains the given point.
+ contains: function (obj) { // (LatLngBounds) or (LatLng) -> Boolean
+ if (typeof obj[0] === 'number' || obj instanceof LatLng || 'lat' in obj) {
+ obj = toLatLng(obj);
+ } else {
+ obj = toLatLngBounds(obj);
+ }
+
+ var sw = this._southWest,
+ ne = this._northEast,
+ sw2, ne2;
+
+ if (obj instanceof LatLngBounds) {
+ sw2 = obj.getSouthWest();
+ ne2 = obj.getNorthEast();
+ } else {
+ sw2 = ne2 = obj;
+ }
+
+ return (sw2.lat >= sw.lat) && (ne2.lat <= ne.lat) &&
+ (sw2.lng >= sw.lng) && (ne2.lng <= ne.lng);
+ },
+
+ // @method intersects(otherBounds: LatLngBounds): Boolean
+ // Returns `true` if the rectangle intersects the given bounds. Two bounds intersect if they have at least one point in common.
+ intersects: function (bounds) {
+ bounds = toLatLngBounds(bounds);
+
+ var sw = this._southWest,
+ ne = this._northEast,
+ sw2 = bounds.getSouthWest(),
+ ne2 = bounds.getNorthEast(),
+
+ latIntersects = (ne2.lat >= sw.lat) && (sw2.lat <= ne.lat),
+ lngIntersects = (ne2.lng >= sw.lng) && (sw2.lng <= ne.lng);
+
+ return latIntersects && lngIntersects;
+ },
+
+ // @method overlaps(otherBounds: LatLngBounds): Boolean
+ // Returns `true` if the rectangle overlaps the given bounds. Two bounds overlap if their intersection is an area.
+ overlaps: function (bounds) {
+ bounds = toLatLngBounds(bounds);
+
+ var sw = this._southWest,
+ ne = this._northEast,
+ sw2 = bounds.getSouthWest(),
+ ne2 = bounds.getNorthEast(),
+
+ latOverlaps = (ne2.lat > sw.lat) && (sw2.lat < ne.lat),
+ lngOverlaps = (ne2.lng > sw.lng) && (sw2.lng < ne.lng);
+
+ return latOverlaps && lngOverlaps;
+ },
+
+ // @method toBBoxString(): String
+ // Returns a string with bounding box coordinates in a 'southwest_lng,southwest_lat,northeast_lng,northeast_lat' format. Useful for sending requests to web services that return geo data.
+ toBBoxString: function () {
+ return [this.getWest(), this.getSouth(), this.getEast(), this.getNorth()].join(',');
+ },
+
+ // @method equals(otherBounds: LatLngBounds, maxMargin?: Number): Boolean
+ // Returns `true` if the rectangle is equivalent (within a small margin of error) to the given bounds. The margin of error can be overridden by setting `maxMargin` to a small number.
+ equals: function (bounds, maxMargin) {
+ if (!bounds) { return false; }
+
+ bounds = toLatLngBounds(bounds);
+
+ return this._southWest.equals(bounds.getSouthWest(), maxMargin) &&
+ this._northEast.equals(bounds.getNorthEast(), maxMargin);
+ },
+
+ // @method isValid(): Boolean
+ // Returns `true` if the bounds are properly initialized.
+ isValid: function () {
+ return !!(this._southWest && this._northEast);
+ }
+};
+
+// TODO International date line?
+
+// @factory L.latLngBounds(corner1: LatLng, corner2: LatLng)
+// Creates a `LatLngBounds` object by defining two diagonally opposite corners of the rectangle.
+
+// @alternative
+// @factory L.latLngBounds(latlngs: LatLng[])
+// Creates a `LatLngBounds` object defined by the geographical points it contains. Very useful for zooming the map to fit a particular set of locations with [`fitBounds`](#map-fitbounds).
+function toLatLngBounds(a, b) {
+ if (a instanceof LatLngBounds) {
+ return a;
+ }
+ return new LatLngBounds(a, b);
+}
+
+/* @class LatLng
+ * @aka L.LatLng
+ *
+ * Represents a geographical point with a certain latitude and longitude.
+ *
+ * @example
+ *
+ * ```
+ * var latlng = L.latLng(50.5, 30.5);
+ * ```
+ *
+ * All Leaflet methods that accept LatLng objects also accept them in a simple Array form and simple object form (unless noted otherwise), so these lines are equivalent:
+ *
+ * ```
+ * map.panTo([50, 30]);
+ * map.panTo({lon: 30, lat: 50});
+ * map.panTo({lat: 50, lng: 30});
+ * map.panTo(L.latLng(50, 30));
+ * ```
+ *
+ * Note that `LatLng` does not inherit from Leaflet's `Class` object,
+ * which means new classes can't inherit from it, and new methods
+ * can't be added to it with the `include` function.
+ */
+
+function LatLng(lat, lng, alt) {
+ if (isNaN(lat) || isNaN(lng)) {
+ throw new Error('Invalid LatLng object: (' + lat + ', ' + lng + ')');
+ }
+
+ // @property lat: Number
+ // Latitude in degrees
+ this.lat = +lat;
+
+ // @property lng: Number
+ // Longitude in degrees
+ this.lng = +lng;
+
+ // @property alt: Number
+ // Altitude in meters (optional)
+ if (alt !== undefined) {
+ this.alt = +alt;
+ }
+}
+
+LatLng.prototype = {
+ // @method equals(otherLatLng: LatLng, maxMargin?: Number): Boolean
+ // Returns `true` if the given `LatLng` point is at the same position (within a small margin of error). The margin of error can be overridden by setting `maxMargin` to a small number.
+ equals: function (obj, maxMargin) {
+ if (!obj) { return false; }
+
+ obj = toLatLng(obj);
+
+ var margin = Math.max(
+ Math.abs(this.lat - obj.lat),
+ Math.abs(this.lng - obj.lng));
+
+ return margin <= (maxMargin === undefined ? 1.0E-9 : maxMargin);
+ },
+
+ // @method toString(): String
+ // Returns a string representation of the point (for debugging purposes).
+ toString: function (precision) {
+ return 'LatLng(' +
+ formatNum(this.lat, precision) + ', ' +
+ formatNum(this.lng, precision) + ')';
+ },
+
+ // @method distanceTo(otherLatLng: LatLng): Number
+ // Returns the distance (in meters) to the given `LatLng` calculated using the [Spherical Law of Cosines](https://en.wikipedia.org/wiki/Spherical_law_of_cosines).
+ distanceTo: function (other) {
+ return Earth.distance(this, toLatLng(other));
+ },
+
+ // @method wrap(): LatLng
+ // Returns a new `LatLng` object with the longitude wrapped so it's always between -180 and +180 degrees.
+ wrap: function () {
+ return Earth.wrapLatLng(this);
+ },
+
+ // @method toBounds(sizeInMeters: Number): LatLngBounds
+ // Returns a new `LatLngBounds` object in which each boundary is `sizeInMeters/2` meters apart from the `LatLng`.
+ toBounds: function (sizeInMeters) {
+ var latAccuracy = 180 * sizeInMeters / 40075017,
+ lngAccuracy = latAccuracy / Math.cos((Math.PI / 180) * this.lat);
+
+ return toLatLngBounds(
+ [this.lat - latAccuracy, this.lng - lngAccuracy],
+ [this.lat + latAccuracy, this.lng + lngAccuracy]);
+ },
+
+ clone: function () {
+ return new LatLng(this.lat, this.lng, this.alt);
+ }
+};
+
+
+
+// @factory L.latLng(latitude: Number, longitude: Number, altitude?: Number): LatLng
+// Creates an object representing a geographical point with the given latitude and longitude (and optionally altitude).
+
+// @alternative
+// @factory L.latLng(coords: Array): LatLng
+// Expects an array of the form `[Number, Number]` or `[Number, Number, Number]` instead.
+
+// @alternative
+// @factory L.latLng(coords: Object): LatLng
+// Expects an plain object of the form `{lat: Number, lng: Number}` or `{lat: Number, lng: Number, alt: Number}` instead.
+
+function toLatLng(a, b, c) {
+ if (a instanceof LatLng) {
+ return a;
+ }
+ if (isArray(a) && typeof a[0] !== 'object') {
+ if (a.length === 3) {
+ return new LatLng(a[0], a[1], a[2]);
+ }
+ if (a.length === 2) {
+ return new LatLng(a[0], a[1]);
+ }
+ return null;
+ }
+ if (a === undefined || a === null) {
+ return a;
+ }
+ if (typeof a === 'object' && 'lat' in a) {
+ return new LatLng(a.lat, 'lng' in a ? a.lng : a.lon, a.alt);
+ }
+ if (b === undefined) {
+ return null;
+ }
+ return new LatLng(a, b, c);
+}
+
+/*
+ * @namespace CRS
+ * @crs L.CRS.Base
+ * Object that defines coordinate reference systems for projecting
+ * geographical points into pixel (screen) coordinates and back (and to
+ * coordinates in other units for [WMS](https://en.wikipedia.org/wiki/Web_Map_Service) services). See
+ * [spatial reference system](https://en.wikipedia.org/wiki/Spatial_reference_system).
+ *
+ * Leaflet defines the most usual CRSs by default. If you want to use a
+ * CRS not defined by default, take a look at the
+ * [Proj4Leaflet](https://github.com/kartena/Proj4Leaflet) plugin.
+ *
+ * Note that the CRS instances do not inherit from Leaflet's `Class` object,
+ * and can't be instantiated. Also, new classes can't inherit from them,
+ * and methods can't be added to them with the `include` function.
+ */
+
+var CRS = {
+ // @method latLngToPoint(latlng: LatLng, zoom: Number): Point
+ // Projects geographical coordinates into pixel coordinates for a given zoom.
+ latLngToPoint: function (latlng, zoom) {
+ var projectedPoint = this.projection.project(latlng),
+ scale = this.scale(zoom);
+
+ return this.transformation._transform(projectedPoint, scale);
+ },
+
+ // @method pointToLatLng(point: Point, zoom: Number): LatLng
+ // The inverse of `latLngToPoint`. Projects pixel coordinates on a given
+ // zoom into geographical coordinates.
+ pointToLatLng: function (point, zoom) {
+ var scale = this.scale(zoom),
+ untransformedPoint = this.transformation.untransform(point, scale);
+
+ return this.projection.unproject(untransformedPoint);
+ },
+
+ // @method project(latlng: LatLng): Point
+ // Projects geographical coordinates into coordinates in units accepted for
+ // this CRS (e.g. meters for EPSG:3857, for passing it to WMS services).
+ project: function (latlng) {
+ return this.projection.project(latlng);
+ },
+
+ // @method unproject(point: Point): LatLng
+ // Given a projected coordinate returns the corresponding LatLng.
+ // The inverse of `project`.
+ unproject: function (point) {
+ return this.projection.unproject(point);
+ },
+
+ // @method scale(zoom: Number): Number
+ // Returns the scale used when transforming projected coordinates into
+ // pixel coordinates for a particular zoom. For example, it returns
+ // `256 * 2^zoom` for Mercator-based CRS.
+ scale: function (zoom) {
+ return 256 * Math.pow(2, zoom);
+ },
+
+ // @method zoom(scale: Number): Number
+ // Inverse of `scale()`, returns the zoom level corresponding to a scale
+ // factor of `scale`.
+ zoom: function (scale) {
+ return Math.log(scale / 256) / Math.LN2;
+ },
+
+ // @method getProjectedBounds(zoom: Number): Bounds
+ // Returns the projection's bounds scaled and transformed for the provided `zoom`.
+ getProjectedBounds: function (zoom) {
+ if (this.infinite) { return null; }
+
+ var b = this.projection.bounds,
+ s = this.scale(zoom),
+ min = this.transformation.transform(b.min, s),
+ max = this.transformation.transform(b.max, s);
+
+ return new Bounds(min, max);
+ },
+
+ // @method distance(latlng1: LatLng, latlng2: LatLng): Number
+ // Returns the distance between two geographical coordinates.
+
+ // @property code: String
+ // Standard code name of the CRS passed into WMS services (e.g. `'EPSG:3857'`)
+ //
+ // @property wrapLng: Number[]
+ // An array of two numbers defining whether the longitude (horizontal) coordinate
+ // axis wraps around a given range and how. Defaults to `[-180, 180]` in most
+ // geographical CRSs. If `undefined`, the longitude axis does not wrap around.
+ //
+ // @property wrapLat: Number[]
+ // Like `wrapLng`, but for the latitude (vertical) axis.
+
+ // wrapLng: [min, max],
+ // wrapLat: [min, max],
+
+ // @property infinite: Boolean
+ // If true, the coordinate space will be unbounded (infinite in both axes)
+ infinite: false,
+
+ // @method wrapLatLng(latlng: LatLng): LatLng
+ // Returns a `LatLng` where lat and lng has been wrapped according to the
+ // CRS's `wrapLat` and `wrapLng` properties, if they are outside the CRS's bounds.
+ wrapLatLng: function (latlng) {
+ var lng = this.wrapLng ? wrapNum(latlng.lng, this.wrapLng, true) : latlng.lng,
+ lat = this.wrapLat ? wrapNum(latlng.lat, this.wrapLat, true) : latlng.lat,
+ alt = latlng.alt;
+
+ return new LatLng(lat, lng, alt);
+ },
+
+ // @method wrapLatLngBounds(bounds: LatLngBounds): LatLngBounds
+ // Returns a `LatLngBounds` with the same size as the given one, ensuring
+ // that its center is within the CRS's bounds.
+ // Only accepts actual `L.LatLngBounds` instances, not arrays.
+ wrapLatLngBounds: function (bounds) {
+ var center = bounds.getCenter(),
+ newCenter = this.wrapLatLng(center),
+ latShift = center.lat - newCenter.lat,
+ lngShift = center.lng - newCenter.lng;
+
+ if (latShift === 0 && lngShift === 0) {
+ return bounds;
+ }
+
+ var sw = bounds.getSouthWest(),
+ ne = bounds.getNorthEast(),
+ newSw = new LatLng(sw.lat - latShift, sw.lng - lngShift),
+ newNe = new LatLng(ne.lat - latShift, ne.lng - lngShift);
+
+ return new LatLngBounds(newSw, newNe);
+ }
+};
+
+/*
+ * @namespace CRS
+ * @crs L.CRS.Earth
+ *
+ * Serves as the base for CRS that are global such that they cover the earth.
+ * Can only be used as the base for other CRS and cannot be used directly,
+ * since it does not have a `code`, `projection` or `transformation`. `distance()` returns
+ * meters.
+ */
+
+var Earth = extend({}, CRS, {
+ wrapLng: [-180, 180],
+
+ // Mean Earth Radius, as recommended for use by
+ // the International Union of Geodesy and Geophysics,
+ // see https://rosettacode.org/wiki/Haversine_formula
+ R: 6371000,
+
+ // distance between two geographical points using spherical law of cosines approximation
+ distance: function (latlng1, latlng2) {
+ var rad = Math.PI / 180,
+ lat1 = latlng1.lat * rad,
+ lat2 = latlng2.lat * rad,
+ sinDLat = Math.sin((latlng2.lat - latlng1.lat) * rad / 2),
+ sinDLon = Math.sin((latlng2.lng - latlng1.lng) * rad / 2),
+ a = sinDLat * sinDLat + Math.cos(lat1) * Math.cos(lat2) * sinDLon * sinDLon,
+ c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+ return this.R * c;
+ }
+});
+
+/*
+ * @namespace Projection
+ * @projection L.Projection.SphericalMercator
+ *
+ * Spherical Mercator projection — the most common projection for online maps,
+ * used by almost all free and commercial tile providers. Assumes that Earth is
+ * a sphere. Used by the `EPSG:3857` CRS.
+ */
+
+var earthRadius = 6378137;
+
+var SphericalMercator = {
+
+ R: earthRadius,
+ MAX_LATITUDE: 85.0511287798,
+
+ project: function (latlng) {
+ var d = Math.PI / 180,
+ max = this.MAX_LATITUDE,
+ lat = Math.max(Math.min(max, latlng.lat), -max),
+ sin = Math.sin(lat * d);
+
+ return new Point(
+ this.R * latlng.lng * d,
+ this.R * Math.log((1 + sin) / (1 - sin)) / 2);
+ },
+
+ unproject: function (point) {
+ var d = 180 / Math.PI;
+
+ return new LatLng(
+ (2 * Math.atan(Math.exp(point.y / this.R)) - (Math.PI / 2)) * d,
+ point.x * d / this.R);
+ },
+
+ bounds: (function () {
+ var d = earthRadius * Math.PI;
+ return new Bounds([-d, -d], [d, d]);
+ })()
+};
+
+/*
+ * @class Transformation
+ * @aka L.Transformation
+ *
+ * Represents an affine transformation: a set of coefficients `a`, `b`, `c`, `d`
+ * for transforming a point of a form `(x, y)` into `(a*x + b, c*y + d)` and doing
+ * the reverse. Used by Leaflet in its projections code.
+ *
+ * @example
+ *
+ * ```js
+ * var transformation = L.transformation(2, 5, -1, 10),
+ * p = L.point(1, 2),
+ * p2 = transformation.transform(p), // L.point(7, 8)
+ * p3 = transformation.untransform(p2); // L.point(1, 2)
+ * ```
+ */
+
+
+// factory new L.Transformation(a: Number, b: Number, c: Number, d: Number)
+// Creates a `Transformation` object with the given coefficients.
+function Transformation(a, b, c, d) {
+ if (isArray(a)) {
+ // use array properties
+ this._a = a[0];
+ this._b = a[1];
+ this._c = a[2];
+ this._d = a[3];
+ return;
+ }
+ this._a = a;
+ this._b = b;
+ this._c = c;
+ this._d = d;
+}
+
+Transformation.prototype = {
+ // @method transform(point: Point, scale?: Number): Point
+ // Returns a transformed point, optionally multiplied by the given scale.
+ // Only accepts actual `L.Point` instances, not arrays.
+ transform: function (point, scale) { // (Point, Number) -> Point
+ return this._transform(point.clone(), scale);
+ },
+
+ // destructive transform (faster)
+ _transform: function (point, scale) {
+ scale = scale || 1;
+ point.x = scale * (this._a * point.x + this._b);
+ point.y = scale * (this._c * point.y + this._d);
+ return point;
+ },
+
+ // @method untransform(point: Point, scale?: Number): Point
+ // Returns the reverse transformation of the given point, optionally divided
+ // by the given scale. Only accepts actual `L.Point` instances, not arrays.
+ untransform: function (point, scale) {
+ scale = scale || 1;
+ return new Point(
+ (point.x / scale - this._b) / this._a,
+ (point.y / scale - this._d) / this._c);
+ }
+};
+
+// factory L.transformation(a: Number, b: Number, c: Number, d: Number)
+
+// @factory L.transformation(a: Number, b: Number, c: Number, d: Number)
+// Instantiates a Transformation object with the given coefficients.
+
+// @alternative
+// @factory L.transformation(coefficients: Array): Transformation
+// Expects an coefficients array of the form
+// `[a: Number, b: Number, c: Number, d: Number]`.
+
+function toTransformation(a, b, c, d) {
+ return new Transformation(a, b, c, d);
+}
+
+/*
+ * @namespace CRS
+ * @crs L.CRS.EPSG3857
+ *
+ * The most common CRS for online maps, used by almost all free and commercial
+ * tile providers. Uses Spherical Mercator projection. Set in by default in
+ * Map's `crs` option.
+ */
+
+var EPSG3857 = extend({}, Earth, {
+ code: 'EPSG:3857',
+ projection: SphericalMercator,
+
+ transformation: (function () {
+ var scale = 0.5 / (Math.PI * SphericalMercator.R);
+ return toTransformation(scale, 0.5, -scale, 0.5);
+ }())
+});
+
+var EPSG900913 = extend({}, EPSG3857, {
+ code: 'EPSG:900913'
+});
+
+// @namespace SVG; @section
+// There are several static functions which can be called without instantiating L.SVG:
+
+// @function create(name: String): SVGElement
+// Returns a instance of [SVGElement](https://developer.mozilla.org/docs/Web/API/SVGElement),
+// corresponding to the class name passed. For example, using 'line' will return
+// an instance of [SVGLineElement](https://developer.mozilla.org/docs/Web/API/SVGLineElement).
+function svgCreate(name) {
+ return document.createElementNS('http://www.w3.org/2000/svg', name);
+}
+
+// @function pointsToPath(rings: Point[], closed: Boolean): String
+// Generates a SVG path string for multiple rings, with each ring turning
+// into "M..L..L.." instructions
+function pointsToPath(rings, closed) {
+ var str = '',
+ i, j, len, len2, points, p;
+
+ for (i = 0, len = rings.length; i < len; i++) {
+ points = rings[i];
+
+ for (j = 0, len2 = points.length; j < len2; j++) {
+ p = points[j];
+ str += (j ? 'L' : 'M') + p.x + ' ' + p.y;
+ }
+
+ // closes the ring for polygons; "x" is VML syntax
+ str += closed ? (Browser.svg ? 'z' : 'x') : '';
+ }
+
+ // SVG complains about empty path strings
+ return str || 'M0 0';
+}
+
+/*
+ * @namespace Browser
+ * @aka L.Browser
+ *
+ * A namespace with static properties for browser/feature detection used by Leaflet internally.
+ *
+ * @example
+ *
+ * ```js
+ * if (L.Browser.ielt9) {
+ * alert('Upgrade your browser, dude!');
+ * }
+ * ```
+ */
+
+var style = document.documentElement.style;
+
+// @property ie: Boolean; `true` for all Internet Explorer versions (not Edge).
+var ie = 'ActiveXObject' in window;
+
+// @property ielt9: Boolean; `true` for Internet Explorer versions less than 9.
+var ielt9 = ie && !document.addEventListener;
+
+// @property edge: Boolean; `true` for the Edge web browser.
+var edge = 'msLaunchUri' in navigator && !('documentMode' in document);
+
+// @property webkit: Boolean;
+// `true` for webkit-based browsers like Chrome and Safari (including mobile versions).
+var webkit = userAgentContains('webkit');
+
+// @property android: Boolean
+// **Deprecated.** `true` for any browser running on an Android platform.
+var android = userAgentContains('android');
+
+// @property android23: Boolean; **Deprecated.** `true` for browsers running on Android 2 or Android 3.
+var android23 = userAgentContains('android 2') || userAgentContains('android 3');
+
+/* See https://stackoverflow.com/a/17961266 for details on detecting stock Android */
+var webkitVer = parseInt(/WebKit\/([0-9]+)|$/.exec(navigator.userAgent)[1], 10); // also matches AppleWebKit
+// @property androidStock: Boolean; **Deprecated.** `true` for the Android stock browser (i.e. not Chrome)
+var androidStock = android && userAgentContains('Google') && webkitVer < 537 && !('AudioNode' in window);
+
+// @property opera: Boolean; `true` for the Opera browser
+var opera = !!window.opera;
+
+// @property chrome: Boolean; `true` for the Chrome browser.
+var chrome = !edge && userAgentContains('chrome');
+
+// @property gecko: Boolean; `true` for gecko-based browsers like Firefox.
+var gecko = userAgentContains('gecko') && !webkit && !opera && !ie;
+
+// @property safari: Boolean; `true` for the Safari browser.
+var safari = !chrome && userAgentContains('safari');
+
+var phantom = userAgentContains('phantom');
+
+// @property opera12: Boolean
+// `true` for the Opera browser supporting CSS transforms (version 12 or later).
+var opera12 = 'OTransition' in style;
+
+// @property win: Boolean; `true` when the browser is running in a Windows platform
+var win = navigator.platform.indexOf('Win') === 0;
+
+// @property ie3d: Boolean; `true` for all Internet Explorer versions supporting CSS transforms.
+var ie3d = ie && ('transition' in style);
+
+// @property webkit3d: Boolean; `true` for webkit-based browsers supporting CSS transforms.
+var webkit3d = ('WebKitCSSMatrix' in window) && ('m11' in new window.WebKitCSSMatrix()) && !android23;
+
+// @property gecko3d: Boolean; `true` for gecko-based browsers supporting CSS transforms.
+var gecko3d = 'MozPerspective' in style;
+
+// @property any3d: Boolean
+// `true` for all browsers supporting CSS transforms.
+var any3d = !window.L_DISABLE_3D && (ie3d || webkit3d || gecko3d) && !opera12 && !phantom;
+
+// @property mobile: Boolean; `true` for all browsers running in a mobile device.
+var mobile = typeof orientation !== 'undefined' || userAgentContains('mobile');
+
+// @property mobileWebkit: Boolean; `true` for all webkit-based browsers in a mobile device.
+var mobileWebkit = mobile && webkit;
+
+// @property mobileWebkit3d: Boolean
+// `true` for all webkit-based browsers in a mobile device supporting CSS transforms.
+var mobileWebkit3d = mobile && webkit3d;
+
+// @property msPointer: Boolean
+// `true` for browsers implementing the Microsoft touch events model (notably IE10).
+var msPointer = !window.PointerEvent && window.MSPointerEvent;
+
+// @property pointer: Boolean
+// `true` for all browsers supporting [pointer events](https://msdn.microsoft.com/en-us/library/dn433244%28v=vs.85%29.aspx).
+var pointer = !!(window.PointerEvent || msPointer);
+
+// @property touchNative: Boolean
+// `true` for all browsers supporting [touch events](https://developer.mozilla.org/docs/Web/API/Touch_events).
+// **This does not necessarily mean** that the browser is running in a computer with
+// a touchscreen, it only means that the browser is capable of understanding
+// touch events.
+var touchNative = 'ontouchstart' in window || !!window.TouchEvent;
+
+// @property touch: Boolean
+// `true` for all browsers supporting either [touch](#browser-touch) or [pointer](#browser-pointer) events.
+// Note: pointer events will be preferred (if available), and processed for all `touch*` listeners.
+var touch = !window.L_NO_TOUCH && (touchNative || pointer);
+
+// @property mobileOpera: Boolean; `true` for the Opera browser in a mobile device.
+var mobileOpera = mobile && opera;
+
+// @property mobileGecko: Boolean
+// `true` for gecko-based browsers running in a mobile device.
+var mobileGecko = mobile && gecko;
+
+// @property retina: Boolean
+// `true` for browsers on a high-resolution "retina" screen or on any screen when browser's display zoom is more than 100%.
+var retina = (window.devicePixelRatio || (window.screen.deviceXDPI / window.screen.logicalXDPI)) > 1;
+
+// @property passiveEvents: Boolean
+// `true` for browsers that support passive events.
+var passiveEvents = (function () {
+ var supportsPassiveOption = false;
+ try {
+ var opts = Object.defineProperty({}, 'passive', {
+ get: function () { // eslint-disable-line getter-return
+ supportsPassiveOption = true;
+ }
+ });
+ window.addEventListener('testPassiveEventSupport', falseFn, opts);
+ window.removeEventListener('testPassiveEventSupport', falseFn, opts);
+ } catch (e) {
+ // Errors can safely be ignored since this is only a browser support test.
+ }
+ return supportsPassiveOption;
+}());
+
+// @property canvas: Boolean
+// `true` when the browser supports [`<canvas>`](https://developer.mozilla.org/docs/Web/API/Canvas_API).
+var canvas$1 = (function () {
+ return !!document.createElement('canvas').getContext;
+}());
+
+// @property svg: Boolean
+// `true` when the browser supports [SVG](https://developer.mozilla.org/docs/Web/SVG).
+var svg$1 = !!(document.createElementNS && svgCreate('svg').createSVGRect);
+
+var inlineSvg = !!svg$1 && (function () {
+ var div = document.createElement('div');
+ div.innerHTML = '<svg/>';
+ return (div.firstChild && div.firstChild.namespaceURI) === 'http://www.w3.org/2000/svg';
+})();
+
+// @property vml: Boolean
+// `true` if the browser supports [VML](https://en.wikipedia.org/wiki/Vector_Markup_Language).
+var vml = !svg$1 && (function () {
+ try {
+ var div = document.createElement('div');
+ div.innerHTML = '<v:shape adj="1"/>';
+
+ var shape = div.firstChild;
+ shape.style.behavior = 'url(#default#VML)';
+
+ return shape && (typeof shape.adj === 'object');
+
+ } catch (e) {
+ return false;
+ }
+}());
+
+
+// @property mac: Boolean; `true` when the browser is running in a Mac platform
+var mac = navigator.platform.indexOf('Mac') === 0;
+
+// @property mac: Boolean; `true` when the browser is running in a Linux platform
+var linux = navigator.platform.indexOf('Linux') === 0;
+
+function userAgentContains(str) {
+ return navigator.userAgent.toLowerCase().indexOf(str) >= 0;
+}
+
+
+var Browser = {
+ ie: ie,
+ ielt9: ielt9,
+ edge: edge,
+ webkit: webkit,
+ android: android,
+ android23: android23,
+ androidStock: androidStock,
+ opera: opera,
+ chrome: chrome,
+ gecko: gecko,
+ safari: safari,
+ phantom: phantom,
+ opera12: opera12,
+ win: win,
+ ie3d: ie3d,
+ webkit3d: webkit3d,
+ gecko3d: gecko3d,
+ any3d: any3d,
+ mobile: mobile,
+ mobileWebkit: mobileWebkit,
+ mobileWebkit3d: mobileWebkit3d,
+ msPointer: msPointer,
+ pointer: pointer,
+ touch: touch,
+ touchNative: touchNative,
+ mobileOpera: mobileOpera,
+ mobileGecko: mobileGecko,
+ retina: retina,
+ passiveEvents: passiveEvents,
+ canvas: canvas$1,
+ svg: svg$1,
+ vml: vml,
+ inlineSvg: inlineSvg,
+ mac: mac,
+ linux: linux
+};
+
+/*
+ * Extends L.DomEvent to provide touch support for Internet Explorer and Windows-based devices.
+ */
+
+var POINTER_DOWN = Browser.msPointer ? 'MSPointerDown' : 'pointerdown';
+var POINTER_MOVE = Browser.msPointer ? 'MSPointerMove' : 'pointermove';
+var POINTER_UP = Browser.msPointer ? 'MSPointerUp' : 'pointerup';
+var POINTER_CANCEL = Browser.msPointer ? 'MSPointerCancel' : 'pointercancel';
+var pEvent = {
+ touchstart : POINTER_DOWN,
+ touchmove : POINTER_MOVE,
+ touchend : POINTER_UP,
+ touchcancel : POINTER_CANCEL
+};
+var handle = {
+ touchstart : _onPointerStart,
+ touchmove : _handlePointer,
+ touchend : _handlePointer,
+ touchcancel : _handlePointer
+};
+var _pointers = {};
+var _pointerDocListener = false;
+
+// Provides a touch events wrapper for (ms)pointer events.
+// ref https://www.w3.org/TR/pointerevents/ https://www.w3.org/Bugs/Public/show_bug.cgi?id=22890
+
+function addPointerListener(obj, type, handler) {
+ if (type === 'touchstart') {
+ _addPointerDocListener();
+ }
+ if (!handle[type]) {
+ console.warn('wrong event specified:', type);
+ return falseFn;
+ }
+ handler = handle[type].bind(this, handler);
+ obj.addEventListener(pEvent[type], handler, false);
+ return handler;
+}
+
+function removePointerListener(obj, type, handler) {
+ if (!pEvent[type]) {
+ console.warn('wrong event specified:', type);
+ return;
+ }
+ obj.removeEventListener(pEvent[type], handler, false);
+}
+
+function _globalPointerDown(e) {
+ _pointers[e.pointerId] = e;
+}
+
+function _globalPointerMove(e) {
+ if (_pointers[e.pointerId]) {
+ _pointers[e.pointerId] = e;
+ }
+}
+
+function _globalPointerUp(e) {
+ delete _pointers[e.pointerId];
+}
+
+function _addPointerDocListener() {
+ // need to keep track of what pointers and how many are active to provide e.touches emulation
+ if (!_pointerDocListener) {
+ // we listen document as any drags that end by moving the touch off the screen get fired there
+ document.addEventListener(POINTER_DOWN, _globalPointerDown, true);
+ document.addEventListener(POINTER_MOVE, _globalPointerMove, true);
+ document.addEventListener(POINTER_UP, _globalPointerUp, true);
+ document.addEventListener(POINTER_CANCEL, _globalPointerUp, true);
+
+ _pointerDocListener = true;
+ }
+}
+
+function _handlePointer(handler, e) {
+ if (e.pointerType === (e.MSPOINTER_TYPE_MOUSE || 'mouse')) { return; }
+
+ e.touches = [];
+ for (var i in _pointers) {
+ e.touches.push(_pointers[i]);
+ }
+ e.changedTouches = [e];
+
+ handler(e);
+}
+
+function _onPointerStart(handler, e) {
+ // IE10 specific: MsTouch needs preventDefault. See #2000
+ if (e.MSPOINTER_TYPE_TOUCH && e.pointerType === e.MSPOINTER_TYPE_TOUCH) {
+ preventDefault(e);
+ }
+ _handlePointer(handler, e);
+}
+
+/*
+ * Extends the event handling code with double tap support for mobile browsers.
+ *
+ * Note: currently most browsers fire native dblclick, with only a few exceptions
+ * (see https://github.com/Leaflet/Leaflet/issues/7012#issuecomment-595087386)
+ */
+
+function makeDblclick(event) {
+ // in modern browsers `type` cannot be just overridden:
+ // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Errors/Getter_only
+ var newEvent = {},
+ prop, i;
+ for (i in event) {
+ prop = event[i];
+ newEvent[i] = prop && prop.bind ? prop.bind(event) : prop;
+ }
+ event = newEvent;
+ newEvent.type = 'dblclick';
+ newEvent.detail = 2;
+ newEvent.isTrusted = false;
+ newEvent._simulated = true; // for debug purposes
+ return newEvent;
+}
+
+var delay = 200;
+function addDoubleTapListener(obj, handler) {
+ // Most browsers handle double tap natively
+ obj.addEventListener('dblclick', handler);
+
+ // On some platforms the browser doesn't fire native dblclicks for touch events.
+ // It seems that in all such cases `detail` property of `click` event is always `1`.
+ // So here we rely on that fact to avoid excessive 'dblclick' simulation when not needed.
+ var last = 0,
+ detail;
+ function simDblclick(e) {
+ if (e.detail !== 1) {
+ detail = e.detail; // keep in sync to avoid false dblclick in some cases
+ return;
+ }
+
+ if (e.pointerType === 'mouse' ||
+ (e.sourceCapabilities && !e.sourceCapabilities.firesTouchEvents)) {
+
+ return;
+ }
+
+ // When clicking on an <input>, the browser generates a click on its
+ // <label> (and vice versa) triggering two clicks in quick succession.
+ // This ignores clicks on elements which are a label with a 'for'
+ // attribute (or children of such a label), but not children of
+ // a <input>.
+ var path = getPropagationPath(e);
+ if (path.some(function (el) {
+ return el instanceof HTMLLabelElement && el.attributes.for;
+ }) &&
+ !path.some(function (el) {
+ return (
+ el instanceof HTMLInputElement ||
+ el instanceof HTMLSelectElement
+ );
+ })
+ ) {
+ return;
+ }
+
+ var now = Date.now();
+ if (now - last <= delay) {
+ detail++;
+ if (detail === 2) {
+ handler(makeDblclick(e));
+ }
+ } else {
+ detail = 1;
+ }
+ last = now;
+ }
+
+ obj.addEventListener('click', simDblclick);
+
+ return {
+ dblclick: handler,
+ simDblclick: simDblclick
+ };
+}
+
+function removeDoubleTapListener(obj, handlers) {
+ obj.removeEventListener('dblclick', handlers.dblclick);
+ obj.removeEventListener('click', handlers.simDblclick);
+}
+
+/*
+ * @namespace DomUtil
+ *
+ * Utility functions to work with the [DOM](https://developer.mozilla.org/docs/Web/API/Document_Object_Model)
+ * tree, used by Leaflet internally.
+ *
+ * Most functions expecting or returning a `HTMLElement` also work for
+ * SVG elements. The only difference is that classes refer to CSS classes
+ * in HTML and SVG classes in SVG.
+ */
+
+
+// @property TRANSFORM: String
+// Vendor-prefixed transform style name (e.g. `'webkitTransform'` for WebKit).
+var TRANSFORM = testProp(
+ ['transform', 'webkitTransform', 'OTransform', 'MozTransform', 'msTransform']);
+
+// webkitTransition comes first because some browser versions that drop vendor prefix don't do
+// the same for the transitionend event, in particular the Android 4.1 stock browser
+
+// @property TRANSITION: String
+// Vendor-prefixed transition style name.
+var TRANSITION = testProp(
+ ['webkitTransition', 'transition', 'OTransition', 'MozTransition', 'msTransition']);
+
+// @property TRANSITION_END: String
+// Vendor-prefixed transitionend event name.
+var TRANSITION_END =
+ TRANSITION === 'webkitTransition' || TRANSITION === 'OTransition' ? TRANSITION + 'End' : 'transitionend';
+
+
+// @function get(id: String|HTMLElement): HTMLElement
+// Returns an element given its DOM id, or returns the element itself
+// if it was passed directly.
+function get(id) {
+ return typeof id === 'string' ? document.getElementById(id) : id;
+}
+
+// @function getStyle(el: HTMLElement, styleAttrib: String): String
+// Returns the value for a certain style attribute on an element,
+// including computed values or values set through CSS.
+function getStyle(el, style) {
+ var value = el.style[style] || (el.currentStyle && el.currentStyle[style]);
+
+ if ((!value || value === 'auto') && document.defaultView) {
+ var css = document.defaultView.getComputedStyle(el, null);
+ value = css ? css[style] : null;
+ }
+ return value === 'auto' ? null : value;
+}
+
+// @function create(tagName: String, className?: String, container?: HTMLElement): HTMLElement
+// Creates an HTML element with `tagName`, sets its class to `className`, and optionally appends it to `container` element.
+function create$1(tagName, className, container) {
+ var el = document.createElement(tagName);
+ el.className = className || '';
+
+ if (container) {
+ container.appendChild(el);
+ }
+ return el;
+}
+
+// @function remove(el: HTMLElement)
+// Removes `el` from its parent element
+function remove(el) {
+ var parent = el.parentNode;
+ if (parent) {
+ parent.removeChild(el);
+ }
+}
+
+// @function empty(el: HTMLElement)
+// Removes all of `el`'s children elements from `el`
+function empty(el) {
+ while (el.firstChild) {
+ el.removeChild(el.firstChild);
+ }
+}
+
+// @function toFront(el: HTMLElement)
+// Makes `el` the last child of its parent, so it renders in front of the other children.
+function toFront(el) {
+ var parent = el.parentNode;
+ if (parent && parent.lastChild !== el) {
+ parent.appendChild(el);
+ }
+}
+
+// @function toBack(el: HTMLElement)
+// Makes `el` the first child of its parent, so it renders behind the other children.
+function toBack(el) {
+ var parent = el.parentNode;
+ if (parent && parent.firstChild !== el) {
+ parent.insertBefore(el, parent.firstChild);
+ }
+}
+
+// @function hasClass(el: HTMLElement, name: String): Boolean
+// Returns `true` if the element's class attribute contains `name`.
+function hasClass(el, name) {
+ if (el.classList !== undefined) {
+ return el.classList.contains(name);
+ }
+ var className = getClass(el);
+ return className.length > 0 && new RegExp('(^|\\s)' + name + '(\\s|$)').test(className);
+}
+
+// @function addClass(el: HTMLElement, name: String)
+// Adds `name` to the element's class attribute.
+function addClass(el, name) {
+ if (el.classList !== undefined) {
+ var classes = splitWords(name);
+ for (var i = 0, len = classes.length; i < len; i++) {
+ el.classList.add(classes[i]);
+ }
+ } else if (!hasClass(el, name)) {
+ var className = getClass(el);
+ setClass(el, (className ? className + ' ' : '') + name);
+ }
+}
+
+// @function removeClass(el: HTMLElement, name: String)
+// Removes `name` from the element's class attribute.
+function removeClass(el, name) {
+ if (el.classList !== undefined) {
+ el.classList.remove(name);
+ } else {
+ setClass(el, trim((' ' + getClass(el) + ' ').replace(' ' + name + ' ', ' ')));
+ }
+}
+
+// @function setClass(el: HTMLElement, name: String)
+// Sets the element's class.
+function setClass(el, name) {
+ if (el.className.baseVal === undefined) {
+ el.className = name;
+ } else {
+ // in case of SVG element
+ el.className.baseVal = name;
+ }
+}
+
+// @function getClass(el: HTMLElement): String
+// Returns the element's class.
+function getClass(el) {
+ // Check if the element is an SVGElementInstance and use the correspondingElement instead
+ // (Required for linked SVG elements in IE11.)
+ if (el.correspondingElement) {
+ el = el.correspondingElement;
+ }
+ return el.className.baseVal === undefined ? el.className : el.className.baseVal;
+}
+
+// @function setOpacity(el: HTMLElement, opacity: Number)
+// Set the opacity of an element (including old IE support).
+// `opacity` must be a number from `0` to `1`.
+function setOpacity(el, value) {
+ if ('opacity' in el.style) {
+ el.style.opacity = value;
+ } else if ('filter' in el.style) {
+ _setOpacityIE(el, value);
+ }
+}
+
+function _setOpacityIE(el, value) {
+ var filter = false,
+ filterName = 'DXImageTransform.Microsoft.Alpha';
+
+ // filters collection throws an error if we try to retrieve a filter that doesn't exist
+ try {
+ filter = el.filters.item(filterName);
+ } catch (e) {
+ // don't set opacity to 1 if we haven't already set an opacity,
+ // it isn't needed and breaks transparent pngs.
+ if (value === 1) { return; }
+ }
+
+ value = Math.round(value * 100);
+
+ if (filter) {
+ filter.Enabled = (value !== 100);
+ filter.Opacity = value;
+ } else {
+ el.style.filter += ' progid:' + filterName + '(opacity=' + value + ')';
+ }
+}
+
+// @function testProp(props: String[]): String|false
+// Goes through the array of style names and returns the first name
+// that is a valid style name for an element. If no such name is found,
+// it returns false. Useful for vendor-prefixed styles like `transform`.
+function testProp(props) {
+ var style = document.documentElement.style;
+
+ for (var i = 0; i < props.length; i++) {
+ if (props[i] in style) {
+ return props[i];
+ }
+ }
+ return false;
+}
+
+// @function setTransform(el: HTMLElement, offset: Point, scale?: Number)
+// Resets the 3D CSS transform of `el` so it is translated by `offset` pixels
+// and optionally scaled by `scale`. Does not have an effect if the
+// browser doesn't support 3D CSS transforms.
+function setTransform(el, offset, scale) {
+ var pos = offset || new Point(0, 0);
+
+ el.style[TRANSFORM] =
+ (Browser.ie3d ?
+ 'translate(' + pos.x + 'px,' + pos.y + 'px)' :
+ 'translate3d(' + pos.x + 'px,' + pos.y + 'px,0)') +
+ (scale ? ' scale(' + scale + ')' : '');
+}
+
+// @function setPosition(el: HTMLElement, position: Point)
+// Sets the position of `el` to coordinates specified by `position`,
+// using CSS translate or top/left positioning depending on the browser
+// (used by Leaflet internally to position its layers).
+function setPosition(el, point) {
+
+ /*eslint-disable */
+ el._leaflet_pos = point;
+ /* eslint-enable */
+
+ if (Browser.any3d) {
+ setTransform(el, point);
+ } else {
+ el.style.left = point.x + 'px';
+ el.style.top = point.y + 'px';
+ }
+}
+
+// @function getPosition(el: HTMLElement): Point
+// Returns the coordinates of an element previously positioned with setPosition.
+function getPosition(el) {
+ // this method is only used for elements previously positioned using setPosition,
+ // so it's safe to cache the position for performance
+
+ return el._leaflet_pos || new Point(0, 0);
+}
+
+// @function disableTextSelection()
+// Prevents the user from generating `selectstart` DOM events, usually generated
+// when the user drags the mouse through a page with text. Used internally
+// by Leaflet to override the behaviour of any click-and-drag interaction on
+// the map. Affects drag interactions on the whole document.
+
+// @function enableTextSelection()
+// Cancels the effects of a previous [`L.DomUtil.disableTextSelection`](#domutil-disabletextselection).
+var disableTextSelection;
+var enableTextSelection;
+var _userSelect;
+if ('onselectstart' in document) {
+ disableTextSelection = function () {
+ on(window, 'selectstart', preventDefault);
+ };
+ enableTextSelection = function () {
+ off(window, 'selectstart', preventDefault);
+ };
+} else {
+ var userSelectProperty = testProp(
+ ['userSelect', 'WebkitUserSelect', 'OUserSelect', 'MozUserSelect', 'msUserSelect']);
+
+ disableTextSelection = function () {
+ if (userSelectProperty) {
+ var style = document.documentElement.style;
+ _userSelect = style[userSelectProperty];
+ style[userSelectProperty] = 'none';
+ }
+ };
+ enableTextSelection = function () {
+ if (userSelectProperty) {
+ document.documentElement.style[userSelectProperty] = _userSelect;
+ _userSelect = undefined;
+ }
+ };
+}
+
+// @function disableImageDrag()
+// As [`L.DomUtil.disableTextSelection`](#domutil-disabletextselection), but
+// for `dragstart` DOM events, usually generated when the user drags an image.
+function disableImageDrag() {
+ on(window, 'dragstart', preventDefault);
+}
+
+// @function enableImageDrag()
+// Cancels the effects of a previous [`L.DomUtil.disableImageDrag`](#domutil-disabletextselection).
+function enableImageDrag() {
+ off(window, 'dragstart', preventDefault);
+}
+
+var _outlineElement, _outlineStyle;
+// @function preventOutline(el: HTMLElement)
+// Makes the [outline](https://developer.mozilla.org/docs/Web/CSS/outline)
+// of the element `el` invisible. Used internally by Leaflet to prevent
+// focusable elements from displaying an outline when the user performs a
+// drag interaction on them.
+function preventOutline(element) {
+ while (element.tabIndex === -1) {
+ element = element.parentNode;
+ }
+ if (!element.style) { return; }
+ restoreOutline();
+ _outlineElement = element;
+ _outlineStyle = element.style.outlineStyle;
+ element.style.outlineStyle = 'none';
+ on(window, 'keydown', restoreOutline);
+}
+
+// @function restoreOutline()
+// Cancels the effects of a previous [`L.DomUtil.preventOutline`]().
+function restoreOutline() {
+ if (!_outlineElement) { return; }
+ _outlineElement.style.outlineStyle = _outlineStyle;
+ _outlineElement = undefined;
+ _outlineStyle = undefined;
+ off(window, 'keydown', restoreOutline);
+}
+
+// @function getSizedParentNode(el: HTMLElement): HTMLElement
+// Finds the closest parent node which size (width and height) is not null.
+function getSizedParentNode(element) {
+ do {
+ element = element.parentNode;
+ } while ((!element.offsetWidth || !element.offsetHeight) && element !== document.body);
+ return element;
+}
+
+// @function getScale(el: HTMLElement): Object
+// Computes the CSS scale currently applied on the element.
+// Returns an object with `x` and `y` members as horizontal and vertical scales respectively,
+// and `boundingClientRect` as the result of [`getBoundingClientRect()`](https://developer.mozilla.org/en-US/docs/Web/API/Element/getBoundingClientRect).
+function getScale(element) {
+ var rect = element.getBoundingClientRect(); // Read-only in old browsers.
+
+ return {
+ x: rect.width / element.offsetWidth || 1,
+ y: rect.height / element.offsetHeight || 1,
+ boundingClientRect: rect
+ };
+}
+
+var DomUtil = {
+ __proto__: null,
+ TRANSFORM: TRANSFORM,
+ TRANSITION: TRANSITION,
+ TRANSITION_END: TRANSITION_END,
+ get: get,
+ getStyle: getStyle,
+ create: create$1,
+ remove: remove,
+ empty: empty,
+ toFront: toFront,
+ toBack: toBack,
+ hasClass: hasClass,
+ addClass: addClass,
+ removeClass: removeClass,
+ setClass: setClass,
+ getClass: getClass,
+ setOpacity: setOpacity,
+ testProp: testProp,
+ setTransform: setTransform,
+ setPosition: setPosition,
+ getPosition: getPosition,
+ get disableTextSelection () { return disableTextSelection; },
+ get enableTextSelection () { return enableTextSelection; },
+ disableImageDrag: disableImageDrag,
+ enableImageDrag: enableImageDrag,
+ preventOutline: preventOutline,
+ restoreOutline: restoreOutline,
+ getSizedParentNode: getSizedParentNode,
+ getScale: getScale
+};
+
+/*
+ * @namespace DomEvent
+ * Utility functions to work with the [DOM events](https://developer.mozilla.org/docs/Web/API/Event), used by Leaflet internally.
+ */
+
+// Inspired by John Resig, Dean Edwards and YUI addEvent implementations.
+
+// @function on(el: HTMLElement, types: String, fn: Function, context?: Object): this
+// Adds a listener function (`fn`) to a particular DOM event type of the
+// element `el`. You can optionally specify the context of the listener
+// (object the `this` keyword will point to). You can also pass several
+// space-separated types (e.g. `'click dblclick'`).
+
+// @alternative
+// @function on(el: HTMLElement, eventMap: Object, context?: Object): this
+// Adds a set of type/listener pairs, e.g. `{click: onClick, mousemove: onMouseMove}`
+function on(obj, types, fn, context) {
+
+ if (types && typeof types === 'object') {
+ for (var type in types) {
+ addOne(obj, type, types[type], fn);
+ }
+ } else {
+ types = splitWords(types);
+
+ for (var i = 0, len = types.length; i < len; i++) {
+ addOne(obj, types[i], fn, context);
+ }
+ }
+
+ return this;
+}
+
+var eventsKey = '_leaflet_events';
+
+// @function off(el: HTMLElement, types: String, fn: Function, context?: Object): this
+// Removes a previously added listener function.
+// Note that if you passed a custom context to on, you must pass the same
+// context to `off` in order to remove the listener.
+
+// @alternative
+// @function off(el: HTMLElement, eventMap: Object, context?: Object): this
+// Removes a set of type/listener pairs, e.g. `{click: onClick, mousemove: onMouseMove}`
+
+// @alternative
+// @function off(el: HTMLElement, types: String): this
+// Removes all previously added listeners of given types.
+
+// @alternative
+// @function off(el: HTMLElement): this
+// Removes all previously added listeners from given HTMLElement
+function off(obj, types, fn, context) {
+
+ if (arguments.length === 1) {
+ batchRemove(obj);
+ delete obj[eventsKey];
+
+ } else if (types && typeof types === 'object') {
+ for (var type in types) {
+ removeOne(obj, type, types[type], fn);
+ }
+
+ } else {
+ types = splitWords(types);
+
+ if (arguments.length === 2) {
+ batchRemove(obj, function (type) {
+ return indexOf(types, type) !== -1;
+ });
+ } else {
+ for (var i = 0, len = types.length; i < len; i++) {
+ removeOne(obj, types[i], fn, context);
+ }
+ }
+ }
+
+ return this;
+}
+
+function batchRemove(obj, filterFn) {
+ for (var id in obj[eventsKey]) {
+ var type = id.split(/\d/)[0];
+ if (!filterFn || filterFn(type)) {
+ removeOne(obj, type, null, null, id);
+ }
+ }
+}
+
+var mouseSubst = {
+ mouseenter: 'mouseover',
+ mouseleave: 'mouseout',
+ wheel: !('onwheel' in window) && 'mousewheel'
+};
+
+function addOne(obj, type, fn, context) {
+ var id = type + stamp(fn) + (context ? '_' + stamp(context) : '');
+
+ if (obj[eventsKey] && obj[eventsKey][id]) { return this; }
+
+ var handler = function (e) {
+ return fn.call(context || obj, e || window.event);
+ };
+
+ var originalHandler = handler;
+
+ if (!Browser.touchNative && Browser.pointer && type.indexOf('touch') === 0) {
+ // Needs DomEvent.Pointer.js
+ handler = addPointerListener(obj, type, handler);
+
+ } else if (Browser.touch && (type === 'dblclick')) {
+ handler = addDoubleTapListener(obj, handler);
+
+ } else if ('addEventListener' in obj) {
+
+ if (type === 'touchstart' || type === 'touchmove' || type === 'wheel' || type === 'mousewheel') {
+ obj.addEventListener(mouseSubst[type] || type, handler, Browser.passiveEvents ? {passive: false} : false);
+
+ } else if (type === 'mouseenter' || type === 'mouseleave') {
+ handler = function (e) {
+ e = e || window.event;
+ if (isExternalTarget(obj, e)) {
+ originalHandler(e);
+ }
+ };
+ obj.addEventListener(mouseSubst[type], handler, false);
+
+ } else {
+ obj.addEventListener(type, originalHandler, false);
+ }
+
+ } else {
+ obj.attachEvent('on' + type, handler);
+ }
+
+ obj[eventsKey] = obj[eventsKey] || {};
+ obj[eventsKey][id] = handler;
+}
+
+function removeOne(obj, type, fn, context, id) {
+ id = id || type + stamp(fn) + (context ? '_' + stamp(context) : '');
+ var handler = obj[eventsKey] && obj[eventsKey][id];
+
+ if (!handler) { return this; }
+
+ if (!Browser.touchNative && Browser.pointer && type.indexOf('touch') === 0) {
+ removePointerListener(obj, type, handler);
+
+ } else if (Browser.touch && (type === 'dblclick')) {
+ removeDoubleTapListener(obj, handler);
+
+ } else if ('removeEventListener' in obj) {
+
+ obj.removeEventListener(mouseSubst[type] || type, handler, false);
+
+ } else {
+ obj.detachEvent('on' + type, handler);
+ }
+
+ obj[eventsKey][id] = null;
+}
+
+// @function stopPropagation(ev: DOMEvent): this
+// Stop the given event from propagation to parent elements. Used inside the listener functions:
+// ```js
+// L.DomEvent.on(div, 'click', function (ev) {
+// L.DomEvent.stopPropagation(ev);
+// });
+// ```
+function stopPropagation(e) {
+
+ if (e.stopPropagation) {
+ e.stopPropagation();
+ } else if (e.originalEvent) { // In case of Leaflet event.
+ e.originalEvent._stopped = true;
+ } else {
+ e.cancelBubble = true;
+ }
+
+ return this;
+}
+
+// @function disableScrollPropagation(el: HTMLElement): this
+// Adds `stopPropagation` to the element's `'wheel'` events (plus browser variants).
+function disableScrollPropagation(el) {
+ addOne(el, 'wheel', stopPropagation);
+ return this;
+}
+
+// @function disableClickPropagation(el: HTMLElement): this
+// Adds `stopPropagation` to the element's `'click'`, `'dblclick'`, `'contextmenu'`,
+// `'mousedown'` and `'touchstart'` events (plus browser variants).
+function disableClickPropagation(el) {
+ on(el, 'mousedown touchstart dblclick contextmenu', stopPropagation);
+ el['_leaflet_disable_click'] = true;
+ return this;
+}
+
+// @function preventDefault(ev: DOMEvent): this
+// Prevents the default action of the DOM Event `ev` from happening (such as
+// following a link in the href of the a element, or doing a POST request
+// with page reload when a `<form>` is submitted).
+// Use it inside listener functions.
+function preventDefault(e) {
+ if (e.preventDefault) {
+ e.preventDefault();
+ } else {
+ e.returnValue = false;
+ }
+ return this;
+}
+
+// @function stop(ev: DOMEvent): this
+// Does `stopPropagation` and `preventDefault` at the same time.
+function stop(e) {
+ preventDefault(e);
+ stopPropagation(e);
+ return this;
+}
+
+// @function getPropagationPath(ev: DOMEvent): Array
+// Compatibility polyfill for [`Event.composedPath()`](https://developer.mozilla.org/en-US/docs/Web/API/Event/composedPath).
+// Returns an array containing the `HTMLElement`s that the given DOM event
+// should propagate to (if not stopped).
+function getPropagationPath(ev) {
+ if (ev.composedPath) {
+ return ev.composedPath();
+ }
+
+ var path = [];
+ var el = ev.target;
+
+ while (el) {
+ path.push(el);
+ el = el.parentNode;
+ }
+ return path;
+}
+
+
+// @function getMousePosition(ev: DOMEvent, container?: HTMLElement): Point
+// Gets normalized mouse position from a DOM event relative to the
+// `container` (border excluded) or to the whole page if not specified.
+function getMousePosition(e, container) {
+ if (!container) {
+ return new Point(e.clientX, e.clientY);
+ }
+
+ var scale = getScale(container),
+ offset = scale.boundingClientRect; // left and top values are in page scale (like the event clientX/Y)
+
+ return new Point(
+ // offset.left/top values are in page scale (like clientX/Y),
+ // whereas clientLeft/Top (border width) values are the original values (before CSS scale applies).
+ (e.clientX - offset.left) / scale.x - container.clientLeft,
+ (e.clientY - offset.top) / scale.y - container.clientTop
+ );
+}
+
+
+// except , Safari and
+// We need double the scroll pixels (see #7403 and #4538) for all Browsers
+// except OSX (Mac) -> 3x, Chrome running on Linux 1x
+
+var wheelPxFactor =
+ (Browser.linux && Browser.chrome) ? window.devicePixelRatio :
+ Browser.mac ? window.devicePixelRatio * 3 :
+ window.devicePixelRatio > 0 ? 2 * window.devicePixelRatio : 1;
+// @function getWheelDelta(ev: DOMEvent): Number
+// Gets normalized wheel delta from a wheel DOM event, in vertical
+// pixels scrolled (negative if scrolling down).
+// Events from pointing devices without precise scrolling are mapped to
+// a best guess of 60 pixels.
+function getWheelDelta(e) {
+ return (Browser.edge) ? e.wheelDeltaY / 2 : // Don't trust window-geometry-based delta
+ (e.deltaY && e.deltaMode === 0) ? -e.deltaY / wheelPxFactor : // Pixels
+ (e.deltaY && e.deltaMode === 1) ? -e.deltaY * 20 : // Lines
+ (e.deltaY && e.deltaMode === 2) ? -e.deltaY * 60 : // Pages
+ (e.deltaX || e.deltaZ) ? 0 : // Skip horizontal/depth wheel events
+ e.wheelDelta ? (e.wheelDeltaY || e.wheelDelta) / 2 : // Legacy IE pixels
+ (e.detail && Math.abs(e.detail) < 32765) ? -e.detail * 20 : // Legacy Moz lines
+ e.detail ? e.detail / -32765 * 60 : // Legacy Moz pages
+ 0;
+}
+
+// check if element really left/entered the event target (for mouseenter/mouseleave)
+function isExternalTarget(el, e) {
+
+ var related = e.relatedTarget;
+
+ if (!related) { return true; }
+
+ try {
+ while (related && (related !== el)) {
+ related = related.parentNode;
+ }
+ } catch (err) {
+ return false;
+ }
+ return (related !== el);
+}
+
+var DomEvent = {
+ __proto__: null,
+ on: on,
+ off: off,
+ stopPropagation: stopPropagation,
+ disableScrollPropagation: disableScrollPropagation,
+ disableClickPropagation: disableClickPropagation,
+ preventDefault: preventDefault,
+ stop: stop,
+ getPropagationPath: getPropagationPath,
+ getMousePosition: getMousePosition,
+ getWheelDelta: getWheelDelta,
+ isExternalTarget: isExternalTarget,
+ addListener: on,
+ removeListener: off
+};
+
+/*
+ * @class PosAnimation
+ * @aka L.PosAnimation
+ * @inherits Evented
+ * Used internally for panning animations, utilizing CSS3 Transitions for modern browsers and a timer fallback for IE6-9.
+ *
+ * @example
+ * ```js
+ * var myPositionMarker = L.marker([48.864716, 2.294694]).addTo(map);
+ *
+ * myPositionMarker.on("click", function() {
+ * var pos = map.latLngToLayerPoint(myPositionMarker.getLatLng());
+ * pos.y -= 25;
+ * var fx = new L.PosAnimation();
+ *
+ * fx.once('end',function() {
+ * pos.y += 25;
+ * fx.run(myPositionMarker._icon, pos, 0.8);
+ * });
+ *
+ * fx.run(myPositionMarker._icon, pos, 0.3);
+ * });
+ *
+ * ```
+ *
+ * @constructor L.PosAnimation()
+ * Creates a `PosAnimation` object.
+ *
+ */
+
+var PosAnimation = Evented.extend({
+
+ // @method run(el: HTMLElement, newPos: Point, duration?: Number, easeLinearity?: Number)
+ // Run an animation of a given element to a new position, optionally setting
+ // duration in seconds (`0.25` by default) and easing linearity factor (3rd
+ // argument of the [cubic bezier curve](https://cubic-bezier.com/#0,0,.5,1),
+ // `0.5` by default).
+ run: function (el, newPos, duration, easeLinearity) {
+ this.stop();
+
+ this._el = el;
+ this._inProgress = true;
+ this._duration = duration || 0.25;
+ this._easeOutPower = 1 / Math.max(easeLinearity || 0.5, 0.2);
+
+ this._startPos = getPosition(el);
+ this._offset = newPos.subtract(this._startPos);
+ this._startTime = +new Date();
+
+ // @event start: Event
+ // Fired when the animation starts
+ this.fire('start');
+
+ this._animate();
+ },
+
+ // @method stop()
+ // Stops the animation (if currently running).
+ stop: function () {
+ if (!this._inProgress) { return; }
+
+ this._step(true);
+ this._complete();
+ },
+
+ _animate: function () {
+ // animation loop
+ this._animId = requestAnimFrame(this._animate, this);
+ this._step();
+ },
+
+ _step: function (round) {
+ var elapsed = (+new Date()) - this._startTime,
+ duration = this._duration * 1000;
+
+ if (elapsed < duration) {
+ this._runFrame(this._easeOut(elapsed / duration), round);
+ } else {
+ this._runFrame(1);
+ this._complete();
+ }
+ },
+
+ _runFrame: function (progress, round) {
+ var pos = this._startPos.add(this._offset.multiplyBy(progress));
+ if (round) {
+ pos._round();
+ }
+ setPosition(this._el, pos);
+
+ // @event step: Event
+ // Fired continuously during the animation.
+ this.fire('step');
+ },
+
+ _complete: function () {
+ cancelAnimFrame(this._animId);
+
+ this._inProgress = false;
+ // @event end: Event
+ // Fired when the animation ends.
+ this.fire('end');
+ },
+
+ _easeOut: function (t) {
+ return 1 - Math.pow(1 - t, this._easeOutPower);
+ }
+});
+
+/*
+ * @class Map
+ * @aka L.Map
+ * @inherits Evented
+ *
+ * The central class of the API — it is used to create a map on a page and manipulate it.
+ *
+ * @example
+ *
+ * ```js
+ * // initialize the map on the "map" div with a given center and zoom
+ * var map = L.map('map', {
+ * center: [51.505, -0.09],
+ * zoom: 13
+ * });
+ * ```
+ *
+ */
+
+var Map = Evented.extend({
+
+ options: {
+ // @section Map State Options
+ // @option crs: CRS = L.CRS.EPSG3857
+ // The [Coordinate Reference System](#crs) to use. Don't change this if you're not
+ // sure what it means.
+ crs: EPSG3857,
+
+ // @option center: LatLng = undefined
+ // Initial geographic center of the map
+ center: undefined,
+
+ // @option zoom: Number = undefined
+ // Initial map zoom level
+ zoom: undefined,
+
+ // @option minZoom: Number = *
+ // Minimum zoom level of the map.
+ // If not specified and at least one `GridLayer` or `TileLayer` is in the map,
+ // the lowest of their `minZoom` options will be used instead.
+ minZoom: undefined,
+
+ // @option maxZoom: Number = *
+ // Maximum zoom level of the map.
+ // If not specified and at least one `GridLayer` or `TileLayer` is in the map,
+ // the highest of their `maxZoom` options will be used instead.
+ maxZoom: undefined,
+
+ // @option layers: Layer[] = []
+ // Array of layers that will be added to the map initially
+ layers: [],
+
+ // @option maxBounds: LatLngBounds = null
+ // When this option is set, the map restricts the view to the given
+ // geographical bounds, bouncing the user back if the user tries to pan
+ // outside the view. To set the restriction dynamically, use
+ // [`setMaxBounds`](#map-setmaxbounds) method.
+ maxBounds: undefined,
+
+ // @option renderer: Renderer = *
+ // The default method for drawing vector layers on the map. `L.SVG`
+ // or `L.Canvas` by default depending on browser support.
+ renderer: undefined,
+
+
+ // @section Animation Options
+ // @option zoomAnimation: Boolean = true
+ // Whether the map zoom animation is enabled. By default it's enabled
+ // in all browsers that support CSS3 Transitions except Android.
+ zoomAnimation: true,
+
+ // @option zoomAnimationThreshold: Number = 4
+ // Won't animate zoom if the zoom difference exceeds this value.
+ zoomAnimationThreshold: 4,
+
+ // @option fadeAnimation: Boolean = true
+ // Whether the tile fade animation is enabled. By default it's enabled
+ // in all browsers that support CSS3 Transitions except Android.
+ fadeAnimation: true,
+
+ // @option markerZoomAnimation: Boolean = true
+ // Whether markers animate their zoom with the zoom animation, if disabled
+ // they will disappear for the length of the animation. By default it's
+ // enabled in all browsers that support CSS3 Transitions except Android.
+ markerZoomAnimation: true,
+
+ // @option transform3DLimit: Number = 2^23
+ // Defines the maximum size of a CSS translation transform. The default
+ // value should not be changed unless a web browser positions layers in
+ // the wrong place after doing a large `panBy`.
+ transform3DLimit: 8388608, // Precision limit of a 32-bit float
+
+ // @section Interaction Options
+ // @option zoomSnap: Number = 1
+ // Forces the map's zoom level to always be a multiple of this, particularly
+ // right after a [`fitBounds()`](#map-fitbounds) or a pinch-zoom.
+ // By default, the zoom level snaps to the nearest integer; lower values
+ // (e.g. `0.5` or `0.1`) allow for greater granularity. A value of `0`
+ // means the zoom level will not be snapped after `fitBounds` or a pinch-zoom.
+ zoomSnap: 1,
+
+ // @option zoomDelta: Number = 1
+ // Controls how much the map's zoom level will change after a
+ // [`zoomIn()`](#map-zoomin), [`zoomOut()`](#map-zoomout), pressing `+`
+ // or `-` on the keyboard, or using the [zoom controls](#control-zoom).
+ // Values smaller than `1` (e.g. `0.5`) allow for greater granularity.
+ zoomDelta: 1,
+
+ // @option trackResize: Boolean = true
+ // Whether the map automatically handles browser window resize to update itself.
+ trackResize: true
+ },
+
+ initialize: function (id, options) { // (HTMLElement or String, Object)
+ options = setOptions(this, options);
+
+ // Make sure to assign internal flags at the beginning,
+ // to avoid inconsistent state in some edge cases.
+ this._handlers = [];
+ this._layers = {};
+ this._zoomBoundLayers = {};
+ this._sizeChanged = true;
+
+ this._initContainer(id);
+ this._initLayout();
+
+ // hack for https://github.com/Leaflet/Leaflet/issues/1980
+ this._onResize = bind(this._onResize, this);
+
+ this._initEvents();
+
+ if (options.maxBounds) {
+ this.setMaxBounds(options.maxBounds);
+ }
+
+ if (options.zoom !== undefined) {
+ this._zoom = this._limitZoom(options.zoom);
+ }
+
+ if (options.center && options.zoom !== undefined) {
+ this.setView(toLatLng(options.center), options.zoom, {reset: true});
+ }
+
+ this.callInitHooks();
+
+ // don't animate on browsers without hardware-accelerated transitions or old Android/Opera
+ this._zoomAnimated = TRANSITION && Browser.any3d && !Browser.mobileOpera &&
+ this.options.zoomAnimation;
+
+ // zoom transitions run with the same duration for all layers, so if one of transitionend events
+ // happens after starting zoom animation (propagating to the map pane), we know that it ended globally
+ if (this._zoomAnimated) {
+ this._createAnimProxy();
+ on(this._proxy, TRANSITION_END, this._catchTransitionEnd, this);
+ }
+
+ this._addLayers(this.options.layers);
+ },
+
+
+ // @section Methods for modifying map state
+
+ // @method setView(center: LatLng, zoom: Number, options?: Zoom/pan options): this
+ // Sets the view of the map (geographical center and zoom) with the given
+ // animation options.
+ setView: function (center, zoom, options) {
+
+ zoom = zoom === undefined ? this._zoom : this._limitZoom(zoom);
+ center = this._limitCenter(toLatLng(center), zoom, this.options.maxBounds);
+ options = options || {};
+
+ this._stop();
+
+ if (this._loaded && !options.reset && options !== true) {
+
+ if (options.animate !== undefined) {
+ options.zoom = extend({animate: options.animate}, options.zoom);
+ options.pan = extend({animate: options.animate, duration: options.duration}, options.pan);
+ }
+
+ // try animating pan or zoom
+ var moved = (this._zoom !== zoom) ?
+ this._tryAnimatedZoom && this._tryAnimatedZoom(center, zoom, options.zoom) :
+ this._tryAnimatedPan(center, options.pan);
+
+ if (moved) {
+ // prevent resize handler call, the view will refresh after animation anyway
+ clearTimeout(this._sizeTimer);
+ return this;
+ }
+ }
+
+ // animation didn't start, just reset the map view
+ this._resetView(center, zoom, options.pan && options.pan.noMoveStart);
+
+ return this;
+ },
+
+ // @method setZoom(zoom: Number, options?: Zoom/pan options): this
+ // Sets the zoom of the map.
+ setZoom: function (zoom, options) {
+ if (!this._loaded) {
+ this._zoom = zoom;
+ return this;
+ }
+ return this.setView(this.getCenter(), zoom, {zoom: options});
+ },
+
+ // @method zoomIn(delta?: Number, options?: Zoom options): this
+ // Increases the zoom of the map by `delta` ([`zoomDelta`](#map-zoomdelta) by default).
+ zoomIn: function (delta, options) {
+ delta = delta || (Browser.any3d ? this.options.zoomDelta : 1);
+ return this.setZoom(this._zoom + delta, options);
+ },
+
+ // @method zoomOut(delta?: Number, options?: Zoom options): this
+ // Decreases the zoom of the map by `delta` ([`zoomDelta`](#map-zoomdelta) by default).
+ zoomOut: function (delta, options) {
+ delta = delta || (Browser.any3d ? this.options.zoomDelta : 1);
+ return this.setZoom(this._zoom - delta, options);
+ },
+
+ // @method setZoomAround(latlng: LatLng, zoom: Number, options: Zoom options): this
+ // Zooms the map while keeping a specified geographical point on the map
+ // stationary (e.g. used internally for scroll zoom and double-click zoom).
+ // @alternative
+ // @method setZoomAround(offset: Point, zoom: Number, options: Zoom options): this
+ // Zooms the map while keeping a specified pixel on the map (relative to the top-left corner) stationary.
+ setZoomAround: function (latlng, zoom, options) {
+ var scale = this.getZoomScale(zoom),
+ viewHalf = this.getSize().divideBy(2),
+ containerPoint = latlng instanceof Point ? latlng : this.latLngToContainerPoint(latlng),
+
+ centerOffset = containerPoint.subtract(viewHalf).multiplyBy(1 - 1 / scale),
+ newCenter = this.containerPointToLatLng(viewHalf.add(centerOffset));
+
+ return this.setView(newCenter, zoom, {zoom: options});
+ },
+
+ _getBoundsCenterZoom: function (bounds, options) {
+
+ options = options || {};
+ bounds = bounds.getBounds ? bounds.getBounds() : toLatLngBounds(bounds);
+
+ var paddingTL = toPoint(options.paddingTopLeft || options.padding || [0, 0]),
+ paddingBR = toPoint(options.paddingBottomRight || options.padding || [0, 0]),
+
+ zoom = this.getBoundsZoom(bounds, false, paddingTL.add(paddingBR));
+
+ zoom = (typeof options.maxZoom === 'number') ? Math.min(options.maxZoom, zoom) : zoom;
+
+ if (zoom === Infinity) {
+ return {
+ center: bounds.getCenter(),
+ zoom: zoom
+ };
+ }
+
+ var paddingOffset = paddingBR.subtract(paddingTL).divideBy(2),
+
+ swPoint = this.project(bounds.getSouthWest(), zoom),
+ nePoint = this.project(bounds.getNorthEast(), zoom),
+ center = this.unproject(swPoint.add(nePoint).divideBy(2).add(paddingOffset), zoom);
+
+ return {
+ center: center,
+ zoom: zoom
+ };
+ },
+
+ // @method fitBounds(bounds: LatLngBounds, options?: fitBounds options): this
+ // Sets a map view that contains the given geographical bounds with the
+ // maximum zoom level possible.
+ fitBounds: function (bounds, options) {
+
+ bounds = toLatLngBounds(bounds);
+
+ if (!bounds.isValid()) {
+ throw new Error('Bounds are not valid.');
+ }
+
+ var target = this._getBoundsCenterZoom(bounds, options);
+ return this.setView(target.center, target.zoom, options);
+ },
+
+ // @method fitWorld(options?: fitBounds options): this
+ // Sets a map view that mostly contains the whole world with the maximum
+ // zoom level possible.
+ fitWorld: function (options) {
+ return this.fitBounds([[-90, -180], [90, 180]], options);
+ },
+
+ // @method panTo(latlng: LatLng, options?: Pan options): this
+ // Pans the map to a given center.
+ panTo: function (center, options) { // (LatLng)
+ return this.setView(center, this._zoom, {pan: options});
+ },
+
+ // @method panBy(offset: Point, options?: Pan options): this
+ // Pans the map by a given number of pixels (animated).
+ panBy: function (offset, options) {
+ offset = toPoint(offset).round();
+ options = options || {};
+
+ if (!offset.x && !offset.y) {
+ return this.fire('moveend');
+ }
+ // If we pan too far, Chrome gets issues with tiles
+ // and makes them disappear or appear in the wrong place (slightly offset) #2602
+ if (options.animate !== true && !this.getSize().contains(offset)) {
+ this._resetView(this.unproject(this.project(this.getCenter()).add(offset)), this.getZoom());
+ return this;
+ }
+
+ if (!this._panAnim) {
+ this._panAnim = new PosAnimation();
+
+ this._panAnim.on({
+ 'step': this._onPanTransitionStep,
+ 'end': this._onPanTransitionEnd
+ }, this);
+ }
+
+ // don't fire movestart if animating inertia
+ if (!options.noMoveStart) {
+ this.fire('movestart');
+ }
+
+ // animate pan unless animate: false specified
+ if (options.animate !== false) {
+ addClass(this._mapPane, 'leaflet-pan-anim');
+
+ var newPos = this._getMapPanePos().subtract(offset).round();
+ this._panAnim.run(this._mapPane, newPos, options.duration || 0.25, options.easeLinearity);
+ } else {
+ this._rawPanBy(offset);
+ this.fire('move').fire('moveend');
+ }
+
+ return this;
+ },
+
+ // @method flyTo(latlng: LatLng, zoom?: Number, options?: Zoom/pan options): this
+ // Sets the view of the map (geographical center and zoom) performing a smooth
+ // pan-zoom animation.
+ flyTo: function (targetCenter, targetZoom, options) {
+
+ options = options || {};
+ if (options.animate === false || !Browser.any3d) {
+ return this.setView(targetCenter, targetZoom, options);
+ }
+
+ this._stop();
+
+ var from = this.project(this.getCenter()),
+ to = this.project(targetCenter),
+ size = this.getSize(),
+ startZoom = this._zoom;
+
+ targetCenter = toLatLng(targetCenter);
+ targetZoom = targetZoom === undefined ? startZoom : targetZoom;
+
+ var w0 = Math.max(size.x, size.y),
+ w1 = w0 * this.getZoomScale(startZoom, targetZoom),
+ u1 = (to.distanceTo(from)) || 1,
+ rho = 1.42,
+ rho2 = rho * rho;
+
+ function r(i) {
+ var s1 = i ? -1 : 1,
+ s2 = i ? w1 : w0,
+ t1 = w1 * w1 - w0 * w0 + s1 * rho2 * rho2 * u1 * u1,
+ b1 = 2 * s2 * rho2 * u1,
+ b = t1 / b1,
+ sq = Math.sqrt(b * b + 1) - b;
+
+ // workaround for floating point precision bug when sq = 0, log = -Infinite,
+ // thus triggering an infinite loop in flyTo
+ var log = sq < 0.000000001 ? -18 : Math.log(sq);
+
+ return log;
+ }
+
+ function sinh(n) { return (Math.exp(n) - Math.exp(-n)) / 2; }
+ function cosh(n) { return (Math.exp(n) + Math.exp(-n)) / 2; }
+ function tanh(n) { return sinh(n) / cosh(n); }
+
+ var r0 = r(0);
+
+ function w(s) { return w0 * (cosh(r0) / cosh(r0 + rho * s)); }
+ function u(s) { return w0 * (cosh(r0) * tanh(r0 + rho * s) - sinh(r0)) / rho2; }
+
+ function easeOut(t) { return 1 - Math.pow(1 - t, 1.5); }
+
+ var start = Date.now(),
+ S = (r(1) - r0) / rho,
+ duration = options.duration ? 1000 * options.duration : 1000 * S * 0.8;
+
+ function frame() {
+ var t = (Date.now() - start) / duration,
+ s = easeOut(t) * S;
+
+ if (t <= 1) {
+ this._flyToFrame = requestAnimFrame(frame, this);
+
+ this._move(
+ this.unproject(from.add(to.subtract(from).multiplyBy(u(s) / u1)), startZoom),
+ this.getScaleZoom(w0 / w(s), startZoom),
+ {flyTo: true});
+
+ } else {
+ this
+ ._move(targetCenter, targetZoom)
+ ._moveEnd(true);
+ }
+ }
+
+ this._moveStart(true, options.noMoveStart);
+
+ frame.call(this);
+ return this;
+ },
+
+ // @method flyToBounds(bounds: LatLngBounds, options?: fitBounds options): this
+ // Sets the view of the map with a smooth animation like [`flyTo`](#map-flyto),
+ // but takes a bounds parameter like [`fitBounds`](#map-fitbounds).
+ flyToBounds: function (bounds, options) {
+ var target = this._getBoundsCenterZoom(bounds, options);
+ return this.flyTo(target.center, target.zoom, options);
+ },
+
+ // @method setMaxBounds(bounds: LatLngBounds): this
+ // Restricts the map view to the given bounds (see the [maxBounds](#map-maxbounds) option).
+ setMaxBounds: function (bounds) {
+ bounds = toLatLngBounds(bounds);
+
+ if (this.listens('moveend', this._panInsideMaxBounds)) {
+ this.off('moveend', this._panInsideMaxBounds);
+ }
+
+ if (!bounds.isValid()) {
+ this.options.maxBounds = null;
+ return this;
+ }
+
+ this.options.maxBounds = bounds;
+
+ if (this._loaded) {
+ this._panInsideMaxBounds();
+ }
+
+ return this.on('moveend', this._panInsideMaxBounds);
+ },
+
+ // @method setMinZoom(zoom: Number): this
+ // Sets the lower limit for the available zoom levels (see the [minZoom](#map-minzoom) option).
+ setMinZoom: function (zoom) {
+ var oldZoom = this.options.minZoom;
+ this.options.minZoom = zoom;
+
+ if (this._loaded && oldZoom !== zoom) {
+ this.fire('zoomlevelschange');
+
+ if (this.getZoom() < this.options.minZoom) {
+ return this.setZoom(zoom);
+ }
+ }
+
+ return this;
+ },
+
+ // @method setMaxZoom(zoom: Number): this
+ // Sets the upper limit for the available zoom levels (see the [maxZoom](#map-maxzoom) option).
+ setMaxZoom: function (zoom) {
+ var oldZoom = this.options.maxZoom;
+ this.options.maxZoom = zoom;
+
+ if (this._loaded && oldZoom !== zoom) {
+ this.fire('zoomlevelschange');
+
+ if (this.getZoom() > this.options.maxZoom) {
+ return this.setZoom(zoom);
+ }
+ }
+
+ return this;
+ },
+
+ // @method panInsideBounds(bounds: LatLngBounds, options?: Pan options): this
+ // Pans the map to the closest view that would lie inside the given bounds (if it's not already), controlling the animation using the options specific, if any.
+ panInsideBounds: function (bounds, options) {
+ this._enforcingBounds = true;
+ var center = this.getCenter(),
+ newCenter = this._limitCenter(center, this._zoom, toLatLngBounds(bounds));
+
+ if (!center.equals(newCenter)) {
+ this.panTo(newCenter, options);
+ }
+
+ this._enforcingBounds = false;
+ return this;
+ },
+
+ // @method panInside(latlng: LatLng, options?: padding options): this
+ // Pans the map the minimum amount to make the `latlng` visible. Use
+ // padding options to fit the display to more restricted bounds.
+ // If `latlng` is already within the (optionally padded) display bounds,
+ // the map will not be panned.
+ panInside: function (latlng, options) {
+ options = options || {};
+
+ var paddingTL = toPoint(options.paddingTopLeft || options.padding || [0, 0]),
+ paddingBR = toPoint(options.paddingBottomRight || options.padding || [0, 0]),
+ pixelCenter = this.project(this.getCenter()),
+ pixelPoint = this.project(latlng),
+ pixelBounds = this.getPixelBounds(),
+ paddedBounds = toBounds([pixelBounds.min.add(paddingTL), pixelBounds.max.subtract(paddingBR)]),
+ paddedSize = paddedBounds.getSize();
+
+ if (!paddedBounds.contains(pixelPoint)) {
+ this._enforcingBounds = true;
+ var centerOffset = pixelPoint.subtract(paddedBounds.getCenter());
+ var offset = paddedBounds.extend(pixelPoint).getSize().subtract(paddedSize);
+ pixelCenter.x += centerOffset.x < 0 ? -offset.x : offset.x;
+ pixelCenter.y += centerOffset.y < 0 ? -offset.y : offset.y;
+ this.panTo(this.unproject(pixelCenter), options);
+ this._enforcingBounds = false;
+ }
+ return this;
+ },
+
+ // @method invalidateSize(options: Zoom/pan options): this
+ // Checks if the map container size changed and updates the map if so —
+ // call it after you've changed the map size dynamically, also animating
+ // pan by default. If `options.pan` is `false`, panning will not occur.
+ // If `options.debounceMoveend` is `true`, it will delay `moveend` event so
+ // that it doesn't happen often even if the method is called many
+ // times in a row.
+
+ // @alternative
+ // @method invalidateSize(animate: Boolean): this
+ // Checks if the map container size changed and updates the map if so —
+ // call it after you've changed the map size dynamically, also animating
+ // pan by default.
+ invalidateSize: function (options) {
+ if (!this._loaded) { return this; }
+
+ options = extend({
+ animate: false,
+ pan: true
+ }, options === true ? {animate: true} : options);
+
+ var oldSize = this.getSize();
+ this._sizeChanged = true;
+ this._lastCenter = null;
+
+ var newSize = this.getSize(),
+ oldCenter = oldSize.divideBy(2).round(),
+ newCenter = newSize.divideBy(2).round(),
+ offset = oldCenter.subtract(newCenter);
+
+ if (!offset.x && !offset.y) { return this; }
+
+ if (options.animate && options.pan) {
+ this.panBy(offset);
+
+ } else {
+ if (options.pan) {
+ this._rawPanBy(offset);
+ }
+
+ this.fire('move');
+
+ if (options.debounceMoveend) {
+ clearTimeout(this._sizeTimer);
+ this._sizeTimer = setTimeout(bind(this.fire, this, 'moveend'), 200);
+ } else {
+ this.fire('moveend');
+ }
+ }
+
+ // @section Map state change events
+ // @event resize: ResizeEvent
+ // Fired when the map is resized.
+ return this.fire('resize', {
+ oldSize: oldSize,
+ newSize: newSize
+ });
+ },
+
+ // @section Methods for modifying map state
+ // @method stop(): this
+ // Stops the currently running `panTo` or `flyTo` animation, if any.
+ stop: function () {
+ this.setZoom(this._limitZoom(this._zoom));
+ if (!this.options.zoomSnap) {
+ this.fire('viewreset');
+ }
+ return this._stop();
+ },
+
+ // @section Geolocation methods
+ // @method locate(options?: Locate options): this
+ // Tries to locate the user using the Geolocation API, firing a [`locationfound`](#map-locationfound)
+ // event with location data on success or a [`locationerror`](#map-locationerror) event on failure,
+ // and optionally sets the map view to the user's location with respect to
+ // detection accuracy (or to the world view if geolocation failed).
+ // Note that, if your page doesn't use HTTPS, this method will fail in
+ // modern browsers ([Chrome 50 and newer](https://sites.google.com/a/chromium.org/dev/Home/chromium-security/deprecating-powerful-features-on-insecure-origins))
+ // See `Locate options` for more details.
+ locate: function (options) {
+
+ options = this._locateOptions = extend({
+ timeout: 10000,
+ watch: false
+ // setView: false
+ // maxZoom: <Number>
+ // maximumAge: 0
+ // enableHighAccuracy: false
+ }, options);
+
+ if (!('geolocation' in navigator)) {
+ this._handleGeolocationError({
+ code: 0,
+ message: 'Geolocation not supported.'
+ });
+ return this;
+ }
+
+ var onResponse = bind(this._handleGeolocationResponse, this),
+ onError = bind(this._handleGeolocationError, this);
+
+ if (options.watch) {
+ this._locationWatchId =
+ navigator.geolocation.watchPosition(onResponse, onError, options);
+ } else {
+ navigator.geolocation.getCurrentPosition(onResponse, onError, options);
+ }
+ return this;
+ },
+
+ // @method stopLocate(): this
+ // Stops watching location previously initiated by `map.locate({watch: true})`
+ // and aborts resetting the map view if map.locate was called with
+ // `{setView: true}`.
+ stopLocate: function () {
+ if (navigator.geolocation && navigator.geolocation.clearWatch) {
+ navigator.geolocation.clearWatch(this._locationWatchId);
+ }
+ if (this._locateOptions) {
+ this._locateOptions.setView = false;
+ }
+ return this;
+ },
+
+ _handleGeolocationError: function (error) {
+ if (!this._container._leaflet_id) { return; }
+
+ var c = error.code,
+ message = error.message ||
+ (c === 1 ? 'permission denied' :
+ (c === 2 ? 'position unavailable' : 'timeout'));
+
+ if (this._locateOptions.setView && !this._loaded) {
+ this.fitWorld();
+ }
+
+ // @section Location events
+ // @event locationerror: ErrorEvent
+ // Fired when geolocation (using the [`locate`](#map-locate) method) failed.
+ this.fire('locationerror', {
+ code: c,
+ message: 'Geolocation error: ' + message + '.'
+ });
+ },
+
+ _handleGeolocationResponse: function (pos) {
+ if (!this._container._leaflet_id) { return; }
+
+ var lat = pos.coords.latitude,
+ lng = pos.coords.longitude,
+ latlng = new LatLng(lat, lng),
+ bounds = latlng.toBounds(pos.coords.accuracy * 2),
+ options = this._locateOptions;
+
+ if (options.setView) {
+ var zoom = this.getBoundsZoom(bounds);
+ this.setView(latlng, options.maxZoom ? Math.min(zoom, options.maxZoom) : zoom);
+ }
+
+ var data = {
+ latlng: latlng,
+ bounds: bounds,
+ timestamp: pos.timestamp
+ };
+
+ for (var i in pos.coords) {
+ if (typeof pos.coords[i] === 'number') {
+ data[i] = pos.coords[i];
+ }
+ }
+
+ // @event locationfound: LocationEvent
+ // Fired when geolocation (using the [`locate`](#map-locate) method)
+ // went successfully.
+ this.fire('locationfound', data);
+ },
+
+ // TODO Appropriate docs section?
+ // @section Other Methods
+ // @method addHandler(name: String, HandlerClass: Function): this
+ // Adds a new `Handler` to the map, given its name and constructor function.
+ addHandler: function (name, HandlerClass) {
+ if (!HandlerClass) { return this; }
+
+ var handler = this[name] = new HandlerClass(this);
+
+ this._handlers.push(handler);
+
+ if (this.options[name]) {
+ handler.enable();
+ }
+
+ return this;
+ },
+
+ // @method remove(): this
+ // Destroys the map and clears all related event listeners.
+ remove: function () {
+
+ this._initEvents(true);
+ if (this.options.maxBounds) { this.off('moveend', this._panInsideMaxBounds); }
+
+ if (this._containerId !== this._container._leaflet_id) {
+ throw new Error('Map container is being reused by another instance');
+ }
+
+ try {
+ // throws error in IE6-8
+ delete this._container._leaflet_id;
+ delete this._containerId;
+ } catch (e) {
+ /*eslint-disable */
+ this._container._leaflet_id = undefined;
+ /* eslint-enable */
+ this._containerId = undefined;
+ }
+
+ if (this._locationWatchId !== undefined) {
+ this.stopLocate();
+ }
+
+ this._stop();
+
+ remove(this._mapPane);
+
+ if (this._clearControlPos) {
+ this._clearControlPos();
+ }
+ if (this._resizeRequest) {
+ cancelAnimFrame(this._resizeRequest);
+ this._resizeRequest = null;
+ }
+
+ this._clearHandlers();
+
+ if (this._loaded) {
+ // @section Map state change events
+ // @event unload: Event
+ // Fired when the map is destroyed with [remove](#map-remove) method.
+ this.fire('unload');
+ }
+
+ var i;
+ for (i in this._layers) {
+ this._layers[i].remove();
+ }
+ for (i in this._panes) {
+ remove(this._panes[i]);
+ }
+
+ this._layers = [];
+ this._panes = [];
+ delete this._mapPane;
+ delete this._renderer;
+
+ return this;
+ },
+
+ // @section Other Methods
+ // @method createPane(name: String, container?: HTMLElement): HTMLElement
+ // Creates a new [map pane](#map-pane) with the given name if it doesn't exist already,
+ // then returns it. The pane is created as a child of `container`, or
+ // as a child of the main map pane if not set.
+ createPane: function (name, container) {
+ var className = 'leaflet-pane' + (name ? ' leaflet-' + name.replace('Pane', '') + '-pane' : ''),
+ pane = create$1('div', className, container || this._mapPane);
+
+ if (name) {
+ this._panes[name] = pane;
+ }
+ return pane;
+ },
+
+ // @section Methods for Getting Map State
+
+ // @method getCenter(): LatLng
+ // Returns the geographical center of the map view
+ getCenter: function () {
+ this._checkIfLoaded();
+
+ if (this._lastCenter && !this._moved()) {
+ return this._lastCenter.clone();
+ }
+ return this.layerPointToLatLng(this._getCenterLayerPoint());
+ },
+
+ // @method getZoom(): Number
+ // Returns the current zoom level of the map view
+ getZoom: function () {
+ return this._zoom;
+ },
+
+ // @method getBounds(): LatLngBounds
+ // Returns the geographical bounds visible in the current map view
+ getBounds: function () {
+ var bounds = this.getPixelBounds(),
+ sw = this.unproject(bounds.getBottomLeft()),
+ ne = this.unproject(bounds.getTopRight());
+
+ return new LatLngBounds(sw, ne);
+ },
+
+ // @method getMinZoom(): Number
+ // Returns the minimum zoom level of the map (if set in the `minZoom` option of the map or of any layers), or `0` by default.
+ getMinZoom: function () {
+ return this.options.minZoom === undefined ? this._layersMinZoom || 0 : this.options.minZoom;
+ },
+
+ // @method getMaxZoom(): Number
+ // Returns the maximum zoom level of the map (if set in the `maxZoom` option of the map or of any layers).
+ getMaxZoom: function () {
+ return this.options.maxZoom === undefined ?
+ (this._layersMaxZoom === undefined ? Infinity : this._layersMaxZoom) :
+ this.options.maxZoom;
+ },
+
+ // @method getBoundsZoom(bounds: LatLngBounds, inside?: Boolean, padding?: Point): Number
+ // Returns the maximum zoom level on which the given bounds fit to the map
+ // view in its entirety. If `inside` (optional) is set to `true`, the method
+ // instead returns the minimum zoom level on which the map view fits into
+ // the given bounds in its entirety.
+ getBoundsZoom: function (bounds, inside, padding) { // (LatLngBounds[, Boolean, Point]) -> Number
+ bounds = toLatLngBounds(bounds);
+ padding = toPoint(padding || [0, 0]);
+
+ var zoom = this.getZoom() || 0,
+ min = this.getMinZoom(),
+ max = this.getMaxZoom(),
+ nw = bounds.getNorthWest(),
+ se = bounds.getSouthEast(),
+ size = this.getSize().subtract(padding),
+ boundsSize = toBounds(this.project(se, zoom), this.project(nw, zoom)).getSize(),
+ snap = Browser.any3d ? this.options.zoomSnap : 1,
+ scalex = size.x / boundsSize.x,
+ scaley = size.y / boundsSize.y,
+ scale = inside ? Math.max(scalex, scaley) : Math.min(scalex, scaley);
+
+ zoom = this.getScaleZoom(scale, zoom);
+
+ if (snap) {
+ zoom = Math.round(zoom / (snap / 100)) * (snap / 100); // don't jump if within 1% of a snap level
+ zoom = inside ? Math.ceil(zoom / snap) * snap : Math.floor(zoom / snap) * snap;
+ }
+
+ return Math.max(min, Math.min(max, zoom));
+ },
+
+ // @method getSize(): Point
+ // Returns the current size of the map container (in pixels).
+ getSize: function () {
+ if (!this._size || this._sizeChanged) {
+ this._size = new Point(
+ this._container.clientWidth || 0,
+ this._container.clientHeight || 0);
+
+ this._sizeChanged = false;
+ }
+ return this._size.clone();
+ },
+
+ // @method getPixelBounds(): Bounds
+ // Returns the bounds of the current map view in projected pixel
+ // coordinates (sometimes useful in layer and overlay implementations).
+ getPixelBounds: function (center, zoom) {
+ var topLeftPoint = this._getTopLeftPoint(center, zoom);
+ return new Bounds(topLeftPoint, topLeftPoint.add(this.getSize()));
+ },
+
+ // TODO: Check semantics - isn't the pixel origin the 0,0 coord relative to
+ // the map pane? "left point of the map layer" can be confusing, specially
+ // since there can be negative offsets.
+ // @method getPixelOrigin(): Point
+ // Returns the projected pixel coordinates of the top left point of
+ // the map layer (useful in custom layer and overlay implementations).
+ getPixelOrigin: function () {
+ this._checkIfLoaded();
+ return this._pixelOrigin;
+ },
+
+ // @method getPixelWorldBounds(zoom?: Number): Bounds
+ // Returns the world's bounds in pixel coordinates for zoom level `zoom`.
+ // If `zoom` is omitted, the map's current zoom level is used.
+ getPixelWorldBounds: function (zoom) {
+ return this.options.crs.getProjectedBounds(zoom === undefined ? this.getZoom() : zoom);
+ },
+
+ // @section Other Methods
+
+ // @method getPane(pane: String|HTMLElement): HTMLElement
+ // Returns a [map pane](#map-pane), given its name or its HTML element (its identity).
+ getPane: function (pane) {
+ return typeof pane === 'string' ? this._panes[pane] : pane;
+ },
+
+ // @method getPanes(): Object
+ // Returns a plain object containing the names of all [panes](#map-pane) as keys and
+ // the panes as values.
+ getPanes: function () {
+ return this._panes;
+ },
+
+ // @method getContainer: HTMLElement
+ // Returns the HTML element that contains the map.
+ getContainer: function () {
+ return this._container;
+ },
+
+
+ // @section Conversion Methods
+
+ // @method getZoomScale(toZoom: Number, fromZoom: Number): Number
+ // Returns the scale factor to be applied to a map transition from zoom level
+ // `fromZoom` to `toZoom`. Used internally to help with zoom animations.
+ getZoomScale: function (toZoom, fromZoom) {
+ // TODO replace with universal implementation after refactoring projections
+ var crs = this.options.crs;
+ fromZoom = fromZoom === undefined ? this._zoom : fromZoom;
+ return crs.scale(toZoom) / crs.scale(fromZoom);
+ },
+
+ // @method getScaleZoom(scale: Number, fromZoom: Number): Number
+ // Returns the zoom level that the map would end up at, if it is at `fromZoom`
+ // level and everything is scaled by a factor of `scale`. Inverse of
+ // [`getZoomScale`](#map-getZoomScale).
+ getScaleZoom: function (scale, fromZoom) {
+ var crs = this.options.crs;
+ fromZoom = fromZoom === undefined ? this._zoom : fromZoom;
+ var zoom = crs.zoom(scale * crs.scale(fromZoom));
+ return isNaN(zoom) ? Infinity : zoom;
+ },
+
+ // @method project(latlng: LatLng, zoom: Number): Point
+ // Projects a geographical coordinate `LatLng` according to the projection
+ // of the map's CRS, then scales it according to `zoom` and the CRS's
+ // `Transformation`. The result is pixel coordinate relative to
+ // the CRS origin.
+ project: function (latlng, zoom) {
+ zoom = zoom === undefined ? this._zoom : zoom;
+ return this.options.crs.latLngToPoint(toLatLng(latlng), zoom);
+ },
+
+ // @method unproject(point: Point, zoom: Number): LatLng
+ // Inverse of [`project`](#map-project).
+ unproject: function (point, zoom) {
+ zoom = zoom === undefined ? this._zoom : zoom;
+ return this.options.crs.pointToLatLng(toPoint(point), zoom);
+ },
+
+ // @method layerPointToLatLng(point: Point): LatLng
+ // Given a pixel coordinate relative to the [origin pixel](#map-getpixelorigin),
+ // returns the corresponding geographical coordinate (for the current zoom level).
+ layerPointToLatLng: function (point) {
+ var projectedPoint = toPoint(point).add(this.getPixelOrigin());
+ return this.unproject(projectedPoint);
+ },
+
+ // @method latLngToLayerPoint(latlng: LatLng): Point
+ // Given a geographical coordinate, returns the corresponding pixel coordinate
+ // relative to the [origin pixel](#map-getpixelorigin).
+ latLngToLayerPoint: function (latlng) {
+ var projectedPoint = this.project(toLatLng(latlng))._round();
+ return projectedPoint._subtract(this.getPixelOrigin());
+ },
+
+ // @method wrapLatLng(latlng: LatLng): LatLng
+ // Returns a `LatLng` where `lat` and `lng` has been wrapped according to the
+ // map's CRS's `wrapLat` and `wrapLng` properties, if they are outside the
+ // CRS's bounds.
+ // By default this means longitude is wrapped around the dateline so its
+ // value is between -180 and +180 degrees.
+ wrapLatLng: function (latlng) {
+ return this.options.crs.wrapLatLng(toLatLng(latlng));
+ },
+
+ // @method wrapLatLngBounds(bounds: LatLngBounds): LatLngBounds
+ // Returns a `LatLngBounds` with the same size as the given one, ensuring that
+ // its center is within the CRS's bounds.
+ // By default this means the center longitude is wrapped around the dateline so its
+ // value is between -180 and +180 degrees, and the majority of the bounds
+ // overlaps the CRS's bounds.
+ wrapLatLngBounds: function (latlng) {
+ return this.options.crs.wrapLatLngBounds(toLatLngBounds(latlng));
+ },
+
+ // @method distance(latlng1: LatLng, latlng2: LatLng): Number
+ // Returns the distance between two geographical coordinates according to
+ // the map's CRS. By default this measures distance in meters.
+ distance: function (latlng1, latlng2) {
+ return this.options.crs.distance(toLatLng(latlng1), toLatLng(latlng2));
+ },
+
+ // @method containerPointToLayerPoint(point: Point): Point
+ // Given a pixel coordinate relative to the map container, returns the corresponding
+ // pixel coordinate relative to the [origin pixel](#map-getpixelorigin).
+ containerPointToLayerPoint: function (point) { // (Point)
+ return toPoint(point).subtract(this._getMapPanePos());
+ },
+
+ // @method layerPointToContainerPoint(point: Point): Point
+ // Given a pixel coordinate relative to the [origin pixel](#map-getpixelorigin),
+ // returns the corresponding pixel coordinate relative to the map container.
+ layerPointToContainerPoint: function (point) { // (Point)
+ return toPoint(point).add(this._getMapPanePos());
+ },
+
+ // @method containerPointToLatLng(point: Point): LatLng
+ // Given a pixel coordinate relative to the map container, returns
+ // the corresponding geographical coordinate (for the current zoom level).
+ containerPointToLatLng: function (point) {
+ var layerPoint = this.containerPointToLayerPoint(toPoint(point));
+ return this.layerPointToLatLng(layerPoint);
+ },
+
+ // @method latLngToContainerPoint(latlng: LatLng): Point
+ // Given a geographical coordinate, returns the corresponding pixel coordinate
+ // relative to the map container.
+ latLngToContainerPoint: function (latlng) {
+ return this.layerPointToContainerPoint(this.latLngToLayerPoint(toLatLng(latlng)));
+ },
+
+ // @method mouseEventToContainerPoint(ev: MouseEvent): Point
+ // Given a MouseEvent object, returns the pixel coordinate relative to the
+ // map container where the event took place.
+ mouseEventToContainerPoint: function (e) {
+ return getMousePosition(e, this._container);
+ },
+
+ // @method mouseEventToLayerPoint(ev: MouseEvent): Point
+ // Given a MouseEvent object, returns the pixel coordinate relative to
+ // the [origin pixel](#map-getpixelorigin) where the event took place.
+ mouseEventToLayerPoint: function (e) {
+ return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(e));
+ },
+
+ // @method mouseEventToLatLng(ev: MouseEvent): LatLng
+ // Given a MouseEvent object, returns geographical coordinate where the
+ // event took place.
+ mouseEventToLatLng: function (e) { // (MouseEvent)
+ return this.layerPointToLatLng(this.mouseEventToLayerPoint(e));
+ },
+
+
+ // map initialization methods
+
+ _initContainer: function (id) {
+ var container = this._container = get(id);
+
+ if (!container) {
+ throw new Error('Map container not found.');
+ } else if (container._leaflet_id) {
+ throw new Error('Map container is already initialized.');
+ }
+
+ on(container, 'scroll', this._onScroll, this);
+ this._containerId = stamp(container);
+ },
+
+ _initLayout: function () {
+ var container = this._container;
+
+ this._fadeAnimated = this.options.fadeAnimation && Browser.any3d;
+
+ addClass(container, 'leaflet-container' +
+ (Browser.touch ? ' leaflet-touch' : '') +
+ (Browser.retina ? ' leaflet-retina' : '') +
+ (Browser.ielt9 ? ' leaflet-oldie' : '') +
+ (Browser.safari ? ' leaflet-safari' : '') +
+ (this._fadeAnimated ? ' leaflet-fade-anim' : ''));
+
+ var position = getStyle(container, 'position');
+
+ if (position !== 'absolute' && position !== 'relative' && position !== 'fixed' && position !== 'sticky') {
+ container.style.position = 'relative';
+ }
+
+ this._initPanes();
+
+ if (this._initControlPos) {
+ this._initControlPos();
+ }
+ },
+
+ _initPanes: function () {
+ var panes = this._panes = {};
+ this._paneRenderers = {};
+
+ // @section
+ //
+ // Panes are DOM elements used to control the ordering of layers on the map. You
+ // can access panes with [`map.getPane`](#map-getpane) or
+ // [`map.getPanes`](#map-getpanes) methods. New panes can be created with the
+ // [`map.createPane`](#map-createpane) method.
+ //
+ // Every map has the following default panes that differ only in zIndex.
+ //
+ // @pane mapPane: HTMLElement = 'auto'
+ // Pane that contains all other map panes
+
+ this._mapPane = this.createPane('mapPane', this._container);
+ setPosition(this._mapPane, new Point(0, 0));
+
+ // @pane tilePane: HTMLElement = 200
+ // Pane for `GridLayer`s and `TileLayer`s
+ this.createPane('tilePane');
+ // @pane overlayPane: HTMLElement = 400
+ // Pane for vectors (`Path`s, like `Polyline`s and `Polygon`s), `ImageOverlay`s and `VideoOverlay`s
+ this.createPane('overlayPane');
+ // @pane shadowPane: HTMLElement = 500
+ // Pane for overlay shadows (e.g. `Marker` shadows)
+ this.createPane('shadowPane');
+ // @pane markerPane: HTMLElement = 600
+ // Pane for `Icon`s of `Marker`s
+ this.createPane('markerPane');
+ // @pane tooltipPane: HTMLElement = 650
+ // Pane for `Tooltip`s.
+ this.createPane('tooltipPane');
+ // @pane popupPane: HTMLElement = 700
+ // Pane for `Popup`s.
+ this.createPane('popupPane');
+
+ if (!this.options.markerZoomAnimation) {
+ addClass(panes.markerPane, 'leaflet-zoom-hide');
+ addClass(panes.shadowPane, 'leaflet-zoom-hide');
+ }
+ },
+
+
+ // private methods that modify map state
+
+ // @section Map state change events
+ _resetView: function (center, zoom, noMoveStart) {
+ setPosition(this._mapPane, new Point(0, 0));
+
+ var loading = !this._loaded;
+ this._loaded = true;
+ zoom = this._limitZoom(zoom);
+
+ this.fire('viewprereset');
+
+ var zoomChanged = this._zoom !== zoom;
+ this
+ ._moveStart(zoomChanged, noMoveStart)
+ ._move(center, zoom)
+ ._moveEnd(zoomChanged);
+
+ // @event viewreset: Event
+ // Fired when the map needs to redraw its content (this usually happens
+ // on map zoom or load). Very useful for creating custom overlays.
+ this.fire('viewreset');
+
+ // @event load: Event
+ // Fired when the map is initialized (when its center and zoom are set
+ // for the first time).
+ if (loading) {
+ this.fire('load');
+ }
+ },
+
+ _moveStart: function (zoomChanged, noMoveStart) {
+ // @event zoomstart: Event
+ // Fired when the map zoom is about to change (e.g. before zoom animation).
+ // @event movestart: Event
+ // Fired when the view of the map starts changing (e.g. user starts dragging the map).
+ if (zoomChanged) {
+ this.fire('zoomstart');
+ }
+ if (!noMoveStart) {
+ this.fire('movestart');
+ }
+ return this;
+ },
+
+ _move: function (center, zoom, data, supressEvent) {
+ if (zoom === undefined) {
+ zoom = this._zoom;
+ }
+ var zoomChanged = this._zoom !== zoom;
+
+ this._zoom = zoom;
+ this._lastCenter = center;
+ this._pixelOrigin = this._getNewPixelOrigin(center);
+
+ if (!supressEvent) {
+ // @event zoom: Event
+ // Fired repeatedly during any change in zoom level,
+ // including zoom and fly animations.
+ if (zoomChanged || (data && data.pinch)) { // Always fire 'zoom' if pinching because #3530
+ this.fire('zoom', data);
+ }
+
+ // @event move: Event
+ // Fired repeatedly during any movement of the map,
+ // including pan and fly animations.
+ this.fire('move', data);
+ } else if (data && data.pinch) { // Always fire 'zoom' if pinching because #3530
+ this.fire('zoom', data);
+ }
+ return this;
+ },
+
+ _moveEnd: function (zoomChanged) {
+ // @event zoomend: Event
+ // Fired when the map zoom changed, after any animations.
+ if (zoomChanged) {
+ this.fire('zoomend');
+ }
+
+ // @event moveend: Event
+ // Fired when the center of the map stops changing
+ // (e.g. user stopped dragging the map or after non-centered zoom).
+ return this.fire('moveend');
+ },
+
+ _stop: function () {
+ cancelAnimFrame(this._flyToFrame);
+ if (this._panAnim) {
+ this._panAnim.stop();
+ }
+ return this;
+ },
+
+ _rawPanBy: function (offset) {
+ setPosition(this._mapPane, this._getMapPanePos().subtract(offset));
+ },
+
+ _getZoomSpan: function () {
+ return this.getMaxZoom() - this.getMinZoom();
+ },
+
+ _panInsideMaxBounds: function () {
+ if (!this._enforcingBounds) {
+ this.panInsideBounds(this.options.maxBounds);
+ }
+ },
+
+ _checkIfLoaded: function () {
+ if (!this._loaded) {
+ throw new Error('Set map center and zoom first.');
+ }
+ },
+
+ // DOM event handling
+
+ // @section Interaction events
+ _initEvents: function (remove) {
+ this._targets = {};
+ this._targets[stamp(this._container)] = this;
+
+ var onOff = remove ? off : on;
+
+ // @event click: MouseEvent
+ // Fired when the user clicks (or taps) the map.
+ // @event dblclick: MouseEvent
+ // Fired when the user double-clicks (or double-taps) the map.
+ // @event mousedown: MouseEvent
+ // Fired when the user pushes the mouse button on the map.
+ // @event mouseup: MouseEvent
+ // Fired when the user releases the mouse button on the map.
+ // @event mouseover: MouseEvent
+ // Fired when the mouse enters the map.
+ // @event mouseout: MouseEvent
+ // Fired when the mouse leaves the map.
+ // @event mousemove: MouseEvent
+ // Fired while the mouse moves over the map.
+ // @event contextmenu: MouseEvent
+ // Fired when the user pushes the right mouse button on the map, prevents
+ // default browser context menu from showing if there are listeners on
+ // this event. Also fired on mobile when the user holds a single touch
+ // for a second (also called long press).
+ // @event keypress: KeyboardEvent
+ // Fired when the user presses a key from the keyboard that produces a character value while the map is focused.
+ // @event keydown: KeyboardEvent
+ // Fired when the user presses a key from the keyboard while the map is focused. Unlike the `keypress` event,
+ // the `keydown` event is fired for keys that produce a character value and for keys
+ // that do not produce a character value.
+ // @event keyup: KeyboardEvent
+ // Fired when the user releases a key from the keyboard while the map is focused.
+ onOff(this._container, 'click dblclick mousedown mouseup ' +
+ 'mouseover mouseout mousemove contextmenu keypress keydown keyup', this._handleDOMEvent, this);
+
+ if (this.options.trackResize) {
+ onOff(window, 'resize', this._onResize, this);
+ }
+
+ if (Browser.any3d && this.options.transform3DLimit) {
+ (remove ? this.off : this.on).call(this, 'moveend', this._onMoveEnd);
+ }
+ },
+
+ _onResize: function () {
+ cancelAnimFrame(this._resizeRequest);
+ this._resizeRequest = requestAnimFrame(
+ function () { this.invalidateSize({debounceMoveend: true}); }, this);
+ },
+
+ _onScroll: function () {
+ this._container.scrollTop = 0;
+ this._container.scrollLeft = 0;
+ },
+
+ _onMoveEnd: function () {
+ var pos = this._getMapPanePos();
+ if (Math.max(Math.abs(pos.x), Math.abs(pos.y)) >= this.options.transform3DLimit) {
+ // https://bugzilla.mozilla.org/show_bug.cgi?id=1203873 but Webkit also have
+ // a pixel offset on very high values, see: https://jsfiddle.net/dg6r5hhb/
+ this._resetView(this.getCenter(), this.getZoom());
+ }
+ },
+
+ _findEventTargets: function (e, type) {
+ var targets = [],
+ target,
+ isHover = type === 'mouseout' || type === 'mouseover',
+ src = e.target || e.srcElement,
+ dragging = false;
+
+ while (src) {
+ target = this._targets[stamp(src)];
+ if (target && (type === 'click' || type === 'preclick') && this._draggableMoved(target)) {
+ // Prevent firing click after you just dragged an object.
+ dragging = true;
+ break;
+ }
+ if (target && target.listens(type, true)) {
+ if (isHover && !isExternalTarget(src, e)) { break; }
+ targets.push(target);
+ if (isHover) { break; }
+ }
+ if (src === this._container) { break; }
+ src = src.parentNode;
+ }
+ if (!targets.length && !dragging && !isHover && this.listens(type, true)) {
+ targets = [this];
+ }
+ return targets;
+ },
+
+ _isClickDisabled: function (el) {
+ while (el && el !== this._container) {
+ if (el['_leaflet_disable_click']) { return true; }
+ el = el.parentNode;
+ }
+ },
+
+ _handleDOMEvent: function (e) {
+ var el = (e.target || e.srcElement);
+ if (!this._loaded || el['_leaflet_disable_events'] || e.type === 'click' && this._isClickDisabled(el)) {
+ return;
+ }
+
+ var type = e.type;
+
+ if (type === 'mousedown') {
+ // prevents outline when clicking on keyboard-focusable element
+ preventOutline(el);
+ }
+
+ this._fireDOMEvent(e, type);
+ },
+
+ _mouseEvents: ['click', 'dblclick', 'mouseover', 'mouseout', 'contextmenu'],
+
+ _fireDOMEvent: function (e, type, canvasTargets) {
+
+ if (e.type === 'click') {
+ // Fire a synthetic 'preclick' event which propagates up (mainly for closing popups).
+ // @event preclick: MouseEvent
+ // Fired before mouse click on the map (sometimes useful when you
+ // want something to happen on click before any existing click
+ // handlers start running).
+ var synth = extend({}, e);
+ synth.type = 'preclick';
+ this._fireDOMEvent(synth, synth.type, canvasTargets);
+ }
+
+ // Find the layer the event is propagating from and its parents.
+ var targets = this._findEventTargets(e, type);
+
+ if (canvasTargets) {
+ var filtered = []; // pick only targets with listeners
+ for (var i = 0; i < canvasTargets.length; i++) {
+ if (canvasTargets[i].listens(type, true)) {
+ filtered.push(canvasTargets[i]);
+ }
+ }
+ targets = filtered.concat(targets);
+ }
+
+ if (!targets.length) { return; }
+
+ if (type === 'contextmenu') {
+ preventDefault(e);
+ }
+
+ var target = targets[0];
+ var data = {
+ originalEvent: e
+ };
+
+ if (e.type !== 'keypress' && e.type !== 'keydown' && e.type !== 'keyup') {
+ var isMarker = target.getLatLng && (!target._radius || target._radius <= 10);
+ data.containerPoint = isMarker ?
+ this.latLngToContainerPoint(target.getLatLng()) : this.mouseEventToContainerPoint(e);
+ data.layerPoint = this.containerPointToLayerPoint(data.containerPoint);
+ data.latlng = isMarker ? target.getLatLng() : this.layerPointToLatLng(data.layerPoint);
+ }
+
+ for (i = 0; i < targets.length; i++) {
+ targets[i].fire(type, data, true);
+ if (data.originalEvent._stopped ||
+ (targets[i].options.bubblingMouseEvents === false && indexOf(this._mouseEvents, type) !== -1)) { return; }
+ }
+ },
+
+ _draggableMoved: function (obj) {
+ obj = obj.dragging && obj.dragging.enabled() ? obj : this;
+ return (obj.dragging && obj.dragging.moved()) || (this.boxZoom && this.boxZoom.moved());
+ },
+
+ _clearHandlers: function () {
+ for (var i = 0, len = this._handlers.length; i < len; i++) {
+ this._handlers[i].disable();
+ }
+ },
+
+ // @section Other Methods
+
+ // @method whenReady(fn: Function, context?: Object): this
+ // Runs the given function `fn` when the map gets initialized with
+ // a view (center and zoom) and at least one layer, or immediately
+ // if it's already initialized, optionally passing a function context.
+ whenReady: function (callback, context) {
+ if (this._loaded) {
+ callback.call(context || this, {target: this});
+ } else {
+ this.on('load', callback, context);
+ }
+ return this;
+ },
+
+
+ // private methods for getting map state
+
+ _getMapPanePos: function () {
+ return getPosition(this._mapPane) || new Point(0, 0);
+ },
+
+ _moved: function () {
+ var pos = this._getMapPanePos();
+ return pos && !pos.equals([0, 0]);
+ },
+
+ _getTopLeftPoint: function (center, zoom) {
+ var pixelOrigin = center && zoom !== undefined ?
+ this._getNewPixelOrigin(center, zoom) :
+ this.getPixelOrigin();
+ return pixelOrigin.subtract(this._getMapPanePos());
+ },
+
+ _getNewPixelOrigin: function (center, zoom) {
+ var viewHalf = this.getSize()._divideBy(2);
+ return this.project(center, zoom)._subtract(viewHalf)._add(this._getMapPanePos())._round();
+ },
+
+ _latLngToNewLayerPoint: function (latlng, zoom, center) {
+ var topLeft = this._getNewPixelOrigin(center, zoom);
+ return this.project(latlng, zoom)._subtract(topLeft);
+ },
+
+ _latLngBoundsToNewLayerBounds: function (latLngBounds, zoom, center) {
+ var topLeft = this._getNewPixelOrigin(center, zoom);
+ return toBounds([
+ this.project(latLngBounds.getSouthWest(), zoom)._subtract(topLeft),
+ this.project(latLngBounds.getNorthWest(), zoom)._subtract(topLeft),
+ this.project(latLngBounds.getSouthEast(), zoom)._subtract(topLeft),
+ this.project(latLngBounds.getNorthEast(), zoom)._subtract(topLeft)
+ ]);
+ },
+
+ // layer point of the current center
+ _getCenterLayerPoint: function () {
+ return this.containerPointToLayerPoint(this.getSize()._divideBy(2));
+ },
+
+ // offset of the specified place to the current center in pixels
+ _getCenterOffset: function (latlng) {
+ return this.latLngToLayerPoint(latlng).subtract(this._getCenterLayerPoint());
+ },
+
+ // adjust center for view to get inside bounds
+ _limitCenter: function (center, zoom, bounds) {
+
+ if (!bounds) { return center; }
+
+ var centerPoint = this.project(center, zoom),
+ viewHalf = this.getSize().divideBy(2),
+ viewBounds = new Bounds(centerPoint.subtract(viewHalf), centerPoint.add(viewHalf)),
+ offset = this._getBoundsOffset(viewBounds, bounds, zoom);
+
+ // If offset is less than a pixel, ignore.
+ // This prevents unstable projections from getting into
+ // an infinite loop of tiny offsets.
+ if (Math.abs(offset.x) <= 1 && Math.abs(offset.y) <= 1) {
+ return center;
+ }
+
+ return this.unproject(centerPoint.add(offset), zoom);
+ },
+
+ // adjust offset for view to get inside bounds
+ _limitOffset: function (offset, bounds) {
+ if (!bounds) { return offset; }
+
+ var viewBounds = this.getPixelBounds(),
+ newBounds = new Bounds(viewBounds.min.add(offset), viewBounds.max.add(offset));
+
+ return offset.add(this._getBoundsOffset(newBounds, bounds));
+ },
+
+ // returns offset needed for pxBounds to get inside maxBounds at a specified zoom
+ _getBoundsOffset: function (pxBounds, maxBounds, zoom) {
+ var projectedMaxBounds = toBounds(
+ this.project(maxBounds.getNorthEast(), zoom),
+ this.project(maxBounds.getSouthWest(), zoom)
+ ),
+ minOffset = projectedMaxBounds.min.subtract(pxBounds.min),
+ maxOffset = projectedMaxBounds.max.subtract(pxBounds.max),
+
+ dx = this._rebound(minOffset.x, -maxOffset.x),
+ dy = this._rebound(minOffset.y, -maxOffset.y);
+
+ return new Point(dx, dy);
+ },
+
+ _rebound: function (left, right) {
+ return left + right > 0 ?
+ Math.round(left - right) / 2 :
+ Math.max(0, Math.ceil(left)) - Math.max(0, Math.floor(right));
+ },
+
+ _limitZoom: function (zoom) {
+ var min = this.getMinZoom(),
+ max = this.getMaxZoom(),
+ snap = Browser.any3d ? this.options.zoomSnap : 1;
+ if (snap) {
+ zoom = Math.round(zoom / snap) * snap;
+ }
+ return Math.max(min, Math.min(max, zoom));
+ },
+
+ _onPanTransitionStep: function () {
+ this.fire('move');
+ },
+
+ _onPanTransitionEnd: function () {
+ removeClass(this._mapPane, 'leaflet-pan-anim');
+ this.fire('moveend');
+ },
+
+ _tryAnimatedPan: function (center, options) {
+ // difference between the new and current centers in pixels
+ var offset = this._getCenterOffset(center)._trunc();
+
+ // don't animate too far unless animate: true specified in options
+ if ((options && options.animate) !== true && !this.getSize().contains(offset)) { return false; }
+
+ this.panBy(offset, options);
+
+ return true;
+ },
+
+ _createAnimProxy: function () {
+
+ var proxy = this._proxy = create$1('div', 'leaflet-proxy leaflet-zoom-animated');
+ this._panes.mapPane.appendChild(proxy);
+
+ this.on('zoomanim', function (e) {
+ var prop = TRANSFORM,
+ transform = this._proxy.style[prop];
+
+ setTransform(this._proxy, this.project(e.center, e.zoom), this.getZoomScale(e.zoom, 1));
+
+ // workaround for case when transform is the same and so transitionend event is not fired
+ if (transform === this._proxy.style[prop] && this._animatingZoom) {
+ this._onZoomTransitionEnd();
+ }
+ }, this);
+
+ this.on('load moveend', this._animMoveEnd, this);
+
+ this._on('unload', this._destroyAnimProxy, this);
+ },
+
+ _destroyAnimProxy: function () {
+ remove(this._proxy);
+ this.off('load moveend', this._animMoveEnd, this);
+ delete this._proxy;
+ },
+
+ _animMoveEnd: function () {
+ var c = this.getCenter(),
+ z = this.getZoom();
+ setTransform(this._proxy, this.project(c, z), this.getZoomScale(z, 1));
+ },
+
+ _catchTransitionEnd: function (e) {
+ if (this._animatingZoom && e.propertyName.indexOf('transform') >= 0) {
+ this._onZoomTransitionEnd();
+ }
+ },
+
+ _nothingToAnimate: function () {
+ return !this._container.getElementsByClassName('leaflet-zoom-animated').length;
+ },
+
+ _tryAnimatedZoom: function (center, zoom, options) {
+
+ if (this._animatingZoom) { return true; }
+
+ options = options || {};
+
+ // don't animate if disabled, not supported or zoom difference is too large
+ if (!this._zoomAnimated || options.animate === false || this._nothingToAnimate() ||
+ Math.abs(zoom - this._zoom) > this.options.zoomAnimationThreshold) { return false; }
+
+ // offset is the pixel coords of the zoom origin relative to the current center
+ var scale = this.getZoomScale(zoom),
+ offset = this._getCenterOffset(center)._divideBy(1 - 1 / scale);
+
+ // don't animate if the zoom origin isn't within one screen from the current center, unless forced
+ if (options.animate !== true && !this.getSize().contains(offset)) { return false; }
+
+ requestAnimFrame(function () {
+ this
+ ._moveStart(true, options.noMoveStart || false)
+ ._animateZoom(center, zoom, true);
+ }, this);
+
+ return true;
+ },
+
+ _animateZoom: function (center, zoom, startAnim, noUpdate) {
+ if (!this._mapPane) { return; }
+
+ if (startAnim) {
+ this._animatingZoom = true;
+
+ // remember what center/zoom to set after animation
+ this._animateToCenter = center;
+ this._animateToZoom = zoom;
+
+ addClass(this._mapPane, 'leaflet-zoom-anim');
+ }
+
+ // @section Other Events
+ // @event zoomanim: ZoomAnimEvent
+ // Fired at least once per zoom animation. For continuous zoom, like pinch zooming, fired once per frame during zoom.
+ this.fire('zoomanim', {
+ center: center,
+ zoom: zoom,
+ noUpdate: noUpdate
+ });
+
+ if (!this._tempFireZoomEvent) {
+ this._tempFireZoomEvent = this._zoom !== this._animateToZoom;
+ }
+
+ this._move(this._animateToCenter, this._animateToZoom, undefined, true);
+
+ // Work around webkit not firing 'transitionend', see https://github.com/Leaflet/Leaflet/issues/3689, 2693
+ setTimeout(bind(this._onZoomTransitionEnd, this), 250);
+ },
+
+ _onZoomTransitionEnd: function () {
+ if (!this._animatingZoom) { return; }
+
+ if (this._mapPane) {
+ removeClass(this._mapPane, 'leaflet-zoom-anim');
+ }
+
+ this._animatingZoom = false;
+
+ this._move(this._animateToCenter, this._animateToZoom, undefined, true);
+
+ if (this._tempFireZoomEvent) {
+ this.fire('zoom');
+ }
+ delete this._tempFireZoomEvent;
+
+ this.fire('move');
+
+ this._moveEnd(true);
+ }
+});
+
+// @section
+
+// @factory L.map(id: String, options?: Map options)
+// Instantiates a map object given the DOM ID of a `<div>` element
+// and optionally an object literal with `Map options`.
+//
+// @alternative
+// @factory L.map(el: HTMLElement, options?: Map options)
+// Instantiates a map object given an instance of a `<div>` HTML element
+// and optionally an object literal with `Map options`.
+function createMap(id, options) {
+ return new Map(id, options);
+}
+
+/*
+ * @class Control
+ * @aka L.Control
+ * @inherits Class
+ *
+ * L.Control is a base class for implementing map controls. Handles positioning.
+ * All other controls extend from this class.
+ */
+
+var Control = Class.extend({
+ // @section
+ // @aka Control Options
+ options: {
+ // @option position: String = 'topright'
+ // The position of the control (one of the map corners). Possible values are `'topleft'`,
+ // `'topright'`, `'bottomleft'` or `'bottomright'`
+ position: 'topright'
+ },
+
+ initialize: function (options) {
+ setOptions(this, options);
+ },
+
+ /* @section
+ * Classes extending L.Control will inherit the following methods:
+ *
+ * @method getPosition: string
+ * Returns the position of the control.
+ */
+ getPosition: function () {
+ return this.options.position;
+ },
+
+ // @method setPosition(position: string): this
+ // Sets the position of the control.
+ setPosition: function (position) {
+ var map = this._map;
+
+ if (map) {
+ map.removeControl(this);
+ }
+
+ this.options.position = position;
+
+ if (map) {
+ map.addControl(this);
+ }
+
+ return this;
+ },
+
+ // @method getContainer: HTMLElement
+ // Returns the HTMLElement that contains the control.
+ getContainer: function () {
+ return this._container;
+ },
+
+ // @method addTo(map: Map): this
+ // Adds the control to the given map.
+ addTo: function (map) {
+ this.remove();
+ this._map = map;
+
+ var container = this._container = this.onAdd(map),
+ pos = this.getPosition(),
+ corner = map._controlCorners[pos];
+
+ addClass(container, 'leaflet-control');
+
+ if (pos.indexOf('bottom') !== -1) {
+ corner.insertBefore(container, corner.firstChild);
+ } else {
+ corner.appendChild(container);
+ }
+
+ this._map.on('unload', this.remove, this);
+
+ return this;
+ },
+
+ // @method remove: this
+ // Removes the control from the map it is currently active on.
+ remove: function () {
+ if (!this._map) {
+ return this;
+ }
+
+ remove(this._container);
+
+ if (this.onRemove) {
+ this.onRemove(this._map);
+ }
+
+ this._map.off('unload', this.remove, this);
+ this._map = null;
+
+ return this;
+ },
+
+ _refocusOnMap: function (e) {
+ // if map exists and event is not a keyboard event
+ if (this._map && e && e.screenX > 0 && e.screenY > 0) {
+ this._map.getContainer().focus();
+ }
+ }
+});
+
+var control = function (options) {
+ return new Control(options);
+};
+
+/* @section Extension methods
+ * @uninheritable
+ *
+ * Every control should extend from `L.Control` and (re-)implement the following methods.
+ *
+ * @method onAdd(map: Map): HTMLElement
+ * Should return the container DOM element for the control and add listeners on relevant map events. Called on [`control.addTo(map)`](#control-addTo).
+ *
+ * @method onRemove(map: Map)
+ * Optional method. Should contain all clean up code that removes the listeners previously added in [`onAdd`](#control-onadd). Called on [`control.remove()`](#control-remove).
+ */
+
+/* @namespace Map
+ * @section Methods for Layers and Controls
+ */
+Map.include({
+ // @method addControl(control: Control): this
+ // Adds the given control to the map
+ addControl: function (control) {
+ control.addTo(this);
+ return this;
+ },
+
+ // @method removeControl(control: Control): this
+ // Removes the given control from the map
+ removeControl: function (control) {
+ control.remove();
+ return this;
+ },
+
+ _initControlPos: function () {
+ var corners = this._controlCorners = {},
+ l = 'leaflet-',
+ container = this._controlContainer =
+ create$1('div', l + 'control-container', this._container);
+
+ function createCorner(vSide, hSide) {
+ var className = l + vSide + ' ' + l + hSide;
+
+ corners[vSide + hSide] = create$1('div', className, container);
+ }
+
+ createCorner('top', 'left');
+ createCorner('top', 'right');
+ createCorner('bottom', 'left');
+ createCorner('bottom', 'right');
+ },
+
+ _clearControlPos: function () {
+ for (var i in this._controlCorners) {
+ remove(this._controlCorners[i]);
+ }
+ remove(this._controlContainer);
+ delete this._controlCorners;
+ delete this._controlContainer;
+ }
+});
+
+/*
+ * @class Control.Layers
+ * @aka L.Control.Layers
+ * @inherits Control
+ *
+ * The layers control gives users the ability to switch between different base layers and switch overlays on/off (check out the [detailed example](https://leafletjs.com/examples/layers-control/)). Extends `Control`.
+ *
+ * @example
+ *
+ * ```js
+ * var baseLayers = {
+ * "Mapbox": mapbox,
+ * "OpenStreetMap": osm
+ * };
+ *
+ * var overlays = {
+ * "Marker": marker,
+ * "Roads": roadsLayer
+ * };
+ *
+ * L.control.layers(baseLayers, overlays).addTo(map);
+ * ```
+ *
+ * The `baseLayers` and `overlays` parameters are object literals with layer names as keys and `Layer` objects as values:
+ *
+ * ```js
+ * {
+ * "<someName1>": layer1,
+ * "<someName2>": layer2
+ * }
+ * ```
+ *
+ * The layer names can contain HTML, which allows you to add additional styling to the items:
+ *
+ * ```js
+ * {"<img src='my-layer-icon' /> <span class='my-layer-item'>My Layer</span>": myLayer}
+ * ```
+ */
+
+var Layers = Control.extend({
+ // @section
+ // @aka Control.Layers options
+ options: {
+ // @option collapsed: Boolean = true
+ // If `true`, the control will be collapsed into an icon and expanded on mouse hover, touch, or keyboard activation.
+ collapsed: true,
+ position: 'topright',
+
+ // @option autoZIndex: Boolean = true
+ // If `true`, the control will assign zIndexes in increasing order to all of its layers so that the order is preserved when switching them on/off.
+ autoZIndex: true,
+
+ // @option hideSingleBase: Boolean = false
+ // If `true`, the base layers in the control will be hidden when there is only one.
+ hideSingleBase: false,
+
+ // @option sortLayers: Boolean = false
+ // Whether to sort the layers. When `false`, layers will keep the order
+ // in which they were added to the control.
+ sortLayers: false,
+
+ // @option sortFunction: Function = *
+ // A [compare function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array/sort)
+ // that will be used for sorting the layers, when `sortLayers` is `true`.
+ // The function receives both the `L.Layer` instances and their names, as in
+ // `sortFunction(layerA, layerB, nameA, nameB)`.
+ // By default, it sorts layers alphabetically by their name.
+ sortFunction: function (layerA, layerB, nameA, nameB) {
+ return nameA < nameB ? -1 : (nameB < nameA ? 1 : 0);
+ }
+ },
+
+ initialize: function (baseLayers, overlays, options) {
+ setOptions(this, options);
+
+ this._layerControlInputs = [];
+ this._layers = [];
+ this._lastZIndex = 0;
+ this._handlingClick = false;
+ this._preventClick = false;
+
+ for (var i in baseLayers) {
+ this._addLayer(baseLayers[i], i);
+ }
+
+ for (i in overlays) {
+ this._addLayer(overlays[i], i, true);
+ }
+ },
+
+ onAdd: function (map) {
+ this._initLayout();
+ this._update();
+
+ this._map = map;
+ map.on('zoomend', this._checkDisabledLayers, this);
+
+ for (var i = 0; i < this._layers.length; i++) {
+ this._layers[i].layer.on('add remove', this._onLayerChange, this);
+ }
+
+ return this._container;
+ },
+
+ addTo: function (map) {
+ Control.prototype.addTo.call(this, map);
+ // Trigger expand after Layers Control has been inserted into DOM so that is now has an actual height.
+ return this._expandIfNotCollapsed();
+ },
+
+ onRemove: function () {
+ this._map.off('zoomend', this._checkDisabledLayers, this);
+
+ for (var i = 0; i < this._layers.length; i++) {
+ this._layers[i].layer.off('add remove', this._onLayerChange, this);
+ }
+ },
+
+ // @method addBaseLayer(layer: Layer, name: String): this
+ // Adds a base layer (radio button entry) with the given name to the control.
+ addBaseLayer: function (layer, name) {
+ this._addLayer(layer, name);
+ return (this._map) ? this._update() : this;
+ },
+
+ // @method addOverlay(layer: Layer, name: String): this
+ // Adds an overlay (checkbox entry) with the given name to the control.
+ addOverlay: function (layer, name) {
+ this._addLayer(layer, name, true);
+ return (this._map) ? this._update() : this;
+ },
+
+ // @method removeLayer(layer: Layer): this
+ // Remove the given layer from the control.
+ removeLayer: function (layer) {
+ layer.off('add remove', this._onLayerChange, this);
+
+ var obj = this._getLayer(stamp(layer));
+ if (obj) {
+ this._layers.splice(this._layers.indexOf(obj), 1);
+ }
+ return (this._map) ? this._update() : this;
+ },
+
+ // @method expand(): this
+ // Expand the control container if collapsed.
+ expand: function () {
+ addClass(this._container, 'leaflet-control-layers-expanded');
+ this._section.style.height = null;
+ var acceptableHeight = this._map.getSize().y - (this._container.offsetTop + 50);
+ if (acceptableHeight < this._section.clientHeight) {
+ addClass(this._section, 'leaflet-control-layers-scrollbar');
+ this._section.style.height = acceptableHeight + 'px';
+ } else {
+ removeClass(this._section, 'leaflet-control-layers-scrollbar');
+ }
+ this._checkDisabledLayers();
+ return this;
+ },
+
+ // @method collapse(): this
+ // Collapse the control container if expanded.
+ collapse: function () {
+ removeClass(this._container, 'leaflet-control-layers-expanded');
+ return this;
+ },
+
+ _initLayout: function () {
+ var className = 'leaflet-control-layers',
+ container = this._container = create$1('div', className),
+ collapsed = this.options.collapsed;
+
+ // makes this work on IE touch devices by stopping it from firing a mouseout event when the touch is released
+ container.setAttribute('aria-haspopup', true);
+
+ disableClickPropagation(container);
+ disableScrollPropagation(container);
+
+ var section = this._section = create$1('section', className + '-list');
+
+ if (collapsed) {
+ this._map.on('click', this.collapse, this);
+
+ on(container, {
+ mouseenter: this._expandSafely,
+ mouseleave: this.collapse
+ }, this);
+ }
+
+ var link = this._layersLink = create$1('a', className + '-toggle', container);
+ link.href = '#';
+ link.title = 'Layers';
+ link.setAttribute('role', 'button');
+
+ on(link, {
+ keydown: function (e) {
+ if (e.keyCode === 13) {
+ this._expandSafely();
+ }
+ },
+ // Certain screen readers intercept the key event and instead send a click event
+ click: function (e) {
+ preventDefault(e);
+ this._expandSafely();
+ }
+ }, this);
+
+ if (!collapsed) {
+ this.expand();
+ }
+
+ this._baseLayersList = create$1('div', className + '-base', section);
+ this._separator = create$1('div', className + '-separator', section);
+ this._overlaysList = create$1('div', className + '-overlays', section);
+
+ container.appendChild(section);
+ },
+
+ _getLayer: function (id) {
+ for (var i = 0; i < this._layers.length; i++) {
+
+ if (this._layers[i] && stamp(this._layers[i].layer) === id) {
+ return this._layers[i];
+ }
+ }
+ },
+
+ _addLayer: function (layer, name, overlay) {
+ if (this._map) {
+ layer.on('add remove', this._onLayerChange, this);
+ }
+
+ this._layers.push({
+ layer: layer,
+ name: name,
+ overlay: overlay
+ });
+
+ if (this.options.sortLayers) {
+ this._layers.sort(bind(function (a, b) {
+ return this.options.sortFunction(a.layer, b.layer, a.name, b.name);
+ }, this));
+ }
+
+ if (this.options.autoZIndex && layer.setZIndex) {
+ this._lastZIndex++;
+ layer.setZIndex(this._lastZIndex);
+ }
+
+ this._expandIfNotCollapsed();
+ },
+
+ _update: function () {
+ if (!this._container) { return this; }
+
+ empty(this._baseLayersList);
+ empty(this._overlaysList);
+
+ this._layerControlInputs = [];
+ var baseLayersPresent, overlaysPresent, i, obj, baseLayersCount = 0;
+
+ for (i = 0; i < this._layers.length; i++) {
+ obj = this._layers[i];
+ this._addItem(obj);
+ overlaysPresent = overlaysPresent || obj.overlay;
+ baseLayersPresent = baseLayersPresent || !obj.overlay;
+ baseLayersCount += !obj.overlay ? 1 : 0;
+ }
+
+ // Hide base layers section if there's only one layer.
+ if (this.options.hideSingleBase) {
+ baseLayersPresent = baseLayersPresent && baseLayersCount > 1;
+ this._baseLayersList.style.display = baseLayersPresent ? '' : 'none';
+ }
+
+ this._separator.style.display = overlaysPresent && baseLayersPresent ? '' : 'none';
+
+ return this;
+ },
+
+ _onLayerChange: function (e) {
+ if (!this._handlingClick) {
+ this._update();
+ }
+
+ var obj = this._getLayer(stamp(e.target));
+
+ // @namespace Map
+ // @section Layer events
+ // @event baselayerchange: LayersControlEvent
+ // Fired when the base layer is changed through the [layers control](#control-layers).
+ // @event overlayadd: LayersControlEvent
+ // Fired when an overlay is selected through the [layers control](#control-layers).
+ // @event overlayremove: LayersControlEvent
+ // Fired when an overlay is deselected through the [layers control](#control-layers).
+ // @namespace Control.Layers
+ var type = obj.overlay ?
+ (e.type === 'add' ? 'overlayadd' : 'overlayremove') :
+ (e.type === 'add' ? 'baselayerchange' : null);
+
+ if (type) {
+ this._map.fire(type, obj);
+ }
+ },
+
+ // IE7 bugs out if you create a radio dynamically, so you have to do it this hacky way (see https://stackoverflow.com/a/119079)
+ _createRadioElement: function (name, checked) {
+
+ var radioHtml = '<input type="radio" class="leaflet-control-layers-selector" name="' +
+ name + '"' + (checked ? ' checked="checked"' : '') + '/>';
+
+ var radioFragment = document.createElement('div');
+ radioFragment.innerHTML = radioHtml;
+
+ return radioFragment.firstChild;
+ },
+
+ _addItem: function (obj) {
+ var label = document.createElement('label'),
+ checked = this._map.hasLayer(obj.layer),
+ input;
+
+ if (obj.overlay) {
+ input = document.createElement('input');
+ input.type = 'checkbox';
+ input.className = 'leaflet-control-layers-selector';
+ input.defaultChecked = checked;
+ } else {
+ input = this._createRadioElement('leaflet-base-layers_' + stamp(this), checked);
+ }
+
+ this._layerControlInputs.push(input);
+ input.layerId = stamp(obj.layer);
+
+ on(input, 'click', this._onInputClick, this);
+
+ var name = document.createElement('span');
+ name.innerHTML = ' ' + obj.name;
+
+ // Helps from preventing layer control flicker when checkboxes are disabled
+ // https://github.com/Leaflet/Leaflet/issues/2771
+ var holder = document.createElement('span');
+
+ label.appendChild(holder);
+ holder.appendChild(input);
+ holder.appendChild(name);
+
+ var container = obj.overlay ? this._overlaysList : this._baseLayersList;
+ container.appendChild(label);
+
+ this._checkDisabledLayers();
+ return label;
+ },
+
+ _onInputClick: function () {
+ // expanding the control on mobile with a click can cause adding a layer - we don't want this
+ if (this._preventClick) {
+ return;
+ }
+
+ var inputs = this._layerControlInputs,
+ input, layer;
+ var addedLayers = [],
+ removedLayers = [];
+
+ this._handlingClick = true;
+
+ for (var i = inputs.length - 1; i >= 0; i--) {
+ input = inputs[i];
+ layer = this._getLayer(input.layerId).layer;
+
+ if (input.checked) {
+ addedLayers.push(layer);
+ } else if (!input.checked) {
+ removedLayers.push(layer);
+ }
+ }
+
+ // Bugfix issue 2318: Should remove all old layers before readding new ones
+ for (i = 0; i < removedLayers.length; i++) {
+ if (this._map.hasLayer(removedLayers[i])) {
+ this._map.removeLayer(removedLayers[i]);
+ }
+ }
+ for (i = 0; i < addedLayers.length; i++) {
+ if (!this._map.hasLayer(addedLayers[i])) {
+ this._map.addLayer(addedLayers[i]);
+ }
+ }
+
+ this._handlingClick = false;
+
+ this._refocusOnMap();
+ },
+
+ _checkDisabledLayers: function () {
+ var inputs = this._layerControlInputs,
+ input,
+ layer,
+ zoom = this._map.getZoom();
+
+ for (var i = inputs.length - 1; i >= 0; i--) {
+ input = inputs[i];
+ layer = this._getLayer(input.layerId).layer;
+ input.disabled = (layer.options.minZoom !== undefined && zoom < layer.options.minZoom) ||
+ (layer.options.maxZoom !== undefined && zoom > layer.options.maxZoom);
+
+ }
+ },
+
+ _expandIfNotCollapsed: function () {
+ if (this._map && !this.options.collapsed) {
+ this.expand();
+ }
+ return this;
+ },
+
+ _expandSafely: function () {
+ var section = this._section;
+ this._preventClick = true;
+ on(section, 'click', preventDefault);
+ this.expand();
+ var that = this;
+ setTimeout(function () {
+ off(section, 'click', preventDefault);
+ that._preventClick = false;
+ });
+ }
+
+});
+
+
+// @factory L.control.layers(baselayers?: Object, overlays?: Object, options?: Control.Layers options)
+// Creates a layers control with the given layers. Base layers will be switched with radio buttons, while overlays will be switched with checkboxes. Note that all base layers should be passed in the base layers object, but only one should be added to the map during map instantiation.
+var layers = function (baseLayers, overlays, options) {
+ return new Layers(baseLayers, overlays, options);
+};
+
+/*
+ * @class Control.Zoom
+ * @aka L.Control.Zoom
+ * @inherits Control
+ *
+ * A basic zoom control with two buttons (zoom in and zoom out). It is put on the map by default unless you set its [`zoomControl` option](#map-zoomcontrol) to `false`. Extends `Control`.
+ */
+
+var Zoom = Control.extend({
+ // @section
+ // @aka Control.Zoom options
+ options: {
+ position: 'topleft',
+
+ // @option zoomInText: String = '<span aria-hidden="true">+</span>'
+ // The text set on the 'zoom in' button.
+ zoomInText: '<span aria-hidden="true">+</span>',
+
+ // @option zoomInTitle: String = 'Zoom in'
+ // The title set on the 'zoom in' button.
+ zoomInTitle: 'Zoom in',
+
+ // @option zoomOutText: String = '<span aria-hidden="true">−</span>'
+ // The text set on the 'zoom out' button.
+ zoomOutText: '<span aria-hidden="true">−</span>',
+
+ // @option zoomOutTitle: String = 'Zoom out'
+ // The title set on the 'zoom out' button.
+ zoomOutTitle: 'Zoom out'
+ },
+
+ onAdd: function (map) {
+ var zoomName = 'leaflet-control-zoom',
+ container = create$1('div', zoomName + ' leaflet-bar'),
+ options = this.options;
+
+ this._zoomInButton = this._createButton(options.zoomInText, options.zoomInTitle,
+ zoomName + '-in', container, this._zoomIn);
+ this._zoomOutButton = this._createButton(options.zoomOutText, options.zoomOutTitle,
+ zoomName + '-out', container, this._zoomOut);
+
+ this._updateDisabled();
+ map.on('zoomend zoomlevelschange', this._updateDisabled, this);
+
+ return container;
+ },
+
+ onRemove: function (map) {
+ map.off('zoomend zoomlevelschange', this._updateDisabled, this);
+ },
+
+ disable: function () {
+ this._disabled = true;
+ this._updateDisabled();
+ return this;
+ },
+
+ enable: function () {
+ this._disabled = false;
+ this._updateDisabled();
+ return this;
+ },
+
+ _zoomIn: function (e) {
+ if (!this._disabled && this._map._zoom < this._map.getMaxZoom()) {
+ this._map.zoomIn(this._map.options.zoomDelta * (e.shiftKey ? 3 : 1));
+ }
+ },
+
+ _zoomOut: function (e) {
+ if (!this._disabled && this._map._zoom > this._map.getMinZoom()) {
+ this._map.zoomOut(this._map.options.zoomDelta * (e.shiftKey ? 3 : 1));
+ }
+ },
+
+ _createButton: function (html, title, className, container, fn) {
+ var link = create$1('a', className, container);
+ link.innerHTML = html;
+ link.href = '#';
+ link.title = title;
+
+ /*
+ * Will force screen readers like VoiceOver to read this as "Zoom in - button"
+ */
+ link.setAttribute('role', 'button');
+ link.setAttribute('aria-label', title);
+
+ disableClickPropagation(link);
+ on(link, 'click', stop);
+ on(link, 'click', fn, this);
+ on(link, 'click', this._refocusOnMap, this);
+
+ return link;
+ },
+
+ _updateDisabled: function () {
+ var map = this._map,
+ className = 'leaflet-disabled';
+
+ removeClass(this._zoomInButton, className);
+ removeClass(this._zoomOutButton, className);
+ this._zoomInButton.setAttribute('aria-disabled', 'false');
+ this._zoomOutButton.setAttribute('aria-disabled', 'false');
+
+ if (this._disabled || map._zoom === map.getMinZoom()) {
+ addClass(this._zoomOutButton, className);
+ this._zoomOutButton.setAttribute('aria-disabled', 'true');
+ }
+ if (this._disabled || map._zoom === map.getMaxZoom()) {
+ addClass(this._zoomInButton, className);
+ this._zoomInButton.setAttribute('aria-disabled', 'true');
+ }
+ }
+});
+
+// @namespace Map
+// @section Control options
+// @option zoomControl: Boolean = true
+// Whether a [zoom control](#control-zoom) is added to the map by default.
+Map.mergeOptions({
+ zoomControl: true
+});
+
+Map.addInitHook(function () {
+ if (this.options.zoomControl) {
+ // @section Controls
+ // @property zoomControl: Control.Zoom
+ // The default zoom control (only available if the
+ // [`zoomControl` option](#map-zoomcontrol) was `true` when creating the map).
+ this.zoomControl = new Zoom();
+ this.addControl(this.zoomControl);
+ }
+});
+
+// @namespace Control.Zoom
+// @factory L.control.zoom(options: Control.Zoom options)
+// Creates a zoom control
+var zoom = function (options) {
+ return new Zoom(options);
+};
+
+/*
+ * @class Control.Scale
+ * @aka L.Control.Scale
+ * @inherits Control
+ *
+ * A simple scale control that shows the scale of the current center of screen in metric (m/km) and imperial (mi/ft) systems. Extends `Control`.
+ *
+ * @example
+ *
+ * ```js
+ * L.control.scale().addTo(map);
+ * ```
+ */
+
+var Scale = Control.extend({
+ // @section
+ // @aka Control.Scale options
+ options: {
+ position: 'bottomleft',
+
+ // @option maxWidth: Number = 100
+ // Maximum width of the control in pixels. The width is set dynamically to show round values (e.g. 100, 200, 500).
+ maxWidth: 100,
+
+ // @option metric: Boolean = True
+ // Whether to show the metric scale line (m/km).
+ metric: true,
+
+ // @option imperial: Boolean = True
+ // Whether to show the imperial scale line (mi/ft).
+ imperial: true
+
+ // @option updateWhenIdle: Boolean = false
+ // If `true`, the control is updated on [`moveend`](#map-moveend), otherwise it's always up-to-date (updated on [`move`](#map-move)).
+ },
+
+ onAdd: function (map) {
+ var className = 'leaflet-control-scale',
+ container = create$1('div', className),
+ options = this.options;
+
+ this._addScales(options, className + '-line', container);
+
+ map.on(options.updateWhenIdle ? 'moveend' : 'move', this._update, this);
+ map.whenReady(this._update, this);
+
+ return container;
+ },
+
+ onRemove: function (map) {
+ map.off(this.options.updateWhenIdle ? 'moveend' : 'move', this._update, this);
+ },
+
+ _addScales: function (options, className, container) {
+ if (options.metric) {
+ this._mScale = create$1('div', className, container);
+ }
+ if (options.imperial) {
+ this._iScale = create$1('div', className, container);
+ }
+ },
+
+ _update: function () {
+ var map = this._map,
+ y = map.getSize().y / 2;
+
+ var maxMeters = map.distance(
+ map.containerPointToLatLng([0, y]),
+ map.containerPointToLatLng([this.options.maxWidth, y]));
+
+ this._updateScales(maxMeters);
+ },
+
+ _updateScales: function (maxMeters) {
+ if (this.options.metric && maxMeters) {
+ this._updateMetric(maxMeters);
+ }
+ if (this.options.imperial && maxMeters) {
+ this._updateImperial(maxMeters);
+ }
+ },
+
+ _updateMetric: function (maxMeters) {
+ var meters = this._getRoundNum(maxMeters),
+ label = meters < 1000 ? meters + ' m' : (meters / 1000) + ' km';
+
+ this._updateScale(this._mScale, label, meters / maxMeters);
+ },
+
+ _updateImperial: function (maxMeters) {
+ var maxFeet = maxMeters * 3.2808399,
+ maxMiles, miles, feet;
+
+ if (maxFeet > 5280) {
+ maxMiles = maxFeet / 5280;
+ miles = this._getRoundNum(maxMiles);
+ this._updateScale(this._iScale, miles + ' mi', miles / maxMiles);
+
+ } else {
+ feet = this._getRoundNum(maxFeet);
+ this._updateScale(this._iScale, feet + ' ft', feet / maxFeet);
+ }
+ },
+
+ _updateScale: function (scale, text, ratio) {
+ scale.style.width = Math.round(this.options.maxWidth * ratio) + 'px';
+ scale.innerHTML = text;
+ },
+
+ _getRoundNum: function (num) {
+ var pow10 = Math.pow(10, (Math.floor(num) + '').length - 1),
+ d = num / pow10;
+
+ d = d >= 10 ? 10 :
+ d >= 5 ? 5 :
+ d >= 3 ? 3 :
+ d >= 2 ? 2 : 1;
+
+ return pow10 * d;
+ }
+});
+
+
+// @factory L.control.scale(options?: Control.Scale options)
+// Creates an scale control with the given options.
+var scale = function (options) {
+ return new Scale(options);
+};
+
+var ukrainianFlag = '<svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="12" height="8" viewBox="0 0 12 8" class="leaflet-attribution-flag"><path fill="#4C7BE1" d="M0 0h12v4H0z"/><path fill="#FFD500" d="M0 4h12v3H0z"/><path fill="#E0BC00" d="M0 7h12v1H0z"/></svg>';
+
+
+/*
+ * @class Control.Attribution
+ * @aka L.Control.Attribution
+ * @inherits Control
+ *
+ * The attribution control allows you to display attribution data in a small text box on a map. It is put on the map by default unless you set its [`attributionControl` option](#map-attributioncontrol) to `false`, and it fetches attribution texts from layers with the [`getAttribution` method](#layer-getattribution) automatically. Extends Control.
+ */
+
+var Attribution = Control.extend({
+ // @section
+ // @aka Control.Attribution options
+ options: {
+ position: 'bottomright',
+
+ // @option prefix: String|false = 'Leaflet'
+ // The HTML text shown before the attributions. Pass `false` to disable.
+ prefix: '<a href="https://leafletjs.com" title="A JavaScript library for interactive maps">' + (Browser.inlineSvg ? ukrainianFlag + ' ' : '') + 'Leaflet</a>'
+ },
+
+ initialize: function (options) {
+ setOptions(this, options);
+
+ this._attributions = {};
+ },
+
+ onAdd: function (map) {
+ map.attributionControl = this;
+ this._container = create$1('div', 'leaflet-control-attribution');
+ disableClickPropagation(this._container);
+
+ // TODO ugly, refactor
+ for (var i in map._layers) {
+ if (map._layers[i].getAttribution) {
+ this.addAttribution(map._layers[i].getAttribution());
+ }
+ }
+
+ this._update();
+
+ map.on('layeradd', this._addAttribution, this);
+
+ return this._container;
+ },
+
+ onRemove: function (map) {
+ map.off('layeradd', this._addAttribution, this);
+ },
+
+ _addAttribution: function (ev) {
+ if (ev.layer.getAttribution) {
+ this.addAttribution(ev.layer.getAttribution());
+ ev.layer.once('remove', function () {
+ this.removeAttribution(ev.layer.getAttribution());
+ }, this);
+ }
+ },
+
+ // @method setPrefix(prefix: String|false): this
+ // The HTML text shown before the attributions. Pass `false` to disable.
+ setPrefix: function (prefix) {
+ this.options.prefix = prefix;
+ this._update();
+ return this;
+ },
+
+ // @method addAttribution(text: String): this
+ // Adds an attribution text (e.g. `'© OpenStreetMap contributors'`).
+ addAttribution: function (text) {
+ if (!text) { return this; }
+
+ if (!this._attributions[text]) {
+ this._attributions[text] = 0;
+ }
+ this._attributions[text]++;
+
+ this._update();
+
+ return this;
+ },
+
+ // @method removeAttribution(text: String): this
+ // Removes an attribution text.
+ removeAttribution: function (text) {
+ if (!text) { return this; }
+
+ if (this._attributions[text]) {
+ this._attributions[text]--;
+ this._update();
+ }
+
+ return this;
+ },
+
+ _update: function () {
+ if (!this._map) { return; }
+
+ var attribs = [];
+
+ for (var i in this._attributions) {
+ if (this._attributions[i]) {
+ attribs.push(i);
+ }
+ }
+
+ var prefixAndAttribs = [];
+
+ if (this.options.prefix) {
+ prefixAndAttribs.push(this.options.prefix);
+ }
+ if (attribs.length) {
+ prefixAndAttribs.push(attribs.join(', '));
+ }
+
+ this._container.innerHTML = prefixAndAttribs.join(' <span aria-hidden="true">|</span> ');
+ }
+});
+
+// @namespace Map
+// @section Control options
+// @option attributionControl: Boolean = true
+// Whether a [attribution control](#control-attribution) is added to the map by default.
+Map.mergeOptions({
+ attributionControl: true
+});
+
+Map.addInitHook(function () {
+ if (this.options.attributionControl) {
+ new Attribution().addTo(this);
+ }
+});
+
+// @namespace Control.Attribution
+// @factory L.control.attribution(options: Control.Attribution options)
+// Creates an attribution control.
+var attribution = function (options) {
+ return new Attribution(options);
+};
+
+Control.Layers = Layers;
+Control.Zoom = Zoom;
+Control.Scale = Scale;
+Control.Attribution = Attribution;
+
+control.layers = layers;
+control.zoom = zoom;
+control.scale = scale;
+control.attribution = attribution;
+
+/*
+ L.Handler is a base class for handler classes that are used internally to inject
+ interaction features like dragging to classes like Map and Marker.
+*/
+
+// @class Handler
+// @aka L.Handler
+// Abstract class for map interaction handlers
+
+var Handler = Class.extend({
+ initialize: function (map) {
+ this._map = map;
+ },
+
+ // @method enable(): this
+ // Enables the handler
+ enable: function () {
+ if (this._enabled) { return this; }
+
+ this._enabled = true;
+ this.addHooks();
+ return this;
+ },
+
+ // @method disable(): this
+ // Disables the handler
+ disable: function () {
+ if (!this._enabled) { return this; }
+
+ this._enabled = false;
+ this.removeHooks();
+ return this;
+ },
+
+ // @method enabled(): Boolean
+ // Returns `true` if the handler is enabled
+ enabled: function () {
+ return !!this._enabled;
+ }
+
+ // @section Extension methods
+ // Classes inheriting from `Handler` must implement the two following methods:
+ // @method addHooks()
+ // Called when the handler is enabled, should add event hooks.
+ // @method removeHooks()
+ // Called when the handler is disabled, should remove the event hooks added previously.
+});
+
+// @section There is static function which can be called without instantiating L.Handler:
+// @function addTo(map: Map, name: String): this
+// Adds a new Handler to the given map with the given name.
+Handler.addTo = function (map, name) {
+ map.addHandler(name, this);
+ return this;
+};
+
+var Mixin = {Events: Events};
+
+/*
+ * @class Draggable
+ * @aka L.Draggable
+ * @inherits Evented
+ *
+ * A class for making DOM elements draggable (including touch support).
+ * Used internally for map and marker dragging. Only works for elements
+ * that were positioned with [`L.DomUtil.setPosition`](#domutil-setposition).
+ *
+ * @example
+ * ```js
+ * var draggable = new L.Draggable(elementToDrag);
+ * draggable.enable();
+ * ```
+ */
+
+var START = Browser.touch ? 'touchstart mousedown' : 'mousedown';
+
+var Draggable = Evented.extend({
+
+ options: {
+ // @section
+ // @aka Draggable options
+ // @option clickTolerance: Number = 3
+ // The max number of pixels a user can shift the mouse pointer during a click
+ // for it to be considered a valid click (as opposed to a mouse drag).
+ clickTolerance: 3
+ },
+
+ // @constructor L.Draggable(el: HTMLElement, dragHandle?: HTMLElement, preventOutline?: Boolean, options?: Draggable options)
+ // Creates a `Draggable` object for moving `el` when you start dragging the `dragHandle` element (equals `el` itself by default).
+ initialize: function (element, dragStartTarget, preventOutline, options) {
+ setOptions(this, options);
+
+ this._element = element;
+ this._dragStartTarget = dragStartTarget || element;
+ this._preventOutline = preventOutline;
+ },
+
+ // @method enable()
+ // Enables the dragging ability
+ enable: function () {
+ if (this._enabled) { return; }
+
+ on(this._dragStartTarget, START, this._onDown, this);
+
+ this._enabled = true;
+ },
+
+ // @method disable()
+ // Disables the dragging ability
+ disable: function () {
+ if (!this._enabled) { return; }
+
+ // If we're currently dragging this draggable,
+ // disabling it counts as first ending the drag.
+ if (Draggable._dragging === this) {
+ this.finishDrag(true);
+ }
+
+ off(this._dragStartTarget, START, this._onDown, this);
+
+ this._enabled = false;
+ this._moved = false;
+ },
+
+ _onDown: function (e) {
+ // Ignore the event if disabled; this happens in IE11
+ // under some circumstances, see #3666.
+ if (!this._enabled) { return; }
+
+ this._moved = false;
+
+ if (hasClass(this._element, 'leaflet-zoom-anim')) { return; }
+
+ if (e.touches && e.touches.length !== 1) {
+ // Finish dragging to avoid conflict with touchZoom
+ if (Draggable._dragging === this) {
+ this.finishDrag();
+ }
+ return;
+ }
+
+ if (Draggable._dragging || e.shiftKey || ((e.which !== 1) && (e.button !== 1) && !e.touches)) { return; }
+ Draggable._dragging = this; // Prevent dragging multiple objects at once.
+
+ if (this._preventOutline) {
+ preventOutline(this._element);
+ }
+
+ disableImageDrag();
+ disableTextSelection();
+
+ if (this._moving) { return; }
+
+ // @event down: Event
+ // Fired when a drag is about to start.
+ this.fire('down');
+
+ var first = e.touches ? e.touches[0] : e,
+ sizedParent = getSizedParentNode(this._element);
+
+ this._startPoint = new Point(first.clientX, first.clientY);
+ this._startPos = getPosition(this._element);
+
+ // Cache the scale, so that we can continuously compensate for it during drag (_onMove).
+ this._parentScale = getScale(sizedParent);
+
+ var mouseevent = e.type === 'mousedown';
+ on(document, mouseevent ? 'mousemove' : 'touchmove', this._onMove, this);
+ on(document, mouseevent ? 'mouseup' : 'touchend touchcancel', this._onUp, this);
+ },
+
+ _onMove: function (e) {
+ // Ignore the event if disabled; this happens in IE11
+ // under some circumstances, see #3666.
+ if (!this._enabled) { return; }
+
+ if (e.touches && e.touches.length > 1) {
+ this._moved = true;
+ return;
+ }
+
+ var first = (e.touches && e.touches.length === 1 ? e.touches[0] : e),
+ offset = new Point(first.clientX, first.clientY)._subtract(this._startPoint);
+
+ if (!offset.x && !offset.y) { return; }
+ if (Math.abs(offset.x) + Math.abs(offset.y) < this.options.clickTolerance) { return; }
+
+ // We assume that the parent container's position, border and scale do not change for the duration of the drag.
+ // Therefore there is no need to account for the position and border (they are eliminated by the subtraction)
+ // and we can use the cached value for the scale.
+ offset.x /= this._parentScale.x;
+ offset.y /= this._parentScale.y;
+
+ preventDefault(e);
+
+ if (!this._moved) {
+ // @event dragstart: Event
+ // Fired when a drag starts
+ this.fire('dragstart');
+
+ this._moved = true;
+
+ addClass(document.body, 'leaflet-dragging');
+
+ this._lastTarget = e.target || e.srcElement;
+ // IE and Edge do not give the <use> element, so fetch it
+ // if necessary
+ if (window.SVGElementInstance && this._lastTarget instanceof window.SVGElementInstance) {
+ this._lastTarget = this._lastTarget.correspondingUseElement;
+ }
+ addClass(this._lastTarget, 'leaflet-drag-target');
+ }
+
+ this._newPos = this._startPos.add(offset);
+ this._moving = true;
+
+ this._lastEvent = e;
+ this._updatePosition();
+ },
+
+ _updatePosition: function () {
+ var e = {originalEvent: this._lastEvent};
+
+ // @event predrag: Event
+ // Fired continuously during dragging *before* each corresponding
+ // update of the element's position.
+ this.fire('predrag', e);
+ setPosition(this._element, this._newPos);
+
+ // @event drag: Event
+ // Fired continuously during dragging.
+ this.fire('drag', e);
+ },
+
+ _onUp: function () {
+ // Ignore the event if disabled; this happens in IE11
+ // under some circumstances, see #3666.
+ if (!this._enabled) { return; }
+ this.finishDrag();
+ },
+
+ finishDrag: function (noInertia) {
+ removeClass(document.body, 'leaflet-dragging');
+
+ if (this._lastTarget) {
+ removeClass(this._lastTarget, 'leaflet-drag-target');
+ this._lastTarget = null;
+ }
+
+ off(document, 'mousemove touchmove', this._onMove, this);
+ off(document, 'mouseup touchend touchcancel', this._onUp, this);
+
+ enableImageDrag();
+ enableTextSelection();
+
+ var fireDragend = this._moved && this._moving;
+
+ this._moving = false;
+ Draggable._dragging = false;
+
+ if (fireDragend) {
+ // @event dragend: DragEndEvent
+ // Fired when the drag ends.
+ this.fire('dragend', {
+ noInertia: noInertia,
+ distance: this._newPos.distanceTo(this._startPos)
+ });
+ }
+ }
+
+});
+
+/*
+ * @namespace PolyUtil
+ * Various utility functions for polygon geometries.
+ */
+
+/* @function clipPolygon(points: Point[], bounds: Bounds, round?: Boolean): Point[]
+ * Clips the polygon geometry defined by the given `points` by the given bounds (using the [Sutherland-Hodgman algorithm](https://en.wikipedia.org/wiki/Sutherland%E2%80%93Hodgman_algorithm)).
+ * Used by Leaflet to only show polygon points that are on the screen or near, increasing
+ * performance. Note that polygon points needs different algorithm for clipping
+ * than polyline, so there's a separate method for it.
+ */
+function clipPolygon(points, bounds, round) {
+ var clippedPoints,
+ edges = [1, 4, 2, 8],
+ i, j, k,
+ a, b,
+ len, edge, p;
+
+ for (i = 0, len = points.length; i < len; i++) {
+ points[i]._code = _getBitCode(points[i], bounds);
+ }
+
+ // for each edge (left, bottom, right, top)
+ for (k = 0; k < 4; k++) {
+ edge = edges[k];
+ clippedPoints = [];
+
+ for (i = 0, len = points.length, j = len - 1; i < len; j = i++) {
+ a = points[i];
+ b = points[j];
+
+ // if a is inside the clip window
+ if (!(a._code & edge)) {
+ // if b is outside the clip window (a->b goes out of screen)
+ if (b._code & edge) {
+ p = _getEdgeIntersection(b, a, edge, bounds, round);
+ p._code = _getBitCode(p, bounds);
+ clippedPoints.push(p);
+ }
+ clippedPoints.push(a);
+
+ // else if b is inside the clip window (a->b enters the screen)
+ } else if (!(b._code & edge)) {
+ p = _getEdgeIntersection(b, a, edge, bounds, round);
+ p._code = _getBitCode(p, bounds);
+ clippedPoints.push(p);
+ }
+ }
+ points = clippedPoints;
+ }
+
+ return points;
+}
+
+/* @function polygonCenter(latlngs: LatLng[], crs: CRS): LatLng
+ * Returns the center ([centroid](http://en.wikipedia.org/wiki/Centroid)) of the passed LatLngs (first ring) from a polygon.
+ */
+function polygonCenter(latlngs, crs) {
+ var i, j, p1, p2, f, area, x, y, center;
+
+ if (!latlngs || latlngs.length === 0) {
+ throw new Error('latlngs not passed');
+ }
+
+ if (!isFlat(latlngs)) {
+ console.warn('latlngs are not flat! Only the first ring will be used');
+ latlngs = latlngs[0];
+ }
+
+ var centroidLatLng = toLatLng([0, 0]);
+
+ var bounds = toLatLngBounds(latlngs);
+ var areaBounds = bounds.getNorthWest().distanceTo(bounds.getSouthWest()) * bounds.getNorthEast().distanceTo(bounds.getNorthWest());
+ // tests showed that below 1700 rounding errors are happening
+ if (areaBounds < 1700) {
+ // getting a inexact center, to move the latlngs near to [0, 0] to prevent rounding errors
+ centroidLatLng = centroid(latlngs);
+ }
+
+ var len = latlngs.length;
+ var points = [];
+ for (i = 0; i < len; i++) {
+ var latlng = toLatLng(latlngs[i]);
+ points.push(crs.project(toLatLng([latlng.lat - centroidLatLng.lat, latlng.lng - centroidLatLng.lng])));
+ }
+
+ area = x = y = 0;
+
+ // polygon centroid algorithm;
+ for (i = 0, j = len - 1; i < len; j = i++) {
+ p1 = points[i];
+ p2 = points[j];
+
+ f = p1.y * p2.x - p2.y * p1.x;
+ x += (p1.x + p2.x) * f;
+ y += (p1.y + p2.y) * f;
+ area += f * 3;
+ }
+
+ if (area === 0) {
+ // Polygon is so small that all points are on same pixel.
+ center = points[0];
+ } else {
+ center = [x / area, y / area];
+ }
+
+ var latlngCenter = crs.unproject(toPoint(center));
+ return toLatLng([latlngCenter.lat + centroidLatLng.lat, latlngCenter.lng + centroidLatLng.lng]);
+}
+
+/* @function centroid(latlngs: LatLng[]): LatLng
+ * Returns the 'center of mass' of the passed LatLngs.
+ */
+function centroid(coords) {
+ var latSum = 0;
+ var lngSum = 0;
+ var len = 0;
+ for (var i = 0; i < coords.length; i++) {
+ var latlng = toLatLng(coords[i]);
+ latSum += latlng.lat;
+ lngSum += latlng.lng;
+ len++;
+ }
+ return toLatLng([latSum / len, lngSum / len]);
+}
+
+var PolyUtil = {
+ __proto__: null,
+ clipPolygon: clipPolygon,
+ polygonCenter: polygonCenter,
+ centroid: centroid
+};
+
+/*
+ * @namespace LineUtil
+ *
+ * Various utility functions for polyline points processing, used by Leaflet internally to make polylines lightning-fast.
+ */
+
+// Simplify polyline with vertex reduction and Douglas-Peucker simplification.
+// Improves rendering performance dramatically by lessening the number of points to draw.
+
+// @function simplify(points: Point[], tolerance: Number): Point[]
+// Dramatically reduces the number of points in a polyline while retaining
+// its shape and returns a new array of simplified points, using the
+// [Ramer-Douglas-Peucker algorithm](https://en.wikipedia.org/wiki/Ramer-Douglas-Peucker_algorithm).
+// Used for a huge performance boost when processing/displaying Leaflet polylines for
+// each zoom level and also reducing visual noise. tolerance affects the amount of
+// simplification (lesser value means higher quality but slower and with more points).
+// Also released as a separated micro-library [Simplify.js](https://mourner.github.io/simplify-js/).
+function simplify(points, tolerance) {
+ if (!tolerance || !points.length) {
+ return points.slice();
+ }
+
+ var sqTolerance = tolerance * tolerance;
+
+ // stage 1: vertex reduction
+ points = _reducePoints(points, sqTolerance);
+
+ // stage 2: Douglas-Peucker simplification
+ points = _simplifyDP(points, sqTolerance);
+
+ return points;
+}
+
+// @function pointToSegmentDistance(p: Point, p1: Point, p2: Point): Number
+// Returns the distance between point `p` and segment `p1` to `p2`.
+function pointToSegmentDistance(p, p1, p2) {
+ return Math.sqrt(_sqClosestPointOnSegment(p, p1, p2, true));
+}
+
+// @function closestPointOnSegment(p: Point, p1: Point, p2: Point): Number
+// Returns the closest point from a point `p` on a segment `p1` to `p2`.
+function closestPointOnSegment(p, p1, p2) {
+ return _sqClosestPointOnSegment(p, p1, p2);
+}
+
+// Ramer-Douglas-Peucker simplification, see https://en.wikipedia.org/wiki/Ramer-Douglas-Peucker_algorithm
+function _simplifyDP(points, sqTolerance) {
+
+ var len = points.length,
+ ArrayConstructor = typeof Uint8Array !== undefined + '' ? Uint8Array : Array,
+ markers = new ArrayConstructor(len);
+
+ markers[0] = markers[len - 1] = 1;
+
+ _simplifyDPStep(points, markers, sqTolerance, 0, len - 1);
+
+ var i,
+ newPoints = [];
+
+ for (i = 0; i < len; i++) {
+ if (markers[i]) {
+ newPoints.push(points[i]);
+ }
+ }
+
+ return newPoints;
+}
+
+function _simplifyDPStep(points, markers, sqTolerance, first, last) {
+
+ var maxSqDist = 0,
+ index, i, sqDist;
+
+ for (i = first + 1; i <= last - 1; i++) {
+ sqDist = _sqClosestPointOnSegment(points[i], points[first], points[last], true);
+
+ if (sqDist > maxSqDist) {
+ index = i;
+ maxSqDist = sqDist;
+ }
+ }
+
+ if (maxSqDist > sqTolerance) {
+ markers[index] = 1;
+
+ _simplifyDPStep(points, markers, sqTolerance, first, index);
+ _simplifyDPStep(points, markers, sqTolerance, index, last);
+ }
+}
+
+// reduce points that are too close to each other to a single point
+function _reducePoints(points, sqTolerance) {
+ var reducedPoints = [points[0]];
+
+ for (var i = 1, prev = 0, len = points.length; i < len; i++) {
+ if (_sqDist(points[i], points[prev]) > sqTolerance) {
+ reducedPoints.push(points[i]);
+ prev = i;
+ }
+ }
+ if (prev < len - 1) {
+ reducedPoints.push(points[len - 1]);
+ }
+ return reducedPoints;
+}
+
+var _lastCode;
+
+// @function clipSegment(a: Point, b: Point, bounds: Bounds, useLastCode?: Boolean, round?: Boolean): Point[]|Boolean
+// Clips the segment a to b by rectangular bounds with the
+// [Cohen-Sutherland algorithm](https://en.wikipedia.org/wiki/Cohen%E2%80%93Sutherland_algorithm)
+// (modifying the segment points directly!). Used by Leaflet to only show polyline
+// points that are on the screen or near, increasing performance.
+function clipSegment(a, b, bounds, useLastCode, round) {
+ var codeA = useLastCode ? _lastCode : _getBitCode(a, bounds),
+ codeB = _getBitCode(b, bounds),
+
+ codeOut, p, newCode;
+
+ // save 2nd code to avoid calculating it on the next segment
+ _lastCode = codeB;
+
+ while (true) {
+ // if a,b is inside the clip window (trivial accept)
+ if (!(codeA | codeB)) {
+ return [a, b];
+ }
+
+ // if a,b is outside the clip window (trivial reject)
+ if (codeA & codeB) {
+ return false;
+ }
+
+ // other cases
+ codeOut = codeA || codeB;
+ p = _getEdgeIntersection(a, b, codeOut, bounds, round);
+ newCode = _getBitCode(p, bounds);
+
+ if (codeOut === codeA) {
+ a = p;
+ codeA = newCode;
+ } else {
+ b = p;
+ codeB = newCode;
+ }
+ }
+}
+
+function _getEdgeIntersection(a, b, code, bounds, round) {
+ var dx = b.x - a.x,
+ dy = b.y - a.y,
+ min = bounds.min,
+ max = bounds.max,
+ x, y;
+
+ if (code & 8) { // top
+ x = a.x + dx * (max.y - a.y) / dy;
+ y = max.y;
+
+ } else if (code & 4) { // bottom
+ x = a.x + dx * (min.y - a.y) / dy;
+ y = min.y;
+
+ } else if (code & 2) { // right
+ x = max.x;
+ y = a.y + dy * (max.x - a.x) / dx;
+
+ } else if (code & 1) { // left
+ x = min.x;
+ y = a.y + dy * (min.x - a.x) / dx;
+ }
+
+ return new Point(x, y, round);
+}
+
+function _getBitCode(p, bounds) {
+ var code = 0;
+
+ if (p.x < bounds.min.x) { // left
+ code |= 1;
+ } else if (p.x > bounds.max.x) { // right
+ code |= 2;
+ }
+
+ if (p.y < bounds.min.y) { // bottom
+ code |= 4;
+ } else if (p.y > bounds.max.y) { // top
+ code |= 8;
+ }
+
+ return code;
+}
+
+// square distance (to avoid unnecessary Math.sqrt calls)
+function _sqDist(p1, p2) {
+ var dx = p2.x - p1.x,
+ dy = p2.y - p1.y;
+ return dx * dx + dy * dy;
+}
+
+// return closest point on segment or distance to that point
+function _sqClosestPointOnSegment(p, p1, p2, sqDist) {
+ var x = p1.x,
+ y = p1.y,
+ dx = p2.x - x,
+ dy = p2.y - y,
+ dot = dx * dx + dy * dy,
+ t;
+
+ if (dot > 0) {
+ t = ((p.x - x) * dx + (p.y - y) * dy) / dot;
+
+ if (t > 1) {
+ x = p2.x;
+ y = p2.y;
+ } else if (t > 0) {
+ x += dx * t;
+ y += dy * t;
+ }
+ }
+
+ dx = p.x - x;
+ dy = p.y - y;
+
+ return sqDist ? dx * dx + dy * dy : new Point(x, y);
+}
+
+
+// @function isFlat(latlngs: LatLng[]): Boolean
+// Returns true if `latlngs` is a flat array, false is nested.
+function isFlat(latlngs) {
+ return !isArray(latlngs[0]) || (typeof latlngs[0][0] !== 'object' && typeof latlngs[0][0] !== 'undefined');
+}
+
+function _flat(latlngs) {
+ console.warn('Deprecated use of _flat, please use L.LineUtil.isFlat instead.');
+ return isFlat(latlngs);
+}
+
+/* @function polylineCenter(latlngs: LatLng[], crs: CRS): LatLng
+ * Returns the center ([centroid](http://en.wikipedia.org/wiki/Centroid)) of the passed LatLngs (first ring) from a polyline.
+ */
+function polylineCenter(latlngs, crs) {
+ var i, halfDist, segDist, dist, p1, p2, ratio, center;
+
+ if (!latlngs || latlngs.length === 0) {
+ throw new Error('latlngs not passed');
+ }
+
+ if (!isFlat(latlngs)) {
+ console.warn('latlngs are not flat! Only the first ring will be used');
+ latlngs = latlngs[0];
+ }
+
+ var centroidLatLng = toLatLng([0, 0]);
+
+ var bounds = toLatLngBounds(latlngs);
+ var areaBounds = bounds.getNorthWest().distanceTo(bounds.getSouthWest()) * bounds.getNorthEast().distanceTo(bounds.getNorthWest());
+ // tests showed that below 1700 rounding errors are happening
+ if (areaBounds < 1700) {
+ // getting a inexact center, to move the latlngs near to [0, 0] to prevent rounding errors
+ centroidLatLng = centroid(latlngs);
+ }
+
+ var len = latlngs.length;
+ var points = [];
+ for (i = 0; i < len; i++) {
+ var latlng = toLatLng(latlngs[i]);
+ points.push(crs.project(toLatLng([latlng.lat - centroidLatLng.lat, latlng.lng - centroidLatLng.lng])));
+ }
+
+ for (i = 0, halfDist = 0; i < len - 1; i++) {
+ halfDist += points[i].distanceTo(points[i + 1]) / 2;
+ }
+
+ // The line is so small in the current view that all points are on the same pixel.
+ if (halfDist === 0) {
+ center = points[0];
+ } else {
+ for (i = 0, dist = 0; i < len - 1; i++) {
+ p1 = points[i];
+ p2 = points[i + 1];
+ segDist = p1.distanceTo(p2);
+ dist += segDist;
+
+ if (dist > halfDist) {
+ ratio = (dist - halfDist) / segDist;
+ center = [
+ p2.x - ratio * (p2.x - p1.x),
+ p2.y - ratio * (p2.y - p1.y)
+ ];
+ break;
+ }
+ }
+ }
+
+ var latlngCenter = crs.unproject(toPoint(center));
+ return toLatLng([latlngCenter.lat + centroidLatLng.lat, latlngCenter.lng + centroidLatLng.lng]);
+}
+
+var LineUtil = {
+ __proto__: null,
+ simplify: simplify,
+ pointToSegmentDistance: pointToSegmentDistance,
+ closestPointOnSegment: closestPointOnSegment,
+ clipSegment: clipSegment,
+ _getEdgeIntersection: _getEdgeIntersection,
+ _getBitCode: _getBitCode,
+ _sqClosestPointOnSegment: _sqClosestPointOnSegment,
+ isFlat: isFlat,
+ _flat: _flat,
+ polylineCenter: polylineCenter
+};
+
+/*
+ * @namespace Projection
+ * @section
+ * Leaflet comes with a set of already defined Projections out of the box:
+ *
+ * @projection L.Projection.LonLat
+ *
+ * Equirectangular, or Plate Carree projection — the most simple projection,
+ * mostly used by GIS enthusiasts. Directly maps `x` as longitude, and `y` as
+ * latitude. Also suitable for flat worlds, e.g. game maps. Used by the
+ * `EPSG:4326` and `Simple` CRS.
+ */
+
+var LonLat = {
+ project: function (latlng) {
+ return new Point(latlng.lng, latlng.lat);
+ },
+
+ unproject: function (point) {
+ return new LatLng(point.y, point.x);
+ },
+
+ bounds: new Bounds([-180, -90], [180, 90])
+};
+
+/*
+ * @namespace Projection
+ * @projection L.Projection.Mercator
+ *
+ * Elliptical Mercator projection — more complex than Spherical Mercator. Assumes that Earth is an ellipsoid. Used by the EPSG:3395 CRS.
+ */
+
+var Mercator = {
+ R: 6378137,
+ R_MINOR: 6356752.314245179,
+
+ bounds: new Bounds([-20037508.34279, -15496570.73972], [20037508.34279, 18764656.23138]),
+
+ project: function (latlng) {
+ var d = Math.PI / 180,
+ r = this.R,
+ y = latlng.lat * d,
+ tmp = this.R_MINOR / r,
+ e = Math.sqrt(1 - tmp * tmp),
+ con = e * Math.sin(y);
+
+ var ts = Math.tan(Math.PI / 4 - y / 2) / Math.pow((1 - con) / (1 + con), e / 2);
+ y = -r * Math.log(Math.max(ts, 1E-10));
+
+ return new Point(latlng.lng * d * r, y);
+ },
+
+ unproject: function (point) {
+ var d = 180 / Math.PI,
+ r = this.R,
+ tmp = this.R_MINOR / r,
+ e = Math.sqrt(1 - tmp * tmp),
+ ts = Math.exp(-point.y / r),
+ phi = Math.PI / 2 - 2 * Math.atan(ts);
+
+ for (var i = 0, dphi = 0.1, con; i < 15 && Math.abs(dphi) > 1e-7; i++) {
+ con = e * Math.sin(phi);
+ con = Math.pow((1 - con) / (1 + con), e / 2);
+ dphi = Math.PI / 2 - 2 * Math.atan(ts * con) - phi;
+ phi += dphi;
+ }
+
+ return new LatLng(phi * d, point.x * d / r);
+ }
+};
+
+/*
+ * @class Projection
+
+ * An object with methods for projecting geographical coordinates of the world onto
+ * a flat surface (and back). See [Map projection](https://en.wikipedia.org/wiki/Map_projection).
+
+ * @property bounds: Bounds
+ * The bounds (specified in CRS units) where the projection is valid
+
+ * @method project(latlng: LatLng): Point
+ * Projects geographical coordinates into a 2D point.
+ * Only accepts actual `L.LatLng` instances, not arrays.
+
+ * @method unproject(point: Point): LatLng
+ * The inverse of `project`. Projects a 2D point into a geographical location.
+ * Only accepts actual `L.Point` instances, not arrays.
+
+ * Note that the projection instances do not inherit from Leaflet's `Class` object,
+ * and can't be instantiated. Also, new classes can't inherit from them,
+ * and methods can't be added to them with the `include` function.
+
+ */
+
+var index = {
+ __proto__: null,
+ LonLat: LonLat,
+ Mercator: Mercator,
+ SphericalMercator: SphericalMercator
+};
+
+/*
+ * @namespace CRS
+ * @crs L.CRS.EPSG3395
+ *
+ * Rarely used by some commercial tile providers. Uses Elliptical Mercator projection.
+ */
+var EPSG3395 = extend({}, Earth, {
+ code: 'EPSG:3395',
+ projection: Mercator,
+
+ transformation: (function () {
+ var scale = 0.5 / (Math.PI * Mercator.R);
+ return toTransformation(scale, 0.5, -scale, 0.5);
+ }())
+});
+
+/*
+ * @namespace CRS
+ * @crs L.CRS.EPSG4326
+ *
+ * A common CRS among GIS enthusiasts. Uses simple Equirectangular projection.
+ *
+ * Leaflet 1.0.x complies with the [TMS coordinate scheme for EPSG:4326](https://wiki.osgeo.org/wiki/Tile_Map_Service_Specification#global-geodetic),
+ * which is a breaking change from 0.7.x behaviour. If you are using a `TileLayer`
+ * with this CRS, ensure that there are two 256x256 pixel tiles covering the
+ * whole earth at zoom level zero, and that the tile coordinate origin is (-180,+90),
+ * or (-180,-90) for `TileLayer`s with [the `tms` option](#tilelayer-tms) set.
+ */
+
+var EPSG4326 = extend({}, Earth, {
+ code: 'EPSG:4326',
+ projection: LonLat,
+ transformation: toTransformation(1 / 180, 1, -1 / 180, 0.5)
+});
+
+/*
+ * @namespace CRS
+ * @crs L.CRS.Simple
+ *
+ * A simple CRS that maps longitude and latitude into `x` and `y` directly.
+ * May be used for maps of flat surfaces (e.g. game maps). Note that the `y`
+ * axis should still be inverted (going from bottom to top). `distance()` returns
+ * simple euclidean distance.
+ */
+
+var Simple = extend({}, CRS, {
+ projection: LonLat,
+ transformation: toTransformation(1, 0, -1, 0),
+
+ scale: function (zoom) {
+ return Math.pow(2, zoom);
+ },
+
+ zoom: function (scale) {
+ return Math.log(scale) / Math.LN2;
+ },
+
+ distance: function (latlng1, latlng2) {
+ var dx = latlng2.lng - latlng1.lng,
+ dy = latlng2.lat - latlng1.lat;
+
+ return Math.sqrt(dx * dx + dy * dy);
+ },
+
+ infinite: true
+});
+
+CRS.Earth = Earth;
+CRS.EPSG3395 = EPSG3395;
+CRS.EPSG3857 = EPSG3857;
+CRS.EPSG900913 = EPSG900913;
+CRS.EPSG4326 = EPSG4326;
+CRS.Simple = Simple;
+
+/*
+ * @class Layer
+ * @inherits Evented
+ * @aka L.Layer
+ * @aka ILayer
+ *
+ * A set of methods from the Layer base class that all Leaflet layers use.
+ * Inherits all methods, options and events from `L.Evented`.
+ *
+ * @example
+ *
+ * ```js
+ * var layer = L.marker(latlng).addTo(map);
+ * layer.addTo(map);
+ * layer.remove();
+ * ```
+ *
+ * @event add: Event
+ * Fired after the layer is added to a map
+ *
+ * @event remove: Event
+ * Fired after the layer is removed from a map
+ */
+
+
+var Layer = Evented.extend({
+
+ // Classes extending `L.Layer` will inherit the following options:
+ options: {
+ // @option pane: String = 'overlayPane'
+ // By default the layer will be added to the map's [overlay pane](#map-overlaypane). Overriding this option will cause the layer to be placed on another pane by default.
+ pane: 'overlayPane',
+
+ // @option attribution: String = null
+ // String to be shown in the attribution control, e.g. "© OpenStreetMap contributors". It describes the layer data and is often a legal obligation towards copyright holders and tile providers.
+ attribution: null,
+
+ bubblingMouseEvents: true
+ },
+
+ /* @section
+ * Classes extending `L.Layer` will inherit the following methods:
+ *
+ * @method addTo(map: Map|LayerGroup): this
+ * Adds the layer to the given map or layer group.
+ */
+ addTo: function (map) {
+ map.addLayer(this);
+ return this;
+ },
+
+ // @method remove: this
+ // Removes the layer from the map it is currently active on.
+ remove: function () {
+ return this.removeFrom(this._map || this._mapToAdd);
+ },
+
+ // @method removeFrom(map: Map): this
+ // Removes the layer from the given map
+ //
+ // @alternative
+ // @method removeFrom(group: LayerGroup): this
+ // Removes the layer from the given `LayerGroup`
+ removeFrom: function (obj) {
+ if (obj) {
+ obj.removeLayer(this);
+ }
+ return this;
+ },
+
+ // @method getPane(name? : String): HTMLElement
+ // Returns the `HTMLElement` representing the named pane on the map. If `name` is omitted, returns the pane for this layer.
+ getPane: function (name) {
+ return this._map.getPane(name ? (this.options[name] || name) : this.options.pane);
+ },
+
+ addInteractiveTarget: function (targetEl) {
+ this._map._targets[stamp(targetEl)] = this;
+ return this;
+ },
+
+ removeInteractiveTarget: function (targetEl) {
+ delete this._map._targets[stamp(targetEl)];
+ return this;
+ },
+
+ // @method getAttribution: String
+ // Used by the `attribution control`, returns the [attribution option](#gridlayer-attribution).
+ getAttribution: function () {
+ return this.options.attribution;
+ },
+
+ _layerAdd: function (e) {
+ var map = e.target;
+
+ // check in case layer gets added and then removed before the map is ready
+ if (!map.hasLayer(this)) { return; }
+
+ this._map = map;
+ this._zoomAnimated = map._zoomAnimated;
+
+ if (this.getEvents) {
+ var events = this.getEvents();
+ map.on(events, this);
+ this.once('remove', function () {
+ map.off(events, this);
+ }, this);
+ }
+
+ this.onAdd(map);
+
+ this.fire('add');
+ map.fire('layeradd', {layer: this});
+ }
+});
+
+/* @section Extension methods
+ * @uninheritable
+ *
+ * Every layer should extend from `L.Layer` and (re-)implement the following methods.
+ *
+ * @method onAdd(map: Map): this
+ * Should contain code that creates DOM elements for the layer, adds them to `map panes` where they should belong and puts listeners on relevant map events. Called on [`map.addLayer(layer)`](#map-addlayer).
+ *
+ * @method onRemove(map: Map): this
+ * Should contain all clean up code that removes the layer's elements from the DOM and removes listeners previously added in [`onAdd`](#layer-onadd). Called on [`map.removeLayer(layer)`](#map-removelayer).
+ *
+ * @method getEvents(): Object
+ * This optional method should return an object like `{ viewreset: this._reset }` for [`addEventListener`](#evented-addeventlistener). The event handlers in this object will be automatically added and removed from the map with your layer.
+ *
+ * @method getAttribution(): String
+ * This optional method should return a string containing HTML to be shown on the `Attribution control` whenever the layer is visible.
+ *
+ * @method beforeAdd(map: Map): this
+ * Optional method. Called on [`map.addLayer(layer)`](#map-addlayer), before the layer is added to the map, before events are initialized, without waiting until the map is in a usable state. Use for early initialization only.
+ */
+
+
+/* @namespace Map
+ * @section Layer events
+ *
+ * @event layeradd: LayerEvent
+ * Fired when a new layer is added to the map.
+ *
+ * @event layerremove: LayerEvent
+ * Fired when some layer is removed from the map
+ *
+ * @section Methods for Layers and Controls
+ */
+Map.include({
+ // @method addLayer(layer: Layer): this
+ // Adds the given layer to the map
+ addLayer: function (layer) {
+ if (!layer._layerAdd) {
+ throw new Error('The provided object is not a Layer.');
+ }
+
+ var id = stamp(layer);
+ if (this._layers[id]) { return this; }
+ this._layers[id] = layer;
+
+ layer._mapToAdd = this;
+
+ if (layer.beforeAdd) {
+ layer.beforeAdd(this);
+ }
+
+ this.whenReady(layer._layerAdd, layer);
+
+ return this;
+ },
+
+ // @method removeLayer(layer: Layer): this
+ // Removes the given layer from the map.
+ removeLayer: function (layer) {
+ var id = stamp(layer);
+
+ if (!this._layers[id]) { return this; }
+
+ if (this._loaded) {
+ layer.onRemove(this);
+ }
+
+ delete this._layers[id];
+
+ if (this._loaded) {
+ this.fire('layerremove', {layer: layer});
+ layer.fire('remove');
+ }
+
+ layer._map = layer._mapToAdd = null;
+
+ return this;
+ },
+
+ // @method hasLayer(layer: Layer): Boolean
+ // Returns `true` if the given layer is currently added to the map
+ hasLayer: function (layer) {
+ return stamp(layer) in this._layers;
+ },
+
+ /* @method eachLayer(fn: Function, context?: Object): this
+ * Iterates over the layers of the map, optionally specifying context of the iterator function.
+ * ```
+ * map.eachLayer(function(layer){
+ * layer.bindPopup('Hello');
+ * });
+ * ```
+ */
+ eachLayer: function (method, context) {
+ for (var i in this._layers) {
+ method.call(context, this._layers[i]);
+ }
+ return this;
+ },
+
+ _addLayers: function (layers) {
+ layers = layers ? (isArray(layers) ? layers : [layers]) : [];
+
+ for (var i = 0, len = layers.length; i < len; i++) {
+ this.addLayer(layers[i]);
+ }
+ },
+
+ _addZoomLimit: function (layer) {
+ if (!isNaN(layer.options.maxZoom) || !isNaN(layer.options.minZoom)) {
+ this._zoomBoundLayers[stamp(layer)] = layer;
+ this._updateZoomLevels();
+ }
+ },
+
+ _removeZoomLimit: function (layer) {
+ var id = stamp(layer);
+
+ if (this._zoomBoundLayers[id]) {
+ delete this._zoomBoundLayers[id];
+ this._updateZoomLevels();
+ }
+ },
+
+ _updateZoomLevels: function () {
+ var minZoom = Infinity,
+ maxZoom = -Infinity,
+ oldZoomSpan = this._getZoomSpan();
+
+ for (var i in this._zoomBoundLayers) {
+ var options = this._zoomBoundLayers[i].options;
+
+ minZoom = options.minZoom === undefined ? minZoom : Math.min(minZoom, options.minZoom);
+ maxZoom = options.maxZoom === undefined ? maxZoom : Math.max(maxZoom, options.maxZoom);
+ }
+
+ this._layersMaxZoom = maxZoom === -Infinity ? undefined : maxZoom;
+ this._layersMinZoom = minZoom === Infinity ? undefined : minZoom;
+
+ // @section Map state change events
+ // @event zoomlevelschange: Event
+ // Fired when the number of zoomlevels on the map is changed due
+ // to adding or removing a layer.
+ if (oldZoomSpan !== this._getZoomSpan()) {
+ this.fire('zoomlevelschange');
+ }
+
+ if (this.options.maxZoom === undefined && this._layersMaxZoom && this.getZoom() > this._layersMaxZoom) {
+ this.setZoom(this._layersMaxZoom);
+ }
+ if (this.options.minZoom === undefined && this._layersMinZoom && this.getZoom() < this._layersMinZoom) {
+ this.setZoom(this._layersMinZoom);
+ }
+ }
+});
+
+/*
+ * @class LayerGroup
+ * @aka L.LayerGroup
+ * @inherits Interactive layer
+ *
+ * Used to group several layers and handle them as one. If you add it to the map,
+ * any layers added or removed from the group will be added/removed on the map as
+ * well. Extends `Layer`.
+ *
+ * @example
+ *
+ * ```js
+ * L.layerGroup([marker1, marker2])
+ * .addLayer(polyline)
+ * .addTo(map);
+ * ```
+ */
+
+var LayerGroup = Layer.extend({
+
+ initialize: function (layers, options) {
+ setOptions(this, options);
+
+ this._layers = {};
+
+ var i, len;
+
+ if (layers) {
+ for (i = 0, len = layers.length; i < len; i++) {
+ this.addLayer(layers[i]);
+ }
+ }
+ },
+
+ // @method addLayer(layer: Layer): this
+ // Adds the given layer to the group.
+ addLayer: function (layer) {
+ var id = this.getLayerId(layer);
+
+ this._layers[id] = layer;
+
+ if (this._map) {
+ this._map.addLayer(layer);
+ }
+
+ return this;
+ },
+
+ // @method removeLayer(layer: Layer): this
+ // Removes the given layer from the group.
+ // @alternative
+ // @method removeLayer(id: Number): this
+ // Removes the layer with the given internal ID from the group.
+ removeLayer: function (layer) {
+ var id = layer in this._layers ? layer : this.getLayerId(layer);
+
+ if (this._map && this._layers[id]) {
+ this._map.removeLayer(this._layers[id]);
+ }
+
+ delete this._layers[id];
+
+ return this;
+ },
+
+ // @method hasLayer(layer: Layer): Boolean
+ // Returns `true` if the given layer is currently added to the group.
+ // @alternative
+ // @method hasLayer(id: Number): Boolean
+ // Returns `true` if the given internal ID is currently added to the group.
+ hasLayer: function (layer) {
+ var layerId = typeof layer === 'number' ? layer : this.getLayerId(layer);
+ return layerId in this._layers;
+ },
+
+ // @method clearLayers(): this
+ // Removes all the layers from the group.
+ clearLayers: function () {
+ return this.eachLayer(this.removeLayer, this);
+ },
+
+ // @method invoke(methodName: String, …): this
+ // Calls `methodName` on every layer contained in this group, passing any
+ // additional parameters. Has no effect if the layers contained do not
+ // implement `methodName`.
+ invoke: function (methodName) {
+ var args = Array.prototype.slice.call(arguments, 1),
+ i, layer;
+
+ for (i in this._layers) {
+ layer = this._layers[i];
+
+ if (layer[methodName]) {
+ layer[methodName].apply(layer, args);
+ }
+ }
+
+ return this;
+ },
+
+ onAdd: function (map) {
+ this.eachLayer(map.addLayer, map);
+ },
+
+ onRemove: function (map) {
+ this.eachLayer(map.removeLayer, map);
+ },
+
+ // @method eachLayer(fn: Function, context?: Object): this
+ // Iterates over the layers of the group, optionally specifying context of the iterator function.
+ // ```js
+ // group.eachLayer(function (layer) {
+ // layer.bindPopup('Hello');
+ // });
+ // ```
+ eachLayer: function (method, context) {
+ for (var i in this._layers) {
+ method.call(context, this._layers[i]);
+ }
+ return this;
+ },
+
+ // @method getLayer(id: Number): Layer
+ // Returns the layer with the given internal ID.
+ getLayer: function (id) {
+ return this._layers[id];
+ },
+
+ // @method getLayers(): Layer[]
+ // Returns an array of all the layers added to the group.
+ getLayers: function () {
+ var layers = [];
+ this.eachLayer(layers.push, layers);
+ return layers;
+ },
+
+ // @method setZIndex(zIndex: Number): this
+ // Calls `setZIndex` on every layer contained in this group, passing the z-index.
+ setZIndex: function (zIndex) {
+ return this.invoke('setZIndex', zIndex);
+ },
+
+ // @method getLayerId(layer: Layer): Number
+ // Returns the internal ID for a layer
+ getLayerId: function (layer) {
+ return stamp(layer);
+ }
+});
+
+
+// @factory L.layerGroup(layers?: Layer[], options?: Object)
+// Create a layer group, optionally given an initial set of layers and an `options` object.
+var layerGroup = function (layers, options) {
+ return new LayerGroup(layers, options);
+};
+
+/*
+ * @class FeatureGroup
+ * @aka L.FeatureGroup
+ * @inherits LayerGroup
+ *
+ * Extended `LayerGroup` that makes it easier to do the same thing to all its member layers:
+ * * [`bindPopup`](#layer-bindpopup) binds a popup to all of the layers at once (likewise with [`bindTooltip`](#layer-bindtooltip))
+ * * Events are propagated to the `FeatureGroup`, so if the group has an event
+ * handler, it will handle events from any of the layers. This includes mouse events
+ * and custom events.
+ * * Has `layeradd` and `layerremove` events
+ *
+ * @example
+ *
+ * ```js
+ * L.featureGroup([marker1, marker2, polyline])
+ * .bindPopup('Hello world!')
+ * .on('click', function() { alert('Clicked on a member of the group!'); })
+ * .addTo(map);
+ * ```
+ */
+
+var FeatureGroup = LayerGroup.extend({
+
+ addLayer: function (layer) {
+ if (this.hasLayer(layer)) {
+ return this;
+ }
+
+ layer.addEventParent(this);
+
+ LayerGroup.prototype.addLayer.call(this, layer);
+
+ // @event layeradd: LayerEvent
+ // Fired when a layer is added to this `FeatureGroup`
+ return this.fire('layeradd', {layer: layer});
+ },
+
+ removeLayer: function (layer) {
+ if (!this.hasLayer(layer)) {
+ return this;
+ }
+ if (layer in this._layers) {
+ layer = this._layers[layer];
+ }
+
+ layer.removeEventParent(this);
+
+ LayerGroup.prototype.removeLayer.call(this, layer);
+
+ // @event layerremove: LayerEvent
+ // Fired when a layer is removed from this `FeatureGroup`
+ return this.fire('layerremove', {layer: layer});
+ },
+
+ // @method setStyle(style: Path options): this
+ // Sets the given path options to each layer of the group that has a `setStyle` method.
+ setStyle: function (style) {
+ return this.invoke('setStyle', style);
+ },
+
+ // @method bringToFront(): this
+ // Brings the layer group to the top of all other layers
+ bringToFront: function () {
+ return this.invoke('bringToFront');
+ },
+
+ // @method bringToBack(): this
+ // Brings the layer group to the back of all other layers
+ bringToBack: function () {
+ return this.invoke('bringToBack');
+ },
+
+ // @method getBounds(): LatLngBounds
+ // Returns the LatLngBounds of the Feature Group (created from bounds and coordinates of its children).
+ getBounds: function () {
+ var bounds = new LatLngBounds();
+
+ for (var id in this._layers) {
+ var layer = this._layers[id];
+ bounds.extend(layer.getBounds ? layer.getBounds() : layer.getLatLng());
+ }
+ return bounds;
+ }
+});
+
+// @factory L.featureGroup(layers?: Layer[], options?: Object)
+// Create a feature group, optionally given an initial set of layers and an `options` object.
+var featureGroup = function (layers, options) {
+ return new FeatureGroup(layers, options);
+};
+
+/*
+ * @class Icon
+ * @aka L.Icon
+ *
+ * Represents an icon to provide when creating a marker.
+ *
+ * @example
+ *
+ * ```js
+ * var myIcon = L.icon({
+ * iconUrl: 'my-icon.png',
+ * iconRetinaUrl: 'my-icon@2x.png',
+ * iconSize: [38, 95],
+ * iconAnchor: [22, 94],
+ * popupAnchor: [-3, -76],
+ * shadowUrl: 'my-icon-shadow.png',
+ * shadowRetinaUrl: 'my-icon-shadow@2x.png',
+ * shadowSize: [68, 95],
+ * shadowAnchor: [22, 94]
+ * });
+ *
+ * L.marker([50.505, 30.57], {icon: myIcon}).addTo(map);
+ * ```
+ *
+ * `L.Icon.Default` extends `L.Icon` and is the blue icon Leaflet uses for markers by default.
+ *
+ */
+
+var Icon = Class.extend({
+
+ /* @section
+ * @aka Icon options
+ *
+ * @option iconUrl: String = null
+ * **(required)** The URL to the icon image (absolute or relative to your script path).
+ *
+ * @option iconRetinaUrl: String = null
+ * The URL to a retina sized version of the icon image (absolute or relative to your
+ * script path). Used for Retina screen devices.
+ *
+ * @option iconSize: Point = null
+ * Size of the icon image in pixels.
+ *
+ * @option iconAnchor: Point = null
+ * The coordinates of the "tip" of the icon (relative to its top left corner). The icon
+ * will be aligned so that this point is at the marker's geographical location. Centered
+ * by default if size is specified, also can be set in CSS with negative margins.
+ *
+ * @option popupAnchor: Point = [0, 0]
+ * The coordinates of the point from which popups will "open", relative to the icon anchor.
+ *
+ * @option tooltipAnchor: Point = [0, 0]
+ * The coordinates of the point from which tooltips will "open", relative to the icon anchor.
+ *
+ * @option shadowUrl: String = null
+ * The URL to the icon shadow image. If not specified, no shadow image will be created.
+ *
+ * @option shadowRetinaUrl: String = null
+ *
+ * @option shadowSize: Point = null
+ * Size of the shadow image in pixels.
+ *
+ * @option shadowAnchor: Point = null
+ * The coordinates of the "tip" of the shadow (relative to its top left corner) (the same
+ * as iconAnchor if not specified).
+ *
+ * @option className: String = ''
+ * A custom class name to assign to both icon and shadow images. Empty by default.
+ */
+
+ options: {
+ popupAnchor: [0, 0],
+ tooltipAnchor: [0, 0],
+
+ // @option crossOrigin: Boolean|String = false
+ // Whether the crossOrigin attribute will be added to the tiles.
+ // If a String is provided, all tiles will have their crossOrigin attribute set to the String provided. This is needed if you want to access tile pixel data.
+ // Refer to [CORS Settings](https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_settings_attributes) for valid String values.
+ crossOrigin: false
+ },
+
+ initialize: function (options) {
+ setOptions(this, options);
+ },
+
+ // @method createIcon(oldIcon?: HTMLElement): HTMLElement
+ // Called internally when the icon has to be shown, returns a `<img>` HTML element
+ // styled according to the options.
+ createIcon: function (oldIcon) {
+ return this._createIcon('icon', oldIcon);
+ },
+
+ // @method createShadow(oldIcon?: HTMLElement): HTMLElement
+ // As `createIcon`, but for the shadow beneath it.
+ createShadow: function (oldIcon) {
+ return this._createIcon('shadow', oldIcon);
+ },
+
+ _createIcon: function (name, oldIcon) {
+ var src = this._getIconUrl(name);
+
+ if (!src) {
+ if (name === 'icon') {
+ throw new Error('iconUrl not set in Icon options (see the docs).');
+ }
+ return null;
+ }
+
+ var img = this._createImg(src, oldIcon && oldIcon.tagName === 'IMG' ? oldIcon : null);
+ this._setIconStyles(img, name);
+
+ if (this.options.crossOrigin || this.options.crossOrigin === '') {
+ img.crossOrigin = this.options.crossOrigin === true ? '' : this.options.crossOrigin;
+ }
+
+ return img;
+ },
+
+ _setIconStyles: function (img, name) {
+ var options = this.options;
+ var sizeOption = options[name + 'Size'];
+
+ if (typeof sizeOption === 'number') {
+ sizeOption = [sizeOption, sizeOption];
+ }
+
+ var size = toPoint(sizeOption),
+ anchor = toPoint(name === 'shadow' && options.shadowAnchor || options.iconAnchor ||
+ size && size.divideBy(2, true));
+
+ img.className = 'leaflet-marker-' + name + ' ' + (options.className || '');
+
+ if (anchor) {
+ img.style.marginLeft = (-anchor.x) + 'px';
+ img.style.marginTop = (-anchor.y) + 'px';
+ }
+
+ if (size) {
+ img.style.width = size.x + 'px';
+ img.style.height = size.y + 'px';
+ }
+ },
+
+ _createImg: function (src, el) {
+ el = el || document.createElement('img');
+ el.src = src;
+ return el;
+ },
+
+ _getIconUrl: function (name) {
+ return Browser.retina && this.options[name + 'RetinaUrl'] || this.options[name + 'Url'];
+ }
+});
+
+
+// @factory L.icon(options: Icon options)
+// Creates an icon instance with the given options.
+function icon(options) {
+ return new Icon(options);
+}
+
+/*
+ * @miniclass Icon.Default (Icon)
+ * @aka L.Icon.Default
+ * @section
+ *
+ * A trivial subclass of `Icon`, represents the icon to use in `Marker`s when
+ * no icon is specified. Points to the blue marker image distributed with Leaflet
+ * releases.
+ *
+ * In order to customize the default icon, just change the properties of `L.Icon.Default.prototype.options`
+ * (which is a set of `Icon options`).
+ *
+ * If you want to _completely_ replace the default icon, override the
+ * `L.Marker.prototype.options.icon` with your own icon instead.
+ */
+
+var IconDefault = Icon.extend({
+
+ options: {
+ iconUrl: 'marker-icon.png',
+ iconRetinaUrl: 'marker-icon-2x.png',
+ shadowUrl: 'marker-shadow.png',
+ iconSize: [25, 41],
+ iconAnchor: [12, 41],
+ popupAnchor: [1, -34],
+ tooltipAnchor: [16, -28],
+ shadowSize: [41, 41]
+ },
+
+ _getIconUrl: function (name) {
+ if (typeof IconDefault.imagePath !== 'string') { // Deprecated, backwards-compatibility only
+ IconDefault.imagePath = this._detectIconPath();
+ }
+
+ // @option imagePath: String
+ // `Icon.Default` will try to auto-detect the location of the
+ // blue icon images. If you are placing these images in a non-standard
+ // way, set this option to point to the right path.
+ return (this.options.imagePath || IconDefault.imagePath) + Icon.prototype._getIconUrl.call(this, name);
+ },
+
+ _stripUrl: function (path) { // separate function to use in tests
+ var strip = function (str, re, idx) {
+ var match = re.exec(str);
+ return match && match[idx];
+ };
+ path = strip(path, /^url\((['"])?(.+)\1\)$/, 2);
+ return path && strip(path, /^(.*)marker-icon\.png$/, 1);
+ },
+
+ _detectIconPath: function () {
+ var el = create$1('div', 'leaflet-default-icon-path', document.body);
+ var path = getStyle(el, 'background-image') ||
+ getStyle(el, 'backgroundImage'); // IE8
+
+ document.body.removeChild(el);
+ path = this._stripUrl(path);
+ if (path) { return path; }
+ var link = document.querySelector('link[href$="leaflet.css"]');
+ if (!link) { return ''; }
+ return link.href.substring(0, link.href.length - 'leaflet.css'.length - 1);
+ }
+});
+
+/*
+ * L.Handler.MarkerDrag is used internally by L.Marker to make the markers draggable.
+ */
+
+
+/* @namespace Marker
+ * @section Interaction handlers
+ *
+ * Interaction handlers are properties of a marker instance that allow you to control interaction behavior in runtime, enabling or disabling certain features such as dragging (see `Handler` methods). Example:
+ *
+ * ```js
+ * marker.dragging.disable();
+ * ```
+ *
+ * @property dragging: Handler
+ * Marker dragging handler (by both mouse and touch). Only valid when the marker is on the map (Otherwise set [`marker.options.draggable`](#marker-draggable)).
+ */
+
+var MarkerDrag = Handler.extend({
+ initialize: function (marker) {
+ this._marker = marker;
+ },
+
+ addHooks: function () {
+ var icon = this._marker._icon;
+
+ if (!this._draggable) {
+ this._draggable = new Draggable(icon, icon, true);
+ }
+
+ this._draggable.on({
+ dragstart: this._onDragStart,
+ predrag: this._onPreDrag,
+ drag: this._onDrag,
+ dragend: this._onDragEnd
+ }, this).enable();
+
+ addClass(icon, 'leaflet-marker-draggable');
+ },
+
+ removeHooks: function () {
+ this._draggable.off({
+ dragstart: this._onDragStart,
+ predrag: this._onPreDrag,
+ drag: this._onDrag,
+ dragend: this._onDragEnd
+ }, this).disable();
+
+ if (this._marker._icon) {
+ removeClass(this._marker._icon, 'leaflet-marker-draggable');
+ }
+ },
+
+ moved: function () {
+ return this._draggable && this._draggable._moved;
+ },
+
+ _adjustPan: function (e) {
+ var marker = this._marker,
+ map = marker._map,
+ speed = this._marker.options.autoPanSpeed,
+ padding = this._marker.options.autoPanPadding,
+ iconPos = getPosition(marker._icon),
+ bounds = map.getPixelBounds(),
+ origin = map.getPixelOrigin();
+
+ var panBounds = toBounds(
+ bounds.min._subtract(origin).add(padding),
+ bounds.max._subtract(origin).subtract(padding)
+ );
+
+ if (!panBounds.contains(iconPos)) {
+ // Compute incremental movement
+ var movement = toPoint(
+ (Math.max(panBounds.max.x, iconPos.x) - panBounds.max.x) / (bounds.max.x - panBounds.max.x) -
+ (Math.min(panBounds.min.x, iconPos.x) - panBounds.min.x) / (bounds.min.x - panBounds.min.x),
+
+ (Math.max(panBounds.max.y, iconPos.y) - panBounds.max.y) / (bounds.max.y - panBounds.max.y) -
+ (Math.min(panBounds.min.y, iconPos.y) - panBounds.min.y) / (bounds.min.y - panBounds.min.y)
+ ).multiplyBy(speed);
+
+ map.panBy(movement, {animate: false});
+
+ this._draggable._newPos._add(movement);
+ this._draggable._startPos._add(movement);
+
+ setPosition(marker._icon, this._draggable._newPos);
+ this._onDrag(e);
+
+ this._panRequest = requestAnimFrame(this._adjustPan.bind(this, e));
+ }
+ },
+
+ _onDragStart: function () {
+ // @section Dragging events
+ // @event dragstart: Event
+ // Fired when the user starts dragging the marker.
+
+ // @event movestart: Event
+ // Fired when the marker starts moving (because of dragging).
+
+ this._oldLatLng = this._marker.getLatLng();
+
+ // When using ES6 imports it could not be set when `Popup` was not imported as well
+ this._marker.closePopup && this._marker.closePopup();
+
+ this._marker
+ .fire('movestart')
+ .fire('dragstart');
+ },
+
+ _onPreDrag: function (e) {
+ if (this._marker.options.autoPan) {
+ cancelAnimFrame(this._panRequest);
+ this._panRequest = requestAnimFrame(this._adjustPan.bind(this, e));
+ }
+ },
+
+ _onDrag: function (e) {
+ var marker = this._marker,
+ shadow = marker._shadow,
+ iconPos = getPosition(marker._icon),
+ latlng = marker._map.layerPointToLatLng(iconPos);
+
+ // update shadow position
+ if (shadow) {
+ setPosition(shadow, iconPos);
+ }
+
+ marker._latlng = latlng;
+ e.latlng = latlng;
+ e.oldLatLng = this._oldLatLng;
+
+ // @event drag: Event
+ // Fired repeatedly while the user drags the marker.
+ marker
+ .fire('move', e)
+ .fire('drag', e);
+ },
+
+ _onDragEnd: function (e) {
+ // @event dragend: DragEndEvent
+ // Fired when the user stops dragging the marker.
+
+ cancelAnimFrame(this._panRequest);
+
+ // @event moveend: Event
+ // Fired when the marker stops moving (because of dragging).
+ delete this._oldLatLng;
+ this._marker
+ .fire('moveend')
+ .fire('dragend', e);
+ }
+});
+
+/*
+ * @class Marker
+ * @inherits Interactive layer
+ * @aka L.Marker
+ * L.Marker is used to display clickable/draggable icons on the map. Extends `Layer`.
+ *
+ * @example
+ *
+ * ```js
+ * L.marker([50.5, 30.5]).addTo(map);
+ * ```
+ */
+
+var Marker = Layer.extend({
+
+ // @section
+ // @aka Marker options
+ options: {
+ // @option icon: Icon = *
+ // Icon instance to use for rendering the marker.
+ // See [Icon documentation](#L.Icon) for details on how to customize the marker icon.
+ // If not specified, a common instance of `L.Icon.Default` is used.
+ icon: new IconDefault(),
+
+ // Option inherited from "Interactive layer" abstract class
+ interactive: true,
+
+ // @option keyboard: Boolean = true
+ // Whether the marker can be tabbed to with a keyboard and clicked by pressing enter.
+ keyboard: true,
+
+ // @option title: String = ''
+ // Text for the browser tooltip that appear on marker hover (no tooltip by default).
+ // [Useful for accessibility](https://leafletjs.com/examples/accessibility/#markers-must-be-labelled).
+ title: '',
+
+ // @option alt: String = 'Marker'
+ // Text for the `alt` attribute of the icon image.
+ // [Useful for accessibility](https://leafletjs.com/examples/accessibility/#markers-must-be-labelled).
+ alt: 'Marker',
+
+ // @option zIndexOffset: Number = 0
+ // By default, marker images zIndex is set automatically based on its latitude. Use this option if you want to put the marker on top of all others (or below), specifying a high value like `1000` (or high negative value, respectively).
+ zIndexOffset: 0,
+
+ // @option opacity: Number = 1.0
+ // The opacity of the marker.
+ opacity: 1,
+
+ // @option riseOnHover: Boolean = false
+ // If `true`, the marker will get on top of others when you hover the mouse over it.
+ riseOnHover: false,
+
+ // @option riseOffset: Number = 250
+ // The z-index offset used for the `riseOnHover` feature.
+ riseOffset: 250,
+
+ // @option pane: String = 'markerPane'
+ // `Map pane` where the markers icon will be added.
+ pane: 'markerPane',
+
+ // @option shadowPane: String = 'shadowPane'
+ // `Map pane` where the markers shadow will be added.
+ shadowPane: 'shadowPane',
+
+ // @option bubblingMouseEvents: Boolean = false
+ // When `true`, a mouse event on this marker will trigger the same event on the map
+ // (unless [`L.DomEvent.stopPropagation`](#domevent-stoppropagation) is used).
+ bubblingMouseEvents: false,
+
+ // @option autoPanOnFocus: Boolean = true
+ // When `true`, the map will pan whenever the marker is focused (via
+ // e.g. pressing `tab` on the keyboard) to ensure the marker is
+ // visible within the map's bounds
+ autoPanOnFocus: true,
+
+ // @section Draggable marker options
+ // @option draggable: Boolean = false
+ // Whether the marker is draggable with mouse/touch or not.
+ draggable: false,
+
+ // @option autoPan: Boolean = false
+ // Whether to pan the map when dragging this marker near its edge or not.
+ autoPan: false,
+
+ // @option autoPanPadding: Point = Point(50, 50)
+ // Distance (in pixels to the left/right and to the top/bottom) of the
+ // map edge to start panning the map.
+ autoPanPadding: [50, 50],
+
+ // @option autoPanSpeed: Number = 10
+ // Number of pixels the map should pan by.
+ autoPanSpeed: 10
+ },
+
+ /* @section
+ *
+ * In addition to [shared layer methods](#Layer) like `addTo()` and `remove()` and [popup methods](#Popup) like bindPopup() you can also use the following methods:
+ */
+
+ initialize: function (latlng, options) {
+ setOptions(this, options);
+ this._latlng = toLatLng(latlng);
+ },
+
+ onAdd: function (map) {
+ this._zoomAnimated = this._zoomAnimated && map.options.markerZoomAnimation;
+
+ if (this._zoomAnimated) {
+ map.on('zoomanim', this._animateZoom, this);
+ }
+
+ this._initIcon();
+ this.update();
+ },
+
+ onRemove: function (map) {
+ if (this.dragging && this.dragging.enabled()) {
+ this.options.draggable = true;
+ this.dragging.removeHooks();
+ }
+ delete this.dragging;
+
+ if (this._zoomAnimated) {
+ map.off('zoomanim', this._animateZoom, this);
+ }
+
+ this._removeIcon();
+ this._removeShadow();
+ },
+
+ getEvents: function () {
+ return {
+ zoom: this.update,
+ viewreset: this.update
+ };
+ },
+
+ // @method getLatLng: LatLng
+ // Returns the current geographical position of the marker.
+ getLatLng: function () {
+ return this._latlng;
+ },
+
+ // @method setLatLng(latlng: LatLng): this
+ // Changes the marker position to the given point.
+ setLatLng: function (latlng) {
+ var oldLatLng = this._latlng;
+ this._latlng = toLatLng(latlng);
+ this.update();
+
+ // @event move: Event
+ // Fired when the marker is moved via [`setLatLng`](#marker-setlatlng) or by [dragging](#marker-dragging). Old and new coordinates are included in event arguments as `oldLatLng`, `latlng`.
+ return this.fire('move', {oldLatLng: oldLatLng, latlng: this._latlng});
+ },
+
+ // @method setZIndexOffset(offset: Number): this
+ // Changes the [zIndex offset](#marker-zindexoffset) of the marker.
+ setZIndexOffset: function (offset) {
+ this.options.zIndexOffset = offset;
+ return this.update();
+ },
+
+ // @method getIcon: Icon
+ // Returns the current icon used by the marker
+ getIcon: function () {
+ return this.options.icon;
+ },
+
+ // @method setIcon(icon: Icon): this
+ // Changes the marker icon.
+ setIcon: function (icon) {
+
+ this.options.icon = icon;
+
+ if (this._map) {
+ this._initIcon();
+ this.update();
+ }
+
+ if (this._popup) {
+ this.bindPopup(this._popup, this._popup.options);
+ }
+
+ return this;
+ },
+
+ getElement: function () {
+ return this._icon;
+ },
+
+ update: function () {
+
+ if (this._icon && this._map) {
+ var pos = this._map.latLngToLayerPoint(this._latlng).round();
+ this._setPos(pos);
+ }
+
+ return this;
+ },
+
+ _initIcon: function () {
+ var options = this.options,
+ classToAdd = 'leaflet-zoom-' + (this._zoomAnimated ? 'animated' : 'hide');
+
+ var icon = options.icon.createIcon(this._icon),
+ addIcon = false;
+
+ // if we're not reusing the icon, remove the old one and init new one
+ if (icon !== this._icon) {
+ if (this._icon) {
+ this._removeIcon();
+ }
+ addIcon = true;
+
+ if (options.title) {
+ icon.title = options.title;
+ }
+
+ if (icon.tagName === 'IMG') {
+ icon.alt = options.alt || '';
+ }
+ }
+
+ addClass(icon, classToAdd);
+
+ if (options.keyboard) {
+ icon.tabIndex = '0';
+ icon.setAttribute('role', 'button');
+ }
+
+ this._icon = icon;
+
+ if (options.riseOnHover) {
+ this.on({
+ mouseover: this._bringToFront,
+ mouseout: this._resetZIndex
+ });
+ }
+
+ if (this.options.autoPanOnFocus) {
+ on(icon, 'focus', this._panOnFocus, this);
+ }
+
+ var newShadow = options.icon.createShadow(this._shadow),
+ addShadow = false;
+
+ if (newShadow !== this._shadow) {
+ this._removeShadow();
+ addShadow = true;
+ }
+
+ if (newShadow) {
+ addClass(newShadow, classToAdd);
+ newShadow.alt = '';
+ }
+ this._shadow = newShadow;
+
+
+ if (options.opacity < 1) {
+ this._updateOpacity();
+ }
+
+
+ if (addIcon) {
+ this.getPane().appendChild(this._icon);
+ }
+ this._initInteraction();
+ if (newShadow && addShadow) {
+ this.getPane(options.shadowPane).appendChild(this._shadow);
+ }
+ },
+
+ _removeIcon: function () {
+ if (this.options.riseOnHover) {
+ this.off({
+ mouseover: this._bringToFront,
+ mouseout: this._resetZIndex
+ });
+ }
+
+ if (this.options.autoPanOnFocus) {
+ off(this._icon, 'focus', this._panOnFocus, this);
+ }
+
+ remove(this._icon);
+ this.removeInteractiveTarget(this._icon);
+
+ this._icon = null;
+ },
+
+ _removeShadow: function () {
+ if (this._shadow) {
+ remove(this._shadow);
+ }
+ this._shadow = null;
+ },
+
+ _setPos: function (pos) {
+
+ if (this._icon) {
+ setPosition(this._icon, pos);
+ }
+
+ if (this._shadow) {
+ setPosition(this._shadow, pos);
+ }
+
+ this._zIndex = pos.y + this.options.zIndexOffset;
+
+ this._resetZIndex();
+ },
+
+ _updateZIndex: function (offset) {
+ if (this._icon) {
+ this._icon.style.zIndex = this._zIndex + offset;
+ }
+ },
+
+ _animateZoom: function (opt) {
+ var pos = this._map._latLngToNewLayerPoint(this._latlng, opt.zoom, opt.center).round();
+
+ this._setPos(pos);
+ },
+
+ _initInteraction: function () {
+
+ if (!this.options.interactive) { return; }
+
+ addClass(this._icon, 'leaflet-interactive');
+
+ this.addInteractiveTarget(this._icon);
+
+ if (MarkerDrag) {
+ var draggable = this.options.draggable;
+ if (this.dragging) {
+ draggable = this.dragging.enabled();
+ this.dragging.disable();
+ }
+
+ this.dragging = new MarkerDrag(this);
+
+ if (draggable) {
+ this.dragging.enable();
+ }
+ }
+ },
+
+ // @method setOpacity(opacity: Number): this
+ // Changes the opacity of the marker.
+ setOpacity: function (opacity) {
+ this.options.opacity = opacity;
+ if (this._map) {
+ this._updateOpacity();
+ }
+
+ return this;
+ },
+
+ _updateOpacity: function () {
+ var opacity = this.options.opacity;
+
+ if (this._icon) {
+ setOpacity(this._icon, opacity);
+ }
+
+ if (this._shadow) {
+ setOpacity(this._shadow, opacity);
+ }
+ },
+
+ _bringToFront: function () {
+ this._updateZIndex(this.options.riseOffset);
+ },
+
+ _resetZIndex: function () {
+ this._updateZIndex(0);
+ },
+
+ _panOnFocus: function () {
+ var map = this._map;
+ if (!map) { return; }
+
+ var iconOpts = this.options.icon.options;
+ var size = iconOpts.iconSize ? toPoint(iconOpts.iconSize) : toPoint(0, 0);
+ var anchor = iconOpts.iconAnchor ? toPoint(iconOpts.iconAnchor) : toPoint(0, 0);
+
+ map.panInside(this._latlng, {
+ paddingTopLeft: anchor,
+ paddingBottomRight: size.subtract(anchor)
+ });
+ },
+
+ _getPopupAnchor: function () {
+ return this.options.icon.options.popupAnchor;
+ },
+
+ _getTooltipAnchor: function () {
+ return this.options.icon.options.tooltipAnchor;
+ }
+});
+
+
+// factory L.marker(latlng: LatLng, options? : Marker options)
+
+// @factory L.marker(latlng: LatLng, options? : Marker options)
+// Instantiates a Marker object given a geographical point and optionally an options object.
+function marker(latlng, options) {
+ return new Marker(latlng, options);
+}
+
+/*
+ * @class Path
+ * @aka L.Path
+ * @inherits Interactive layer
+ *
+ * An abstract class that contains options and constants shared between vector
+ * overlays (Polygon, Polyline, Circle). Do not use it directly. Extends `Layer`.
+ */
+
+var Path = Layer.extend({
+
+ // @section
+ // @aka Path options
+ options: {
+ // @option stroke: Boolean = true
+ // Whether to draw stroke along the path. Set it to `false` to disable borders on polygons or circles.
+ stroke: true,
+
+ // @option color: String = '#3388ff'
+ // Stroke color
+ color: '#3388ff',
+
+ // @option weight: Number = 3
+ // Stroke width in pixels
+ weight: 3,
+
+ // @option opacity: Number = 1.0
+ // Stroke opacity
+ opacity: 1,
+
+ // @option lineCap: String= 'round'
+ // A string that defines [shape to be used at the end](https://developer.mozilla.org/docs/Web/SVG/Attribute/stroke-linecap) of the stroke.
+ lineCap: 'round',
+
+ // @option lineJoin: String = 'round'
+ // A string that defines [shape to be used at the corners](https://developer.mozilla.org/docs/Web/SVG/Attribute/stroke-linejoin) of the stroke.
+ lineJoin: 'round',
+
+ // @option dashArray: String = null
+ // A string that defines the stroke [dash pattern](https://developer.mozilla.org/docs/Web/SVG/Attribute/stroke-dasharray). Doesn't work on `Canvas`-powered layers in [some old browsers](https://developer.mozilla.org/docs/Web/API/CanvasRenderingContext2D/setLineDash#Browser_compatibility).
+ dashArray: null,
+
+ // @option dashOffset: String = null
+ // A string that defines the [distance into the dash pattern to start the dash](https://developer.mozilla.org/docs/Web/SVG/Attribute/stroke-dashoffset). Doesn't work on `Canvas`-powered layers in [some old browsers](https://developer.mozilla.org/docs/Web/API/CanvasRenderingContext2D/setLineDash#Browser_compatibility).
+ dashOffset: null,
+
+ // @option fill: Boolean = depends
+ // Whether to fill the path with color. Set it to `false` to disable filling on polygons or circles.
+ fill: false,
+
+ // @option fillColor: String = *
+ // Fill color. Defaults to the value of the [`color`](#path-color) option
+ fillColor: null,
+
+ // @option fillOpacity: Number = 0.2
+ // Fill opacity.
+ fillOpacity: 0.2,
+
+ // @option fillRule: String = 'evenodd'
+ // A string that defines [how the inside of a shape](https://developer.mozilla.org/docs/Web/SVG/Attribute/fill-rule) is determined.
+ fillRule: 'evenodd',
+
+ // className: '',
+
+ // Option inherited from "Interactive layer" abstract class
+ interactive: true,
+
+ // @option bubblingMouseEvents: Boolean = true
+ // When `true`, a mouse event on this path will trigger the same event on the map
+ // (unless [`L.DomEvent.stopPropagation`](#domevent-stoppropagation) is used).
+ bubblingMouseEvents: true
+ },
+
+ beforeAdd: function (map) {
+ // Renderer is set here because we need to call renderer.getEvents
+ // before this.getEvents.
+ this._renderer = map.getRenderer(this);
+ },
+
+ onAdd: function () {
+ this._renderer._initPath(this);
+ this._reset();
+ this._renderer._addPath(this);
+ },
+
+ onRemove: function () {
+ this._renderer._removePath(this);
+ },
+
+ // @method redraw(): this
+ // Redraws the layer. Sometimes useful after you changed the coordinates that the path uses.
+ redraw: function () {
+ if (this._map) {
+ this._renderer._updatePath(this);
+ }
+ return this;
+ },
+
+ // @method setStyle(style: Path options): this
+ // Changes the appearance of a Path based on the options in the `Path options` object.
+ setStyle: function (style) {
+ setOptions(this, style);
+ if (this._renderer) {
+ this._renderer._updateStyle(this);
+ if (this.options.stroke && style && Object.prototype.hasOwnProperty.call(style, 'weight')) {
+ this._updateBounds();
+ }
+ }
+ return this;
+ },
+
+ // @method bringToFront(): this
+ // Brings the layer to the top of all path layers.
+ bringToFront: function () {
+ if (this._renderer) {
+ this._renderer._bringToFront(this);
+ }
+ return this;
+ },
+
+ // @method bringToBack(): this
+ // Brings the layer to the bottom of all path layers.
+ bringToBack: function () {
+ if (this._renderer) {
+ this._renderer._bringToBack(this);
+ }
+ return this;
+ },
+
+ getElement: function () {
+ return this._path;
+ },
+
+ _reset: function () {
+ // defined in child classes
+ this._project();
+ this._update();
+ },
+
+ _clickTolerance: function () {
+ // used when doing hit detection for Canvas layers
+ return (this.options.stroke ? this.options.weight / 2 : 0) +
+ (this._renderer.options.tolerance || 0);
+ }
+});
+
+/*
+ * @class CircleMarker
+ * @aka L.CircleMarker
+ * @inherits Path
+ *
+ * A circle of a fixed size with radius specified in pixels. Extends `Path`.
+ */
+
+var CircleMarker = Path.extend({
+
+ // @section
+ // @aka CircleMarker options
+ options: {
+ fill: true,
+
+ // @option radius: Number = 10
+ // Radius of the circle marker, in pixels
+ radius: 10
+ },
+
+ initialize: function (latlng, options) {
+ setOptions(this, options);
+ this._latlng = toLatLng(latlng);
+ this._radius = this.options.radius;
+ },
+
+ // @method setLatLng(latLng: LatLng): this
+ // Sets the position of a circle marker to a new location.
+ setLatLng: function (latlng) {
+ var oldLatLng = this._latlng;
+ this._latlng = toLatLng(latlng);
+ this.redraw();
+
+ // @event move: Event
+ // Fired when the marker is moved via [`setLatLng`](#circlemarker-setlatlng). Old and new coordinates are included in event arguments as `oldLatLng`, `latlng`.
+ return this.fire('move', {oldLatLng: oldLatLng, latlng: this._latlng});
+ },
+
+ // @method getLatLng(): LatLng
+ // Returns the current geographical position of the circle marker
+ getLatLng: function () {
+ return this._latlng;
+ },
+
+ // @method setRadius(radius: Number): this
+ // Sets the radius of a circle marker. Units are in pixels.
+ setRadius: function (radius) {
+ this.options.radius = this._radius = radius;
+ return this.redraw();
+ },
+
+ // @method getRadius(): Number
+ // Returns the current radius of the circle
+ getRadius: function () {
+ return this._radius;
+ },
+
+ setStyle : function (options) {
+ var radius = options && options.radius || this._radius;
+ Path.prototype.setStyle.call(this, options);
+ this.setRadius(radius);
+ return this;
+ },
+
+ _project: function () {
+ this._point = this._map.latLngToLayerPoint(this._latlng);
+ this._updateBounds();
+ },
+
+ _updateBounds: function () {
+ var r = this._radius,
+ r2 = this._radiusY || r,
+ w = this._clickTolerance(),
+ p = [r + w, r2 + w];
+ this._pxBounds = new Bounds(this._point.subtract(p), this._point.add(p));
+ },
+
+ _update: function () {
+ if (this._map) {
+ this._updatePath();
+ }
+ },
+
+ _updatePath: function () {
+ this._renderer._updateCircle(this);
+ },
+
+ _empty: function () {
+ return this._radius && !this._renderer._bounds.intersects(this._pxBounds);
+ },
+
+ // Needed by the `Canvas` renderer for interactivity
+ _containsPoint: function (p) {
+ return p.distanceTo(this._point) <= this._radius + this._clickTolerance();
+ }
+});
+
+
+// @factory L.circleMarker(latlng: LatLng, options?: CircleMarker options)
+// Instantiates a circle marker object given a geographical point, and an optional options object.
+function circleMarker(latlng, options) {
+ return new CircleMarker(latlng, options);
+}
+
+/*
+ * @class Circle
+ * @aka L.Circle
+ * @inherits CircleMarker
+ *
+ * A class for drawing circle overlays on a map. Extends `CircleMarker`.
+ *
+ * It's an approximation and starts to diverge from a real circle closer to poles (due to projection distortion).
+ *
+ * @example
+ *
+ * ```js
+ * L.circle([50.5, 30.5], {radius: 200}).addTo(map);
+ * ```
+ */
+
+var Circle = CircleMarker.extend({
+
+ initialize: function (latlng, options, legacyOptions) {
+ if (typeof options === 'number') {
+ // Backwards compatibility with 0.7.x factory (latlng, radius, options?)
+ options = extend({}, legacyOptions, {radius: options});
+ }
+ setOptions(this, options);
+ this._latlng = toLatLng(latlng);
+
+ if (isNaN(this.options.radius)) { throw new Error('Circle radius cannot be NaN'); }
+
+ // @section
+ // @aka Circle options
+ // @option radius: Number; Radius of the circle, in meters.
+ this._mRadius = this.options.radius;
+ },
+
+ // @method setRadius(radius: Number): this
+ // Sets the radius of a circle. Units are in meters.
+ setRadius: function (radius) {
+ this._mRadius = radius;
+ return this.redraw();
+ },
+
+ // @method getRadius(): Number
+ // Returns the current radius of a circle. Units are in meters.
+ getRadius: function () {
+ return this._mRadius;
+ },
+
+ // @method getBounds(): LatLngBounds
+ // Returns the `LatLngBounds` of the path.
+ getBounds: function () {
+ var half = [this._radius, this._radiusY || this._radius];
+
+ return new LatLngBounds(
+ this._map.layerPointToLatLng(this._point.subtract(half)),
+ this._map.layerPointToLatLng(this._point.add(half)));
+ },
+
+ setStyle: Path.prototype.setStyle,
+
+ _project: function () {
+
+ var lng = this._latlng.lng,
+ lat = this._latlng.lat,
+ map = this._map,
+ crs = map.options.crs;
+
+ if (crs.distance === Earth.distance) {
+ var d = Math.PI / 180,
+ latR = (this._mRadius / Earth.R) / d,
+ top = map.project([lat + latR, lng]),
+ bottom = map.project([lat - latR, lng]),
+ p = top.add(bottom).divideBy(2),
+ lat2 = map.unproject(p).lat,
+ lngR = Math.acos((Math.cos(latR * d) - Math.sin(lat * d) * Math.sin(lat2 * d)) /
+ (Math.cos(lat * d) * Math.cos(lat2 * d))) / d;
+
+ if (isNaN(lngR) || lngR === 0) {
+ lngR = latR / Math.cos(Math.PI / 180 * lat); // Fallback for edge case, #2425
+ }
+
+ this._point = p.subtract(map.getPixelOrigin());
+ this._radius = isNaN(lngR) ? 0 : p.x - map.project([lat2, lng - lngR]).x;
+ this._radiusY = p.y - top.y;
+
+ } else {
+ var latlng2 = crs.unproject(crs.project(this._latlng).subtract([this._mRadius, 0]));
+
+ this._point = map.latLngToLayerPoint(this._latlng);
+ this._radius = this._point.x - map.latLngToLayerPoint(latlng2).x;
+ }
+
+ this._updateBounds();
+ }
+});
+
+// @factory L.circle(latlng: LatLng, options?: Circle options)
+// Instantiates a circle object given a geographical point, and an options object
+// which contains the circle radius.
+// @alternative
+// @factory L.circle(latlng: LatLng, radius: Number, options?: Circle options)
+// Obsolete way of instantiating a circle, for compatibility with 0.7.x code.
+// Do not use in new applications or plugins.
+function circle(latlng, options, legacyOptions) {
+ return new Circle(latlng, options, legacyOptions);
+}
+
+/*
+ * @class Polyline
+ * @aka L.Polyline
+ * @inherits Path
+ *
+ * A class for drawing polyline overlays on a map. Extends `Path`.
+ *
+ * @example
+ *
+ * ```js
+ * // create a red polyline from an array of LatLng points
+ * var latlngs = [
+ * [45.51, -122.68],
+ * [37.77, -122.43],
+ * [34.04, -118.2]
+ * ];
+ *
+ * var polyline = L.polyline(latlngs, {color: 'red'}).addTo(map);
+ *
+ * // zoom the map to the polyline
+ * map.fitBounds(polyline.getBounds());
+ * ```
+ *
+ * You can also pass a multi-dimensional array to represent a `MultiPolyline` shape:
+ *
+ * ```js
+ * // create a red polyline from an array of arrays of LatLng points
+ * var latlngs = [
+ * [[45.51, -122.68],
+ * [37.77, -122.43],
+ * [34.04, -118.2]],
+ * [[40.78, -73.91],
+ * [41.83, -87.62],
+ * [32.76, -96.72]]
+ * ];
+ * ```
+ */
+
+
+var Polyline = Path.extend({
+
+ // @section
+ // @aka Polyline options
+ options: {
+ // @option smoothFactor: Number = 1.0
+ // How much to simplify the polyline on each zoom level. More means
+ // better performance and smoother look, and less means more accurate representation.
+ smoothFactor: 1.0,
+
+ // @option noClip: Boolean = false
+ // Disable polyline clipping.
+ noClip: false
+ },
+
+ initialize: function (latlngs, options) {
+ setOptions(this, options);
+ this._setLatLngs(latlngs);
+ },
+
+ // @method getLatLngs(): LatLng[]
+ // Returns an array of the points in the path, or nested arrays of points in case of multi-polyline.
+ getLatLngs: function () {
+ return this._latlngs;
+ },
+
+ // @method setLatLngs(latlngs: LatLng[]): this
+ // Replaces all the points in the polyline with the given array of geographical points.
+ setLatLngs: function (latlngs) {
+ this._setLatLngs(latlngs);
+ return this.redraw();
+ },
+
+ // @method isEmpty(): Boolean
+ // Returns `true` if the Polyline has no LatLngs.
+ isEmpty: function () {
+ return !this._latlngs.length;
+ },
+
+ // @method closestLayerPoint(p: Point): Point
+ // Returns the point closest to `p` on the Polyline.
+ closestLayerPoint: function (p) {
+ var minDistance = Infinity,
+ minPoint = null,
+ closest = _sqClosestPointOnSegment,
+ p1, p2;
+
+ for (var j = 0, jLen = this._parts.length; j < jLen; j++) {
+ var points = this._parts[j];
+
+ for (var i = 1, len = points.length; i < len; i++) {
+ p1 = points[i - 1];
+ p2 = points[i];
+
+ var sqDist = closest(p, p1, p2, true);
+
+ if (sqDist < minDistance) {
+ minDistance = sqDist;
+ minPoint = closest(p, p1, p2);
+ }
+ }
+ }
+ if (minPoint) {
+ minPoint.distance = Math.sqrt(minDistance);
+ }
+ return minPoint;
+ },
+
+ // @method getCenter(): LatLng
+ // Returns the center ([centroid](https://en.wikipedia.org/wiki/Centroid)) of the polyline.
+ getCenter: function () {
+ // throws error when not yet added to map as this center calculation requires projected coordinates
+ if (!this._map) {
+ throw new Error('Must add layer to map before using getCenter()');
+ }
+ return polylineCenter(this._defaultShape(), this._map.options.crs);
+ },
+
+ // @method getBounds(): LatLngBounds
+ // Returns the `LatLngBounds` of the path.
+ getBounds: function () {
+ return this._bounds;
+ },
+
+ // @method addLatLng(latlng: LatLng, latlngs?: LatLng[]): this
+ // Adds a given point to the polyline. By default, adds to the first ring of
+ // the polyline in case of a multi-polyline, but can be overridden by passing
+ // a specific ring as a LatLng array (that you can earlier access with [`getLatLngs`](#polyline-getlatlngs)).
+ addLatLng: function (latlng, latlngs) {
+ latlngs = latlngs || this._defaultShape();
+ latlng = toLatLng(latlng);
+ latlngs.push(latlng);
+ this._bounds.extend(latlng);
+ return this.redraw();
+ },
+
+ _setLatLngs: function (latlngs) {
+ this._bounds = new LatLngBounds();
+ this._latlngs = this._convertLatLngs(latlngs);
+ },
+
+ _defaultShape: function () {
+ return isFlat(this._latlngs) ? this._latlngs : this._latlngs[0];
+ },
+
+ // recursively convert latlngs input into actual LatLng instances; calculate bounds along the way
+ _convertLatLngs: function (latlngs) {
+ var result = [],
+ flat = isFlat(latlngs);
+
+ for (var i = 0, len = latlngs.length; i < len; i++) {
+ if (flat) {
+ result[i] = toLatLng(latlngs[i]);
+ this._bounds.extend(result[i]);
+ } else {
+ result[i] = this._convertLatLngs(latlngs[i]);
+ }
+ }
+
+ return result;
+ },
+
+ _project: function () {
+ var pxBounds = new Bounds();
+ this._rings = [];
+ this._projectLatlngs(this._latlngs, this._rings, pxBounds);
+
+ if (this._bounds.isValid() && pxBounds.isValid()) {
+ this._rawPxBounds = pxBounds;
+ this._updateBounds();
+ }
+ },
+
+ _updateBounds: function () {
+ var w = this._clickTolerance(),
+ p = new Point(w, w);
+
+ if (!this._rawPxBounds) {
+ return;
+ }
+
+ this._pxBounds = new Bounds([
+ this._rawPxBounds.min.subtract(p),
+ this._rawPxBounds.max.add(p)
+ ]);
+ },
+
+ // recursively turns latlngs into a set of rings with projected coordinates
+ _projectLatlngs: function (latlngs, result, projectedBounds) {
+ var flat = latlngs[0] instanceof LatLng,
+ len = latlngs.length,
+ i, ring;
+
+ if (flat) {
+ ring = [];
+ for (i = 0; i < len; i++) {
+ ring[i] = this._map.latLngToLayerPoint(latlngs[i]);
+ projectedBounds.extend(ring[i]);
+ }
+ result.push(ring);
+ } else {
+ for (i = 0; i < len; i++) {
+ this._projectLatlngs(latlngs[i], result, projectedBounds);
+ }
+ }
+ },
+
+ // clip polyline by renderer bounds so that we have less to render for performance
+ _clipPoints: function () {
+ var bounds = this._renderer._bounds;
+
+ this._parts = [];
+ if (!this._pxBounds || !this._pxBounds.intersects(bounds)) {
+ return;
+ }
+
+ if (this.options.noClip) {
+ this._parts = this._rings;
+ return;
+ }
+
+ var parts = this._parts,
+ i, j, k, len, len2, segment, points;
+
+ for (i = 0, k = 0, len = this._rings.length; i < len; i++) {
+ points = this._rings[i];
+
+ for (j = 0, len2 = points.length; j < len2 - 1; j++) {
+ segment = clipSegment(points[j], points[j + 1], bounds, j, true);
+
+ if (!segment) { continue; }
+
+ parts[k] = parts[k] || [];
+ parts[k].push(segment[0]);
+
+ // if segment goes out of screen, or it's the last one, it's the end of the line part
+ if ((segment[1] !== points[j + 1]) || (j === len2 - 2)) {
+ parts[k].push(segment[1]);
+ k++;
+ }
+ }
+ }
+ },
+
+ // simplify each clipped part of the polyline for performance
+ _simplifyPoints: function () {
+ var parts = this._parts,
+ tolerance = this.options.smoothFactor;
+
+ for (var i = 0, len = parts.length; i < len; i++) {
+ parts[i] = simplify(parts[i], tolerance);
+ }
+ },
+
+ _update: function () {
+ if (!this._map) { return; }
+
+ this._clipPoints();
+ this._simplifyPoints();
+ this._updatePath();
+ },
+
+ _updatePath: function () {
+ this._renderer._updatePoly(this);
+ },
+
+ // Needed by the `Canvas` renderer for interactivity
+ _containsPoint: function (p, closed) {
+ var i, j, k, len, len2, part,
+ w = this._clickTolerance();
+
+ if (!this._pxBounds || !this._pxBounds.contains(p)) { return false; }
+
+ // hit detection for polylines
+ for (i = 0, len = this._parts.length; i < len; i++) {
+ part = this._parts[i];
+
+ for (j = 0, len2 = part.length, k = len2 - 1; j < len2; k = j++) {
+ if (!closed && (j === 0)) { continue; }
+
+ if (pointToSegmentDistance(p, part[k], part[j]) <= w) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+});
+
+// @factory L.polyline(latlngs: LatLng[], options?: Polyline options)
+// Instantiates a polyline object given an array of geographical points and
+// optionally an options object. You can create a `Polyline` object with
+// multiple separate lines (`MultiPolyline`) by passing an array of arrays
+// of geographic points.
+function polyline(latlngs, options) {
+ return new Polyline(latlngs, options);
+}
+
+// Retrocompat. Allow plugins to support Leaflet versions before and after 1.1.
+Polyline._flat = _flat;
+
+/*
+ * @class Polygon
+ * @aka L.Polygon
+ * @inherits Polyline
+ *
+ * A class for drawing polygon overlays on a map. Extends `Polyline`.
+ *
+ * Note that points you pass when creating a polygon shouldn't have an additional last point equal to the first one — it's better to filter out such points.
+ *
+ *
+ * @example
+ *
+ * ```js
+ * // create a red polygon from an array of LatLng points
+ * var latlngs = [[37, -109.05],[41, -109.03],[41, -102.05],[37, -102.04]];
+ *
+ * var polygon = L.polygon(latlngs, {color: 'red'}).addTo(map);
+ *
+ * // zoom the map to the polygon
+ * map.fitBounds(polygon.getBounds());
+ * ```
+ *
+ * You can also pass an array of arrays of latlngs, with the first array representing the outer shape and the other arrays representing holes in the outer shape:
+ *
+ * ```js
+ * var latlngs = [
+ * [[37, -109.05],[41, -109.03],[41, -102.05],[37, -102.04]], // outer ring
+ * [[37.29, -108.58],[40.71, -108.58],[40.71, -102.50],[37.29, -102.50]] // hole
+ * ];
+ * ```
+ *
+ * Additionally, you can pass a multi-dimensional array to represent a MultiPolygon shape.
+ *
+ * ```js
+ * var latlngs = [
+ * [ // first polygon
+ * [[37, -109.05],[41, -109.03],[41, -102.05],[37, -102.04]], // outer ring
+ * [[37.29, -108.58],[40.71, -108.58],[40.71, -102.50],[37.29, -102.50]] // hole
+ * ],
+ * [ // second polygon
+ * [[41, -111.03],[45, -111.04],[45, -104.05],[41, -104.05]]
+ * ]
+ * ];
+ * ```
+ */
+
+var Polygon = Polyline.extend({
+
+ options: {
+ fill: true
+ },
+
+ isEmpty: function () {
+ return !this._latlngs.length || !this._latlngs[0].length;
+ },
+
+ // @method getCenter(): LatLng
+ // Returns the center ([centroid](http://en.wikipedia.org/wiki/Centroid)) of the Polygon.
+ getCenter: function () {
+ // throws error when not yet added to map as this center calculation requires projected coordinates
+ if (!this._map) {
+ throw new Error('Must add layer to map before using getCenter()');
+ }
+ return polygonCenter(this._defaultShape(), this._map.options.crs);
+ },
+
+ _convertLatLngs: function (latlngs) {
+ var result = Polyline.prototype._convertLatLngs.call(this, latlngs),
+ len = result.length;
+
+ // remove last point if it equals first one
+ if (len >= 2 && result[0] instanceof LatLng && result[0].equals(result[len - 1])) {
+ result.pop();
+ }
+ return result;
+ },
+
+ _setLatLngs: function (latlngs) {
+ Polyline.prototype._setLatLngs.call(this, latlngs);
+ if (isFlat(this._latlngs)) {
+ this._latlngs = [this._latlngs];
+ }
+ },
+
+ _defaultShape: function () {
+ return isFlat(this._latlngs[0]) ? this._latlngs[0] : this._latlngs[0][0];
+ },
+
+ _clipPoints: function () {
+ // polygons need a different clipping algorithm so we redefine that
+
+ var bounds = this._renderer._bounds,
+ w = this.options.weight,
+ p = new Point(w, w);
+
+ // increase clip padding by stroke width to avoid stroke on clip edges
+ bounds = new Bounds(bounds.min.subtract(p), bounds.max.add(p));
+
+ this._parts = [];
+ if (!this._pxBounds || !this._pxBounds.intersects(bounds)) {
+ return;
+ }
+
+ if (this.options.noClip) {
+ this._parts = this._rings;
+ return;
+ }
+
+ for (var i = 0, len = this._rings.length, clipped; i < len; i++) {
+ clipped = clipPolygon(this._rings[i], bounds, true);
+ if (clipped.length) {
+ this._parts.push(clipped);
+ }
+ }
+ },
+
+ _updatePath: function () {
+ this._renderer._updatePoly(this, true);
+ },
+
+ // Needed by the `Canvas` renderer for interactivity
+ _containsPoint: function (p) {
+ var inside = false,
+ part, p1, p2, i, j, k, len, len2;
+
+ if (!this._pxBounds || !this._pxBounds.contains(p)) { return false; }
+
+ // ray casting algorithm for detecting if point is in polygon
+ for (i = 0, len = this._parts.length; i < len; i++) {
+ part = this._parts[i];
+
+ for (j = 0, len2 = part.length, k = len2 - 1; j < len2; k = j++) {
+ p1 = part[j];
+ p2 = part[k];
+
+ if (((p1.y > p.y) !== (p2.y > p.y)) && (p.x < (p2.x - p1.x) * (p.y - p1.y) / (p2.y - p1.y) + p1.x)) {
+ inside = !inside;
+ }
+ }
+ }
+
+ // also check if it's on polygon stroke
+ return inside || Polyline.prototype._containsPoint.call(this, p, true);
+ }
+
+});
+
+
+// @factory L.polygon(latlngs: LatLng[], options?: Polyline options)
+function polygon(latlngs, options) {
+ return new Polygon(latlngs, options);
+}
+
+/*
+ * @class GeoJSON
+ * @aka L.GeoJSON
+ * @inherits FeatureGroup
+ *
+ * Represents a GeoJSON object or an array of GeoJSON objects. Allows you to parse
+ * GeoJSON data and display it on the map. Extends `FeatureGroup`.
+ *
+ * @example
+ *
+ * ```js
+ * L.geoJSON(data, {
+ * style: function (feature) {
+ * return {color: feature.properties.color};
+ * }
+ * }).bindPopup(function (layer) {
+ * return layer.feature.properties.description;
+ * }).addTo(map);
+ * ```
+ */
+
+var GeoJSON = FeatureGroup.extend({
+
+ /* @section
+ * @aka GeoJSON options
+ *
+ * @option pointToLayer: Function = *
+ * A `Function` defining how GeoJSON points spawn Leaflet layers. It is internally
+ * called when data is added, passing the GeoJSON point feature and its `LatLng`.
+ * The default is to spawn a default `Marker`:
+ * ```js
+ * function(geoJsonPoint, latlng) {
+ * return L.marker(latlng);
+ * }
+ * ```
+ *
+ * @option style: Function = *
+ * A `Function` defining the `Path options` for styling GeoJSON lines and polygons,
+ * called internally when data is added.
+ * The default value is to not override any defaults:
+ * ```js
+ * function (geoJsonFeature) {
+ * return {}
+ * }
+ * ```
+ *
+ * @option onEachFeature: Function = *
+ * A `Function` that will be called once for each created `Feature`, after it has
+ * been created and styled. Useful for attaching events and popups to features.
+ * The default is to do nothing with the newly created layers:
+ * ```js
+ * function (feature, layer) {}
+ * ```
+ *
+ * @option filter: Function = *
+ * A `Function` that will be used to decide whether to include a feature or not.
+ * The default is to include all features:
+ * ```js
+ * function (geoJsonFeature) {
+ * return true;
+ * }
+ * ```
+ * Note: dynamically changing the `filter` option will have effect only on newly
+ * added data. It will _not_ re-evaluate already included features.
+ *
+ * @option coordsToLatLng: Function = *
+ * A `Function` that will be used for converting GeoJSON coordinates to `LatLng`s.
+ * The default is the `coordsToLatLng` static method.
+ *
+ * @option markersInheritOptions: Boolean = false
+ * Whether default Markers for "Point" type Features inherit from group options.
+ */
+
+ initialize: function (geojson, options) {
+ setOptions(this, options);
+
+ this._layers = {};
+
+ if (geojson) {
+ this.addData(geojson);
+ }
+ },
+
+ // @method addData( <GeoJSON> data ): this
+ // Adds a GeoJSON object to the layer.
+ addData: function (geojson) {
+ var features = isArray(geojson) ? geojson : geojson.features,
+ i, len, feature;
+
+ if (features) {
+ for (i = 0, len = features.length; i < len; i++) {
+ // only add this if geometry or geometries are set and not null
+ feature = features[i];
+ if (feature.geometries || feature.geometry || feature.features || feature.coordinates) {
+ this.addData(feature);
+ }
+ }
+ return this;
+ }
+
+ var options = this.options;
+
+ if (options.filter && !options.filter(geojson)) { return this; }
+
+ var layer = geometryToLayer(geojson, options);
+ if (!layer) {
+ return this;
+ }
+ layer.feature = asFeature(geojson);
+
+ layer.defaultOptions = layer.options;
+ this.resetStyle(layer);
+
+ if (options.onEachFeature) {
+ options.onEachFeature(geojson, layer);
+ }
+
+ return this.addLayer(layer);
+ },
+
+ // @method resetStyle( <Path> layer? ): this
+ // Resets the given vector layer's style to the original GeoJSON style, useful for resetting style after hover events.
+ // If `layer` is omitted, the style of all features in the current layer is reset.
+ resetStyle: function (layer) {
+ if (layer === undefined) {
+ return this.eachLayer(this.resetStyle, this);
+ }
+ // reset any custom styles
+ layer.options = extend({}, layer.defaultOptions);
+ this._setLayerStyle(layer, this.options.style);
+ return this;
+ },
+
+ // @method setStyle( <Function> style ): this
+ // Changes styles of GeoJSON vector layers with the given style function.
+ setStyle: function (style) {
+ return this.eachLayer(function (layer) {
+ this._setLayerStyle(layer, style);
+ }, this);
+ },
+
+ _setLayerStyle: function (layer, style) {
+ if (layer.setStyle) {
+ if (typeof style === 'function') {
+ style = style(layer.feature);
+ }
+ layer.setStyle(style);
+ }
+ }
+});
+
+// @section
+// There are several static functions which can be called without instantiating L.GeoJSON:
+
+// @function geometryToLayer(featureData: Object, options?: GeoJSON options): Layer
+// Creates a `Layer` from a given GeoJSON feature. Can use a custom
+// [`pointToLayer`](#geojson-pointtolayer) and/or [`coordsToLatLng`](#geojson-coordstolatlng)
+// functions if provided as options.
+function geometryToLayer(geojson, options) {
+
+ var geometry = geojson.type === 'Feature' ? geojson.geometry : geojson,
+ coords = geometry ? geometry.coordinates : null,
+ layers = [],
+ pointToLayer = options && options.pointToLayer,
+ _coordsToLatLng = options && options.coordsToLatLng || coordsToLatLng,
+ latlng, latlngs, i, len;
+
+ if (!coords && !geometry) {
+ return null;
+ }
+
+ switch (geometry.type) {
+ case 'Point':
+ latlng = _coordsToLatLng(coords);
+ return _pointToLayer(pointToLayer, geojson, latlng, options);
+
+ case 'MultiPoint':
+ for (i = 0, len = coords.length; i < len; i++) {
+ latlng = _coordsToLatLng(coords[i]);
+ layers.push(_pointToLayer(pointToLayer, geojson, latlng, options));
+ }
+ return new FeatureGroup(layers);
+
+ case 'LineString':
+ case 'MultiLineString':
+ latlngs = coordsToLatLngs(coords, geometry.type === 'LineString' ? 0 : 1, _coordsToLatLng);
+ return new Polyline(latlngs, options);
+
+ case 'Polygon':
+ case 'MultiPolygon':
+ latlngs = coordsToLatLngs(coords, geometry.type === 'Polygon' ? 1 : 2, _coordsToLatLng);
+ return new Polygon(latlngs, options);
+
+ case 'GeometryCollection':
+ for (i = 0, len = geometry.geometries.length; i < len; i++) {
+ var geoLayer = geometryToLayer({
+ geometry: geometry.geometries[i],
+ type: 'Feature',
+ properties: geojson.properties
+ }, options);
+
+ if (geoLayer) {
+ layers.push(geoLayer);
+ }
+ }
+ return new FeatureGroup(layers);
+
+ case 'FeatureCollection':
+ for (i = 0, len = geometry.features.length; i < len; i++) {
+ var featureLayer = geometryToLayer(geometry.features[i], options);
+
+ if (featureLayer) {
+ layers.push(featureLayer);
+ }
+ }
+ return new FeatureGroup(layers);
+
+ default:
+ throw new Error('Invalid GeoJSON object.');
+ }
+}
+
+function _pointToLayer(pointToLayerFn, geojson, latlng, options) {
+ return pointToLayerFn ?
+ pointToLayerFn(geojson, latlng) :
+ new Marker(latlng, options && options.markersInheritOptions && options);
+}
+
+// @function coordsToLatLng(coords: Array): LatLng
+// Creates a `LatLng` object from an array of 2 numbers (longitude, latitude)
+// or 3 numbers (longitude, latitude, altitude) used in GeoJSON for points.
+function coordsToLatLng(coords) {
+ return new LatLng(coords[1], coords[0], coords[2]);
+}
+
+// @function coordsToLatLngs(coords: Array, levelsDeep?: Number, coordsToLatLng?: Function): Array
+// Creates a multidimensional array of `LatLng`s from a GeoJSON coordinates array.
+// `levelsDeep` specifies the nesting level (0 is for an array of points, 1 for an array of arrays of points, etc., 0 by default).
+// Can use a custom [`coordsToLatLng`](#geojson-coordstolatlng) function.
+function coordsToLatLngs(coords, levelsDeep, _coordsToLatLng) {
+ var latlngs = [];
+
+ for (var i = 0, len = coords.length, latlng; i < len; i++) {
+ latlng = levelsDeep ?
+ coordsToLatLngs(coords[i], levelsDeep - 1, _coordsToLatLng) :
+ (_coordsToLatLng || coordsToLatLng)(coords[i]);
+
+ latlngs.push(latlng);
+ }
+
+ return latlngs;
+}
+
+// @function latLngToCoords(latlng: LatLng, precision?: Number|false): Array
+// Reverse of [`coordsToLatLng`](#geojson-coordstolatlng)
+// Coordinates values are rounded with [`formatNum`](#util-formatnum) function.
+function latLngToCoords(latlng, precision) {
+ latlng = toLatLng(latlng);
+ return latlng.alt !== undefined ?
+ [formatNum(latlng.lng, precision), formatNum(latlng.lat, precision), formatNum(latlng.alt, precision)] :
+ [formatNum(latlng.lng, precision), formatNum(latlng.lat, precision)];
+}
+
+// @function latLngsToCoords(latlngs: Array, levelsDeep?: Number, closed?: Boolean, precision?: Number|false): Array
+// Reverse of [`coordsToLatLngs`](#geojson-coordstolatlngs)
+// `closed` determines whether the first point should be appended to the end of the array to close the feature, only used when `levelsDeep` is 0. False by default.
+// Coordinates values are rounded with [`formatNum`](#util-formatnum) function.
+function latLngsToCoords(latlngs, levelsDeep, closed, precision) {
+ var coords = [];
+
+ for (var i = 0, len = latlngs.length; i < len; i++) {
+ // Check for flat arrays required to ensure unbalanced arrays are correctly converted in recursion
+ coords.push(levelsDeep ?
+ latLngsToCoords(latlngs[i], isFlat(latlngs[i]) ? 0 : levelsDeep - 1, closed, precision) :
+ latLngToCoords(latlngs[i], precision));
+ }
+
+ if (!levelsDeep && closed && coords.length > 0) {
+ coords.push(coords[0].slice());
+ }
+
+ return coords;
+}
+
+function getFeature(layer, newGeometry) {
+ return layer.feature ?
+ extend({}, layer.feature, {geometry: newGeometry}) :
+ asFeature(newGeometry);
+}
+
+// @function asFeature(geojson: Object): Object
+// Normalize GeoJSON geometries/features into GeoJSON features.
+function asFeature(geojson) {
+ if (geojson.type === 'Feature' || geojson.type === 'FeatureCollection') {
+ return geojson;
+ }
+
+ return {
+ type: 'Feature',
+ properties: {},
+ geometry: geojson
+ };
+}
+
+var PointToGeoJSON = {
+ toGeoJSON: function (precision) {
+ return getFeature(this, {
+ type: 'Point',
+ coordinates: latLngToCoords(this.getLatLng(), precision)
+ });
+ }
+};
+
+// @namespace Marker
+// @section Other methods
+// @method toGeoJSON(precision?: Number|false): Object
+// Coordinates values are rounded with [`formatNum`](#util-formatnum) function with given `precision`.
+// Returns a [`GeoJSON`](https://en.wikipedia.org/wiki/GeoJSON) representation of the marker (as a GeoJSON `Point` Feature).
+Marker.include(PointToGeoJSON);
+
+// @namespace CircleMarker
+// @method toGeoJSON(precision?: Number|false): Object
+// Coordinates values are rounded with [`formatNum`](#util-formatnum) function with given `precision`.
+// Returns a [`GeoJSON`](https://en.wikipedia.org/wiki/GeoJSON) representation of the circle marker (as a GeoJSON `Point` Feature).
+Circle.include(PointToGeoJSON);
+CircleMarker.include(PointToGeoJSON);
+
+
+// @namespace Polyline
+// @method toGeoJSON(precision?: Number|false): Object
+// Coordinates values are rounded with [`formatNum`](#util-formatnum) function with given `precision`.
+// Returns a [`GeoJSON`](https://en.wikipedia.org/wiki/GeoJSON) representation of the polyline (as a GeoJSON `LineString` or `MultiLineString` Feature).
+Polyline.include({
+ toGeoJSON: function (precision) {
+ var multi = !isFlat(this._latlngs);
+
+ var coords = latLngsToCoords(this._latlngs, multi ? 1 : 0, false, precision);
+
+ return getFeature(this, {
+ type: (multi ? 'Multi' : '') + 'LineString',
+ coordinates: coords
+ });
+ }
+});
+
+// @namespace Polygon
+// @method toGeoJSON(precision?: Number|false): Object
+// Coordinates values are rounded with [`formatNum`](#util-formatnum) function with given `precision`.
+// Returns a [`GeoJSON`](https://en.wikipedia.org/wiki/GeoJSON) representation of the polygon (as a GeoJSON `Polygon` or `MultiPolygon` Feature).
+Polygon.include({
+ toGeoJSON: function (precision) {
+ var holes = !isFlat(this._latlngs),
+ multi = holes && !isFlat(this._latlngs[0]);
+
+ var coords = latLngsToCoords(this._latlngs, multi ? 2 : holes ? 1 : 0, true, precision);
+
+ if (!holes) {
+ coords = [coords];
+ }
+
+ return getFeature(this, {
+ type: (multi ? 'Multi' : '') + 'Polygon',
+ coordinates: coords
+ });
+ }
+});
+
+
+// @namespace LayerGroup
+LayerGroup.include({
+ toMultiPoint: function (precision) {
+ var coords = [];
+
+ this.eachLayer(function (layer) {
+ coords.push(layer.toGeoJSON(precision).geometry.coordinates);
+ });
+
+ return getFeature(this, {
+ type: 'MultiPoint',
+ coordinates: coords
+ });
+ },
+
+ // @method toGeoJSON(precision?: Number|false): Object
+ // Coordinates values are rounded with [`formatNum`](#util-formatnum) function with given `precision`.
+ // Returns a [`GeoJSON`](https://en.wikipedia.org/wiki/GeoJSON) representation of the layer group (as a GeoJSON `FeatureCollection`, `GeometryCollection`, or `MultiPoint`).
+ toGeoJSON: function (precision) {
+
+ var type = this.feature && this.feature.geometry && this.feature.geometry.type;
+
+ if (type === 'MultiPoint') {
+ return this.toMultiPoint(precision);
+ }
+
+ var isGeometryCollection = type === 'GeometryCollection',
+ jsons = [];
+
+ this.eachLayer(function (layer) {
+ if (layer.toGeoJSON) {
+ var json = layer.toGeoJSON(precision);
+ if (isGeometryCollection) {
+ jsons.push(json.geometry);
+ } else {
+ var feature = asFeature(json);
+ // Squash nested feature collections
+ if (feature.type === 'FeatureCollection') {
+ jsons.push.apply(jsons, feature.features);
+ } else {
+ jsons.push(feature);
+ }
+ }
+ }
+ });
+
+ if (isGeometryCollection) {
+ return getFeature(this, {
+ geometries: jsons,
+ type: 'GeometryCollection'
+ });
+ }
+
+ return {
+ type: 'FeatureCollection',
+ features: jsons
+ };
+ }
+});
+
+// @namespace GeoJSON
+// @factory L.geoJSON(geojson?: Object, options?: GeoJSON options)
+// Creates a GeoJSON layer. Optionally accepts an object in
+// [GeoJSON format](https://tools.ietf.org/html/rfc7946) to display on the map
+// (you can alternatively add it later with `addData` method) and an `options` object.
+function geoJSON(geojson, options) {
+ return new GeoJSON(geojson, options);
+}
+
+// Backward compatibility.
+var geoJson = geoJSON;
+
+/*
+ * @class ImageOverlay
+ * @aka L.ImageOverlay
+ * @inherits Interactive layer
+ *
+ * Used to load and display a single image over specific bounds of the map. Extends `Layer`.
+ *
+ * @example
+ *
+ * ```js
+ * var imageUrl = 'https://maps.lib.utexas.edu/maps/historical/newark_nj_1922.jpg',
+ * imageBounds = [[40.712216, -74.22655], [40.773941, -74.12544]];
+ * L.imageOverlay(imageUrl, imageBounds).addTo(map);
+ * ```
+ */
+
+var ImageOverlay = Layer.extend({
+
+ // @section
+ // @aka ImageOverlay options
+ options: {
+ // @option opacity: Number = 1.0
+ // The opacity of the image overlay.
+ opacity: 1,
+
+ // @option alt: String = ''
+ // Text for the `alt` attribute of the image (useful for accessibility).
+ alt: '',
+
+ // @option interactive: Boolean = false
+ // If `true`, the image overlay will emit [mouse events](#interactive-layer) when clicked or hovered.
+ interactive: false,
+
+ // @option crossOrigin: Boolean|String = false
+ // Whether the crossOrigin attribute will be added to the image.
+ // If a String is provided, the image will have its crossOrigin attribute set to the String provided. This is needed if you want to access image pixel data.
+ // Refer to [CORS Settings](https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_settings_attributes) for valid String values.
+ crossOrigin: false,
+
+ // @option errorOverlayUrl: String = ''
+ // URL to the overlay image to show in place of the overlay that failed to load.
+ errorOverlayUrl: '',
+
+ // @option zIndex: Number = 1
+ // The explicit [zIndex](https://developer.mozilla.org/docs/Web/CSS/CSS_Positioning/Understanding_z_index) of the overlay layer.
+ zIndex: 1,
+
+ // @option className: String = ''
+ // A custom class name to assign to the image. Empty by default.
+ className: ''
+ },
+
+ initialize: function (url, bounds, options) { // (String, LatLngBounds, Object)
+ this._url = url;
+ this._bounds = toLatLngBounds(bounds);
+
+ setOptions(this, options);
+ },
+
+ onAdd: function () {
+ if (!this._image) {
+ this._initImage();
+
+ if (this.options.opacity < 1) {
+ this._updateOpacity();
+ }
+ }
+
+ if (this.options.interactive) {
+ addClass(this._image, 'leaflet-interactive');
+ this.addInteractiveTarget(this._image);
+ }
+
+ this.getPane().appendChild(this._image);
+ this._reset();
+ },
+
+ onRemove: function () {
+ remove(this._image);
+ if (this.options.interactive) {
+ this.removeInteractiveTarget(this._image);
+ }
+ },
+
+ // @method setOpacity(opacity: Number): this
+ // Sets the opacity of the overlay.
+ setOpacity: function (opacity) {
+ this.options.opacity = opacity;
+
+ if (this._image) {
+ this._updateOpacity();
+ }
+ return this;
+ },
+
+ setStyle: function (styleOpts) {
+ if (styleOpts.opacity) {
+ this.setOpacity(styleOpts.opacity);
+ }
+ return this;
+ },
+
+ // @method bringToFront(): this
+ // Brings the layer to the top of all overlays.
+ bringToFront: function () {
+ if (this._map) {
+ toFront(this._image);
+ }
+ return this;
+ },
+
+ // @method bringToBack(): this
+ // Brings the layer to the bottom of all overlays.
+ bringToBack: function () {
+ if (this._map) {
+ toBack(this._image);
+ }
+ return this;
+ },
+
+ // @method setUrl(url: String): this
+ // Changes the URL of the image.
+ setUrl: function (url) {
+ this._url = url;
+
+ if (this._image) {
+ this._image.src = url;
+ }
+ return this;
+ },
+
+ // @method setBounds(bounds: LatLngBounds): this
+ // Update the bounds that this ImageOverlay covers
+ setBounds: function (bounds) {
+ this._bounds = toLatLngBounds(bounds);
+
+ if (this._map) {
+ this._reset();
+ }
+ return this;
+ },
+
+ getEvents: function () {
+ var events = {
+ zoom: this._reset,
+ viewreset: this._reset
+ };
+
+ if (this._zoomAnimated) {
+ events.zoomanim = this._animateZoom;
+ }
+
+ return events;
+ },
+
+ // @method setZIndex(value: Number): this
+ // Changes the [zIndex](#imageoverlay-zindex) of the image overlay.
+ setZIndex: function (value) {
+ this.options.zIndex = value;
+ this._updateZIndex();
+ return this;
+ },
+
+ // @method getBounds(): LatLngBounds
+ // Get the bounds that this ImageOverlay covers
+ getBounds: function () {
+ return this._bounds;
+ },
+
+ // @method getElement(): HTMLElement
+ // Returns the instance of [`HTMLImageElement`](https://developer.mozilla.org/docs/Web/API/HTMLImageElement)
+ // used by this overlay.
+ getElement: function () {
+ return this._image;
+ },
+
+ _initImage: function () {
+ var wasElementSupplied = this._url.tagName === 'IMG';
+ var img = this._image = wasElementSupplied ? this._url : create$1('img');
+
+ addClass(img, 'leaflet-image-layer');
+ if (this._zoomAnimated) { addClass(img, 'leaflet-zoom-animated'); }
+ if (this.options.className) { addClass(img, this.options.className); }
+
+ img.onselectstart = falseFn;
+ img.onmousemove = falseFn;
+
+ // @event load: Event
+ // Fired when the ImageOverlay layer has loaded its image
+ img.onload = bind(this.fire, this, 'load');
+ img.onerror = bind(this._overlayOnError, this, 'error');
+
+ if (this.options.crossOrigin || this.options.crossOrigin === '') {
+ img.crossOrigin = this.options.crossOrigin === true ? '' : this.options.crossOrigin;
+ }
+
+ if (this.options.zIndex) {
+ this._updateZIndex();
+ }
+
+ if (wasElementSupplied) {
+ this._url = img.src;
+ return;
+ }
+
+ img.src = this._url;
+ img.alt = this.options.alt;
+ },
+
+ _animateZoom: function (e) {
+ var scale = this._map.getZoomScale(e.zoom),
+ offset = this._map._latLngBoundsToNewLayerBounds(this._bounds, e.zoom, e.center).min;
+
+ setTransform(this._image, offset, scale);
+ },
+
+ _reset: function () {
+ var image = this._image,
+ bounds = new Bounds(
+ this._map.latLngToLayerPoint(this._bounds.getNorthWest()),
+ this._map.latLngToLayerPoint(this._bounds.getSouthEast())),
+ size = bounds.getSize();
+
+ setPosition(image, bounds.min);
+
+ image.style.width = size.x + 'px';
+ image.style.height = size.y + 'px';
+ },
+
+ _updateOpacity: function () {
+ setOpacity(this._image, this.options.opacity);
+ },
+
+ _updateZIndex: function () {
+ if (this._image && this.options.zIndex !== undefined && this.options.zIndex !== null) {
+ this._image.style.zIndex = this.options.zIndex;
+ }
+ },
+
+ _overlayOnError: function () {
+ // @event error: Event
+ // Fired when the ImageOverlay layer fails to load its image
+ this.fire('error');
+
+ var errorUrl = this.options.errorOverlayUrl;
+ if (errorUrl && this._url !== errorUrl) {
+ this._url = errorUrl;
+ this._image.src = errorUrl;
+ }
+ },
+
+ // @method getCenter(): LatLng
+ // Returns the center of the ImageOverlay.
+ getCenter: function () {
+ return this._bounds.getCenter();
+ }
+});
+
+// @factory L.imageOverlay(imageUrl: String, bounds: LatLngBounds, options?: ImageOverlay options)
+// Instantiates an image overlay object given the URL of the image and the
+// geographical bounds it is tied to.
+var imageOverlay = function (url, bounds, options) {
+ return new ImageOverlay(url, bounds, options);
+};
+
+/*
+ * @class VideoOverlay
+ * @aka L.VideoOverlay
+ * @inherits ImageOverlay
+ *
+ * Used to load and display a video player over specific bounds of the map. Extends `ImageOverlay`.
+ *
+ * A video overlay uses the [`<video>`](https://developer.mozilla.org/docs/Web/HTML/Element/video)
+ * HTML5 element.
+ *
+ * @example
+ *
+ * ```js
+ * var videoUrl = 'https://www.mapbox.com/bites/00188/patricia_nasa.webm',
+ * videoBounds = [[ 32, -130], [ 13, -100]];
+ * L.videoOverlay(videoUrl, videoBounds ).addTo(map);
+ * ```
+ */
+
+var VideoOverlay = ImageOverlay.extend({
+
+ // @section
+ // @aka VideoOverlay options
+ options: {
+ // @option autoplay: Boolean = true
+ // Whether the video starts playing automatically when loaded.
+ // On some browsers autoplay will only work with `muted: true`
+ autoplay: true,
+
+ // @option loop: Boolean = true
+ // Whether the video will loop back to the beginning when played.
+ loop: true,
+
+ // @option keepAspectRatio: Boolean = true
+ // Whether the video will save aspect ratio after the projection.
+ // Relevant for supported browsers. See [browser compatibility](https://developer.mozilla.org/en-US/docs/Web/CSS/object-fit)
+ keepAspectRatio: true,
+
+ // @option muted: Boolean = false
+ // Whether the video starts on mute when loaded.
+ muted: false,
+
+ // @option playsInline: Boolean = true
+ // Mobile browsers will play the video right where it is instead of open it up in fullscreen mode.
+ playsInline: true
+ },
+
+ _initImage: function () {
+ var wasElementSupplied = this._url.tagName === 'VIDEO';
+ var vid = this._image = wasElementSupplied ? this._url : create$1('video');
+
+ addClass(vid, 'leaflet-image-layer');
+ if (this._zoomAnimated) { addClass(vid, 'leaflet-zoom-animated'); }
+ if (this.options.className) { addClass(vid, this.options.className); }
+
+ vid.onselectstart = falseFn;
+ vid.onmousemove = falseFn;
+
+ // @event load: Event
+ // Fired when the video has finished loading the first frame
+ vid.onloadeddata = bind(this.fire, this, 'load');
+
+ if (wasElementSupplied) {
+ var sourceElements = vid.getElementsByTagName('source');
+ var sources = [];
+ for (var j = 0; j < sourceElements.length; j++) {
+ sources.push(sourceElements[j].src);
+ }
+
+ this._url = (sourceElements.length > 0) ? sources : [vid.src];
+ return;
+ }
+
+ if (!isArray(this._url)) { this._url = [this._url]; }
+
+ if (!this.options.keepAspectRatio && Object.prototype.hasOwnProperty.call(vid.style, 'objectFit')) {
+ vid.style['objectFit'] = 'fill';
+ }
+ vid.autoplay = !!this.options.autoplay;
+ vid.loop = !!this.options.loop;
+ vid.muted = !!this.options.muted;
+ vid.playsInline = !!this.options.playsInline;
+ for (var i = 0; i < this._url.length; i++) {
+ var source = create$1('source');
+ source.src = this._url[i];
+ vid.appendChild(source);
+ }
+ }
+
+ // @method getElement(): HTMLVideoElement
+ // Returns the instance of [`HTMLVideoElement`](https://developer.mozilla.org/docs/Web/API/HTMLVideoElement)
+ // used by this overlay.
+});
+
+
+// @factory L.videoOverlay(video: String|Array|HTMLVideoElement, bounds: LatLngBounds, options?: VideoOverlay options)
+// Instantiates an image overlay object given the URL of the video (or array of URLs, or even a video element) and the
+// geographical bounds it is tied to.
+
+function videoOverlay(video, bounds, options) {
+ return new VideoOverlay(video, bounds, options);
+}
+
+/*
+ * @class SVGOverlay
+ * @aka L.SVGOverlay
+ * @inherits ImageOverlay
+ *
+ * Used to load, display and provide DOM access to an SVG file over specific bounds of the map. Extends `ImageOverlay`.
+ *
+ * An SVG overlay uses the [`<svg>`](https://developer.mozilla.org/docs/Web/SVG/Element/svg) element.
+ *
+ * @example
+ *
+ * ```js
+ * var svgElement = document.createElementNS("http://www.w3.org/2000/svg", "svg");
+ * svgElement.setAttribute('xmlns', "http://www.w3.org/2000/svg");
+ * svgElement.setAttribute('viewBox', "0 0 200 200");
+ * svgElement.innerHTML = '<rect width="200" height="200"/><rect x="75" y="23" width="50" height="50" style="fill:red"/><rect x="75" y="123" width="50" height="50" style="fill:#0013ff"/>';
+ * var svgElementBounds = [ [ 32, -130 ], [ 13, -100 ] ];
+ * L.svgOverlay(svgElement, svgElementBounds).addTo(map);
+ * ```
+ */
+
+var SVGOverlay = ImageOverlay.extend({
+ _initImage: function () {
+ var el = this._image = this._url;
+
+ addClass(el, 'leaflet-image-layer');
+ if (this._zoomAnimated) { addClass(el, 'leaflet-zoom-animated'); }
+ if (this.options.className) { addClass(el, this.options.className); }
+
+ el.onselectstart = falseFn;
+ el.onmousemove = falseFn;
+ }
+
+ // @method getElement(): SVGElement
+ // Returns the instance of [`SVGElement`](https://developer.mozilla.org/docs/Web/API/SVGElement)
+ // used by this overlay.
+});
+
+
+// @factory L.svgOverlay(svg: String|SVGElement, bounds: LatLngBounds, options?: SVGOverlay options)
+// Instantiates an image overlay object given an SVG element and the geographical bounds it is tied to.
+// A viewBox attribute is required on the SVG element to zoom in and out properly.
+
+function svgOverlay(el, bounds, options) {
+ return new SVGOverlay(el, bounds, options);
+}
+
+/*
+ * @class DivOverlay
+ * @inherits Interactive layer
+ * @aka L.DivOverlay
+ * Base model for L.Popup and L.Tooltip. Inherit from it for custom overlays like plugins.
+ */
+
+// @namespace DivOverlay
+var DivOverlay = Layer.extend({
+
+ // @section
+ // @aka DivOverlay options
+ options: {
+ // @option interactive: Boolean = false
+ // If true, the popup/tooltip will listen to the mouse events.
+ interactive: false,
+
+ // @option offset: Point = Point(0, 0)
+ // The offset of the overlay position.
+ offset: [0, 0],
+
+ // @option className: String = ''
+ // A custom CSS class name to assign to the overlay.
+ className: '',
+
+ // @option pane: String = undefined
+ // `Map pane` where the overlay will be added.
+ pane: undefined,
+
+ // @option content: String|HTMLElement|Function = ''
+ // Sets the HTML content of the overlay while initializing. If a function is passed the source layer will be
+ // passed to the function. The function should return a `String` or `HTMLElement` to be used in the overlay.
+ content: ''
+ },
+
+ initialize: function (options, source) {
+ if (options && (options instanceof LatLng || isArray(options))) {
+ this._latlng = toLatLng(options);
+ setOptions(this, source);
+ } else {
+ setOptions(this, options);
+ this._source = source;
+ }
+ if (this.options.content) {
+ this._content = this.options.content;
+ }
+ },
+
+ // @method openOn(map: Map): this
+ // Adds the overlay to the map.
+ // Alternative to `map.openPopup(popup)`/`.openTooltip(tooltip)`.
+ openOn: function (map) {
+ map = arguments.length ? map : this._source._map; // experimental, not the part of public api
+ if (!map.hasLayer(this)) {
+ map.addLayer(this);
+ }
+ return this;
+ },
+
+ // @method close(): this
+ // Closes the overlay.
+ // Alternative to `map.closePopup(popup)`/`.closeTooltip(tooltip)`
+ // and `layer.closePopup()`/`.closeTooltip()`.
+ close: function () {
+ if (this._map) {
+ this._map.removeLayer(this);
+ }
+ return this;
+ },
+
+ // @method toggle(layer?: Layer): this
+ // Opens or closes the overlay bound to layer depending on its current state.
+ // Argument may be omitted only for overlay bound to layer.
+ // Alternative to `layer.togglePopup()`/`.toggleTooltip()`.
+ toggle: function (layer) {
+ if (this._map) {
+ this.close();
+ } else {
+ if (arguments.length) {
+ this._source = layer;
+ } else {
+ layer = this._source;
+ }
+ this._prepareOpen();
+
+ // open the overlay on the map
+ this.openOn(layer._map);
+ }
+ return this;
+ },
+
+ onAdd: function (map) {
+ this._zoomAnimated = map._zoomAnimated;
+
+ if (!this._container) {
+ this._initLayout();
+ }
+
+ if (map._fadeAnimated) {
+ setOpacity(this._container, 0);
+ }
+
+ clearTimeout(this._removeTimeout);
+ this.getPane().appendChild(this._container);
+ this.update();
+
+ if (map._fadeAnimated) {
+ setOpacity(this._container, 1);
+ }
+
+ this.bringToFront();
+
+ if (this.options.interactive) {
+ addClass(this._container, 'leaflet-interactive');
+ this.addInteractiveTarget(this._container);
+ }
+ },
+
+ onRemove: function (map) {
+ if (map._fadeAnimated) {
+ setOpacity(this._container, 0);
+ this._removeTimeout = setTimeout(bind(remove, undefined, this._container), 200);
+ } else {
+ remove(this._container);
+ }
+
+ if (this.options.interactive) {
+ removeClass(this._container, 'leaflet-interactive');
+ this.removeInteractiveTarget(this._container);
+ }
+ },
+
+ // @namespace DivOverlay
+ // @method getLatLng: LatLng
+ // Returns the geographical point of the overlay.
+ getLatLng: function () {
+ return this._latlng;
+ },
+
+ // @method setLatLng(latlng: LatLng): this
+ // Sets the geographical point where the overlay will open.
+ setLatLng: function (latlng) {
+ this._latlng = toLatLng(latlng);
+ if (this._map) {
+ this._updatePosition();
+ this._adjustPan();
+ }
+ return this;
+ },
+
+ // @method getContent: String|HTMLElement
+ // Returns the content of the overlay.
+ getContent: function () {
+ return this._content;
+ },
+
+ // @method setContent(htmlContent: String|HTMLElement|Function): this
+ // Sets the HTML content of the overlay. If a function is passed the source layer will be passed to the function.
+ // The function should return a `String` or `HTMLElement` to be used in the overlay.
+ setContent: function (content) {
+ this._content = content;
+ this.update();
+ return this;
+ },
+
+ // @method getElement: String|HTMLElement
+ // Returns the HTML container of the overlay.
+ getElement: function () {
+ return this._container;
+ },
+
+ // @method update: null
+ // Updates the overlay content, layout and position. Useful for updating the overlay after something inside changed, e.g. image loaded.
+ update: function () {
+ if (!this._map) { return; }
+
+ this._container.style.visibility = 'hidden';
+
+ this._updateContent();
+ this._updateLayout();
+ this._updatePosition();
+
+ this._container.style.visibility = '';
+
+ this._adjustPan();
+ },
+
+ getEvents: function () {
+ var events = {
+ zoom: this._updatePosition,
+ viewreset: this._updatePosition
+ };
+
+ if (this._zoomAnimated) {
+ events.zoomanim = this._animateZoom;
+ }
+ return events;
+ },
+
+ // @method isOpen: Boolean
+ // Returns `true` when the overlay is visible on the map.
+ isOpen: function () {
+ return !!this._map && this._map.hasLayer(this);
+ },
+
+ // @method bringToFront: this
+ // Brings this overlay in front of other overlays (in the same map pane).
+ bringToFront: function () {
+ if (this._map) {
+ toFront(this._container);
+ }
+ return this;
+ },
+
+ // @method bringToBack: this
+ // Brings this overlay to the back of other overlays (in the same map pane).
+ bringToBack: function () {
+ if (this._map) {
+ toBack(this._container);
+ }
+ return this;
+ },
+
+ // prepare bound overlay to open: update latlng pos / content source (for FeatureGroup)
+ _prepareOpen: function (latlng) {
+ var source = this._source;
+ if (!source._map) { return false; }
+
+ if (source instanceof FeatureGroup) {
+ source = null;
+ var layers = this._source._layers;
+ for (var id in layers) {
+ if (layers[id]._map) {
+ source = layers[id];
+ break;
+ }
+ }
+ if (!source) { return false; } // Unable to get source layer.
+
+ // set overlay source to this layer
+ this._source = source;
+ }
+
+ if (!latlng) {
+ if (source.getCenter) {
+ latlng = source.getCenter();
+ } else if (source.getLatLng) {
+ latlng = source.getLatLng();
+ } else if (source.getBounds) {
+ latlng = source.getBounds().getCenter();
+ } else {
+ throw new Error('Unable to get source layer LatLng.');
+ }
+ }
+ this.setLatLng(latlng);
+
+ if (this._map) {
+ // update the overlay (content, layout, etc...)
+ this.update();
+ }
+
+ return true;
+ },
+
+ _updateContent: function () {
+ if (!this._content) { return; }
+
+ var node = this._contentNode;
+ var content = (typeof this._content === 'function') ? this._content(this._source || this) : this._content;
+
+ if (typeof content === 'string') {
+ node.innerHTML = content;
+ } else {
+ while (node.hasChildNodes()) {
+ node.removeChild(node.firstChild);
+ }
+ node.appendChild(content);
+ }
+
+ // @namespace DivOverlay
+ // @section DivOverlay events
+ // @event contentupdate: Event
+ // Fired when the content of the overlay is updated
+ this.fire('contentupdate');
+ },
+
+ _updatePosition: function () {
+ if (!this._map) { return; }
+
+ var pos = this._map.latLngToLayerPoint(this._latlng),
+ offset = toPoint(this.options.offset),
+ anchor = this._getAnchor();
+
+ if (this._zoomAnimated) {
+ setPosition(this._container, pos.add(anchor));
+ } else {
+ offset = offset.add(pos).add(anchor);
+ }
+
+ var bottom = this._containerBottom = -offset.y,
+ left = this._containerLeft = -Math.round(this._containerWidth / 2) + offset.x;
+
+ // bottom position the overlay in case the height of the overlay changes (images loading etc)
+ this._container.style.bottom = bottom + 'px';
+ this._container.style.left = left + 'px';
+ },
+
+ _getAnchor: function () {
+ return [0, 0];
+ }
+
+});
+
+Map.include({
+ _initOverlay: function (OverlayClass, content, latlng, options) {
+ var overlay = content;
+ if (!(overlay instanceof OverlayClass)) {
+ overlay = new OverlayClass(options).setContent(content);
+ }
+ if (latlng) {
+ overlay.setLatLng(latlng);
+ }
+ return overlay;
+ }
+});
+
+
+Layer.include({
+ _initOverlay: function (OverlayClass, old, content, options) {
+ var overlay = content;
+ if (overlay instanceof OverlayClass) {
+ setOptions(overlay, options);
+ overlay._source = this;
+ } else {
+ overlay = (old && !options) ? old : new OverlayClass(options, this);
+ overlay.setContent(content);
+ }
+ return overlay;
+ }
+});
+
+/*
+ * @class Popup
+ * @inherits DivOverlay
+ * @aka L.Popup
+ * Used to open popups in certain places of the map. Use [Map.openPopup](#map-openpopup) to
+ * open popups while making sure that only one popup is open at one time
+ * (recommended for usability), or use [Map.addLayer](#map-addlayer) to open as many as you want.
+ *
+ * @example
+ *
+ * If you want to just bind a popup to marker click and then open it, it's really easy:
+ *
+ * ```js
+ * marker.bindPopup(popupContent).openPopup();
+ * ```
+ * Path overlays like polylines also have a `bindPopup` method.
+ *
+ * A popup can be also standalone:
+ *
+ * ```js
+ * var popup = L.popup()
+ * .setLatLng(latlng)
+ * .setContent('<p>Hello world!<br />This is a nice popup.</p>')
+ * .openOn(map);
+ * ```
+ * or
+ * ```js
+ * var popup = L.popup(latlng, {content: '<p>Hello world!<br />This is a nice popup.</p>')
+ * .openOn(map);
+ * ```
+ */
+
+
+// @namespace Popup
+var Popup = DivOverlay.extend({
+
+ // @section
+ // @aka Popup options
+ options: {
+ // @option pane: String = 'popupPane'
+ // `Map pane` where the popup will be added.
+ pane: 'popupPane',
+
+ // @option offset: Point = Point(0, 7)
+ // The offset of the popup position.
+ offset: [0, 7],
+
+ // @option maxWidth: Number = 300
+ // Max width of the popup, in pixels.
+ maxWidth: 300,
+
+ // @option minWidth: Number = 50
+ // Min width of the popup, in pixels.
+ minWidth: 50,
+
+ // @option maxHeight: Number = null
+ // If set, creates a scrollable container of the given height
+ // inside a popup if its content exceeds it.
+ // The scrollable container can be styled using the
+ // `leaflet-popup-scrolled` CSS class selector.
+ maxHeight: null,
+
+ // @option autoPan: Boolean = true
+ // Set it to `false` if you don't want the map to do panning animation
+ // to fit the opened popup.
+ autoPan: true,
+
+ // @option autoPanPaddingTopLeft: Point = null
+ // The margin between the popup and the top left corner of the map
+ // view after autopanning was performed.
+ autoPanPaddingTopLeft: null,
+
+ // @option autoPanPaddingBottomRight: Point = null
+ // The margin between the popup and the bottom right corner of the map
+ // view after autopanning was performed.
+ autoPanPaddingBottomRight: null,
+
+ // @option autoPanPadding: Point = Point(5, 5)
+ // Equivalent of setting both top left and bottom right autopan padding to the same value.
+ autoPanPadding: [5, 5],
+
+ // @option keepInView: Boolean = false
+ // Set it to `true` if you want to prevent users from panning the popup
+ // off of the screen while it is open.
+ keepInView: false,
+
+ // @option closeButton: Boolean = true
+ // Controls the presence of a close button in the popup.
+ closeButton: true,
+
+ // @option autoClose: Boolean = true
+ // Set it to `false` if you want to override the default behavior of
+ // the popup closing when another popup is opened.
+ autoClose: true,
+
+ // @option closeOnEscapeKey: Boolean = true
+ // Set it to `false` if you want to override the default behavior of
+ // the ESC key for closing of the popup.
+ closeOnEscapeKey: true,
+
+ // @option closeOnClick: Boolean = *
+ // Set it if you want to override the default behavior of the popup closing when user clicks
+ // on the map. Defaults to the map's [`closePopupOnClick`](#map-closepopuponclick) option.
+
+ // @option className: String = ''
+ // A custom CSS class name to assign to the popup.
+ className: ''
+ },
+
+ // @namespace Popup
+ // @method openOn(map: Map): this
+ // Alternative to `map.openPopup(popup)`.
+ // Adds the popup to the map and closes the previous one.
+ openOn: function (map) {
+ map = arguments.length ? map : this._source._map; // experimental, not the part of public api
+
+ if (!map.hasLayer(this) && map._popup && map._popup.options.autoClose) {
+ map.removeLayer(map._popup);
+ }
+ map._popup = this;
+
+ return DivOverlay.prototype.openOn.call(this, map);
+ },
+
+ onAdd: function (map) {
+ DivOverlay.prototype.onAdd.call(this, map);
+
+ // @namespace Map
+ // @section Popup events
+ // @event popupopen: PopupEvent
+ // Fired when a popup is opened in the map
+ map.fire('popupopen', {popup: this});
+
+ if (this._source) {
+ // @namespace Layer
+ // @section Popup events
+ // @event popupopen: PopupEvent
+ // Fired when a popup bound to this layer is opened
+ this._source.fire('popupopen', {popup: this}, true);
+ // For non-path layers, we toggle the popup when clicking
+ // again the layer, so prevent the map to reopen it.
+ if (!(this._source instanceof Path)) {
+ this._source.on('preclick', stopPropagation);
+ }
+ }
+ },
+
+ onRemove: function (map) {
+ DivOverlay.prototype.onRemove.call(this, map);
+
+ // @namespace Map
+ // @section Popup events
+ // @event popupclose: PopupEvent
+ // Fired when a popup in the map is closed
+ map.fire('popupclose', {popup: this});
+
+ if (this._source) {
+ // @namespace Layer
+ // @section Popup events
+ // @event popupclose: PopupEvent
+ // Fired when a popup bound to this layer is closed
+ this._source.fire('popupclose', {popup: this}, true);
+ if (!(this._source instanceof Path)) {
+ this._source.off('preclick', stopPropagation);
+ }
+ }
+ },
+
+ getEvents: function () {
+ var events = DivOverlay.prototype.getEvents.call(this);
+
+ if (this.options.closeOnClick !== undefined ? this.options.closeOnClick : this._map.options.closePopupOnClick) {
+ events.preclick = this.close;
+ }
+
+ if (this.options.keepInView) {
+ events.moveend = this._adjustPan;
+ }
+
+ return events;
+ },
+
+ _initLayout: function () {
+ var prefix = 'leaflet-popup',
+ container = this._container = create$1('div',
+ prefix + ' ' + (this.options.className || '') +
+ ' leaflet-zoom-animated');
+
+ var wrapper = this._wrapper = create$1('div', prefix + '-content-wrapper', container);
+ this._contentNode = create$1('div', prefix + '-content', wrapper);
+
+ disableClickPropagation(container);
+ disableScrollPropagation(this._contentNode);
+ on(container, 'contextmenu', stopPropagation);
+
+ this._tipContainer = create$1('div', prefix + '-tip-container', container);
+ this._tip = create$1('div', prefix + '-tip', this._tipContainer);
+
+ if (this.options.closeButton) {
+ var closeButton = this._closeButton = create$1('a', prefix + '-close-button', container);
+ closeButton.setAttribute('role', 'button'); // overrides the implicit role=link of <a> elements #7399
+ closeButton.setAttribute('aria-label', 'Close popup');
+ closeButton.href = '#close';
+ closeButton.innerHTML = '<span aria-hidden="true">×</span>';
+
+ on(closeButton, 'click', function (ev) {
+ preventDefault(ev);
+ this.close();
+ }, this);
+ }
+ },
+
+ _updateLayout: function () {
+ var container = this._contentNode,
+ style = container.style;
+
+ style.width = '';
+ style.whiteSpace = 'nowrap';
+
+ var width = container.offsetWidth;
+ width = Math.min(width, this.options.maxWidth);
+ width = Math.max(width, this.options.minWidth);
+
+ style.width = (width + 1) + 'px';
+ style.whiteSpace = '';
+
+ style.height = '';
+
+ var height = container.offsetHeight,
+ maxHeight = this.options.maxHeight,
+ scrolledClass = 'leaflet-popup-scrolled';
+
+ if (maxHeight && height > maxHeight) {
+ style.height = maxHeight + 'px';
+ addClass(container, scrolledClass);
+ } else {
+ removeClass(container, scrolledClass);
+ }
+
+ this._containerWidth = this._container.offsetWidth;
+ },
+
+ _animateZoom: function (e) {
+ var pos = this._map._latLngToNewLayerPoint(this._latlng, e.zoom, e.center),
+ anchor = this._getAnchor();
+ setPosition(this._container, pos.add(anchor));
+ },
+
+ _adjustPan: function () {
+ if (!this.options.autoPan) { return; }
+ if (this._map._panAnim) { this._map._panAnim.stop(); }
+
+ // We can endlessly recurse if keepInView is set and the view resets.
+ // Let's guard against that by exiting early if we're responding to our own autopan.
+ if (this._autopanning) {
+ this._autopanning = false;
+ return;
+ }
+
+ var map = this._map,
+ marginBottom = parseInt(getStyle(this._container, 'marginBottom'), 10) || 0,
+ containerHeight = this._container.offsetHeight + marginBottom,
+ containerWidth = this._containerWidth,
+ layerPos = new Point(this._containerLeft, -containerHeight - this._containerBottom);
+
+ layerPos._add(getPosition(this._container));
+
+ var containerPos = map.layerPointToContainerPoint(layerPos),
+ padding = toPoint(this.options.autoPanPadding),
+ paddingTL = toPoint(this.options.autoPanPaddingTopLeft || padding),
+ paddingBR = toPoint(this.options.autoPanPaddingBottomRight || padding),
+ size = map.getSize(),
+ dx = 0,
+ dy = 0;
+
+ if (containerPos.x + containerWidth + paddingBR.x > size.x) { // right
+ dx = containerPos.x + containerWidth - size.x + paddingBR.x;
+ }
+ if (containerPos.x - dx - paddingTL.x < 0) { // left
+ dx = containerPos.x - paddingTL.x;
+ }
+ if (containerPos.y + containerHeight + paddingBR.y > size.y) { // bottom
+ dy = containerPos.y + containerHeight - size.y + paddingBR.y;
+ }
+ if (containerPos.y - dy - paddingTL.y < 0) { // top
+ dy = containerPos.y - paddingTL.y;
+ }
+
+ // @namespace Map
+ // @section Popup events
+ // @event autopanstart: Event
+ // Fired when the map starts autopanning when opening a popup.
+ if (dx || dy) {
+ // Track that we're autopanning, as this function will be re-ran on moveend
+ if (this.options.keepInView) {
+ this._autopanning = true;
+ }
+
+ map
+ .fire('autopanstart')
+ .panBy([dx, dy]);
+ }
+ },
+
+ _getAnchor: function () {
+ // Where should we anchor the popup on the source layer?
+ return toPoint(this._source && this._source._getPopupAnchor ? this._source._getPopupAnchor() : [0, 0]);
+ }
+
+});
+
+// @namespace Popup
+// @factory L.popup(options?: Popup options, source?: Layer)
+// Instantiates a `Popup` object given an optional `options` object that describes its appearance and location and an optional `source` object that is used to tag the popup with a reference to the Layer to which it refers.
+// @alternative
+// @factory L.popup(latlng: LatLng, options?: Popup options)
+// Instantiates a `Popup` object given `latlng` where the popup will open and an optional `options` object that describes its appearance and location.
+var popup = function (options, source) {
+ return new Popup(options, source);
+};
+
+
+/* @namespace Map
+ * @section Interaction Options
+ * @option closePopupOnClick: Boolean = true
+ * Set it to `false` if you don't want popups to close when user clicks the map.
+ */
+Map.mergeOptions({
+ closePopupOnClick: true
+});
+
+
+// @namespace Map
+// @section Methods for Layers and Controls
+Map.include({
+ // @method openPopup(popup: Popup): this
+ // Opens the specified popup while closing the previously opened (to make sure only one is opened at one time for usability).
+ // @alternative
+ // @method openPopup(content: String|HTMLElement, latlng: LatLng, options?: Popup options): this
+ // Creates a popup with the specified content and options and opens it in the given point on a map.
+ openPopup: function (popup, latlng, options) {
+ this._initOverlay(Popup, popup, latlng, options)
+ .openOn(this);
+
+ return this;
+ },
+
+ // @method closePopup(popup?: Popup): this
+ // Closes the popup previously opened with [openPopup](#map-openpopup) (or the given one).
+ closePopup: function (popup) {
+ popup = arguments.length ? popup : this._popup;
+ if (popup) {
+ popup.close();
+ }
+ return this;
+ }
+});
+
+/*
+ * @namespace Layer
+ * @section Popup methods example
+ *
+ * All layers share a set of methods convenient for binding popups to it.
+ *
+ * ```js
+ * var layer = L.Polygon(latlngs).bindPopup('Hi There!').addTo(map);
+ * layer.openPopup();
+ * layer.closePopup();
+ * ```
+ *
+ * Popups will also be automatically opened when the layer is clicked on and closed when the layer is removed from the map or another popup is opened.
+ */
+
+// @section Popup methods
+Layer.include({
+
+ // @method bindPopup(content: String|HTMLElement|Function|Popup, options?: Popup options): this
+ // Binds a popup to the layer with the passed `content` and sets up the
+ // necessary event listeners. If a `Function` is passed it will receive
+ // the layer as the first argument and should return a `String` or `HTMLElement`.
+ bindPopup: function (content, options) {
+ this._popup = this._initOverlay(Popup, this._popup, content, options);
+ if (!this._popupHandlersAdded) {
+ this.on({
+ click: this._openPopup,
+ keypress: this._onKeyPress,
+ remove: this.closePopup,
+ move: this._movePopup
+ });
+ this._popupHandlersAdded = true;
+ }
+
+ return this;
+ },
+
+ // @method unbindPopup(): this
+ // Removes the popup previously bound with `bindPopup`.
+ unbindPopup: function () {
+ if (this._popup) {
+ this.off({
+ click: this._openPopup,
+ keypress: this._onKeyPress,
+ remove: this.closePopup,
+ move: this._movePopup
+ });
+ this._popupHandlersAdded = false;
+ this._popup = null;
+ }
+ return this;
+ },
+
+ // @method openPopup(latlng?: LatLng): this
+ // Opens the bound popup at the specified `latlng` or at the default popup anchor if no `latlng` is passed.
+ openPopup: function (latlng) {
+ if (this._popup) {
+ if (!(this instanceof FeatureGroup)) {
+ this._popup._source = this;
+ }
+ if (this._popup._prepareOpen(latlng || this._latlng)) {
+ // open the popup on the map
+ this._popup.openOn(this._map);
+ }
+ }
+ return this;
+ },
+
+ // @method closePopup(): this
+ // Closes the popup bound to this layer if it is open.
+ closePopup: function () {
+ if (this._popup) {
+ this._popup.close();
+ }
+ return this;
+ },
+
+ // @method togglePopup(): this
+ // Opens or closes the popup bound to this layer depending on its current state.
+ togglePopup: function () {
+ if (this._popup) {
+ this._popup.toggle(this);
+ }
+ return this;
+ },
+
+ // @method isPopupOpen(): boolean
+ // Returns `true` if the popup bound to this layer is currently open.
+ isPopupOpen: function () {
+ return (this._popup ? this._popup.isOpen() : false);
+ },
+
+ // @method setPopupContent(content: String|HTMLElement|Popup): this
+ // Sets the content of the popup bound to this layer.
+ setPopupContent: function (content) {
+ if (this._popup) {
+ this._popup.setContent(content);
+ }
+ return this;
+ },
+
+ // @method getPopup(): Popup
+ // Returns the popup bound to this layer.
+ getPopup: function () {
+ return this._popup;
+ },
+
+ _openPopup: function (e) {
+ if (!this._popup || !this._map) {
+ return;
+ }
+ // prevent map click
+ stop(e);
+
+ var target = e.layer || e.target;
+ if (this._popup._source === target && !(target instanceof Path)) {
+ // treat it like a marker and figure out
+ // if we should toggle it open/closed
+ if (this._map.hasLayer(this._popup)) {
+ this.closePopup();
+ } else {
+ this.openPopup(e.latlng);
+ }
+ return;
+ }
+ this._popup._source = target;
+ this.openPopup(e.latlng);
+ },
+
+ _movePopup: function (e) {
+ this._popup.setLatLng(e.latlng);
+ },
+
+ _onKeyPress: function (e) {
+ if (e.originalEvent.keyCode === 13) {
+ this._openPopup(e);
+ }
+ }
+});
+
+/*
+ * @class Tooltip
+ * @inherits DivOverlay
+ * @aka L.Tooltip
+ * Used to display small texts on top of map layers.
+ *
+ * @example
+ * If you want to just bind a tooltip to marker:
+ *
+ * ```js
+ * marker.bindTooltip("my tooltip text").openTooltip();
+ * ```
+ * Path overlays like polylines also have a `bindTooltip` method.
+ *
+ * A tooltip can be also standalone:
+ *
+ * ```js
+ * var tooltip = L.tooltip()
+ * .setLatLng(latlng)
+ * .setContent('Hello world!<br />This is a nice tooltip.')
+ * .addTo(map);
+ * ```
+ * or
+ * ```js
+ * var tooltip = L.tooltip(latlng, {content: 'Hello world!<br />This is a nice tooltip.'})
+ * .addTo(map);
+ * ```
+ *
+ *
+ * Note about tooltip offset. Leaflet takes two options in consideration
+ * for computing tooltip offsetting:
+ * - the `offset` Tooltip option: it defaults to [0, 0], and it's specific to one tooltip.
+ * Add a positive x offset to move the tooltip to the right, and a positive y offset to
+ * move it to the bottom. Negatives will move to the left and top.
+ * - the `tooltipAnchor` Icon option: this will only be considered for Marker. You
+ * should adapt this value if you use a custom icon.
+ */
+
+
+// @namespace Tooltip
+var Tooltip = DivOverlay.extend({
+
+ // @section
+ // @aka Tooltip options
+ options: {
+ // @option pane: String = 'tooltipPane'
+ // `Map pane` where the tooltip will be added.
+ pane: 'tooltipPane',
+
+ // @option offset: Point = Point(0, 0)
+ // Optional offset of the tooltip position.
+ offset: [0, 0],
+
+ // @option direction: String = 'auto'
+ // Direction where to open the tooltip. Possible values are: `right`, `left`,
+ // `top`, `bottom`, `center`, `auto`.
+ // `auto` will dynamically switch between `right` and `left` according to the tooltip
+ // position on the map.
+ direction: 'auto',
+
+ // @option permanent: Boolean = false
+ // Whether to open the tooltip permanently or only on mouseover.
+ permanent: false,
+
+ // @option sticky: Boolean = false
+ // If true, the tooltip will follow the mouse instead of being fixed at the feature center.
+ sticky: false,
+
+ // @option opacity: Number = 0.9
+ // Tooltip container opacity.
+ opacity: 0.9
+ },
+
+ onAdd: function (map) {
+ DivOverlay.prototype.onAdd.call(this, map);
+ this.setOpacity(this.options.opacity);
+
+ // @namespace Map
+ // @section Tooltip events
+ // @event tooltipopen: TooltipEvent
+ // Fired when a tooltip is opened in the map.
+ map.fire('tooltipopen', {tooltip: this});
+
+ if (this._source) {
+ this.addEventParent(this._source);
+
+ // @namespace Layer
+ // @section Tooltip events
+ // @event tooltipopen: TooltipEvent
+ // Fired when a tooltip bound to this layer is opened.
+ this._source.fire('tooltipopen', {tooltip: this}, true);
+ }
+ },
+
+ onRemove: function (map) {
+ DivOverlay.prototype.onRemove.call(this, map);
+
+ // @namespace Map
+ // @section Tooltip events
+ // @event tooltipclose: TooltipEvent
+ // Fired when a tooltip in the map is closed.
+ map.fire('tooltipclose', {tooltip: this});
+
+ if (this._source) {
+ this.removeEventParent(this._source);
+
+ // @namespace Layer
+ // @section Tooltip events
+ // @event tooltipclose: TooltipEvent
+ // Fired when a tooltip bound to this layer is closed.
+ this._source.fire('tooltipclose', {tooltip: this}, true);
+ }
+ },
+
+ getEvents: function () {
+ var events = DivOverlay.prototype.getEvents.call(this);
+
+ if (!this.options.permanent) {
+ events.preclick = this.close;
+ }
+
+ return events;
+ },
+
+ _initLayout: function () {
+ var prefix = 'leaflet-tooltip',
+ className = prefix + ' ' + (this.options.className || '') + ' leaflet-zoom-' + (this._zoomAnimated ? 'animated' : 'hide');
+
+ this._contentNode = this._container = create$1('div', className);
+
+ this._container.setAttribute('role', 'tooltip');
+ this._container.setAttribute('id', 'leaflet-tooltip-' + stamp(this));
+ },
+
+ _updateLayout: function () {},
+
+ _adjustPan: function () {},
+
+ _setPosition: function (pos) {
+ var subX, subY,
+ map = this._map,
+ container = this._container,
+ centerPoint = map.latLngToContainerPoint(map.getCenter()),
+ tooltipPoint = map.layerPointToContainerPoint(pos),
+ direction = this.options.direction,
+ tooltipWidth = container.offsetWidth,
+ tooltipHeight = container.offsetHeight,
+ offset = toPoint(this.options.offset),
+ anchor = this._getAnchor();
+
+ if (direction === 'top') {
+ subX = tooltipWidth / 2;
+ subY = tooltipHeight;
+ } else if (direction === 'bottom') {
+ subX = tooltipWidth / 2;
+ subY = 0;
+ } else if (direction === 'center') {
+ subX = tooltipWidth / 2;
+ subY = tooltipHeight / 2;
+ } else if (direction === 'right') {
+ subX = 0;
+ subY = tooltipHeight / 2;
+ } else if (direction === 'left') {
+ subX = tooltipWidth;
+ subY = tooltipHeight / 2;
+ } else if (tooltipPoint.x < centerPoint.x) {
+ direction = 'right';
+ subX = 0;
+ subY = tooltipHeight / 2;
+ } else {
+ direction = 'left';
+ subX = tooltipWidth + (offset.x + anchor.x) * 2;
+ subY = tooltipHeight / 2;
+ }
+
+ pos = pos.subtract(toPoint(subX, subY, true)).add(offset).add(anchor);
+
+ removeClass(container, 'leaflet-tooltip-right');
+ removeClass(container, 'leaflet-tooltip-left');
+ removeClass(container, 'leaflet-tooltip-top');
+ removeClass(container, 'leaflet-tooltip-bottom');
+ addClass(container, 'leaflet-tooltip-' + direction);
+ setPosition(container, pos);
+ },
+
+ _updatePosition: function () {
+ var pos = this._map.latLngToLayerPoint(this._latlng);
+ this._setPosition(pos);
+ },
+
+ setOpacity: function (opacity) {
+ this.options.opacity = opacity;
+
+ if (this._container) {
+ setOpacity(this._container, opacity);
+ }
+ },
+
+ _animateZoom: function (e) {
+ var pos = this._map._latLngToNewLayerPoint(this._latlng, e.zoom, e.center);
+ this._setPosition(pos);
+ },
+
+ _getAnchor: function () {
+ // Where should we anchor the tooltip on the source layer?
+ return toPoint(this._source && this._source._getTooltipAnchor && !this.options.sticky ? this._source._getTooltipAnchor() : [0, 0]);
+ }
+
+});
+
+// @namespace Tooltip
+// @factory L.tooltip(options?: Tooltip options, source?: Layer)
+// Instantiates a `Tooltip` object given an optional `options` object that describes its appearance and location and an optional `source` object that is used to tag the tooltip with a reference to the Layer to which it refers.
+// @alternative
+// @factory L.tooltip(latlng: LatLng, options?: Tooltip options)
+// Instantiates a `Tooltip` object given `latlng` where the tooltip will open and an optional `options` object that describes its appearance and location.
+var tooltip = function (options, source) {
+ return new Tooltip(options, source);
+};
+
+// @namespace Map
+// @section Methods for Layers and Controls
+Map.include({
+
+ // @method openTooltip(tooltip: Tooltip): this
+ // Opens the specified tooltip.
+ // @alternative
+ // @method openTooltip(content: String|HTMLElement, latlng: LatLng, options?: Tooltip options): this
+ // Creates a tooltip with the specified content and options and open it.
+ openTooltip: function (tooltip, latlng, options) {
+ this._initOverlay(Tooltip, tooltip, latlng, options)
+ .openOn(this);
+
+ return this;
+ },
+
+ // @method closeTooltip(tooltip: Tooltip): this
+ // Closes the tooltip given as parameter.
+ closeTooltip: function (tooltip) {
+ tooltip.close();
+ return this;
+ }
+
+});
+
+/*
+ * @namespace Layer
+ * @section Tooltip methods example
+ *
+ * All layers share a set of methods convenient for binding tooltips to it.
+ *
+ * ```js
+ * var layer = L.Polygon(latlngs).bindTooltip('Hi There!').addTo(map);
+ * layer.openTooltip();
+ * layer.closeTooltip();
+ * ```
+ */
+
+// @section Tooltip methods
+Layer.include({
+
+ // @method bindTooltip(content: String|HTMLElement|Function|Tooltip, options?: Tooltip options): this
+ // Binds a tooltip to the layer with the passed `content` and sets up the
+ // necessary event listeners. If a `Function` is passed it will receive
+ // the layer as the first argument and should return a `String` or `HTMLElement`.
+ bindTooltip: function (content, options) {
+
+ if (this._tooltip && this.isTooltipOpen()) {
+ this.unbindTooltip();
+ }
+
+ this._tooltip = this._initOverlay(Tooltip, this._tooltip, content, options);
+ this._initTooltipInteractions();
+
+ if (this._tooltip.options.permanent && this._map && this._map.hasLayer(this)) {
+ this.openTooltip();
+ }
+
+ return this;
+ },
+
+ // @method unbindTooltip(): this
+ // Removes the tooltip previously bound with `bindTooltip`.
+ unbindTooltip: function () {
+ if (this._tooltip) {
+ this._initTooltipInteractions(true);
+ this.closeTooltip();
+ this._tooltip = null;
+ }
+ return this;
+ },
+
+ _initTooltipInteractions: function (remove) {
+ if (!remove && this._tooltipHandlersAdded) { return; }
+ var onOff = remove ? 'off' : 'on',
+ events = {
+ remove: this.closeTooltip,
+ move: this._moveTooltip
+ };
+ if (!this._tooltip.options.permanent) {
+ events.mouseover = this._openTooltip;
+ events.mouseout = this.closeTooltip;
+ events.click = this._openTooltip;
+ if (this._map) {
+ this._addFocusListeners();
+ } else {
+ events.add = this._addFocusListeners;
+ }
+ } else {
+ events.add = this._openTooltip;
+ }
+ if (this._tooltip.options.sticky) {
+ events.mousemove = this._moveTooltip;
+ }
+ this[onOff](events);
+ this._tooltipHandlersAdded = !remove;
+ },
+
+ // @method openTooltip(latlng?: LatLng): this
+ // Opens the bound tooltip at the specified `latlng` or at the default tooltip anchor if no `latlng` is passed.
+ openTooltip: function (latlng) {
+ if (this._tooltip) {
+ if (!(this instanceof FeatureGroup)) {
+ this._tooltip._source = this;
+ }
+ if (this._tooltip._prepareOpen(latlng)) {
+ // open the tooltip on the map
+ this._tooltip.openOn(this._map);
+
+ if (this.getElement) {
+ this._setAriaDescribedByOnLayer(this);
+ } else if (this.eachLayer) {
+ this.eachLayer(this._setAriaDescribedByOnLayer, this);
+ }
+ }
+ }
+ return this;
+ },
+
+ // @method closeTooltip(): this
+ // Closes the tooltip bound to this layer if it is open.
+ closeTooltip: function () {
+ if (this._tooltip) {
+ return this._tooltip.close();
+ }
+ },
+
+ // @method toggleTooltip(): this
+ // Opens or closes the tooltip bound to this layer depending on its current state.
+ toggleTooltip: function () {
+ if (this._tooltip) {
+ this._tooltip.toggle(this);
+ }
+ return this;
+ },
+
+ // @method isTooltipOpen(): boolean
+ // Returns `true` if the tooltip bound to this layer is currently open.
+ isTooltipOpen: function () {
+ return this._tooltip.isOpen();
+ },
+
+ // @method setTooltipContent(content: String|HTMLElement|Tooltip): this
+ // Sets the content of the tooltip bound to this layer.
+ setTooltipContent: function (content) {
+ if (this._tooltip) {
+ this._tooltip.setContent(content);
+ }
+ return this;
+ },
+
+ // @method getTooltip(): Tooltip
+ // Returns the tooltip bound to this layer.
+ getTooltip: function () {
+ return this._tooltip;
+ },
+
+ _addFocusListeners: function () {
+ if (this.getElement) {
+ this._addFocusListenersOnLayer(this);
+ } else if (this.eachLayer) {
+ this.eachLayer(this._addFocusListenersOnLayer, this);
+ }
+ },
+
+ _addFocusListenersOnLayer: function (layer) {
+ var el = typeof layer.getElement === 'function' && layer.getElement();
+ if (el) {
+ on(el, 'focus', function () {
+ this._tooltip._source = layer;
+ this.openTooltip();
+ }, this);
+ on(el, 'blur', this.closeTooltip, this);
+ }
+ },
+
+ _setAriaDescribedByOnLayer: function (layer) {
+ var el = typeof layer.getElement === 'function' && layer.getElement();
+ if (el) {
+ el.setAttribute('aria-describedby', this._tooltip._container.id);
+ }
+ },
+
+
+ _openTooltip: function (e) {
+ if (!this._tooltip || !this._map) {
+ return;
+ }
+
+ // If the map is moving, we will show the tooltip after it's done.
+ if (this._map.dragging && this._map.dragging.moving() && !this._openOnceFlag) {
+ this._openOnceFlag = true;
+ var that = this;
+ this._map.once('moveend', function () {
+ that._openOnceFlag = false;
+ that._openTooltip(e);
+ });
+ return;
+ }
+
+ this._tooltip._source = e.layer || e.target;
+
+ this.openTooltip(this._tooltip.options.sticky ? e.latlng : undefined);
+ },
+
+ _moveTooltip: function (e) {
+ var latlng = e.latlng, containerPoint, layerPoint;
+ if (this._tooltip.options.sticky && e.originalEvent) {
+ containerPoint = this._map.mouseEventToContainerPoint(e.originalEvent);
+ layerPoint = this._map.containerPointToLayerPoint(containerPoint);
+ latlng = this._map.layerPointToLatLng(layerPoint);
+ }
+ this._tooltip.setLatLng(latlng);
+ }
+});
+
+/*
+ * @class DivIcon
+ * @aka L.DivIcon
+ * @inherits Icon
+ *
+ * Represents a lightweight icon for markers that uses a simple `<div>`
+ * element instead of an image. Inherits from `Icon` but ignores the `iconUrl` and shadow options.
+ *
+ * @example
+ * ```js
+ * var myIcon = L.divIcon({className: 'my-div-icon'});
+ * // you can set .my-div-icon styles in CSS
+ *
+ * L.marker([50.505, 30.57], {icon: myIcon}).addTo(map);
+ * ```
+ *
+ * By default, it has a 'leaflet-div-icon' CSS class and is styled as a little white square with a shadow.
+ */
+
+var DivIcon = Icon.extend({
+ options: {
+ // @section
+ // @aka DivIcon options
+ iconSize: [12, 12], // also can be set through CSS
+
+ // iconAnchor: (Point),
+ // popupAnchor: (Point),
+
+ // @option html: String|HTMLElement = ''
+ // Custom HTML code to put inside the div element, empty by default. Alternatively,
+ // an instance of `HTMLElement`.
+ html: false,
+
+ // @option bgPos: Point = [0, 0]
+ // Optional relative position of the background, in pixels
+ bgPos: null,
+
+ className: 'leaflet-div-icon'
+ },
+
+ createIcon: function (oldIcon) {
+ var div = (oldIcon && oldIcon.tagName === 'DIV') ? oldIcon : document.createElement('div'),
+ options = this.options;
+
+ if (options.html instanceof Element) {
+ empty(div);
+ div.appendChild(options.html);
+ } else {
+ div.innerHTML = options.html !== false ? options.html : '';
+ }
+
+ if (options.bgPos) {
+ var bgPos = toPoint(options.bgPos);
+ div.style.backgroundPosition = (-bgPos.x) + 'px ' + (-bgPos.y) + 'px';
+ }
+ this._setIconStyles(div, 'icon');
+
+ return div;
+ },
+
+ createShadow: function () {
+ return null;
+ }
+});
+
+// @factory L.divIcon(options: DivIcon options)
+// Creates a `DivIcon` instance with the given options.
+function divIcon(options) {
+ return new DivIcon(options);
+}
+
+Icon.Default = IconDefault;
+
+/*
+ * @class GridLayer
+ * @inherits Layer
+ * @aka L.GridLayer
+ *
+ * Generic class for handling a tiled grid of HTML elements. This is the base class for all tile layers and replaces `TileLayer.Canvas`.
+ * GridLayer can be extended to create a tiled grid of HTML elements like `<canvas>`, `<img>` or `<div>`. GridLayer will handle creating and animating these DOM elements for you.
+ *
+ *
+ * @section Synchronous usage
+ * @example
+ *
+ * To create a custom layer, extend GridLayer and implement the `createTile()` method, which will be passed a `Point` object with the `x`, `y`, and `z` (zoom level) coordinates to draw your tile.
+ *
+ * ```js
+ * var CanvasLayer = L.GridLayer.extend({
+ * createTile: function(coords){
+ * // create a <canvas> element for drawing
+ * var tile = L.DomUtil.create('canvas', 'leaflet-tile');
+ *
+ * // setup tile width and height according to the options
+ * var size = this.getTileSize();
+ * tile.width = size.x;
+ * tile.height = size.y;
+ *
+ * // get a canvas context and draw something on it using coords.x, coords.y and coords.z
+ * var ctx = tile.getContext('2d');
+ *
+ * // return the tile so it can be rendered on screen
+ * return tile;
+ * }
+ * });
+ * ```
+ *
+ * @section Asynchronous usage
+ * @example
+ *
+ * Tile creation can also be asynchronous, this is useful when using a third-party drawing library. Once the tile is finished drawing it can be passed to the `done()` callback.
+ *
+ * ```js
+ * var CanvasLayer = L.GridLayer.extend({
+ * createTile: function(coords, done){
+ * var error;
+ *
+ * // create a <canvas> element for drawing
+ * var tile = L.DomUtil.create('canvas', 'leaflet-tile');
+ *
+ * // setup tile width and height according to the options
+ * var size = this.getTileSize();
+ * tile.width = size.x;
+ * tile.height = size.y;
+ *
+ * // draw something asynchronously and pass the tile to the done() callback
+ * setTimeout(function() {
+ * done(error, tile);
+ * }, 1000);
+ *
+ * return tile;
+ * }
+ * });
+ * ```
+ *
+ * @section
+ */
+
+
+var GridLayer = Layer.extend({
+
+ // @section
+ // @aka GridLayer options
+ options: {
+ // @option tileSize: Number|Point = 256
+ // Width and height of tiles in the grid. Use a number if width and height are equal, or `L.point(width, height)` otherwise.
+ tileSize: 256,
+
+ // @option opacity: Number = 1.0
+ // Opacity of the tiles. Can be used in the `createTile()` function.
+ opacity: 1,
+
+ // @option updateWhenIdle: Boolean = (depends)
+ // Load new tiles only when panning ends.
+ // `true` by default on mobile browsers, in order to avoid too many requests and keep smooth navigation.
+ // `false` otherwise in order to display new tiles _during_ panning, since it is easy to pan outside the
+ // [`keepBuffer`](#gridlayer-keepbuffer) option in desktop browsers.
+ updateWhenIdle: Browser.mobile,
+
+ // @option updateWhenZooming: Boolean = true
+ // By default, a smooth zoom animation (during a [touch zoom](#map-touchzoom) or a [`flyTo()`](#map-flyto)) will update grid layers every integer zoom level. Setting this option to `false` will update the grid layer only when the smooth animation ends.
+ updateWhenZooming: true,
+
+ // @option updateInterval: Number = 200
+ // Tiles will not update more than once every `updateInterval` milliseconds when panning.
+ updateInterval: 200,
+
+ // @option zIndex: Number = 1
+ // The explicit zIndex of the tile layer.
+ zIndex: 1,
+
+ // @option bounds: LatLngBounds = undefined
+ // If set, tiles will only be loaded inside the set `LatLngBounds`.
+ bounds: null,
+
+ // @option minZoom: Number = 0
+ // The minimum zoom level down to which this layer will be displayed (inclusive).
+ minZoom: 0,
+
+ // @option maxZoom: Number = undefined
+ // The maximum zoom level up to which this layer will be displayed (inclusive).
+ maxZoom: undefined,
+
+ // @option maxNativeZoom: Number = undefined
+ // Maximum zoom number the tile source has available. If it is specified,
+ // the tiles on all zoom levels higher than `maxNativeZoom` will be loaded
+ // from `maxNativeZoom` level and auto-scaled.
+ maxNativeZoom: undefined,
+
+ // @option minNativeZoom: Number = undefined
+ // Minimum zoom number the tile source has available. If it is specified,
+ // the tiles on all zoom levels lower than `minNativeZoom` will be loaded
+ // from `minNativeZoom` level and auto-scaled.
+ minNativeZoom: undefined,
+
+ // @option noWrap: Boolean = false
+ // Whether the layer is wrapped around the antimeridian. If `true`, the
+ // GridLayer will only be displayed once at low zoom levels. Has no
+ // effect when the [map CRS](#map-crs) doesn't wrap around. Can be used
+ // in combination with [`bounds`](#gridlayer-bounds) to prevent requesting
+ // tiles outside the CRS limits.
+ noWrap: false,
+
+ // @option pane: String = 'tilePane'
+ // `Map pane` where the grid layer will be added.
+ pane: 'tilePane',
+
+ // @option className: String = ''
+ // A custom class name to assign to the tile layer. Empty by default.
+ className: '',
+
+ // @option keepBuffer: Number = 2
+ // When panning the map, keep this many rows and columns of tiles before unloading them.
+ keepBuffer: 2
+ },
+
+ initialize: function (options) {
+ setOptions(this, options);
+ },
+
+ onAdd: function () {
+ this._initContainer();
+
+ this._levels = {};
+ this._tiles = {};
+
+ this._resetView(); // implicit _update() call
+ },
+
+ beforeAdd: function (map) {
+ map._addZoomLimit(this);
+ },
+
+ onRemove: function (map) {
+ this._removeAllTiles();
+ remove(this._container);
+ map._removeZoomLimit(this);
+ this._container = null;
+ this._tileZoom = undefined;
+ },
+
+ // @method bringToFront: this
+ // Brings the tile layer to the top of all tile layers.
+ bringToFront: function () {
+ if (this._map) {
+ toFront(this._container);
+ this._setAutoZIndex(Math.max);
+ }
+ return this;
+ },
+
+ // @method bringToBack: this
+ // Brings the tile layer to the bottom of all tile layers.
+ bringToBack: function () {
+ if (this._map) {
+ toBack(this._container);
+ this._setAutoZIndex(Math.min);
+ }
+ return this;
+ },
+
+ // @method getContainer: HTMLElement
+ // Returns the HTML element that contains the tiles for this layer.
+ getContainer: function () {
+ return this._container;
+ },
+
+ // @method setOpacity(opacity: Number): this
+ // Changes the [opacity](#gridlayer-opacity) of the grid layer.
+ setOpacity: function (opacity) {
+ this.options.opacity = opacity;
+ this._updateOpacity();
+ return this;
+ },
+
+ // @method setZIndex(zIndex: Number): this
+ // Changes the [zIndex](#gridlayer-zindex) of the grid layer.
+ setZIndex: function (zIndex) {
+ this.options.zIndex = zIndex;
+ this._updateZIndex();
+
+ return this;
+ },
+
+ // @method isLoading: Boolean
+ // Returns `true` if any tile in the grid layer has not finished loading.
+ isLoading: function () {
+ return this._loading;
+ },
+
+ // @method redraw: this
+ // Causes the layer to clear all the tiles and request them again.
+ redraw: function () {
+ if (this._map) {
+ this._removeAllTiles();
+ var tileZoom = this._clampZoom(this._map.getZoom());
+ if (tileZoom !== this._tileZoom) {
+ this._tileZoom = tileZoom;
+ this._updateLevels();
+ }
+ this._update();
+ }
+ return this;
+ },
+
+ getEvents: function () {
+ var events = {
+ viewprereset: this._invalidateAll,
+ viewreset: this._resetView,
+ zoom: this._resetView,
+ moveend: this._onMoveEnd
+ };
+
+ if (!this.options.updateWhenIdle) {
+ // update tiles on move, but not more often than once per given interval
+ if (!this._onMove) {
+ this._onMove = throttle(this._onMoveEnd, this.options.updateInterval, this);
+ }
+
+ events.move = this._onMove;
+ }
+
+ if (this._zoomAnimated) {
+ events.zoomanim = this._animateZoom;
+ }
+
+ return events;
+ },
+
+ // @section Extension methods
+ // Layers extending `GridLayer` shall reimplement the following method.
+ // @method createTile(coords: Object, done?: Function): HTMLElement
+ // Called only internally, must be overridden by classes extending `GridLayer`.
+ // Returns the `HTMLElement` corresponding to the given `coords`. If the `done` callback
+ // is specified, it must be called when the tile has finished loading and drawing.
+ createTile: function () {
+ return document.createElement('div');
+ },
+
+ // @section
+ // @method getTileSize: Point
+ // Normalizes the [tileSize option](#gridlayer-tilesize) into a point. Used by the `createTile()` method.
+ getTileSize: function () {
+ var s = this.options.tileSize;
+ return s instanceof Point ? s : new Point(s, s);
+ },
+
+ _updateZIndex: function () {
+ if (this._container && this.options.zIndex !== undefined && this.options.zIndex !== null) {
+ this._container.style.zIndex = this.options.zIndex;
+ }
+ },
+
+ _setAutoZIndex: function (compare) {
+ // go through all other layers of the same pane, set zIndex to max + 1 (front) or min - 1 (back)
+
+ var layers = this.getPane().children,
+ edgeZIndex = -compare(-Infinity, Infinity); // -Infinity for max, Infinity for min
+
+ for (var i = 0, len = layers.length, zIndex; i < len; i++) {
+
+ zIndex = layers[i].style.zIndex;
+
+ if (layers[i] !== this._container && zIndex) {
+ edgeZIndex = compare(edgeZIndex, +zIndex);
+ }
+ }
+
+ if (isFinite(edgeZIndex)) {
+ this.options.zIndex = edgeZIndex + compare(-1, 1);
+ this._updateZIndex();
+ }
+ },
+
+ _updateOpacity: function () {
+ if (!this._map) { return; }
+
+ // IE doesn't inherit filter opacity properly, so we're forced to set it on tiles
+ if (Browser.ielt9) { return; }
+
+ setOpacity(this._container, this.options.opacity);
+
+ var now = +new Date(),
+ nextFrame = false,
+ willPrune = false;
+
+ for (var key in this._tiles) {
+ var tile = this._tiles[key];
+ if (!tile.current || !tile.loaded) { continue; }
+
+ var fade = Math.min(1, (now - tile.loaded) / 200);
+
+ setOpacity(tile.el, fade);
+ if (fade < 1) {
+ nextFrame = true;
+ } else {
+ if (tile.active) {
+ willPrune = true;
+ } else {
+ this._onOpaqueTile(tile);
+ }
+ tile.active = true;
+ }
+ }
+
+ if (willPrune && !this._noPrune) { this._pruneTiles(); }
+
+ if (nextFrame) {
+ cancelAnimFrame(this._fadeFrame);
+ this._fadeFrame = requestAnimFrame(this._updateOpacity, this);
+ }
+ },
+
+ _onOpaqueTile: falseFn,
+
+ _initContainer: function () {
+ if (this._container) { return; }
+
+ this._container = create$1('div', 'leaflet-layer ' + (this.options.className || ''));
+ this._updateZIndex();
+
+ if (this.options.opacity < 1) {
+ this._updateOpacity();
+ }
+
+ this.getPane().appendChild(this._container);
+ },
+
+ _updateLevels: function () {
+
+ var zoom = this._tileZoom,
+ maxZoom = this.options.maxZoom;
+
+ if (zoom === undefined) { return undefined; }
+
+ for (var z in this._levels) {
+ z = Number(z);
+ if (this._levels[z].el.children.length || z === zoom) {
+ this._levels[z].el.style.zIndex = maxZoom - Math.abs(zoom - z);
+ this._onUpdateLevel(z);
+ } else {
+ remove(this._levels[z].el);
+ this._removeTilesAtZoom(z);
+ this._onRemoveLevel(z);
+ delete this._levels[z];
+ }
+ }
+
+ var level = this._levels[zoom],
+ map = this._map;
+
+ if (!level) {
+ level = this._levels[zoom] = {};
+
+ level.el = create$1('div', 'leaflet-tile-container leaflet-zoom-animated', this._container);
+ level.el.style.zIndex = maxZoom;
+
+ level.origin = map.project(map.unproject(map.getPixelOrigin()), zoom).round();
+ level.zoom = zoom;
+
+ this._setZoomTransform(level, map.getCenter(), map.getZoom());
+
+ // force the browser to consider the newly added element for transition
+ falseFn(level.el.offsetWidth);
+
+ this._onCreateLevel(level);
+ }
+
+ this._level = level;
+
+ return level;
+ },
+
+ _onUpdateLevel: falseFn,
+
+ _onRemoveLevel: falseFn,
+
+ _onCreateLevel: falseFn,
+
+ _pruneTiles: function () {
+ if (!this._map) {
+ return;
+ }
+
+ var key, tile;
+
+ var zoom = this._map.getZoom();
+ if (zoom > this.options.maxZoom ||
+ zoom < this.options.minZoom) {
+ this._removeAllTiles();
+ return;
+ }
+
+ for (key in this._tiles) {
+ tile = this._tiles[key];
+ tile.retain = tile.current;
+ }
+
+ for (key in this._tiles) {
+ tile = this._tiles[key];
+ if (tile.current && !tile.active) {
+ var coords = tile.coords;
+ if (!this._retainParent(coords.x, coords.y, coords.z, coords.z - 5)) {
+ this._retainChildren(coords.x, coords.y, coords.z, coords.z + 2);
+ }
+ }
+ }
+
+ for (key in this._tiles) {
+ if (!this._tiles[key].retain) {
+ this._removeTile(key);
+ }
+ }
+ },
+
+ _removeTilesAtZoom: function (zoom) {
+ for (var key in this._tiles) {
+ if (this._tiles[key].coords.z !== zoom) {
+ continue;
+ }
+ this._removeTile(key);
+ }
+ },
+
+ _removeAllTiles: function () {
+ for (var key in this._tiles) {
+ this._removeTile(key);
+ }
+ },
+
+ _invalidateAll: function () {
+ for (var z in this._levels) {
+ remove(this._levels[z].el);
+ this._onRemoveLevel(Number(z));
+ delete this._levels[z];
+ }
+ this._removeAllTiles();
+
+ this._tileZoom = undefined;
+ },
+
+ _retainParent: function (x, y, z, minZoom) {
+ var x2 = Math.floor(x / 2),
+ y2 = Math.floor(y / 2),
+ z2 = z - 1,
+ coords2 = new Point(+x2, +y2);
+ coords2.z = +z2;
+
+ var key = this._tileCoordsToKey(coords2),
+ tile = this._tiles[key];
+
+ if (tile && tile.active) {
+ tile.retain = true;
+ return true;
+
+ } else if (tile && tile.loaded) {
+ tile.retain = true;
+ }
+
+ if (z2 > minZoom) {
+ return this._retainParent(x2, y2, z2, minZoom);
+ }
+
+ return false;
+ },
+
+ _retainChildren: function (x, y, z, maxZoom) {
+
+ for (var i = 2 * x; i < 2 * x + 2; i++) {
+ for (var j = 2 * y; j < 2 * y + 2; j++) {
+
+ var coords = new Point(i, j);
+ coords.z = z + 1;
+
+ var key = this._tileCoordsToKey(coords),
+ tile = this._tiles[key];
+
+ if (tile && tile.active) {
+ tile.retain = true;
+ continue;
+
+ } else if (tile && tile.loaded) {
+ tile.retain = true;
+ }
+
+ if (z + 1 < maxZoom) {
+ this._retainChildren(i, j, z + 1, maxZoom);
+ }
+ }
+ }
+ },
+
+ _resetView: function (e) {
+ var animating = e && (e.pinch || e.flyTo);
+ this._setView(this._map.getCenter(), this._map.getZoom(), animating, animating);
+ },
+
+ _animateZoom: function (e) {
+ this._setView(e.center, e.zoom, true, e.noUpdate);
+ },
+
+ _clampZoom: function (zoom) {
+ var options = this.options;
+
+ if (undefined !== options.minNativeZoom && zoom < options.minNativeZoom) {
+ return options.minNativeZoom;
+ }
+
+ if (undefined !== options.maxNativeZoom && options.maxNativeZoom < zoom) {
+ return options.maxNativeZoom;
+ }
+
+ return zoom;
+ },
+
+ _setView: function (center, zoom, noPrune, noUpdate) {
+ var tileZoom = Math.round(zoom);
+ if ((this.options.maxZoom !== undefined && tileZoom > this.options.maxZoom) ||
+ (this.options.minZoom !== undefined && tileZoom < this.options.minZoom)) {
+ tileZoom = undefined;
+ } else {
+ tileZoom = this._clampZoom(tileZoom);
+ }
+
+ var tileZoomChanged = this.options.updateWhenZooming && (tileZoom !== this._tileZoom);
+
+ if (!noUpdate || tileZoomChanged) {
+
+ this._tileZoom = tileZoom;
+
+ if (this._abortLoading) {
+ this._abortLoading();
+ }
+
+ this._updateLevels();
+ this._resetGrid();
+
+ if (tileZoom !== undefined) {
+ this._update(center);
+ }
+
+ if (!noPrune) {
+ this._pruneTiles();
+ }
+
+ // Flag to prevent _updateOpacity from pruning tiles during
+ // a zoom anim or a pinch gesture
+ this._noPrune = !!noPrune;
+ }
+
+ this._setZoomTransforms(center, zoom);
+ },
+
+ _setZoomTransforms: function (center, zoom) {
+ for (var i in this._levels) {
+ this._setZoomTransform(this._levels[i], center, zoom);
+ }
+ },
+
+ _setZoomTransform: function (level, center, zoom) {
+ var scale = this._map.getZoomScale(zoom, level.zoom),
+ translate = level.origin.multiplyBy(scale)
+ .subtract(this._map._getNewPixelOrigin(center, zoom)).round();
+
+ if (Browser.any3d) {
+ setTransform(level.el, translate, scale);
+ } else {
+ setPosition(level.el, translate);
+ }
+ },
+
+ _resetGrid: function () {
+ var map = this._map,
+ crs = map.options.crs,
+ tileSize = this._tileSize = this.getTileSize(),
+ tileZoom = this._tileZoom;
+
+ var bounds = this._map.getPixelWorldBounds(this._tileZoom);
+ if (bounds) {
+ this._globalTileRange = this._pxBoundsToTileRange(bounds);
+ }
+
+ this._wrapX = crs.wrapLng && !this.options.noWrap && [
+ Math.floor(map.project([0, crs.wrapLng[0]], tileZoom).x / tileSize.x),
+ Math.ceil(map.project([0, crs.wrapLng[1]], tileZoom).x / tileSize.y)
+ ];
+ this._wrapY = crs.wrapLat && !this.options.noWrap && [
+ Math.floor(map.project([crs.wrapLat[0], 0], tileZoom).y / tileSize.x),
+ Math.ceil(map.project([crs.wrapLat[1], 0], tileZoom).y / tileSize.y)
+ ];
+ },
+
+ _onMoveEnd: function () {
+ if (!this._map || this._map._animatingZoom) { return; }
+
+ this._update();
+ },
+
+ _getTiledPixelBounds: function (center) {
+ var map = this._map,
+ mapZoom = map._animatingZoom ? Math.max(map._animateToZoom, map.getZoom()) : map.getZoom(),
+ scale = map.getZoomScale(mapZoom, this._tileZoom),
+ pixelCenter = map.project(center, this._tileZoom).floor(),
+ halfSize = map.getSize().divideBy(scale * 2);
+
+ return new Bounds(pixelCenter.subtract(halfSize), pixelCenter.add(halfSize));
+ },
+
+ // Private method to load tiles in the grid's active zoom level according to map bounds
+ _update: function (center) {
+ var map = this._map;
+ if (!map) { return; }
+ var zoom = this._clampZoom(map.getZoom());
+
+ if (center === undefined) { center = map.getCenter(); }
+ if (this._tileZoom === undefined) { return; } // if out of minzoom/maxzoom
+
+ var pixelBounds = this._getTiledPixelBounds(center),
+ tileRange = this._pxBoundsToTileRange(pixelBounds),
+ tileCenter = tileRange.getCenter(),
+ queue = [],
+ margin = this.options.keepBuffer,
+ noPruneRange = new Bounds(tileRange.getBottomLeft().subtract([margin, -margin]),
+ tileRange.getTopRight().add([margin, -margin]));
+
+ // Sanity check: panic if the tile range contains Infinity somewhere.
+ if (!(isFinite(tileRange.min.x) &&
+ isFinite(tileRange.min.y) &&
+ isFinite(tileRange.max.x) &&
+ isFinite(tileRange.max.y))) { throw new Error('Attempted to load an infinite number of tiles'); }
+
+ for (var key in this._tiles) {
+ var c = this._tiles[key].coords;
+ if (c.z !== this._tileZoom || !noPruneRange.contains(new Point(c.x, c.y))) {
+ this._tiles[key].current = false;
+ }
+ }
+
+ // _update just loads more tiles. If the tile zoom level differs too much
+ // from the map's, let _setView reset levels and prune old tiles.
+ if (Math.abs(zoom - this._tileZoom) > 1) { this._setView(center, zoom); return; }
+
+ // create a queue of coordinates to load tiles from
+ for (var j = tileRange.min.y; j <= tileRange.max.y; j++) {
+ for (var i = tileRange.min.x; i <= tileRange.max.x; i++) {
+ var coords = new Point(i, j);
+ coords.z = this._tileZoom;
+
+ if (!this._isValidTile(coords)) { continue; }
+
+ var tile = this._tiles[this._tileCoordsToKey(coords)];
+ if (tile) {
+ tile.current = true;
+ } else {
+ queue.push(coords);
+ }
+ }
+ }
+
+ // sort tile queue to load tiles in order of their distance to center
+ queue.sort(function (a, b) {
+ return a.distanceTo(tileCenter) - b.distanceTo(tileCenter);
+ });
+
+ if (queue.length !== 0) {
+ // if it's the first batch of tiles to load
+ if (!this._loading) {
+ this._loading = true;
+ // @event loading: Event
+ // Fired when the grid layer starts loading tiles.
+ this.fire('loading');
+ }
+
+ // create DOM fragment to append tiles in one batch
+ var fragment = document.createDocumentFragment();
+
+ for (i = 0; i < queue.length; i++) {
+ this._addTile(queue[i], fragment);
+ }
+
+ this._level.el.appendChild(fragment);
+ }
+ },
+
+ _isValidTile: function (coords) {
+ var crs = this._map.options.crs;
+
+ if (!crs.infinite) {
+ // don't load tile if it's out of bounds and not wrapped
+ var bounds = this._globalTileRange;
+ if ((!crs.wrapLng && (coords.x < bounds.min.x || coords.x > bounds.max.x)) ||
+ (!crs.wrapLat && (coords.y < bounds.min.y || coords.y > bounds.max.y))) { return false; }
+ }
+
+ if (!this.options.bounds) { return true; }
+
+ // don't load tile if it doesn't intersect the bounds in options
+ var tileBounds = this._tileCoordsToBounds(coords);
+ return toLatLngBounds(this.options.bounds).overlaps(tileBounds);
+ },
+
+ _keyToBounds: function (key) {
+ return this._tileCoordsToBounds(this._keyToTileCoords(key));
+ },
+
+ _tileCoordsToNwSe: function (coords) {
+ var map = this._map,
+ tileSize = this.getTileSize(),
+ nwPoint = coords.scaleBy(tileSize),
+ sePoint = nwPoint.add(tileSize),
+ nw = map.unproject(nwPoint, coords.z),
+ se = map.unproject(sePoint, coords.z);
+ return [nw, se];
+ },
+
+ // converts tile coordinates to its geographical bounds
+ _tileCoordsToBounds: function (coords) {
+ var bp = this._tileCoordsToNwSe(coords),
+ bounds = new LatLngBounds(bp[0], bp[1]);
+
+ if (!this.options.noWrap) {
+ bounds = this._map.wrapLatLngBounds(bounds);
+ }
+ return bounds;
+ },
+ // converts tile coordinates to key for the tile cache
+ _tileCoordsToKey: function (coords) {
+ return coords.x + ':' + coords.y + ':' + coords.z;
+ },
+
+ // converts tile cache key to coordinates
+ _keyToTileCoords: function (key) {
+ var k = key.split(':'),
+ coords = new Point(+k[0], +k[1]);
+ coords.z = +k[2];
+ return coords;
+ },
+
+ _removeTile: function (key) {
+ var tile = this._tiles[key];
+ if (!tile) { return; }
+
+ remove(tile.el);
+
+ delete this._tiles[key];
+
+ // @event tileunload: TileEvent
+ // Fired when a tile is removed (e.g. when a tile goes off the screen).
+ this.fire('tileunload', {
+ tile: tile.el,
+ coords: this._keyToTileCoords(key)
+ });
+ },
+
+ _initTile: function (tile) {
+ addClass(tile, 'leaflet-tile');
+
+ var tileSize = this.getTileSize();
+ tile.style.width = tileSize.x + 'px';
+ tile.style.height = tileSize.y + 'px';
+
+ tile.onselectstart = falseFn;
+ tile.onmousemove = falseFn;
+
+ // update opacity on tiles in IE7-8 because of filter inheritance problems
+ if (Browser.ielt9 && this.options.opacity < 1) {
+ setOpacity(tile, this.options.opacity);
+ }
+ },
+
+ _addTile: function (coords, container) {
+ var tilePos = this._getTilePos(coords),
+ key = this._tileCoordsToKey(coords);
+
+ var tile = this.createTile(this._wrapCoords(coords), bind(this._tileReady, this, coords));
+
+ this._initTile(tile);
+
+ // if createTile is defined with a second argument ("done" callback),
+ // we know that tile is async and will be ready later; otherwise
+ if (this.createTile.length < 2) {
+ // mark tile as ready, but delay one frame for opacity animation to happen
+ requestAnimFrame(bind(this._tileReady, this, coords, null, tile));
+ }
+
+ setPosition(tile, tilePos);
+
+ // save tile in cache
+ this._tiles[key] = {
+ el: tile,
+ coords: coords,
+ current: true
+ };
+
+ container.appendChild(tile);
+ // @event tileloadstart: TileEvent
+ // Fired when a tile is requested and starts loading.
+ this.fire('tileloadstart', {
+ tile: tile,
+ coords: coords
+ });
+ },
+
+ _tileReady: function (coords, err, tile) {
+ if (err) {
+ // @event tileerror: TileErrorEvent
+ // Fired when there is an error loading a tile.
+ this.fire('tileerror', {
+ error: err,
+ tile: tile,
+ coords: coords
+ });
+ }
+
+ var key = this._tileCoordsToKey(coords);
+
+ tile = this._tiles[key];
+ if (!tile) { return; }
+
+ tile.loaded = +new Date();
+ if (this._map._fadeAnimated) {
+ setOpacity(tile.el, 0);
+ cancelAnimFrame(this._fadeFrame);
+ this._fadeFrame = requestAnimFrame(this._updateOpacity, this);
+ } else {
+ tile.active = true;
+ this._pruneTiles();
+ }
+
+ if (!err) {
+ addClass(tile.el, 'leaflet-tile-loaded');
+
+ // @event tileload: TileEvent
+ // Fired when a tile loads.
+ this.fire('tileload', {
+ tile: tile.el,
+ coords: coords
+ });
+ }
+
+ if (this._noTilesToLoad()) {
+ this._loading = false;
+ // @event load: Event
+ // Fired when the grid layer loaded all visible tiles.
+ this.fire('load');
+
+ if (Browser.ielt9 || !this._map._fadeAnimated) {
+ requestAnimFrame(this._pruneTiles, this);
+ } else {
+ // Wait a bit more than 0.2 secs (the duration of the tile fade-in)
+ // to trigger a pruning.
+ setTimeout(bind(this._pruneTiles, this), 250);
+ }
+ }
+ },
+
+ _getTilePos: function (coords) {
+ return coords.scaleBy(this.getTileSize()).subtract(this._level.origin);
+ },
+
+ _wrapCoords: function (coords) {
+ var newCoords = new Point(
+ this._wrapX ? wrapNum(coords.x, this._wrapX) : coords.x,
+ this._wrapY ? wrapNum(coords.y, this._wrapY) : coords.y);
+ newCoords.z = coords.z;
+ return newCoords;
+ },
+
+ _pxBoundsToTileRange: function (bounds) {
+ var tileSize = this.getTileSize();
+ return new Bounds(
+ bounds.min.unscaleBy(tileSize).floor(),
+ bounds.max.unscaleBy(tileSize).ceil().subtract([1, 1]));
+ },
+
+ _noTilesToLoad: function () {
+ for (var key in this._tiles) {
+ if (!this._tiles[key].loaded) { return false; }
+ }
+ return true;
+ }
+});
+
+// @factory L.gridLayer(options?: GridLayer options)
+// Creates a new instance of GridLayer with the supplied options.
+function gridLayer(options) {
+ return new GridLayer(options);
+}
+
+/*
+ * @class TileLayer
+ * @inherits GridLayer
+ * @aka L.TileLayer
+ * Used to load and display tile layers on the map. Note that most tile servers require attribution, which you can set under `Layer`. Extends `GridLayer`.
+ *
+ * @example
+ *
+ * ```js
+ * L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png?{foo}', {foo: 'bar', attribution: '© <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'}).addTo(map);
+ * ```
+ *
+ * @section URL template
+ * @example
+ *
+ * A string of the following form:
+ *
+ * ```
+ * 'https://{s}.somedomain.com/blabla/{z}/{x}/{y}{r}.png'
+ * ```
+ *
+ * `{s}` means one of the available subdomains (used sequentially to help with browser parallel requests per domain limitation; subdomain values are specified in options; `a`, `b` or `c` by default, can be omitted), `{z}` — zoom level, `{x}` and `{y}` — tile coordinates. `{r}` can be used to add "@2x" to the URL to load retina tiles.
+ *
+ * You can use custom keys in the template, which will be [evaluated](#util-template) from TileLayer options, like this:
+ *
+ * ```
+ * L.tileLayer('https://{s}.somedomain.com/{foo}/{z}/{x}/{y}.png', {foo: 'bar'});
+ * ```
+ */
+
+
+var TileLayer = GridLayer.extend({
+
+ // @section
+ // @aka TileLayer options
+ options: {
+ // @option minZoom: Number = 0
+ // The minimum zoom level down to which this layer will be displayed (inclusive).
+ minZoom: 0,
+
+ // @option maxZoom: Number = 18
+ // The maximum zoom level up to which this layer will be displayed (inclusive).
+ maxZoom: 18,
+
+ // @option subdomains: String|String[] = 'abc'
+ // Subdomains of the tile service. Can be passed in the form of one string (where each letter is a subdomain name) or an array of strings.
+ subdomains: 'abc',
+
+ // @option errorTileUrl: String = ''
+ // URL to the tile image to show in place of the tile that failed to load.
+ errorTileUrl: '',
+
+ // @option zoomOffset: Number = 0
+ // The zoom number used in tile URLs will be offset with this value.
+ zoomOffset: 0,
+
+ // @option tms: Boolean = false
+ // If `true`, inverses Y axis numbering for tiles (turn this on for [TMS](https://en.wikipedia.org/wiki/Tile_Map_Service) services).
+ tms: false,
+
+ // @option zoomReverse: Boolean = false
+ // If set to true, the zoom number used in tile URLs will be reversed (`maxZoom - zoom` instead of `zoom`)
+ zoomReverse: false,
+
+ // @option detectRetina: Boolean = false
+ // If `true` and user is on a retina display, it will request four tiles of half the specified size and a bigger zoom level in place of one to utilize the high resolution.
+ detectRetina: false,
+
+ // @option crossOrigin: Boolean|String = false
+ // Whether the crossOrigin attribute will be added to the tiles.
+ // If a String is provided, all tiles will have their crossOrigin attribute set to the String provided. This is needed if you want to access tile pixel data.
+ // Refer to [CORS Settings](https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_settings_attributes) for valid String values.
+ crossOrigin: false,
+
+ // @option referrerPolicy: Boolean|String = false
+ // Whether the referrerPolicy attribute will be added to the tiles.
+ // If a String is provided, all tiles will have their referrerPolicy attribute set to the String provided.
+ // This may be needed if your map's rendering context has a strict default but your tile provider expects a valid referrer
+ // (e.g. to validate an API token).
+ // Refer to [HTMLImageElement.referrerPolicy](https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/referrerPolicy) for valid String values.
+ referrerPolicy: false
+ },
+
+ initialize: function (url, options) {
+
+ this._url = url;
+
+ options = setOptions(this, options);
+
+ // detecting retina displays, adjusting tileSize and zoom levels
+ if (options.detectRetina && Browser.retina && options.maxZoom > 0) {
+
+ options.tileSize = Math.floor(options.tileSize / 2);
+
+ if (!options.zoomReverse) {
+ options.zoomOffset++;
+ options.maxZoom = Math.max(options.minZoom, options.maxZoom - 1);
+ } else {
+ options.zoomOffset--;
+ options.minZoom = Math.min(options.maxZoom, options.minZoom + 1);
+ }
+
+ options.minZoom = Math.max(0, options.minZoom);
+ } else if (!options.zoomReverse) {
+ // make sure maxZoom is gte minZoom
+ options.maxZoom = Math.max(options.minZoom, options.maxZoom);
+ } else {
+ // make sure minZoom is lte maxZoom
+ options.minZoom = Math.min(options.maxZoom, options.minZoom);
+ }
+
+ if (typeof options.subdomains === 'string') {
+ options.subdomains = options.subdomains.split('');
+ }
+
+ this.on('tileunload', this._onTileRemove);
+ },
+
+ // @method setUrl(url: String, noRedraw?: Boolean): this
+ // Updates the layer's URL template and redraws it (unless `noRedraw` is set to `true`).
+ // If the URL does not change, the layer will not be redrawn unless
+ // the noRedraw parameter is set to false.
+ setUrl: function (url, noRedraw) {
+ if (this._url === url && noRedraw === undefined) {
+ noRedraw = true;
+ }
+
+ this._url = url;
+
+ if (!noRedraw) {
+ this.redraw();
+ }
+ return this;
+ },
+
+ // @method createTile(coords: Object, done?: Function): HTMLElement
+ // Called only internally, overrides GridLayer's [`createTile()`](#gridlayer-createtile)
+ // to return an `<img>` HTML element with the appropriate image URL given `coords`. The `done`
+ // callback is called when the tile has been loaded.
+ createTile: function (coords, done) {
+ var tile = document.createElement('img');
+
+ on(tile, 'load', bind(this._tileOnLoad, this, done, tile));
+ on(tile, 'error', bind(this._tileOnError, this, done, tile));
+
+ if (this.options.crossOrigin || this.options.crossOrigin === '') {
+ tile.crossOrigin = this.options.crossOrigin === true ? '' : this.options.crossOrigin;
+ }
+
+ // for this new option we follow the documented behavior
+ // more closely by only setting the property when string
+ if (typeof this.options.referrerPolicy === 'string') {
+ tile.referrerPolicy = this.options.referrerPolicy;
+ }
+
+ // The alt attribute is set to the empty string,
+ // allowing screen readers to ignore the decorative image tiles.
+ // https://www.w3.org/WAI/tutorials/images/decorative/
+ // https://www.w3.org/TR/html-aria/#el-img-empty-alt
+ tile.alt = '';
+
+ tile.src = this.getTileUrl(coords);
+
+ return tile;
+ },
+
+ // @section Extension methods
+ // @uninheritable
+ // Layers extending `TileLayer` might reimplement the following method.
+ // @method getTileUrl(coords: Object): String
+ // Called only internally, returns the URL for a tile given its coordinates.
+ // Classes extending `TileLayer` can override this function to provide custom tile URL naming schemes.
+ getTileUrl: function (coords) {
+ var data = {
+ r: Browser.retina ? '@2x' : '',
+ s: this._getSubdomain(coords),
+ x: coords.x,
+ y: coords.y,
+ z: this._getZoomForUrl()
+ };
+ if (this._map && !this._map.options.crs.infinite) {
+ var invertedY = this._globalTileRange.max.y - coords.y;
+ if (this.options.tms) {
+ data['y'] = invertedY;
+ }
+ data['-y'] = invertedY;
+ }
+
+ return template(this._url, extend(data, this.options));
+ },
+
+ _tileOnLoad: function (done, tile) {
+ // For https://github.com/Leaflet/Leaflet/issues/3332
+ if (Browser.ielt9) {
+ setTimeout(bind(done, this, null, tile), 0);
+ } else {
+ done(null, tile);
+ }
+ },
+
+ _tileOnError: function (done, tile, e) {
+ var errorUrl = this.options.errorTileUrl;
+ if (errorUrl && tile.getAttribute('src') !== errorUrl) {
+ tile.src = errorUrl;
+ }
+ done(e, tile);
+ },
+
+ _onTileRemove: function (e) {
+ e.tile.onload = null;
+ },
+
+ _getZoomForUrl: function () {
+ var zoom = this._tileZoom,
+ maxZoom = this.options.maxZoom,
+ zoomReverse = this.options.zoomReverse,
+ zoomOffset = this.options.zoomOffset;
+
+ if (zoomReverse) {
+ zoom = maxZoom - zoom;
+ }
+
+ return zoom + zoomOffset;
+ },
+
+ _getSubdomain: function (tilePoint) {
+ var index = Math.abs(tilePoint.x + tilePoint.y) % this.options.subdomains.length;
+ return this.options.subdomains[index];
+ },
+
+ // stops loading all tiles in the background layer
+ _abortLoading: function () {
+ var i, tile;
+ for (i in this._tiles) {
+ if (this._tiles[i].coords.z !== this._tileZoom) {
+ tile = this._tiles[i].el;
+
+ tile.onload = falseFn;
+ tile.onerror = falseFn;
+
+ if (!tile.complete) {
+ tile.src = emptyImageUrl;
+ var coords = this._tiles[i].coords;
+ remove(tile);
+ delete this._tiles[i];
+ // @event tileabort: TileEvent
+ // Fired when a tile was loading but is now not wanted.
+ this.fire('tileabort', {
+ tile: tile,
+ coords: coords
+ });
+ }
+ }
+ }
+ },
+
+ _removeTile: function (key) {
+ var tile = this._tiles[key];
+ if (!tile) { return; }
+
+ // Cancels any pending http requests associated with the tile
+ tile.el.setAttribute('src', emptyImageUrl);
+
+ return GridLayer.prototype._removeTile.call(this, key);
+ },
+
+ _tileReady: function (coords, err, tile) {
+ if (!this._map || (tile && tile.getAttribute('src') === emptyImageUrl)) {
+ return;
+ }
+
+ return GridLayer.prototype._tileReady.call(this, coords, err, tile);
+ }
+});
+
+
+// @factory L.tilelayer(urlTemplate: String, options?: TileLayer options)
+// Instantiates a tile layer object given a `URL template` and optionally an options object.
+
+function tileLayer(url, options) {
+ return new TileLayer(url, options);
+}
+
+/*
+ * @class TileLayer.WMS
+ * @inherits TileLayer
+ * @aka L.TileLayer.WMS
+ * Used to display [WMS](https://en.wikipedia.org/wiki/Web_Map_Service) services as tile layers on the map. Extends `TileLayer`.
+ *
+ * @example
+ *
+ * ```js
+ * var nexrad = L.tileLayer.wms("http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r.cgi", {
+ * layers: 'nexrad-n0r-900913',
+ * format: 'image/png',
+ * transparent: true,
+ * attribution: "Weather data © 2012 IEM Nexrad"
+ * });
+ * ```
+ */
+
+var TileLayerWMS = TileLayer.extend({
+
+ // @section
+ // @aka TileLayer.WMS options
+ // If any custom options not documented here are used, they will be sent to the
+ // WMS server as extra parameters in each request URL. This can be useful for
+ // [non-standard vendor WMS parameters](https://docs.geoserver.org/stable/en/user/services/wms/vendor.html).
+ defaultWmsParams: {
+ service: 'WMS',
+ request: 'GetMap',
+
+ // @option layers: String = ''
+ // **(required)** Comma-separated list of WMS layers to show.
+ layers: '',
+
+ // @option styles: String = ''
+ // Comma-separated list of WMS styles.
+ styles: '',
+
+ // @option format: String = 'image/jpeg'
+ // WMS image format (use `'image/png'` for layers with transparency).
+ format: 'image/jpeg',
+
+ // @option transparent: Boolean = false
+ // If `true`, the WMS service will return images with transparency.
+ transparent: false,
+
+ // @option version: String = '1.1.1'
+ // Version of the WMS service to use
+ version: '1.1.1'
+ },
+
+ options: {
+ // @option crs: CRS = null
+ // Coordinate Reference System to use for the WMS requests, defaults to
+ // map CRS. Don't change this if you're not sure what it means.
+ crs: null,
+
+ // @option uppercase: Boolean = false
+ // If `true`, WMS request parameter keys will be uppercase.
+ uppercase: false
+ },
+
+ initialize: function (url, options) {
+
+ this._url = url;
+
+ var wmsParams = extend({}, this.defaultWmsParams);
+
+ // all keys that are not TileLayer options go to WMS params
+ for (var i in options) {
+ if (!(i in this.options)) {
+ wmsParams[i] = options[i];
+ }
+ }
+
+ options = setOptions(this, options);
+
+ var realRetina = options.detectRetina && Browser.retina ? 2 : 1;
+ var tileSize = this.getTileSize();
+ wmsParams.width = tileSize.x * realRetina;
+ wmsParams.height = tileSize.y * realRetina;
+
+ this.wmsParams = wmsParams;
+ },
+
+ onAdd: function (map) {
+
+ this._crs = this.options.crs || map.options.crs;
+ this._wmsVersion = parseFloat(this.wmsParams.version);
+
+ var projectionKey = this._wmsVersion >= 1.3 ? 'crs' : 'srs';
+ this.wmsParams[projectionKey] = this._crs.code;
+
+ TileLayer.prototype.onAdd.call(this, map);
+ },
+
+ getTileUrl: function (coords) {
+
+ var tileBounds = this._tileCoordsToNwSe(coords),
+ crs = this._crs,
+ bounds = toBounds(crs.project(tileBounds[0]), crs.project(tileBounds[1])),
+ min = bounds.min,
+ max = bounds.max,
+ bbox = (this._wmsVersion >= 1.3 && this._crs === EPSG4326 ?
+ [min.y, min.x, max.y, max.x] :
+ [min.x, min.y, max.x, max.y]).join(','),
+ url = TileLayer.prototype.getTileUrl.call(this, coords);
+ return url +
+ getParamString(this.wmsParams, url, this.options.uppercase) +
+ (this.options.uppercase ? '&BBOX=' : '&bbox=') + bbox;
+ },
+
+ // @method setParams(params: Object, noRedraw?: Boolean): this
+ // Merges an object with the new parameters and re-requests tiles on the current screen (unless `noRedraw` was set to true).
+ setParams: function (params, noRedraw) {
+
+ extend(this.wmsParams, params);
+
+ if (!noRedraw) {
+ this.redraw();
+ }
+
+ return this;
+ }
+});
+
+
+// @factory L.tileLayer.wms(baseUrl: String, options: TileLayer.WMS options)
+// Instantiates a WMS tile layer object given a base URL of the WMS service and a WMS parameters/options object.
+function tileLayerWMS(url, options) {
+ return new TileLayerWMS(url, options);
+}
+
+TileLayer.WMS = TileLayerWMS;
+tileLayer.wms = tileLayerWMS;
+
+/*
+ * @class Renderer
+ * @inherits Layer
+ * @aka L.Renderer
+ *
+ * Base class for vector renderer implementations (`SVG`, `Canvas`). Handles the
+ * DOM container of the renderer, its bounds, and its zoom animation.
+ *
+ * A `Renderer` works as an implicit layer group for all `Path`s - the renderer
+ * itself can be added or removed to the map. All paths use a renderer, which can
+ * be implicit (the map will decide the type of renderer and use it automatically)
+ * or explicit (using the [`renderer`](#path-renderer) option of the path).
+ *
+ * Do not use this class directly, use `SVG` and `Canvas` instead.
+ *
+ * @event update: Event
+ * Fired when the renderer updates its bounds, center and zoom, for example when
+ * its map has moved
+ */
+
+var Renderer = Layer.extend({
+
+ // @section
+ // @aka Renderer options
+ options: {
+ // @option padding: Number = 0.1
+ // How much to extend the clip area around the map view (relative to its size)
+ // e.g. 0.1 would be 10% of map view in each direction
+ padding: 0.1
+ },
+
+ initialize: function (options) {
+ setOptions(this, options);
+ stamp(this);
+ this._layers = this._layers || {};
+ },
+
+ onAdd: function () {
+ if (!this._container) {
+ this._initContainer(); // defined by renderer implementations
+
+ // always keep transform-origin as 0 0
+ addClass(this._container, 'leaflet-zoom-animated');
+ }
+
+ this.getPane().appendChild(this._container);
+ this._update();
+ this.on('update', this._updatePaths, this);
+ },
+
+ onRemove: function () {
+ this.off('update', this._updatePaths, this);
+ this._destroyContainer();
+ },
+
+ getEvents: function () {
+ var events = {
+ viewreset: this._reset,
+ zoom: this._onZoom,
+ moveend: this._update,
+ zoomend: this._onZoomEnd
+ };
+ if (this._zoomAnimated) {
+ events.zoomanim = this._onAnimZoom;
+ }
+ return events;
+ },
+
+ _onAnimZoom: function (ev) {
+ this._updateTransform(ev.center, ev.zoom);
+ },
+
+ _onZoom: function () {
+ this._updateTransform(this._map.getCenter(), this._map.getZoom());
+ },
+
+ _updateTransform: function (center, zoom) {
+ var scale = this._map.getZoomScale(zoom, this._zoom),
+ viewHalf = this._map.getSize().multiplyBy(0.5 + this.options.padding),
+ currentCenterPoint = this._map.project(this._center, zoom),
+
+ topLeftOffset = viewHalf.multiplyBy(-scale).add(currentCenterPoint)
+ .subtract(this._map._getNewPixelOrigin(center, zoom));
+
+ if (Browser.any3d) {
+ setTransform(this._container, topLeftOffset, scale);
+ } else {
+ setPosition(this._container, topLeftOffset);
+ }
+ },
+
+ _reset: function () {
+ this._update();
+ this._updateTransform(this._center, this._zoom);
+
+ for (var id in this._layers) {
+ this._layers[id]._reset();
+ }
+ },
+
+ _onZoomEnd: function () {
+ for (var id in this._layers) {
+ this._layers[id]._project();
+ }
+ },
+
+ _updatePaths: function () {
+ for (var id in this._layers) {
+ this._layers[id]._update();
+ }
+ },
+
+ _update: function () {
+ // Update pixel bounds of renderer container (for positioning/sizing/clipping later)
+ // Subclasses are responsible of firing the 'update' event.
+ var p = this.options.padding,
+ size = this._map.getSize(),
+ min = this._map.containerPointToLayerPoint(size.multiplyBy(-p)).round();
+
+ this._bounds = new Bounds(min, min.add(size.multiplyBy(1 + p * 2)).round());
+
+ this._center = this._map.getCenter();
+ this._zoom = this._map.getZoom();
+ }
+});
+
+/*
+ * @class Canvas
+ * @inherits Renderer
+ * @aka L.Canvas
+ *
+ * Allows vector layers to be displayed with [`<canvas>`](https://developer.mozilla.org/docs/Web/API/Canvas_API).
+ * Inherits `Renderer`.
+ *
+ * Due to [technical limitations](https://caniuse.com/canvas), Canvas is not
+ * available in all web browsers, notably IE8, and overlapping geometries might
+ * not display properly in some edge cases.
+ *
+ * @example
+ *
+ * Use Canvas by default for all paths in the map:
+ *
+ * ```js
+ * var map = L.map('map', {
+ * renderer: L.canvas()
+ * });
+ * ```
+ *
+ * Use a Canvas renderer with extra padding for specific vector geometries:
+ *
+ * ```js
+ * var map = L.map('map');
+ * var myRenderer = L.canvas({ padding: 0.5 });
+ * var line = L.polyline( coordinates, { renderer: myRenderer } );
+ * var circle = L.circle( center, { renderer: myRenderer } );
+ * ```
+ */
+
+var Canvas = Renderer.extend({
+
+ // @section
+ // @aka Canvas options
+ options: {
+ // @option tolerance: Number = 0
+ // How much to extend the click tolerance around a path/object on the map.
+ tolerance: 0
+ },
+
+ getEvents: function () {
+ var events = Renderer.prototype.getEvents.call(this);
+ events.viewprereset = this._onViewPreReset;
+ return events;
+ },
+
+ _onViewPreReset: function () {
+ // Set a flag so that a viewprereset+moveend+viewreset only updates&redraws once
+ this._postponeUpdatePaths = true;
+ },
+
+ onAdd: function () {
+ Renderer.prototype.onAdd.call(this);
+
+ // Redraw vectors since canvas is cleared upon removal,
+ // in case of removing the renderer itself from the map.
+ this._draw();
+ },
+
+ _initContainer: function () {
+ var container = this._container = document.createElement('canvas');
+
+ on(container, 'mousemove', this._onMouseMove, this);
+ on(container, 'click dblclick mousedown mouseup contextmenu', this._onClick, this);
+ on(container, 'mouseout', this._handleMouseOut, this);
+ container['_leaflet_disable_events'] = true;
+
+ this._ctx = container.getContext('2d');
+ },
+
+ _destroyContainer: function () {
+ cancelAnimFrame(this._redrawRequest);
+ delete this._ctx;
+ remove(this._container);
+ off(this._container);
+ delete this._container;
+ },
+
+ _updatePaths: function () {
+ if (this._postponeUpdatePaths) { return; }
+
+ var layer;
+ this._redrawBounds = null;
+ for (var id in this._layers) {
+ layer = this._layers[id];
+ layer._update();
+ }
+ this._redraw();
+ },
+
+ _update: function () {
+ if (this._map._animatingZoom && this._bounds) { return; }
+
+ Renderer.prototype._update.call(this);
+
+ var b = this._bounds,
+ container = this._container,
+ size = b.getSize(),
+ m = Browser.retina ? 2 : 1;
+
+ setPosition(container, b.min);
+
+ // set canvas size (also clearing it); use double size on retina
+ container.width = m * size.x;
+ container.height = m * size.y;
+ container.style.width = size.x + 'px';
+ container.style.height = size.y + 'px';
+
+ if (Browser.retina) {
+ this._ctx.scale(2, 2);
+ }
+
+ // translate so we use the same path coordinates after canvas element moves
+ this._ctx.translate(-b.min.x, -b.min.y);
+
+ // Tell paths to redraw themselves
+ this.fire('update');
+ },
+
+ _reset: function () {
+ Renderer.prototype._reset.call(this);
+
+ if (this._postponeUpdatePaths) {
+ this._postponeUpdatePaths = false;
+ this._updatePaths();
+ }
+ },
+
+ _initPath: function (layer) {
+ this._updateDashArray(layer);
+ this._layers[stamp(layer)] = layer;
+
+ var order = layer._order = {
+ layer: layer,
+ prev: this._drawLast,
+ next: null
+ };
+ if (this._drawLast) { this._drawLast.next = order; }
+ this._drawLast = order;
+ this._drawFirst = this._drawFirst || this._drawLast;
+ },
+
+ _addPath: function (layer) {
+ this._requestRedraw(layer);
+ },
+
+ _removePath: function (layer) {
+ var order = layer._order;
+ var next = order.next;
+ var prev = order.prev;
+
+ if (next) {
+ next.prev = prev;
+ } else {
+ this._drawLast = prev;
+ }
+ if (prev) {
+ prev.next = next;
+ } else {
+ this._drawFirst = next;
+ }
+
+ delete layer._order;
+
+ delete this._layers[stamp(layer)];
+
+ this._requestRedraw(layer);
+ },
+
+ _updatePath: function (layer) {
+ // Redraw the union of the layer's old pixel
+ // bounds and the new pixel bounds.
+ this._extendRedrawBounds(layer);
+ layer._project();
+ layer._update();
+ // The redraw will extend the redraw bounds
+ // with the new pixel bounds.
+ this._requestRedraw(layer);
+ },
+
+ _updateStyle: function (layer) {
+ this._updateDashArray(layer);
+ this._requestRedraw(layer);
+ },
+
+ _updateDashArray: function (layer) {
+ if (typeof layer.options.dashArray === 'string') {
+ var parts = layer.options.dashArray.split(/[, ]+/),
+ dashArray = [],
+ dashValue,
+ i;
+ for (i = 0; i < parts.length; i++) {
+ dashValue = Number(parts[i]);
+ // Ignore dash array containing invalid lengths
+ if (isNaN(dashValue)) { return; }
+ dashArray.push(dashValue);
+ }
+ layer.options._dashArray = dashArray;
+ } else {
+ layer.options._dashArray = layer.options.dashArray;
+ }
+ },
+
+ _requestRedraw: function (layer) {
+ if (!this._map) { return; }
+
+ this._extendRedrawBounds(layer);
+ this._redrawRequest = this._redrawRequest || requestAnimFrame(this._redraw, this);
+ },
+
+ _extendRedrawBounds: function (layer) {
+ if (layer._pxBounds) {
+ var padding = (layer.options.weight || 0) + 1;
+ this._redrawBounds = this._redrawBounds || new Bounds();
+ this._redrawBounds.extend(layer._pxBounds.min.subtract([padding, padding]));
+ this._redrawBounds.extend(layer._pxBounds.max.add([padding, padding]));
+ }
+ },
+
+ _redraw: function () {
+ this._redrawRequest = null;
+
+ if (this._redrawBounds) {
+ this._redrawBounds.min._floor();
+ this._redrawBounds.max._ceil();
+ }
+
+ this._clear(); // clear layers in redraw bounds
+ this._draw(); // draw layers
+
+ this._redrawBounds = null;
+ },
+
+ _clear: function () {
+ var bounds = this._redrawBounds;
+ if (bounds) {
+ var size = bounds.getSize();
+ this._ctx.clearRect(bounds.min.x, bounds.min.y, size.x, size.y);
+ } else {
+ this._ctx.save();
+ this._ctx.setTransform(1, 0, 0, 1, 0, 0);
+ this._ctx.clearRect(0, 0, this._container.width, this._container.height);
+ this._ctx.restore();
+ }
+ },
+
+ _draw: function () {
+ var layer, bounds = this._redrawBounds;
+ this._ctx.save();
+ if (bounds) {
+ var size = bounds.getSize();
+ this._ctx.beginPath();
+ this._ctx.rect(bounds.min.x, bounds.min.y, size.x, size.y);
+ this._ctx.clip();
+ }
+
+ this._drawing = true;
+
+ for (var order = this._drawFirst; order; order = order.next) {
+ layer = order.layer;
+ if (!bounds || (layer._pxBounds && layer._pxBounds.intersects(bounds))) {
+ layer._updatePath();
+ }
+ }
+
+ this._drawing = false;
+
+ this._ctx.restore(); // Restore state before clipping.
+ },
+
+ _updatePoly: function (layer, closed) {
+ if (!this._drawing) { return; }
+
+ var i, j, len2, p,
+ parts = layer._parts,
+ len = parts.length,
+ ctx = this._ctx;
+
+ if (!len) { return; }
+
+ ctx.beginPath();
+
+ for (i = 0; i < len; i++) {
+ for (j = 0, len2 = parts[i].length; j < len2; j++) {
+ p = parts[i][j];
+ ctx[j ? 'lineTo' : 'moveTo'](p.x, p.y);
+ }
+ if (closed) {
+ ctx.closePath();
+ }
+ }
+
+ this._fillStroke(ctx, layer);
+
+ // TODO optimization: 1 fill/stroke for all features with equal style instead of 1 for each feature
+ },
+
+ _updateCircle: function (layer) {
+
+ if (!this._drawing || layer._empty()) { return; }
+
+ var p = layer._point,
+ ctx = this._ctx,
+ r = Math.max(Math.round(layer._radius), 1),
+ s = (Math.max(Math.round(layer._radiusY), 1) || r) / r;
+
+ if (s !== 1) {
+ ctx.save();
+ ctx.scale(1, s);
+ }
+
+ ctx.beginPath();
+ ctx.arc(p.x, p.y / s, r, 0, Math.PI * 2, false);
+
+ if (s !== 1) {
+ ctx.restore();
+ }
+
+ this._fillStroke(ctx, layer);
+ },
+
+ _fillStroke: function (ctx, layer) {
+ var options = layer.options;
+
+ if (options.fill) {
+ ctx.globalAlpha = options.fillOpacity;
+ ctx.fillStyle = options.fillColor || options.color;
+ ctx.fill(options.fillRule || 'evenodd');
+ }
+
+ if (options.stroke && options.weight !== 0) {
+ if (ctx.setLineDash) {
+ ctx.setLineDash(layer.options && layer.options._dashArray || []);
+ }
+ ctx.globalAlpha = options.opacity;
+ ctx.lineWidth = options.weight;
+ ctx.strokeStyle = options.color;
+ ctx.lineCap = options.lineCap;
+ ctx.lineJoin = options.lineJoin;
+ ctx.stroke();
+ }
+ },
+
+ // Canvas obviously doesn't have mouse events for individual drawn objects,
+ // so we emulate that by calculating what's under the mouse on mousemove/click manually
+
+ _onClick: function (e) {
+ var point = this._map.mouseEventToLayerPoint(e), layer, clickedLayer;
+
+ for (var order = this._drawFirst; order; order = order.next) {
+ layer = order.layer;
+ if (layer.options.interactive && layer._containsPoint(point)) {
+ if (!(e.type === 'click' || e.type === 'preclick') || !this._map._draggableMoved(layer)) {
+ clickedLayer = layer;
+ }
+ }
+ }
+ this._fireEvent(clickedLayer ? [clickedLayer] : false, e);
+ },
+
+ _onMouseMove: function (e) {
+ if (!this._map || this._map.dragging.moving() || this._map._animatingZoom) { return; }
+
+ var point = this._map.mouseEventToLayerPoint(e);
+ this._handleMouseHover(e, point);
+ },
+
+
+ _handleMouseOut: function (e) {
+ var layer = this._hoveredLayer;
+ if (layer) {
+ // if we're leaving the layer, fire mouseout
+ removeClass(this._container, 'leaflet-interactive');
+ this._fireEvent([layer], e, 'mouseout');
+ this._hoveredLayer = null;
+ this._mouseHoverThrottled = false;
+ }
+ },
+
+ _handleMouseHover: function (e, point) {
+ if (this._mouseHoverThrottled) {
+ return;
+ }
+
+ var layer, candidateHoveredLayer;
+
+ for (var order = this._drawFirst; order; order = order.next) {
+ layer = order.layer;
+ if (layer.options.interactive && layer._containsPoint(point)) {
+ candidateHoveredLayer = layer;
+ }
+ }
+
+ if (candidateHoveredLayer !== this._hoveredLayer) {
+ this._handleMouseOut(e);
+
+ if (candidateHoveredLayer) {
+ addClass(this._container, 'leaflet-interactive'); // change cursor
+ this._fireEvent([candidateHoveredLayer], e, 'mouseover');
+ this._hoveredLayer = candidateHoveredLayer;
+ }
+ }
+
+ this._fireEvent(this._hoveredLayer ? [this._hoveredLayer] : false, e);
+
+ this._mouseHoverThrottled = true;
+ setTimeout(bind(function () {
+ this._mouseHoverThrottled = false;
+ }, this), 32);
+ },
+
+ _fireEvent: function (layers, e, type) {
+ this._map._fireDOMEvent(e, type || e.type, layers);
+ },
+
+ _bringToFront: function (layer) {
+ var order = layer._order;
+
+ if (!order) { return; }
+
+ var next = order.next;
+ var prev = order.prev;
+
+ if (next) {
+ next.prev = prev;
+ } else {
+ // Already last
+ return;
+ }
+ if (prev) {
+ prev.next = next;
+ } else if (next) {
+ // Update first entry unless this is the
+ // single entry
+ this._drawFirst = next;
+ }
+
+ order.prev = this._drawLast;
+ this._drawLast.next = order;
+
+ order.next = null;
+ this._drawLast = order;
+
+ this._requestRedraw(layer);
+ },
+
+ _bringToBack: function (layer) {
+ var order = layer._order;
+
+ if (!order) { return; }
+
+ var next = order.next;
+ var prev = order.prev;
+
+ if (prev) {
+ prev.next = next;
+ } else {
+ // Already first
+ return;
+ }
+ if (next) {
+ next.prev = prev;
+ } else if (prev) {
+ // Update last entry unless this is the
+ // single entry
+ this._drawLast = prev;
+ }
+
+ order.prev = null;
+
+ order.next = this._drawFirst;
+ this._drawFirst.prev = order;
+ this._drawFirst = order;
+
+ this._requestRedraw(layer);
+ }
+});
+
+// @factory L.canvas(options?: Renderer options)
+// Creates a Canvas renderer with the given options.
+function canvas(options) {
+ return Browser.canvas ? new Canvas(options) : null;
+}
+
+/*
+ * Thanks to Dmitry Baranovsky and his Raphael library for inspiration!
+ */
+
+
+var vmlCreate = (function () {
+ try {
+ document.namespaces.add('lvml', 'urn:schemas-microsoft-com:vml');
+ return function (name) {
+ return document.createElement('<lvml:' + name + ' class="lvml">');
+ };
+ } catch (e) {
+ // Do not return fn from catch block so `e` can be garbage collected
+ // See https://github.com/Leaflet/Leaflet/pull/7279
+ }
+ return function (name) {
+ return document.createElement('<' + name + ' xmlns="urn:schemas-microsoft.com:vml" class="lvml">');
+ };
+})();
+
+
+/*
+ * @class SVG
+ *
+ *
+ * VML was deprecated in 2012, which means VML functionality exists only for backwards compatibility
+ * with old versions of Internet Explorer.
+ */
+
+// mixin to redefine some SVG methods to handle VML syntax which is similar but with some differences
+var vmlMixin = {
+
+ _initContainer: function () {
+ this._container = create$1('div', 'leaflet-vml-container');
+ },
+
+ _update: function () {
+ if (this._map._animatingZoom) { return; }
+ Renderer.prototype._update.call(this);
+ this.fire('update');
+ },
+
+ _initPath: function (layer) {
+ var container = layer._container = vmlCreate('shape');
+
+ addClass(container, 'leaflet-vml-shape ' + (this.options.className || ''));
+
+ container.coordsize = '1 1';
+
+ layer._path = vmlCreate('path');
+ container.appendChild(layer._path);
+
+ this._updateStyle(layer);
+ this._layers[stamp(layer)] = layer;
+ },
+
+ _addPath: function (layer) {
+ var container = layer._container;
+ this._container.appendChild(container);
+
+ if (layer.options.interactive) {
+ layer.addInteractiveTarget(container);
+ }
+ },
+
+ _removePath: function (layer) {
+ var container = layer._container;
+ remove(container);
+ layer.removeInteractiveTarget(container);
+ delete this._layers[stamp(layer)];
+ },
+
+ _updateStyle: function (layer) {
+ var stroke = layer._stroke,
+ fill = layer._fill,
+ options = layer.options,
+ container = layer._container;
+
+ container.stroked = !!options.stroke;
+ container.filled = !!options.fill;
+
+ if (options.stroke) {
+ if (!stroke) {
+ stroke = layer._stroke = vmlCreate('stroke');
+ }
+ container.appendChild(stroke);
+ stroke.weight = options.weight + 'px';
+ stroke.color = options.color;
+ stroke.opacity = options.opacity;
+
+ if (options.dashArray) {
+ stroke.dashStyle = isArray(options.dashArray) ?
+ options.dashArray.join(' ') :
+ options.dashArray.replace(/( *, *)/g, ' ');
+ } else {
+ stroke.dashStyle = '';
+ }
+ stroke.endcap = options.lineCap.replace('butt', 'flat');
+ stroke.joinstyle = options.lineJoin;
+
+ } else if (stroke) {
+ container.removeChild(stroke);
+ layer._stroke = null;
+ }
+
+ if (options.fill) {
+ if (!fill) {
+ fill = layer._fill = vmlCreate('fill');
+ }
+ container.appendChild(fill);
+ fill.color = options.fillColor || options.color;
+ fill.opacity = options.fillOpacity;
+
+ } else if (fill) {
+ container.removeChild(fill);
+ layer._fill = null;
+ }
+ },
+
+ _updateCircle: function (layer) {
+ var p = layer._point.round(),
+ r = Math.round(layer._radius),
+ r2 = Math.round(layer._radiusY || r);
+
+ this._setPath(layer, layer._empty() ? 'M0 0' :
+ 'AL ' + p.x + ',' + p.y + ' ' + r + ',' + r2 + ' 0,' + (65535 * 360));
+ },
+
+ _setPath: function (layer, path) {
+ layer._path.v = path;
+ },
+
+ _bringToFront: function (layer) {
+ toFront(layer._container);
+ },
+
+ _bringToBack: function (layer) {
+ toBack(layer._container);
+ }
+};
+
+var create = Browser.vml ? vmlCreate : svgCreate;
+
+/*
+ * @class SVG
+ * @inherits Renderer
+ * @aka L.SVG
+ *
+ * Allows vector layers to be displayed with [SVG](https://developer.mozilla.org/docs/Web/SVG).
+ * Inherits `Renderer`.
+ *
+ * Due to [technical limitations](https://caniuse.com/svg), SVG is not
+ * available in all web browsers, notably Android 2.x and 3.x.
+ *
+ * Although SVG is not available on IE7 and IE8, these browsers support
+ * [VML](https://en.wikipedia.org/wiki/Vector_Markup_Language)
+ * (a now deprecated technology), and the SVG renderer will fall back to VML in
+ * this case.
+ *
+ * @example
+ *
+ * Use SVG by default for all paths in the map:
+ *
+ * ```js
+ * var map = L.map('map', {
+ * renderer: L.svg()
+ * });
+ * ```
+ *
+ * Use a SVG renderer with extra padding for specific vector geometries:
+ *
+ * ```js
+ * var map = L.map('map');
+ * var myRenderer = L.svg({ padding: 0.5 });
+ * var line = L.polyline( coordinates, { renderer: myRenderer } );
+ * var circle = L.circle( center, { renderer: myRenderer } );
+ * ```
+ */
+
+var SVG = Renderer.extend({
+
+ _initContainer: function () {
+ this._container = create('svg');
+
+ // makes it possible to click through svg root; we'll reset it back in individual paths
+ this._container.setAttribute('pointer-events', 'none');
+
+ this._rootGroup = create('g');
+ this._container.appendChild(this._rootGroup);
+ },
+
+ _destroyContainer: function () {
+ remove(this._container);
+ off(this._container);
+ delete this._container;
+ delete this._rootGroup;
+ delete this._svgSize;
+ },
+
+ _update: function () {
+ if (this._map._animatingZoom && this._bounds) { return; }
+
+ Renderer.prototype._update.call(this);
+
+ var b = this._bounds,
+ size = b.getSize(),
+ container = this._container;
+
+ // set size of svg-container if changed
+ if (!this._svgSize || !this._svgSize.equals(size)) {
+ this._svgSize = size;
+ container.setAttribute('width', size.x);
+ container.setAttribute('height', size.y);
+ }
+
+ // movement: update container viewBox so that we don't have to change coordinates of individual layers
+ setPosition(container, b.min);
+ container.setAttribute('viewBox', [b.min.x, b.min.y, size.x, size.y].join(' '));
+
+ this.fire('update');
+ },
+
+ // methods below are called by vector layers implementations
+
+ _initPath: function (layer) {
+ var path = layer._path = create('path');
+
+ // @namespace Path
+ // @option className: String = null
+ // Custom class name set on an element. Only for SVG renderer.
+ if (layer.options.className) {
+ addClass(path, layer.options.className);
+ }
+
+ if (layer.options.interactive) {
+ addClass(path, 'leaflet-interactive');
+ }
+
+ this._updateStyle(layer);
+ this._layers[stamp(layer)] = layer;
+ },
+
+ _addPath: function (layer) {
+ if (!this._rootGroup) { this._initContainer(); }
+ this._rootGroup.appendChild(layer._path);
+ layer.addInteractiveTarget(layer._path);
+ },
+
+ _removePath: function (layer) {
+ remove(layer._path);
+ layer.removeInteractiveTarget(layer._path);
+ delete this._layers[stamp(layer)];
+ },
+
+ _updatePath: function (layer) {
+ layer._project();
+ layer._update();
+ },
+
+ _updateStyle: function (layer) {
+ var path = layer._path,
+ options = layer.options;
+
+ if (!path) { return; }
+
+ if (options.stroke) {
+ path.setAttribute('stroke', options.color);
+ path.setAttribute('stroke-opacity', options.opacity);
+ path.setAttribute('stroke-width', options.weight);
+ path.setAttribute('stroke-linecap', options.lineCap);
+ path.setAttribute('stroke-linejoin', options.lineJoin);
+
+ if (options.dashArray) {
+ path.setAttribute('stroke-dasharray', options.dashArray);
+ } else {
+ path.removeAttribute('stroke-dasharray');
+ }
+
+ if (options.dashOffset) {
+ path.setAttribute('stroke-dashoffset', options.dashOffset);
+ } else {
+ path.removeAttribute('stroke-dashoffset');
+ }
+ } else {
+ path.setAttribute('stroke', 'none');
+ }
+
+ if (options.fill) {
+ path.setAttribute('fill', options.fillColor || options.color);
+ path.setAttribute('fill-opacity', options.fillOpacity);
+ path.setAttribute('fill-rule', options.fillRule || 'evenodd');
+ } else {
+ path.setAttribute('fill', 'none');
+ }
+ },
+
+ _updatePoly: function (layer, closed) {
+ this._setPath(layer, pointsToPath(layer._parts, closed));
+ },
+
+ _updateCircle: function (layer) {
+ var p = layer._point,
+ r = Math.max(Math.round(layer._radius), 1),
+ r2 = Math.max(Math.round(layer._radiusY), 1) || r,
+ arc = 'a' + r + ',' + r2 + ' 0 1,0 ';
+
+ // drawing a circle with two half-arcs
+ var d = layer._empty() ? 'M0 0' :
+ 'M' + (p.x - r) + ',' + p.y +
+ arc + (r * 2) + ',0 ' +
+ arc + (-r * 2) + ',0 ';
+
+ this._setPath(layer, d);
+ },
+
+ _setPath: function (layer, path) {
+ layer._path.setAttribute('d', path);
+ },
+
+ // SVG does not have the concept of zIndex so we resort to changing the DOM order of elements
+ _bringToFront: function (layer) {
+ toFront(layer._path);
+ },
+
+ _bringToBack: function (layer) {
+ toBack(layer._path);
+ }
+});
+
+if (Browser.vml) {
+ SVG.include(vmlMixin);
+}
+
+// @namespace SVG
+// @factory L.svg(options?: Renderer options)
+// Creates a SVG renderer with the given options.
+function svg(options) {
+ return Browser.svg || Browser.vml ? new SVG(options) : null;
+}
+
+Map.include({
+ // @namespace Map; @method getRenderer(layer: Path): Renderer
+ // Returns the instance of `Renderer` that should be used to render the given
+ // `Path`. It will ensure that the `renderer` options of the map and paths
+ // are respected, and that the renderers do exist on the map.
+ getRenderer: function (layer) {
+ // @namespace Path; @option renderer: Renderer
+ // Use this specific instance of `Renderer` for this path. Takes
+ // precedence over the map's [default renderer](#map-renderer).
+ var renderer = layer.options.renderer || this._getPaneRenderer(layer.options.pane) || this.options.renderer || this._renderer;
+
+ if (!renderer) {
+ renderer = this._renderer = this._createRenderer();
+ }
+
+ if (!this.hasLayer(renderer)) {
+ this.addLayer(renderer);
+ }
+ return renderer;
+ },
+
+ _getPaneRenderer: function (name) {
+ if (name === 'overlayPane' || name === undefined) {
+ return false;
+ }
+
+ var renderer = this._paneRenderers[name];
+ if (renderer === undefined) {
+ renderer = this._createRenderer({pane: name});
+ this._paneRenderers[name] = renderer;
+ }
+ return renderer;
+ },
+
+ _createRenderer: function (options) {
+ // @namespace Map; @option preferCanvas: Boolean = false
+ // Whether `Path`s should be rendered on a `Canvas` renderer.
+ // By default, all `Path`s are rendered in a `SVG` renderer.
+ return (this.options.preferCanvas && canvas(options)) || svg(options);
+ }
+});
+
+/*
+ * L.Rectangle extends Polygon and creates a rectangle when passed a LatLngBounds object.
+ */
+
+/*
+ * @class Rectangle
+ * @aka L.Rectangle
+ * @inherits Polygon
+ *
+ * A class for drawing rectangle overlays on a map. Extends `Polygon`.
+ *
+ * @example
+ *
+ * ```js
+ * // define rectangle geographical bounds
+ * var bounds = [[54.559322, -5.767822], [56.1210604, -3.021240]];
+ *
+ * // create an orange rectangle
+ * L.rectangle(bounds, {color: "#ff7800", weight: 1}).addTo(map);
+ *
+ * // zoom the map to the rectangle bounds
+ * map.fitBounds(bounds);
+ * ```
+ *
+ */
+
+
+var Rectangle = Polygon.extend({
+ initialize: function (latLngBounds, options) {
+ Polygon.prototype.initialize.call(this, this._boundsToLatLngs(latLngBounds), options);
+ },
+
+ // @method setBounds(latLngBounds: LatLngBounds): this
+ // Redraws the rectangle with the passed bounds.
+ setBounds: function (latLngBounds) {
+ return this.setLatLngs(this._boundsToLatLngs(latLngBounds));
+ },
+
+ _boundsToLatLngs: function (latLngBounds) {
+ latLngBounds = toLatLngBounds(latLngBounds);
+ return [
+ latLngBounds.getSouthWest(),
+ latLngBounds.getNorthWest(),
+ latLngBounds.getNorthEast(),
+ latLngBounds.getSouthEast()
+ ];
+ }
+});
+
+
+// @factory L.rectangle(latLngBounds: LatLngBounds, options?: Polyline options)
+function rectangle(latLngBounds, options) {
+ return new Rectangle(latLngBounds, options);
+}
+
+SVG.create = create;
+SVG.pointsToPath = pointsToPath;
+
+GeoJSON.geometryToLayer = geometryToLayer;
+GeoJSON.coordsToLatLng = coordsToLatLng;
+GeoJSON.coordsToLatLngs = coordsToLatLngs;
+GeoJSON.latLngToCoords = latLngToCoords;
+GeoJSON.latLngsToCoords = latLngsToCoords;
+GeoJSON.getFeature = getFeature;
+GeoJSON.asFeature = asFeature;
+
+/*
+ * L.Handler.BoxZoom is used to add shift-drag zoom interaction to the map
+ * (zoom to a selected bounding box), enabled by default.
+ */
+
+// @namespace Map
+// @section Interaction Options
+Map.mergeOptions({
+ // @option boxZoom: Boolean = true
+ // Whether the map can be zoomed to a rectangular area specified by
+ // dragging the mouse while pressing the shift key.
+ boxZoom: true
+});
+
+var BoxZoom = Handler.extend({
+ initialize: function (map) {
+ this._map = map;
+ this._container = map._container;
+ this._pane = map._panes.overlayPane;
+ this._resetStateTimeout = 0;
+ map.on('unload', this._destroy, this);
+ },
+
+ addHooks: function () {
+ on(this._container, 'mousedown', this._onMouseDown, this);
+ },
+
+ removeHooks: function () {
+ off(this._container, 'mousedown', this._onMouseDown, this);
+ },
+
+ moved: function () {
+ return this._moved;
+ },
+
+ _destroy: function () {
+ remove(this._pane);
+ delete this._pane;
+ },
+
+ _resetState: function () {
+ this._resetStateTimeout = 0;
+ this._moved = false;
+ },
+
+ _clearDeferredResetState: function () {
+ if (this._resetStateTimeout !== 0) {
+ clearTimeout(this._resetStateTimeout);
+ this._resetStateTimeout = 0;
+ }
+ },
+
+ _onMouseDown: function (e) {
+ if (!e.shiftKey || ((e.which !== 1) && (e.button !== 1))) { return false; }
+
+ // Clear the deferred resetState if it hasn't executed yet, otherwise it
+ // will interrupt the interaction and orphan a box element in the container.
+ this._clearDeferredResetState();
+ this._resetState();
+
+ disableTextSelection();
+ disableImageDrag();
+
+ this._startPoint = this._map.mouseEventToContainerPoint(e);
+
+ on(document, {
+ contextmenu: stop,
+ mousemove: this._onMouseMove,
+ mouseup: this._onMouseUp,
+ keydown: this._onKeyDown
+ }, this);
+ },
+
+ _onMouseMove: function (e) {
+ if (!this._moved) {
+ this._moved = true;
+
+ this._box = create$1('div', 'leaflet-zoom-box', this._container);
+ addClass(this._container, 'leaflet-crosshair');
+
+ this._map.fire('boxzoomstart');
+ }
+
+ this._point = this._map.mouseEventToContainerPoint(e);
+
+ var bounds = new Bounds(this._point, this._startPoint),
+ size = bounds.getSize();
+
+ setPosition(this._box, bounds.min);
+
+ this._box.style.width = size.x + 'px';
+ this._box.style.height = size.y + 'px';
+ },
+
+ _finish: function () {
+ if (this._moved) {
+ remove(this._box);
+ removeClass(this._container, 'leaflet-crosshair');
+ }
+
+ enableTextSelection();
+ enableImageDrag();
+
+ off(document, {
+ contextmenu: stop,
+ mousemove: this._onMouseMove,
+ mouseup: this._onMouseUp,
+ keydown: this._onKeyDown
+ }, this);
+ },
+
+ _onMouseUp: function (e) {
+ if ((e.which !== 1) && (e.button !== 1)) { return; }
+
+ this._finish();
+
+ if (!this._moved) { return; }
+ // Postpone to next JS tick so internal click event handling
+ // still see it as "moved".
+ this._clearDeferredResetState();
+ this._resetStateTimeout = setTimeout(bind(this._resetState, this), 0);
+
+ var bounds = new LatLngBounds(
+ this._map.containerPointToLatLng(this._startPoint),
+ this._map.containerPointToLatLng(this._point));
+
+ this._map
+ .fitBounds(bounds)
+ .fire('boxzoomend', {boxZoomBounds: bounds});
+ },
+
+ _onKeyDown: function (e) {
+ if (e.keyCode === 27) {
+ this._finish();
+ this._clearDeferredResetState();
+ this._resetState();
+ }
+ }
+});
+
+// @section Handlers
+// @property boxZoom: Handler
+// Box (shift-drag with mouse) zoom handler.
+Map.addInitHook('addHandler', 'boxZoom', BoxZoom);
+
+/*
+ * L.Handler.DoubleClickZoom is used to handle double-click zoom on the map, enabled by default.
+ */
+
+// @namespace Map
+// @section Interaction Options
+
+Map.mergeOptions({
+ // @option doubleClickZoom: Boolean|String = true
+ // Whether the map can be zoomed in by double clicking on it and
+ // zoomed out by double clicking while holding shift. If passed
+ // `'center'`, double-click zoom will zoom to the center of the
+ // view regardless of where the mouse was.
+ doubleClickZoom: true
+});
+
+var DoubleClickZoom = Handler.extend({
+ addHooks: function () {
+ this._map.on('dblclick', this._onDoubleClick, this);
+ },
+
+ removeHooks: function () {
+ this._map.off('dblclick', this._onDoubleClick, this);
+ },
+
+ _onDoubleClick: function (e) {
+ var map = this._map,
+ oldZoom = map.getZoom(),
+ delta = map.options.zoomDelta,
+ zoom = e.originalEvent.shiftKey ? oldZoom - delta : oldZoom + delta;
+
+ if (map.options.doubleClickZoom === 'center') {
+ map.setZoom(zoom);
+ } else {
+ map.setZoomAround(e.containerPoint, zoom);
+ }
+ }
+});
+
+// @section Handlers
+//
+// Map properties include interaction handlers that allow you to control
+// interaction behavior in runtime, enabling or disabling certain features such
+// as dragging or touch zoom (see `Handler` methods). For example:
+//
+// ```js
+// map.doubleClickZoom.disable();
+// ```
+//
+// @property doubleClickZoom: Handler
+// Double click zoom handler.
+Map.addInitHook('addHandler', 'doubleClickZoom', DoubleClickZoom);
+
+/*
+ * L.Handler.MapDrag is used to make the map draggable (with panning inertia), enabled by default.
+ */
+
+// @namespace Map
+// @section Interaction Options
+Map.mergeOptions({
+ // @option dragging: Boolean = true
+ // Whether the map is draggable with mouse/touch or not.
+ dragging: true,
+
+ // @section Panning Inertia Options
+ // @option inertia: Boolean = *
+ // If enabled, panning of the map will have an inertia effect where
+ // the map builds momentum while dragging and continues moving in
+ // the same direction for some time. Feels especially nice on touch
+ // devices. Enabled by default.
+ inertia: true,
+
+ // @option inertiaDeceleration: Number = 3000
+ // The rate with which the inertial movement slows down, in pixels/second².
+ inertiaDeceleration: 3400, // px/s^2
+
+ // @option inertiaMaxSpeed: Number = Infinity
+ // Max speed of the inertial movement, in pixels/second.
+ inertiaMaxSpeed: Infinity, // px/s
+
+ // @option easeLinearity: Number = 0.2
+ easeLinearity: 0.2,
+
+ // TODO refactor, move to CRS
+ // @option worldCopyJump: Boolean = false
+ // With this option enabled, the map tracks when you pan to another "copy"
+ // of the world and seamlessly jumps to the original one so that all overlays
+ // like markers and vector layers are still visible.
+ worldCopyJump: false,
+
+ // @option maxBoundsViscosity: Number = 0.0
+ // If `maxBounds` is set, this option will control how solid the bounds
+ // are when dragging the map around. The default value of `0.0` allows the
+ // user to drag outside the bounds at normal speed, higher values will
+ // slow down map dragging outside bounds, and `1.0` makes the bounds fully
+ // solid, preventing the user from dragging outside the bounds.
+ maxBoundsViscosity: 0.0
+});
+
+var Drag = Handler.extend({
+ addHooks: function () {
+ if (!this._draggable) {
+ var map = this._map;
+
+ this._draggable = new Draggable(map._mapPane, map._container);
+
+ this._draggable.on({
+ dragstart: this._onDragStart,
+ drag: this._onDrag,
+ dragend: this._onDragEnd
+ }, this);
+
+ this._draggable.on('predrag', this._onPreDragLimit, this);
+ if (map.options.worldCopyJump) {
+ this._draggable.on('predrag', this._onPreDragWrap, this);
+ map.on('zoomend', this._onZoomEnd, this);
+
+ map.whenReady(this._onZoomEnd, this);
+ }
+ }
+ addClass(this._map._container, 'leaflet-grab leaflet-touch-drag');
+ this._draggable.enable();
+ this._positions = [];
+ this._times = [];
+ },
+
+ removeHooks: function () {
+ removeClass(this._map._container, 'leaflet-grab');
+ removeClass(this._map._container, 'leaflet-touch-drag');
+ this._draggable.disable();
+ },
+
+ moved: function () {
+ return this._draggable && this._draggable._moved;
+ },
+
+ moving: function () {
+ return this._draggable && this._draggable._moving;
+ },
+
+ _onDragStart: function () {
+ var map = this._map;
+
+ map._stop();
+ if (this._map.options.maxBounds && this._map.options.maxBoundsViscosity) {
+ var bounds = toLatLngBounds(this._map.options.maxBounds);
+
+ this._offsetLimit = toBounds(
+ this._map.latLngToContainerPoint(bounds.getNorthWest()).multiplyBy(-1),
+ this._map.latLngToContainerPoint(bounds.getSouthEast()).multiplyBy(-1)
+ .add(this._map.getSize()));
+
+ this._viscosity = Math.min(1.0, Math.max(0.0, this._map.options.maxBoundsViscosity));
+ } else {
+ this._offsetLimit = null;
+ }
+
+ map
+ .fire('movestart')
+ .fire('dragstart');
+
+ if (map.options.inertia) {
+ this._positions = [];
+ this._times = [];
+ }
+ },
+
+ _onDrag: function (e) {
+ if (this._map.options.inertia) {
+ var time = this._lastTime = +new Date(),
+ pos = this._lastPos = this._draggable._absPos || this._draggable._newPos;
+
+ this._positions.push(pos);
+ this._times.push(time);
+
+ this._prunePositions(time);
+ }
+
+ this._map
+ .fire('move', e)
+ .fire('drag', e);
+ },
+
+ _prunePositions: function (time) {
+ while (this._positions.length > 1 && time - this._times[0] > 50) {
+ this._positions.shift();
+ this._times.shift();
+ }
+ },
+
+ _onZoomEnd: function () {
+ var pxCenter = this._map.getSize().divideBy(2),
+ pxWorldCenter = this._map.latLngToLayerPoint([0, 0]);
+
+ this._initialWorldOffset = pxWorldCenter.subtract(pxCenter).x;
+ this._worldWidth = this._map.getPixelWorldBounds().getSize().x;
+ },
+
+ _viscousLimit: function (value, threshold) {
+ return value - (value - threshold) * this._viscosity;
+ },
+
+ _onPreDragLimit: function () {
+ if (!this._viscosity || !this._offsetLimit) { return; }
+
+ var offset = this._draggable._newPos.subtract(this._draggable._startPos);
+
+ var limit = this._offsetLimit;
+ if (offset.x < limit.min.x) { offset.x = this._viscousLimit(offset.x, limit.min.x); }
+ if (offset.y < limit.min.y) { offset.y = this._viscousLimit(offset.y, limit.min.y); }
+ if (offset.x > limit.max.x) { offset.x = this._viscousLimit(offset.x, limit.max.x); }
+ if (offset.y > limit.max.y) { offset.y = this._viscousLimit(offset.y, limit.max.y); }
+
+ this._draggable._newPos = this._draggable._startPos.add(offset);
+ },
+
+ _onPreDragWrap: function () {
+ // TODO refactor to be able to adjust map pane position after zoom
+ var worldWidth = this._worldWidth,
+ halfWidth = Math.round(worldWidth / 2),
+ dx = this._initialWorldOffset,
+ x = this._draggable._newPos.x,
+ newX1 = (x - halfWidth + dx) % worldWidth + halfWidth - dx,
+ newX2 = (x + halfWidth + dx) % worldWidth - halfWidth - dx,
+ newX = Math.abs(newX1 + dx) < Math.abs(newX2 + dx) ? newX1 : newX2;
+
+ this._draggable._absPos = this._draggable._newPos.clone();
+ this._draggable._newPos.x = newX;
+ },
+
+ _onDragEnd: function (e) {
+ var map = this._map,
+ options = map.options,
+
+ noInertia = !options.inertia || e.noInertia || this._times.length < 2;
+
+ map.fire('dragend', e);
+
+ if (noInertia) {
+ map.fire('moveend');
+
+ } else {
+ this._prunePositions(+new Date());
+
+ var direction = this._lastPos.subtract(this._positions[0]),
+ duration = (this._lastTime - this._times[0]) / 1000,
+ ease = options.easeLinearity,
+
+ speedVector = direction.multiplyBy(ease / duration),
+ speed = speedVector.distanceTo([0, 0]),
+
+ limitedSpeed = Math.min(options.inertiaMaxSpeed, speed),
+ limitedSpeedVector = speedVector.multiplyBy(limitedSpeed / speed),
+
+ decelerationDuration = limitedSpeed / (options.inertiaDeceleration * ease),
+ offset = limitedSpeedVector.multiplyBy(-decelerationDuration / 2).round();
+
+ if (!offset.x && !offset.y) {
+ map.fire('moveend');
+
+ } else {
+ offset = map._limitOffset(offset, map.options.maxBounds);
+
+ requestAnimFrame(function () {
+ map.panBy(offset, {
+ duration: decelerationDuration,
+ easeLinearity: ease,
+ noMoveStart: true,
+ animate: true
+ });
+ });
+ }
+ }
+ }
+});
+
+// @section Handlers
+// @property dragging: Handler
+// Map dragging handler (by both mouse and touch).
+Map.addInitHook('addHandler', 'dragging', Drag);
+
+/*
+ * L.Map.Keyboard is handling keyboard interaction with the map, enabled by default.
+ */
+
+// @namespace Map
+// @section Keyboard Navigation Options
+Map.mergeOptions({
+ // @option keyboard: Boolean = true
+ // Makes the map focusable and allows users to navigate the map with keyboard
+ // arrows and `+`/`-` keys.
+ keyboard: true,
+
+ // @option keyboardPanDelta: Number = 80
+ // Amount of pixels to pan when pressing an arrow key.
+ keyboardPanDelta: 80
+});
+
+var Keyboard = Handler.extend({
+
+ keyCodes: {
+ left: [37],
+ right: [39],
+ down: [40],
+ up: [38],
+ zoomIn: [187, 107, 61, 171],
+ zoomOut: [189, 109, 54, 173]
+ },
+
+ initialize: function (map) {
+ this._map = map;
+
+ this._setPanDelta(map.options.keyboardPanDelta);
+ this._setZoomDelta(map.options.zoomDelta);
+ },
+
+ addHooks: function () {
+ var container = this._map._container;
+
+ // make the container focusable by tabbing
+ if (container.tabIndex <= 0) {
+ container.tabIndex = '0';
+ }
+
+ on(container, {
+ focus: this._onFocus,
+ blur: this._onBlur,
+ mousedown: this._onMouseDown
+ }, this);
+
+ this._map.on({
+ focus: this._addHooks,
+ blur: this._removeHooks
+ }, this);
+ },
+
+ removeHooks: function () {
+ this._removeHooks();
+
+ 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) { return; }
+
+ var body = document.body,
+ docEl = document.documentElement,
+ top = body.scrollTop || docEl.scrollTop,
+ left = body.scrollLeft || docEl.scrollLeft;
+
+ this._map._container.focus();
+
+ window.scrollTo(left, top);
+ },
+
+ _onFocus: function () {
+ this._focused = true;
+ this._map.fire('focus');
+ },
+
+ _onBlur: function () {
+ this._focused = false;
+ this._map.fire('blur');
+ },
+
+ _setPanDelta: function (panDelta) {
+ var keys = this._panKeys = {},
+ codes = this.keyCodes,
+ i, len;
+
+ for (i = 0, len = codes.left.length; i < len; i++) {
+ keys[codes.left[i]] = [-1 * panDelta, 0];
+ }
+ for (i = 0, len = codes.right.length; i < len; i++) {
+ keys[codes.right[i]] = [panDelta, 0];
+ }
+ for (i = 0, len = codes.down.length; i < len; i++) {
+ keys[codes.down[i]] = [0, panDelta];
+ }
+ for (i = 0, len = codes.up.length; i < len; i++) {
+ keys[codes.up[i]] = [0, -1 * panDelta];
+ }
+ },
+
+ _setZoomDelta: function (zoomDelta) {
+ var keys = this._zoomKeys = {},
+ codes = this.keyCodes,
+ i, len;
+
+ for (i = 0, len = codes.zoomIn.length; i < len; i++) {
+ keys[codes.zoomIn[i]] = zoomDelta;
+ }
+ for (i = 0, len = codes.zoomOut.length; i < len; i++) {
+ keys[codes.zoomOut[i]] = -zoomDelta;
+ }
+ },
+
+ _addHooks: function () {
+ on(document, 'keydown', this._onKeyDown, this);
+ },
+
+ _removeHooks: function () {
+ off(document, 'keydown', this._onKeyDown, this);
+ },
+
+ _onKeyDown: function (e) {
+ if (e.altKey || e.ctrlKey || e.metaKey) { return; }
+
+ var key = e.keyCode,
+ map = this._map,
+ offset;
+
+ if (key in this._panKeys) {
+ if (!map._panAnim || !map._panAnim._inProgress) {
+ offset = this._panKeys[key];
+ if (e.shiftKey) {
+ offset = toPoint(offset).multiplyBy(3);
+ }
+
+ if (map.options.maxBounds) {
+ offset = map._limitOffset(toPoint(offset), map.options.maxBounds);
+ }
+
+ if (map.options.worldCopyJump) {
+ var newLatLng = map.wrapLatLng(map.unproject(map.project(map.getCenter()).add(offset)));
+ map.panTo(newLatLng);
+ } else {
+ map.panBy(offset);
+ }
+ }
+ } else if (key in this._zoomKeys) {
+ map.setZoom(map.getZoom() + (e.shiftKey ? 3 : 1) * this._zoomKeys[key]);
+
+ } else if (key === 27 && map._popup && map._popup.options.closeOnEscapeKey) {
+ map.closePopup();
+
+ } else {
+ return;
+ }
+
+ stop(e);
+ }
+});
+
+// @section Handlers
+// @section Handlers
+// @property keyboard: Handler
+// Keyboard navigation handler.
+Map.addInitHook('addHandler', 'keyboard', Keyboard);
+
+/*
+ * L.Handler.ScrollWheelZoom is used by L.Map to enable mouse scroll wheel zoom on the map.
+ */
+
+// @namespace Map
+// @section Interaction Options
+Map.mergeOptions({
+ // @section Mouse wheel options
+ // @option scrollWheelZoom: Boolean|String = true
+ // Whether the map can be zoomed by using the mouse wheel. If passed `'center'`,
+ // it will zoom to the center of the view regardless of where the mouse was.
+ scrollWheelZoom: true,
+
+ // @option wheelDebounceTime: Number = 40
+ // Limits the rate at which a wheel can fire (in milliseconds). By default
+ // user can't zoom via wheel more often than once per 40 ms.
+ wheelDebounceTime: 40,
+
+ // @option wheelPxPerZoomLevel: Number = 60
+ // How many scroll pixels (as reported by [L.DomEvent.getWheelDelta](#domevent-getwheeldelta))
+ // mean a change of one full zoom level. Smaller values will make wheel-zooming
+ // faster (and vice versa).
+ wheelPxPerZoomLevel: 60
+});
+
+var ScrollWheelZoom = Handler.extend({
+ addHooks: function () {
+ on(this._map._container, 'wheel', this._onWheelScroll, this);
+
+ this._delta = 0;
+ },
+
+ removeHooks: function () {
+ off(this._map._container, 'wheel', this._onWheelScroll, this);
+ },
+
+ _onWheelScroll: function (e) {
+ var delta = getWheelDelta(e);
+
+ var debounce = this._map.options.wheelDebounceTime;
+
+ this._delta += delta;
+ this._lastMousePos = this._map.mouseEventToContainerPoint(e);
+
+ if (!this._startTime) {
+ this._startTime = +new Date();
+ }
+
+ var left = Math.max(debounce - (+new Date() - this._startTime), 0);
+
+ clearTimeout(this._timer);
+ this._timer = setTimeout(bind(this._performZoom, this), left);
+
+ stop(e);
+ },
+
+ _performZoom: function () {
+ var map = this._map,
+ zoom = map.getZoom(),
+ snap = this._map.options.zoomSnap || 0;
+
+ map._stop(); // stop panning and fly animations if any
+
+ // map the delta with a sigmoid function to -4..4 range leaning on -1..1
+ var d2 = this._delta / (this._map.options.wheelPxPerZoomLevel * 4),
+ d3 = 4 * Math.log(2 / (1 + Math.exp(-Math.abs(d2)))) / Math.LN2,
+ d4 = snap ? Math.ceil(d3 / snap) * snap : d3,
+ delta = map._limitZoom(zoom + (this._delta > 0 ? d4 : -d4)) - zoom;
+
+ this._delta = 0;
+ this._startTime = null;
+
+ if (!delta) { return; }
+
+ if (map.options.scrollWheelZoom === 'center') {
+ map.setZoom(zoom + delta);
+ } else {
+ map.setZoomAround(this._lastMousePos, zoom + delta);
+ }
+ }
+});
+
+// @section Handlers
+// @property scrollWheelZoom: Handler
+// Scroll wheel zoom handler.
+Map.addInitHook('addHandler', 'scrollWheelZoom', ScrollWheelZoom);
+
+/*
+ * L.Map.TapHold is used to simulate `contextmenu` event on long hold,
+ * which otherwise is not fired by mobile Safari.
+ */
+
+var tapHoldDelay = 600;
+
+// @namespace Map
+// @section Interaction Options
+Map.mergeOptions({
+ // @section Touch interaction options
+ // @option tapHold: Boolean
+ // Enables simulation of `contextmenu` event, default is `true` for mobile Safari.
+ tapHold: Browser.touchNative && Browser.safari && Browser.mobile,
+
+ // @option tapTolerance: Number = 15
+ // The max number of pixels a user can shift his finger during touch
+ // for it to be considered a valid tap.
+ tapTolerance: 15
+});
+
+var TapHold = Handler.extend({
+ addHooks: function () {
+ on(this._map._container, 'touchstart', this._onDown, this);
+ },
+
+ removeHooks: function () {
+ off(this._map._container, 'touchstart', this._onDown, this);
+ },
+
+ _onDown: function (e) {
+ clearTimeout(this._holdTimeout);
+ if (e.touches.length !== 1) { return; }
+
+ var first = e.touches[0];
+ this._startPos = this._newPos = new Point(first.clientX, first.clientY);
+
+ this._holdTimeout = setTimeout(bind(function () {
+ this._cancel();
+ if (!this._isTapValid()) { return; }
+
+ // prevent simulated mouse events https://w3c.github.io/touch-events/#mouse-events
+ on(document, 'touchend', preventDefault);
+ on(document, 'touchend touchcancel', this._cancelClickPrevent);
+ this._simulateEvent('contextmenu', first);
+ }, this), tapHoldDelay);
+
+ on(document, 'touchend touchcancel contextmenu', this._cancel, this);
+ on(document, 'touchmove', this._onMove, this);
+ },
+
+ _cancelClickPrevent: function cancelClickPrevent() {
+ off(document, 'touchend', preventDefault);
+ off(document, 'touchend touchcancel', cancelClickPrevent);
+ },
+
+ _cancel: function () {
+ clearTimeout(this._holdTimeout);
+ off(document, 'touchend touchcancel contextmenu', this._cancel, this);
+ off(document, 'touchmove', this._onMove, this);
+ },
+
+ _onMove: function (e) {
+ var first = e.touches[0];
+ this._newPos = new Point(first.clientX, first.clientY);
+ },
+
+ _isTapValid: function () {
+ return this._newPos.distanceTo(this._startPos) <= this._map.options.tapTolerance;
+ },
+
+ _simulateEvent: function (type, e) {
+ var simulatedEvent = new MouseEvent(type, {
+ bubbles: true,
+ cancelable: true,
+ view: window,
+ // detail: 1,
+ screenX: e.screenX,
+ screenY: e.screenY,
+ clientX: e.clientX,
+ clientY: e.clientY,
+ // button: 2,
+ // buttons: 2
+ });
+
+ simulatedEvent._simulated = true;
+
+ e.target.dispatchEvent(simulatedEvent);
+ }
+});
+
+// @section Handlers
+// @property tapHold: Handler
+// Long tap handler to simulate `contextmenu` event (useful in mobile Safari).
+Map.addInitHook('addHandler', 'tapHold', TapHold);
+
+/*
+ * L.Handler.TouchZoom is used by L.Map to add pinch zoom on supported mobile browsers.
+ */
+
+// @namespace Map
+// @section Interaction Options
+Map.mergeOptions({
+ // @section Touch interaction options
+ // @option touchZoom: Boolean|String = *
+ // Whether the map can be zoomed by touch-dragging with two fingers. If
+ // passed `'center'`, it will zoom to the center of the view regardless of
+ // where the touch events (fingers) were. Enabled for touch-capable web
+ // browsers.
+ touchZoom: Browser.touch,
+
+ // @option bounceAtZoomLimits: Boolean = true
+ // Set it to false if you don't want the map to zoom beyond min/max zoom
+ // and then bounce back when pinch-zooming.
+ bounceAtZoomLimits: true
+});
+
+var TouchZoom = Handler.extend({
+ addHooks: function () {
+ addClass(this._map._container, 'leaflet-touch-zoom');
+ on(this._map._container, 'touchstart', this._onTouchStart, this);
+ },
+
+ removeHooks: function () {
+ removeClass(this._map._container, 'leaflet-touch-zoom');
+ off(this._map._container, 'touchstart', this._onTouchStart, this);
+ },
+
+ _onTouchStart: function (e) {
+ var map = this._map;
+ if (!e.touches || e.touches.length !== 2 || map._animatingZoom || this._zooming) { return; }
+
+ var p1 = map.mouseEventToContainerPoint(e.touches[0]),
+ p2 = map.mouseEventToContainerPoint(e.touches[1]);
+
+ this._centerPoint = map.getSize()._divideBy(2);
+ this._startLatLng = map.containerPointToLatLng(this._centerPoint);
+ if (map.options.touchZoom !== 'center') {
+ this._pinchStartLatLng = map.containerPointToLatLng(p1.add(p2)._divideBy(2));
+ }
+
+ this._startDist = p1.distanceTo(p2);
+ this._startZoom = map.getZoom();
+
+ this._moved = false;
+ this._zooming = true;
+
+ map._stop();
+
+ on(document, 'touchmove', this._onTouchMove, this);
+ on(document, 'touchend touchcancel', this._onTouchEnd, this);
+
+ preventDefault(e);
+ },
+
+ _onTouchMove: function (e) {
+ if (!e.touches || e.touches.length !== 2 || !this._zooming) { return; }
+
+ var map = this._map,
+ p1 = map.mouseEventToContainerPoint(e.touches[0]),
+ p2 = map.mouseEventToContainerPoint(e.touches[1]),
+ scale = p1.distanceTo(p2) / this._startDist;
+
+ this._zoom = map.getScaleZoom(scale, this._startZoom);
+
+ if (!map.options.bounceAtZoomLimits && (
+ (this._zoom < map.getMinZoom() && scale < 1) ||
+ (this._zoom > map.getMaxZoom() && scale > 1))) {
+ this._zoom = map._limitZoom(this._zoom);
+ }
+
+ if (map.options.touchZoom === 'center') {
+ this._center = this._startLatLng;
+ if (scale === 1) { return; }
+ } else {
+ // Get delta from pinch to center, so centerLatLng is delta applied to initial pinchLatLng
+ var delta = p1._add(p2)._divideBy(2)._subtract(this._centerPoint);
+ if (scale === 1 && delta.x === 0 && delta.y === 0) { return; }
+ this._center = map.unproject(map.project(this._pinchStartLatLng, this._zoom).subtract(delta), this._zoom);
+ }
+
+ if (!this._moved) {
+ map._moveStart(true, false);
+ this._moved = true;
+ }
+
+ cancelAnimFrame(this._animRequest);
+
+ var moveFn = bind(map._move, map, this._center, this._zoom, {pinch: true, round: false}, undefined);
+ this._animRequest = requestAnimFrame(moveFn, this, true);
+
+ preventDefault(e);
+ },
+
+ _onTouchEnd: function () {
+ if (!this._moved || !this._zooming) {
+ this._zooming = false;
+ return;
+ }
+
+ this._zooming = false;
+ cancelAnimFrame(this._animRequest);
+
+ off(document, 'touchmove', this._onTouchMove, this);
+ off(document, 'touchend touchcancel', this._onTouchEnd, this);
+
+ // Pinch updates GridLayers' levels only when zoomSnap is off, so zoomSnap becomes noUpdate.
+ if (this._map.options.zoomAnimation) {
+ this._map._animateZoom(this._center, this._map._limitZoom(this._zoom), true, this._map.options.zoomSnap);
+ } else {
+ this._map._resetView(this._center, this._map._limitZoom(this._zoom));
+ }
+ }
+});
+
+// @section Handlers
+// @property touchZoom: Handler
+// Touch zoom handler.
+Map.addInitHook('addHandler', 'touchZoom', TouchZoom);
+
+Map.BoxZoom = BoxZoom;
+Map.DoubleClickZoom = DoubleClickZoom;
+Map.Drag = Drag;
+Map.Keyboard = Keyboard;
+Map.ScrollWheelZoom = ScrollWheelZoom;
+Map.TapHold = TapHold;
+Map.TouchZoom = TouchZoom;
+
+export { Bounds, Browser, CRS, Canvas, Circle, CircleMarker, Class, Control, DivIcon, DivOverlay, DomEvent, DomUtil, Draggable, Evented, FeatureGroup, GeoJSON, GridLayer, Handler, Icon, ImageOverlay, LatLng, LatLngBounds, Layer, LayerGroup, LineUtil, Map, Marker, Mixin, Path, Point, PolyUtil, Polygon, Polyline, Popup, PosAnimation, index as Projection, Rectangle, Renderer, SVG, SVGOverlay, TileLayer, Tooltip, Transformation, Util, VideoOverlay, bind, toBounds as bounds, canvas, circle, circleMarker, control, divIcon, extend, featureGroup, geoJSON, geoJson, gridLayer, icon, imageOverlay, toLatLng as latLng, toLatLngBounds as latLngBounds, layerGroup, createMap as map, marker, toPoint as point, polygon, polyline, popup, rectangle, setOptions, stamp, svg, svgOverlay, tileLayer, tooltip, toTransformation as transformation, version, videoOverlay };
+//# sourceMappingURL=leaflet-src.esm.js.map
diff --git a/src/main/webapp/js/mapModal.js b/src/main/webapp/js/mapModal.js
new file mode 100644
index 0000000000000000000000000000000000000000..a7076fd49b4ea12020e123816307612d043a108d
--- /dev/null
+++ b/src/main/webapp/js/mapModal.js
@@ -0,0 +1,676 @@
+// mapModal.js
+import {
+ map,
+ divIcon,
+ tileLayer,
+ geoJSON,
+ circleMarker,
+ marker,
+ GeoJSON,
+ DomEvent,
+ Control,
+ DomUtil,
+ latLng
+} from '/js/3rdparty/leaflet-src.esm.js';
+
+/**
+ * This JavaScript module enables the display of a map modal centered on Norway, with a given set of
+ * coordinates representing points of interest. The map is primarily intended for use within VIPSLogic,
+ * but can also be imported and used in VIPSWeb or other applications within the VIPS sphere.
+ *
+ * Follow the steps below in order to set up the map:
+ * 1) Include the following stylesheets:
+ * <link type="text/css" rel="stylesheet" href="(https://logic.vips.nibio.no)/css/3rdparty/leaflet.css" />
+ * <link type="text/css" rel="stylesheet" href="/https://logic.vips.nibio.no)/css/mapModal.css" />
+ * 2) Include HTML to display a button, and a div in which the map will be opened:
+ * <i id="open-map-modal-icon" class="fa fa-map-marker" onclick="openLocationMap()"></i>
+ * <div id="location-map" class="map-modal"></div>
+ * 3) Include MapModal within a script tag of type 'module', and implement the function openLocationMap(),
+ * which initializes and opens the map modal.
+ *
+ * Uses css classes from bootstrap 3.4.1
+ * Leaflet: https://unpkg.com/leaflet@1.9.4/dist/leaflet-src.esm.js
+ */
+class MapModal {
+
+ static TRANSLATIONS = {
+ nb: {
+ selectLocation: 'Velg sted',
+ selectCoordinates: 'Velg punkt',
+ createNewLocation: 'Opprett nytt sted',
+ selectNewCoordinates: 'Velg nytt punkt',
+ name: 'Navn',
+ latitude: 'Breddegrad',
+ longitude: 'Lengdegrad',
+ type: 'Type',
+ zoomToLocation: 'Zoom til meg',
+ geolocationNotSupported: 'Geolokalisering støttes ikke av denne nettleseren',
+ geolocationFailed: 'Fant ikke din posisjon',
+ closeMap: 'Lukk kart',
+ poiType0: 'Uspesifisert',
+ poiType1: 'Værstasjon',
+ poiType2: 'Gård',
+ poiType3: 'Felt',
+ poiType5: 'Felle',
+ poiType6: 'Bigårdsplass',
+ poiType7: 'Planteskole',
+ },
+ en: {
+ selectLocation: 'Select location',
+ selectCoordinates: 'Select point',
+ createNewLocation: 'Create New Location',
+ selectNewCoordinates: 'Select new point',
+ name: 'Name',
+ latitude: 'Latitude',
+ longitude: 'Longitude',
+ type: 'Type',
+ zoomToLocation: 'Zoom to My Location',
+ geolocationNotSupported: 'Geolocation is not supported by this browser',
+ geolocationFailed: 'Unable to retrieve your location',
+ closeMap: 'Close Map',
+ poiType0: 'Unspecified',
+ poiType1: 'Weather station',
+ poiType2: 'Farm',
+ poiType3: 'Field',
+ poiType5: 'Trap',
+ poiType6: 'Apiary site',
+ poiType7: 'Nursery',
+ }
+ };
+
+ /**
+ * @param mapModalId The id of the HTML element in which the modal should be opened
+ * @param geoJsonData GeoJson containing all features which should be displayed on the map
+ * @param language The language in which texts should be displayed, either 'nb' or 'en'
+ * @param isPoiMap True if the map operates on pois with an id, name and type, false if it operates on coordinates
+ * @param allowNewPoints Whether or not the user should be allowed to add new points
+ * @param callbackOnClose Callback function to call when closing the modal
+ */
+ constructor(mapModalId, geoJsonData, language = 'nb', isPoiMap = true, allowNewPoints = false, callbackOnClose = null) {
+ this.mapModalElement = document.getElementById(mapModalId);
+ this.mapContainerId = mapModalId + "-container";
+ this.mapContainerElement = this.addMapContainer(this.mapModalElement, this.mapContainerId);
+
+ this.geoJsonData = geoJsonData && geoJsonData !== "{}" ? geoJsonData : { features: []};
+ // Filter out invalid features
+ this.geoJsonData.features = this.geoJsonData.features.filter(feature => feature.geometry.type === "Point" && !isNaN(feature.geometry.coordinates[0]) && !isNaN(feature.geometry.coordinates[1]));
+
+ if (language in MapModal.TRANSLATIONS) {
+ this.translations = MapModal.TRANSLATIONS[language];
+ } else {
+ console.error("'" + language + "' is not a supported language");
+ this.translations = MapModal.TRANSLATIONS['nb'];
+ }
+ this.isPoiMap = isPoiMap;
+ this.allowNewPoints = allowNewPoints;
+ this.callbackOnClose = callbackOnClose;
+
+ this.map = null;
+ this.isMapInitialized = false;
+ this.markersByType = {};
+ this.selectedNewPointMarker = null;
+ this.selectedExistingPointMarker = null;
+ this.coordinatePrecision = 6;
+
+ this.zoomToLocationControl = new ZoomToLocationControl({
+ translations: this.translations
+ });
+ this.closeMapControl = new CloseMapControl({
+ translations: this.translations,
+ onClose: () => {
+ this.closeModal()
+ }
+ });
+
+ // Colours for the available types of pois
+ this.typeColorMap = {
+ 0: "#5DADE2", // Bright Blue
+ 1: "#58D68D", // Vibrant Green
+ 2: "#AF7AC5", // Medium Lavender
+ 3: "#F5B041", // Warm Orange
+ 5: "#F7DC6F", // Bright Yellow
+ 6: "#DC7633", // Rich Brown
+ 7: "#FF33A6" // Vivid Magenta
+ };
+ }
+
+ addMapContainer(parentDiv, id) {
+ const mapContainer = document.createElement('div');
+ mapContainer.id = id;
+ mapContainer.style.height = '100%';
+ mapContainer.style.width = '100%';
+ mapContainer.style.position = 'relative';
+ parentDiv.appendChild(mapContainer);
+ return mapContainer;
+ }
+
+ styleOfSelectedPointMarker(newPoint) {
+ const styleMap = {
+ radius: 12,
+ color: "#FFFFFF",
+ weight: 2,
+ opacity: 1,
+ fillOpacity: 1,
+ };
+ if (newPoint) {
+ styleMap['fillColor'] = "#FF5733";
+ }
+ return styleMap
+ }
+
+ styleOfPointMarker(pointOfInterestTypeId) {
+ const color = this.typeColorMap[pointOfInterestTypeId] || "#3498DB";
+ return {
+ radius: 8,
+ fillColor: color,
+ color: "#FFFFFF",
+ weight: 2,
+ opacity: 1,
+ fillOpacity: 0.8
+ }
+ }
+
+ initMap(latitude = 65, longitude = 14, zoomLevel = 5) {
+ if (this.isMapInitialized) {
+ console.error("Map is already initialized");
+ return;
+ }
+ // Initialize the map centered on Norway
+ this.map = map(this.mapContainerId).setView([latitude, longitude], zoomLevel);
+ tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+ maxZoom: 19,
+ minZoom: 3
+ }).addTo(this.map);
+ console.info("Create map " + this.mapContainerId + " centered on (" + latitude + "," + longitude + ") with points", this.geoJsonData ? this.geoJsonData.features : null);
+
+ this.map.addControl(this.zoomToLocationControl);
+ this.map.addControl(this.closeMapControl);
+
+ // Add points to the map if given
+ if (this.geoJsonData && this.geoJsonData.features) {
+ geoJSON(this.geoJsonData, {
+ pointToLayer: (feature, latlng) => {
+ return circleMarker(latlng, this.styleOfPointMarker(feature.properties.pointOfInterestTypeId));
+ },
+ onEachFeature: (feature, layer) => {
+ const typeId = feature.properties.pointOfInterestTypeId;
+ this.bindActionToPoint(layer);
+ if (!this.markersByType[typeId]) {
+ this.markersByType[typeId] = [];
+ }
+ this.markersByType[typeId].push(layer);
+ }
+ }).addTo(this.map);
+ }
+
+ // Poi type selection panel should only be included if map operates on pois
+ if (this.isPoiMap) {
+ this.legendControl = new LegendControl({
+ typeColorMap: this.typeColorMap,
+ translations: this.translations,
+ markersByType: this.markersByType,
+ mapModalInstance: this
+ });
+ this.map.addControl(this.legendControl);
+ }
+
+ // Enable adding new points if allowed
+ if (this.allowNewPoints) {
+ this.enablePointCreation();
+ }
+ this.isMapInitialized = true;
+ }
+
+ // Function called when point is hidden (by deselecting its location type in legend box)
+ // If point is already selected, the popup is removed.
+ unbindActionToPoint(layer) {
+ if (this.selectedExistingPointMarker === layer) {
+ layer.closePopup();
+ this.removeSelectedPointMarkerIfExists();
+ }
+ layer.unbindPopup();
+ layer.off('click');
+ }
+
+ bindActionToPoint(layer) {
+ layer.bindPopup(this.popupContent(layer.feature));
+ layer.on('click', () => {
+ this.displaySelectedPoint(layer.feature, layer, false);
+ });
+ }
+
+ selectPointById(pointOfInterestId) {
+ const selectedFeature = this.getFeatureById(pointOfInterestId);
+ const selectedLayer = this.getLayerById(pointOfInterestId);
+ if(!selectedFeature || !selectedLayer) {
+ console.error("Unable to display selected point " + pointOfInterestId, this.geoJsonData.features)
+ return
+ }
+ this.displaySelectedPoint(selectedFeature, selectedLayer, true);
+ selectedLayer.openPopup();
+ }
+
+ getFeatureById(pointOfInterestId) {
+ return this.geoJsonData.features.find(feature => feature.properties.pointOfInterestId == pointOfInterestId);
+ }
+
+ getLayerById(pointOfInterestId) {
+ let result = null;
+ this.map.eachLayer(layer => {
+ if (layer instanceof GeoJSON) {
+ layer.eachLayer(l => {
+ if (l.feature && l.feature.properties.pointOfInterestId == pointOfInterestId) {
+ result = l;
+ }
+ });
+ }
+ });
+ return result;
+ }
+
+ displaySelectedPoint(feature, layer, zoomInToSelected = false) {
+ // Deselect previously selected point, if any
+ this.removeSelectedPointMarkerIfExists();
+ this.removeNewPointMarkerIfExists();
+
+ this.selectedExistingPointMarker = layer;
+ this.selectedExistingPointMarker.setStyle(this.styleOfSelectedPointMarker(false));
+ if (zoomInToSelected) {
+ const latLng = this.selectedExistingPointMarker.getLatLng();
+ this.map.setView(latLng, 10);
+ }
+ }
+
+ confirmSelection(feature) {
+ if (typeof this.callbackOnClose === 'function') {
+ const pointData = {
+ pointOfInterestId: feature.properties.pointOfInterestId,
+ name: feature.properties.pointOfInterestName,
+ pointOfInterestTypeId: feature.properties.pointOfInterestTypeId,
+ longitude: feature.geometry.coordinates[0],
+ latitude: feature.geometry.coordinates[1]
+ };
+ this.callbackOnClose(pointData);
+ }
+ this.closeModal();
+ }
+
+ enablePointCreation() {
+ this.map.on('click', (e) => {
+ const latlng = e.latlng;
+
+ // Click on the map should remove any previous selections
+ this.removeSelectedPointMarkerIfExists();
+ this.removeNewPointMarkerIfExists();
+ this.closeNewPointFormIfOpen();
+
+ // Calculate the pixel position from the map's click event
+ const containerPoint = this.map.latLngToContainerPoint(latlng);
+
+ this.selectedNewPointMarker = circleMarker(latlng, this.styleOfSelectedPointMarker(true)).addTo(this.map);
+ const newPointFormElement = this.addHtmlElementNewPointForm(containerPoint.x, containerPoint.y, latlng.lat, latlng.lng)
+
+ DomEvent.disableClickPropagation(newPointFormElement);
+ document.addEventListener('click', this.handleClickOutsidePointForm.bind(this), true);
+
+ const closeButton = newPointFormElement.querySelector("#map-poi-close-button");
+ const nameInput = newPointFormElement.querySelector('#map-poi-name');
+ const latitudeInput = newPointFormElement.querySelector('#map-poi-latitude');
+ const longitudeInput = newPointFormElement.querySelector('#map-poi-longitude');
+ const typeInput = newPointFormElement.querySelector('#map-poi-type');
+ const submitButton = newPointFormElement.querySelector('#map-poi-submit-button');
+
+ const validateInputs = () => {
+ const isValidLat = !isNaN(parseFloat(latitudeInput.value)) && isFinite(latitudeInput.value);
+ const isValidLng = !isNaN(parseFloat(longitudeInput.value)) && isFinite(longitudeInput.value);
+ if (isValidLat && isValidLng) {
+ this.updateMarkerPosition(this.selectedNewPointMarker, parseFloat(latitudeInput.value), parseFloat(longitudeInput.value));
+ }
+ submitButton.disabled = !(isValidLat && isValidLng);
+ };
+ latitudeInput.addEventListener('blur', validateInputs);
+ longitudeInput.addEventListener('blur', validateInputs);
+
+ closeButton.addEventListener('click', () => {
+ newPointFormElement.remove();
+ this.removeNewPointMarkerIfExists();
+ });
+
+ submitButton.addEventListener('click', () => {
+ const formName = nameInput ? nameInput.value : '';
+ const formType = typeInput ? parseInt(typeInput.value, 10) : '';
+ const feature = this.createFeatureForPoint(formName, formType, parseFloat(longitudeInput.value), parseFloat(latitudeInput.value));
+ this.confirmSelection(feature);
+ });
+ });
+ }
+
+ updateMarkerPosition(marker, lat, lng) {
+ if (marker) {
+ marker.setLatLng([lat, lng]);
+ this.map.setView([lat, lng], this.map.getZoom());
+ }
+ }
+
+ removeNewPointMarkerIfExists() {
+ if (this.selectedNewPointMarker) {
+ this.map.removeLayer(this.selectedNewPointMarker);
+ }
+ }
+
+ removeSelectedPointMarkerIfExists() {
+ if (this.selectedExistingPointMarker) {
+ const pointOfInterestTypeId = this.selectedExistingPointMarker.feature.properties.pointOfInterestTypeId;
+ this.selectedExistingPointMarker.setStyle(this.styleOfPointMarker(pointOfInterestTypeId));
+ }
+ }
+
+ handleClickOutsidePointForm(event) {
+ const formElement = document.getElementById('new-point-form');
+ if (formElement && !formElement.contains(event.target)) {
+ this.closeNewPointFormIfOpen();
+ }
+ }
+
+ closeNewPointFormIfOpen() {
+ const formElement = document.getElementById('new-point-form');
+ if (formElement) {
+ formElement.remove();
+ }
+ document.removeEventListener('click', this.handleClickOutsidePointForm.bind(this), true);
+ }
+
+ createFeatureForPoint(name, type, longitude, latitude) {
+ return {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [longitude, latitude]
+ },
+ "properties": {
+ "pointOfInterestId": 0,
+ "pointOfInterestName": name,
+ "pointOfInterestTypeId": type
+ }
+ };
+ }
+
+ popupContent(feature) {
+ const popupElement = document.createElement("div");
+ popupElement.id = 'poi-popup';
+ const name = feature.properties.pointOfInterestName;
+ const type = this.translations['poiType' + feature.properties.pointOfInterestTypeId];
+ const latitude = feature.geometry.coordinates[1].toFixed(this.coordinatePrecision);
+ const longitude = feature.geometry.coordinates[0].toFixed(this.coordinatePrecision);
+ const buttonLabel = this.isPoiMap ? this.translations.selectLocation : this.translations.selectCoordinates;
+
+ if(this.isPoiMap) {
+ popupElement.innerHTML = `<h4>${name}</h4>
+ <b>${this.translations.latitude}</b> ${latitude}<br>
+ <b>${this.translations.longitude}</b> ${longitude}<br>
+ <b>${this.translations.type}</b> ${type}<br><br>
+ <button id="submit-button" class="btn btn-primary">${buttonLabel}</button>`
+ } else {
+ popupElement.innerHTML = `<b>${this.translations.latitude}</b> ${latitude}<br>
+ <b>${this.translations.longitude}</b> ${longitude}<br><br>
+ <button id="submit-button" class="btn btn-primary">${buttonLabel}</button>`
+ }
+ const buttonElement = popupElement.querySelector("#submit-button");
+ buttonElement.addEventListener('click', () => {
+ this.confirmSelection(feature);
+ });
+ return popupElement;
+ }
+
+ /**
+ * Creates the HTML form for adding a new point, and add it to the map container.
+ *
+ * @param positionX Where to place the form on the x axis
+ * @param positionY Where to place the form on the y axis
+ * @param latitude Latitude of the point clicked
+ * @param longitude Longitude of the point clicked
+ * @returns {Element}
+ */
+ addHtmlElementNewPointForm(positionX, positionY, latitude, longitude) {
+ const form = document.createElement("div");
+ form.id = "new-point-form"
+ form.classList.add("panel");
+ form.classList.add("panel-default");
+
+ // Adjust position so that the form is always displayed within the map
+ const mapWidth = this.mapModalElement.offsetWidth;
+ const mapHeight = this.mapModalElement.offsetHeight;
+ const formWidth = 200; // approximately
+ const formHeight = 400; // approximately
+ if (positionX + formWidth > mapWidth) {
+ positionX = mapWidth - formWidth - 10; // 10px padding from the edge
+ }
+ if (positionY + formHeight > mapHeight) {
+ positionY = mapHeight - formHeight - 10; // 10px padding from the edge
+ }
+ form.style.left = `${positionX}px`;
+ form.style.top = `${positionY}px`;
+
+ form.innerHTML = `
+ <div class="panel-heading">
+ <h4 class="panel-title">${this.isPoiMap ? this.translations.createNewLocation : this.translations.selectNewCoordinates}</h4>
+ <span id="map-poi-close-button" style="position: absolute; top: 5px; right: 10px; cursor: pointer; font-size: 18px;">×</span>
+ </div>
+ <div class="panel-body">
+ <div id="form-group-poi-name" class="form-group">
+ <label for="map-poi-name">${this.translations.name}:</label>
+ <input type="text" class="form-control" id="map-poi-name" name="name">
+ </div>
+ <div class="form-group">
+ <label for="map-poi-latitude">${this.translations.latitude}:</label>
+ <input type="text" class="form-control" id="map-poi-latitude" name="latitude" value="${latitude.toFixed(this.coordinatePrecision)}">
+ </div>
+ <div class="form-group">
+ <label for="map-poi-longitude">${this.translations.longitude}:</label>
+ <input type="text" class="form-control" id="map-poi-longitude" name="longitude" value="${longitude.toFixed(this.coordinatePrecision)}">
+ </div>
+ <div id="form-group-poi-type" class="form-group">
+ <label for="map-poi-type">${this.translations.type}:</label>
+ <select class="form-control" id="map-poi-type" name="type">
+ <option value="2">${this.translations['poiType2']}</option>
+ <option value="3">${this.translations['poiType3']}</option>
+ <option value="5">${this.translations['poiType5']}</option>
+ </select>
+ </div>
+ <div class="form-group text-right">
+ <button id="map-poi-submit-button" class="btn btn-primary">${this.isPoiMap ? this.translations.selectLocation : this.translations.selectCoordinates}</button>
+ </div>
+ </div>`;
+
+ // If map does not operate on pois, the form should not include input fields for name and type
+ if (!this.isPoiMap) {
+ form.querySelector("#form-group-poi-name").remove()
+ form.querySelector("#form-group-poi-type").remove()
+ }
+
+ this.mapContainerElement.appendChild(form);
+ return form;
+ }
+
+ /**
+ * Make modal visible. Initialise map with selected point marked, if given.
+ *
+ * @param selectedPointOfInterestId
+ * @param latitude
+ * @param longitude
+ * @param zoomLevel
+ */
+ openModal(selectedPointOfInterestId, latitude, longitude, zoomLevel) {
+ this.mapModalElement.style.display = 'flex';
+ this.mapModalElement.style.justifyContent = 'center';
+ this.mapModalElement.style.alignItems = 'center';
+ this.initMap(latitude, longitude, zoomLevel);
+ if (selectedPointOfInterestId) {
+ // Id -1 is used if the map should display the single given point as selected, with a form to enable lat/lng modification
+ if(selectedPointOfInterestId === -1) {
+ const layer = this.getLayerById(selectedPointOfInterestId)
+ const feature = this.getFeatureById(selectedPointOfInterestId)
+ this.map.removeLayer(layer);
+ this.simulateMapClick(this.map, feature.geometry.coordinates[1], feature.geometry.coordinates[0])
+ } else {
+ this.selectPointById(selectedPointOfInterestId);
+ }
+ }
+ }
+
+ simulateMapClick(map, lat, lng) {
+ const clickEvent = {
+ latlng: latLng(lat, lng),
+ layerPoint: map.latLngToLayerPoint(latLng(lat, lng)),
+ containerPoint: map.latLngToContainerPoint(latLng(lat, lng))
+ };
+ map.fire('click', clickEvent);
+ }
+
+ /**
+ * Hide modal. Remove container element and map.
+ */
+ closeModal() {
+ this.mapModalElement.style.display = 'none';
+ this.mapContainerElement.remove();
+ this.map.remove();
+ this.map = null;
+ }
+
+}
+
+const ZoomToLocationControl = Control.extend({
+ options: {
+ position: 'topleft',
+ translations: {}
+ },
+
+ onAdd: function (map) {
+ // Create the button element
+ const container = DomUtil.create('div', 'leaflet-bar leaflet-control');
+ const zoomToLocationButton = DomUtil.create('a', 'map-button', container);
+ zoomToLocationButton.innerHTML = '<i class="fa fa-map-marker"></i>';
+ zoomToLocationButton.href = '#';
+ zoomToLocationButton.title = this.options.translations.zoomToLocation;
+
+ DomEvent
+ .on(zoomToLocationButton, 'click', DomEvent.stop)
+ .on(zoomToLocationButton, 'click', () => {
+ if (navigator.geolocation) {
+ const locationIcon = divIcon({
+ html: '<i class="fa fa-map-marker fa-3x"></i>',
+ iconSize: [40, 60],
+ className: 'location-marker',
+ iconAnchor: [20, 60]
+ });
+ navigator.geolocation.getCurrentPosition((position) => {
+ const latitude = position.coords.latitude;
+ const longitude = position.coords.longitude;
+
+ map.setView([latitude, longitude], 13);
+ marker([latitude, longitude], {icon: locationIcon}).addTo(map);
+ }, (error) => {
+ console.error('Geolocation failed: ' + error.message);
+ alert(this.options.translations.geolocationFailed);
+ });
+ } else {
+ alert(this.options.translations.geolocationNotSupported);
+ }
+ });
+ return container;
+ }
+});
+
+
+const CloseMapControl = Control.extend({
+ options: {
+ position: 'topright',
+ translations: {}
+ },
+
+ onAdd: function (map) {
+ // Create a container for the button
+ const container = DomUtil.create('div', 'leaflet-bar leaflet-control');
+
+ // Create the button element
+ const closeMapButton = DomUtil.create('a', 'map-button', container);
+ closeMapButton.innerHTML = '×'; // Unicode for close symbol
+ closeMapButton.href = '#';
+ closeMapButton.title = this.options.translations.closeMap;
+
+ DomEvent
+ .on(closeMapButton, 'click', DomEvent.stop)
+ .on(closeMapButton, 'click', () => {
+ if (this.options.onClose) {
+ this.options.onClose();
+ }
+ });
+ return container;
+ }
+});
+
+const LegendControl = Control.extend({
+ options: {
+ position: 'bottomright',
+ typeColorMap: {},
+ translations: {},
+ markersByType: {},
+ mapModalInstance: null,
+ },
+ onAdd: function (map) {
+ const legendDiv = DomUtil.create('div', 'info legend');
+ const typeColorMap = this.options.typeColorMap;
+ const translations = this.options.translations;
+ const markersByType = this.options.markersByType;
+
+ DomEvent.disableClickPropagation(legendDiv);
+
+ for (const type in typeColorMap) {
+ if (!markersByType[type]) {
+ continue;
+ }
+ const count = markersByType[type].length;
+ const color = typeColorMap[type];
+
+ const itemDiv = DomUtil.create('div', 'legend-item', legendDiv);
+ itemDiv.innerHTML = `<i style="background:${color};"></i>
+ <span>${translations['poiType' + type]} (${count})</span>`;
+
+ DomEvent
+ .on(itemDiv, 'click', DomEvent.stop)
+ .on(itemDiv, 'click', () => {
+ this.toggleMarkers(type, markersByType[type], itemDiv);
+ });
+ }
+ return legendDiv;
+ },
+
+ toggleMarkers: function (type, markers, itemDiv) {
+ if (!markers) return;
+ const wasVisible = markers[0].options.opacity !== 0;
+ const isVisible = !wasVisible;
+
+ markers.forEach(marker => {
+ const markerElement = marker.getElement();
+ if (wasVisible) {
+ this.options.mapModalInstance.unbindActionToPoint(marker);
+ if (markerElement) {
+ markerElement.style.pointerEvents = 'none';
+ }
+ marker.setStyle({opacity: 0, fillOpacity: 0});
+ } else {
+ marker.setStyle({opacity: 1, fillOpacity: 0.8});
+ this.options.mapModalInstance.bindActionToPoint(marker);
+ if (markerElement) {
+ markerElement.style.pointerEvents = '';
+ }
+ }
+ });
+ // Mark hidden with line-through
+ itemDiv.style.textDecoration = isVisible ? "none" : "line-through solid black 2px";
+ }
+
+});
+
+// Export the module
+export default MapModal;
diff --git a/src/main/webapp/js/util.js b/src/main/webapp/js/util.js
index 193a56249727b373aa7f9471f457d27a60bc6296..e92ca9fb10d92473489427ecd62fbb7c704c7dd9 100755
--- a/src/main/webapp/js/util.js
+++ b/src/main/webapp/js/util.js
@@ -17,9 +17,8 @@
*
*/
-function setFieldValue(theForm, fieldName, value)
-{
- theForm[fieldName] = value;
+function setFieldValue(theForm, fieldName, value) {
+ theForm[fieldName] = value;
}
/* An easy way to sort list options alphabetically
@@ -28,43 +27,35 @@ function setFieldValue(theForm, fieldName, value)
* @param {type} b
* @returns {Number}
*/
-var compareSelectListOptions = function(a,b)
-{
- if(a.text < b.text)
- {
+var compareSelectListOptions = function (a, b) {
+ if (a.text < b.text) {
return -1;
}
- if(a.text > b.text)
- {
+ if (a.text > b.text) {
return 1;
}
return 0;
};
-var sortListAlphabetically = function(theList, keepFirst)
-{
- keepFirst = keepFirst | 0;
- var allOptions = [];
- for(var i=keepFirst;i<theList.options.length;i++)
- {
- allOptions.push(theList.options[i]);
- }
- allOptions.sort(function(a,b){
- if(a.label < b.label)
- {
- return -1;
+var sortListAlphabetically = function (theList, keepFirst) {
+ keepFirst = keepFirst | 0;
+ var allOptions = [];
+ for (var i = keepFirst; i < theList.options.length; i++) {
+ allOptions.push(theList.options[i]);
}
- if(a.label > b.label)
- {
- return 1;
+ allOptions.sort(function (a, b) {
+ if (a.label < b.label) {
+ return -1;
+ }
+ if (a.label > b.label) {
+ return 1;
+ }
+ return 0;
+ });
+ theList.options.length = keepFirst; // Keeping the top items?
+ for (var i = 0; i < allOptions.length; i++) {
+ theList.options[theList.options.length] = allOptions[i];
}
- return 0;
- });
- theList.options.length=keepFirst; // Keeping the top items?
- for(var i=0;i<allOptions.length;i++)
- {
- theList.options[theList.options.length] = allOptions[i];
- }
};
/**
@@ -73,42 +64,35 @@ var sortListAlphabetically = function(theList, keepFirst)
* @param language if you want to override system settings, specify language here
* @returns {String}
*/
-function getLocalizedOrganismName(organism, language)
-{
- var preferredLanguage = language || environment.currentLanguage;
- // Fallback in case nothing works
- if(organism === null)
- {
- return gettext("Unnamed");
- }
- // Attempting the following languages (in order): current language, default language, English
- var languages = [preferredLanguage, environment.defaultLanguage, "en"];
- for(var j in languages)
- {
- for(var i in organism.organismLocaleSet)
- {
- var localeSet = organism.organismLocaleSet[i];
- //console.log(localeSet);
- if(localeSet.organismLocalePK.locale == languages[j])
- {
- return localeSet.localName;
- }
- }
- }
- // Then we try the latin name
- if(organism.latinName !== null
- && organism.latinName !== "")
- {
- return organism.latinName;
- }
- // Then the trade name
- if(organism.tradeName !== null
- && organism.tradeName !== "")
- {
- return organism.tradeName;
- }
- // Then we give up
- return gettext("Unnamed");
+function getLocalizedOrganismName(organism, language) {
+ var preferredLanguage = language || environment.currentLanguage;
+ // Fallback in case nothing works
+ if (organism === null) {
+ return gettext("Unnamed");
+ }
+ // Attempting the following languages (in order): current language, default language, English
+ var languages = [preferredLanguage, environment.defaultLanguage, "en"];
+ for (var j in languages) {
+ for (var i in organism.organismLocaleSet) {
+ var localeSet = organism.organismLocaleSet[i];
+ //console.log(localeSet);
+ if (localeSet.organismLocalePK.locale == languages[j]) {
+ return localeSet.localName;
+ }
+ }
+ }
+ // Then we try the latin name
+ if (organism.latinName !== null
+ && organism.latinName !== "") {
+ return organism.latinName;
+ }
+ // Then the trade name
+ if (organism.tradeName !== null
+ && organism.tradeName !== "") {
+ return organism.tradeName;
+ }
+ // Then we give up
+ return gettext("Unnamed");
}
/**
@@ -116,30 +100,24 @@ function getLocalizedOrganismName(organism, language)
* @param cropCategory
* @returns {String}
*/
-function getLocalizedCropCategoryName(cropCategory)
-{
+function getLocalizedCropCategoryName(cropCategory) {
// Fallback in case nothing works
- if(cropCategory === null)
- {
+ if (cropCategory === null) {
return "Unnamed";
}
// Attempting the following languages (in order): current language, default language, English
var languages = [environment.currentLanguage, environment.defaultLanguage, "en"];
- for(var j in languages)
- {
- for(var i in cropCategory.cropCategoryLocalSet)
- {
+ for (var j in languages) {
+ for (var i in cropCategory.cropCategoryLocalSet) {
var localeSet = cropCategory.cropCategoryLocalSet[i];
- if(localeSet.cropCategoryLocalPK.locale.trim() == languages[j].trim())
- {
+ if (localeSet.cropCategoryLocalPK.locale.trim() == languages[j].trim()) {
return localeSet.localName;
}
}
}
// Then we try the latin name
- if(cropCategory.defaultName !== null
- && cropCategory.defaultName !== "")
- {
+ if (cropCategory.defaultName !== null
+ && cropCategory.defaultName !== "") {
return cropCategory.defaultName;
}
// Then we give up
@@ -147,32 +125,28 @@ function getLocalizedCropCategoryName(cropCategory)
}
function getLocalizedOptionsHTML(optionsList) {
- var translatedOptionsHTML = "";
- var languages = [environment.currentLanguage, environment.defaultLanguage, "en"];
-
- for(var i in optionsList){
- var option = optionsList[i];
- var label = null;
- var labelList = option.label;
- for(var j in languages)
- {
- for(var k in labelList)
- {
- if(k === languages[j])
- {
- label = labelList[k];
- break;
- }
+ var translatedOptionsHTML = "";
+ var languages = [environment.currentLanguage, environment.defaultLanguage, "en"];
+
+ for (var i in optionsList) {
+ var option = optionsList[i];
+ var label = null;
+ var labelList = option.label;
+ for (var j in languages) {
+ for (var k in labelList) {
+ if (k === languages[j]) {
+ label = labelList[k];
+ break;
+ }
+ }
+ if (label !== null) {
+ break;
+ }
}
- if(label !== null)
- {
- break;
- }
- }
- translatedOptionsHTML += '<option value="' + option.value + '"' + (option.selected === "true" ? ' selected="selected"' : '') + ">" + label + "</option>";
- }
-
- return translatedOptionsHTML;
+ translatedOptionsHTML += '<option value="' + option.value + '"' + (option.selected === "true" ? ' selected="selected"' : '') + ">" + label + "</option>";
+ }
+
+ return translatedOptionsHTML;
}
/**
@@ -182,24 +156,19 @@ function getLocalizedOptionsHTML(optionsList) {
* @param {type} ambiguousValue
* @returns {Number}
*/
-function getUnixTimestampFromJSON(ambiguousValue)
-{
+function getUnixTimestampFromJSON(ambiguousValue) {
var possibleDateObject;
- if(!isMomentJSAvailable())
- {
+ if (!isMomentJSAvailable()) {
possibleDateObject = new Date(ambiguousValue);
console.info("Warning: Parsing date without MomentJS. Can't guarantee correct result.");
}
- else
- {
+ else {
possibleDateObject = moment(ambiguousValue).toDate();
}
- if(possibleDateObject.getTime() === NaN && typeof parseInt(ambiguousValue) === "number")
- {
+ if (possibleDateObject.getTime() === NaN && typeof parseInt(ambiguousValue) === "number") {
return parseInt(ambiguousValue);
}
- else
- {
+ else {
return possibleDateObject.getTime();
}
}
@@ -209,15 +178,56 @@ function getUnixTimestampFromJSON(ambiguousValue)
*
* @return {Boolean}
*/
-function isMomentJSAvailable()
-{
+function isMomentJSAvailable() {
try {
moment();
return true;
}
- catch (err)
- {
+ catch (err) {
return false;
}
-}
\ No newline at end of file
+}
+
+/** Converts numeric degrees to radians
+ * Essential to make the calculateDistanceBetweenCoordinates to work
+ **/
+if (typeof Number.prototype.toRad == 'undefined') {
+ Number.prototype.toRad = function () {
+ return this * Math.PI / 180;
+ }
+}
+
+
+
+/**
+ * Reference: <a href="http://www.movable-type.co.uk/scripts/latlong.html">this webpage</a>
+ * <pre>
+ * This uses the "haversine" formula to calculate the great-circle distance between two points ? that is, the shortest distance over the earth?s surface ? giving an ?as-the-crow-flies? distance between the points (ignoring any hills, of course!).
+ Haversine formula:
+ a = sin²(?lat/2) + cos(lat1).cos(lat2).sin²(?long/2)
+ c = 2.atan2(?a, ?(1?a))
+ d = R.c
+ where R is earth's radius (mean radius = 6,371km);
+ Note that angles need to be in radians to pass to trig functions!
+ * </pre>
+ * @param lat1
+ * @param lon1
+ * @param lat2
+ * @param lon2
+ * @return distance in km between to coordinates
+ */
+function calculateDistanceBetweenCoordinates(lat1, lon1, lat2, lon2) {
+ var R = 6371; // km
+ var dLat = (lat2 - lat1).toRad();
+ var dLon = (lon2 - lon1).toRad();
+ lat1 = lat1.toRad();
+ lat2 = lat2.toRad();
+
+ var a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+ Math.sin(dLon / 2) * Math.sin(dLon / 2) * Math.cos(lat1) * Math.cos(lat2);
+ var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+ var d = R * c;
+
+ return d;
+}
diff --git a/src/main/webapp/js/validateForm.js b/src/main/webapp/js/validateForm.js
index 0e4a8e2199f33cc8708ad12f040b266889a1dd31..833dfe22f7c1995643b4943c6cac1863557ec37f 100755
--- a/src/main/webapp/js/validateForm.js
+++ b/src/main/webapp/js/validateForm.js
@@ -268,7 +268,8 @@ function validateFieldActual(fieldEl, theForm, formDefinitionKey)
// Single select field - check for nullValue
if(fieldDefinition.fieldType === fieldTypes.TYPE_SELECT_SINGLE)
{
- webValue = fieldEl.options[fieldEl.selectedIndex].value;
+ // Fallback if this is not a select list (could be a readonly list using a twin hidden field)
+ webValue = webValue = fieldEl.options != undefined ? fieldEl.options[fieldEl.selectedIndex].value : fieldEl.value;
if(fieldDefinition.nullValue === webValue && fieldDefinition.required === true)
{
invalidizeField(fieldEl, theForm, getI18nMsg("fieldIsRequired",null));
@@ -471,7 +472,7 @@ function validateFieldActual(fieldEl, theForm, formDefinitionKey)
}
/**
- * Recursive function to travers upwards in tree until we find the form
+ * Recursive function to traverse upwards in tree until we find the form
* for the given element
* @param {DOMElement} fieldEl
* @returns {DOMelement} the form
diff --git a/src/main/webapp/templates/forecastConfigurationForm.ftl b/src/main/webapp/templates/forecastConfigurationForm.ftl
index c4656b5809c21741a48ddec2aac42bd9940a25c8..56c50f57ff3d3d1d5822aba263a70b2ed8405a05 100755
--- a/src/main/webapp/templates/forecastConfigurationForm.ftl
+++ b/src/main/webapp/templates/forecastConfigurationForm.ftl
@@ -1,6 +1,6 @@
-<#--
- Copyright (c) 2016 NIBIO <http://www.nibio.no/>.
-
+<#--
+ Copyright (c) 2016 NIBIO <http://www.nibio.no/>.
+
This file is part of VIPSLogic.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -15,24 +15,224 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
--><#include "master.ftl">
+<#assign isGridForecastSupported = (user.organizationId.defaultGridWeatherStationDataSource?has_content)>
<#macro page_head>
- <title>${i18nBundle.viewForecastConfiguration}</title>
+ <title>${i18nBundle.viewForecastConfiguration}</title>
</#macro>
<#macro custom_js>
- <script src="/js/resourcebundle.js"></script>
- <script src="/js/forecastConfigurationForm.js"></script>
- <script src="/js/validateForm.js"></script>
- <script src="//code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
- <link href="//code.jquery.com/ui/1.10.3/themes/redmond/jquery-ui.css" rel="stylesheet" />
- <script type="text/javascript" src="/js/3rdparty/modernizr_custom.js"></script>
- <script type="text/javascript" src="/js/3rdparty/moment.min.js"></script>
+ <script src="/js/resourcebundle.js"></script>
+ <script src="/js/forecastConfigurationForm.js"></script>
+ <script src="/js/validateForm.js"></script>
+ <script src="//code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
+ <link href="//code.jquery.com/ui/1.10.3/themes/redmond/jquery-ui.css" rel="stylesheet" />
+ <link rel="stylesheet" href="/css/3rdparty/leaflet.css" />
+ <link rel="stylesheet" href="/css/mapModal.css" />
+ <script type="text/javascript" src="/js/3rdparty/modernizr_custom.js"></script>
+ <script type="text/javascript" src="/js/3rdparty/moment.min.js"></script>
<script type="text/javascript" src="/js/environment.js"></script>
<script type="text/javascript" src="/js/util.js"></script>
<script type="text/javascript" src="/js/3rdparty/chosen.jquery.min.js"></script>
<script type="text/javascript">
$(".chosen-select").chosen();
+ </script>
+ <script type="module">
+ import MapModal from '/js/mapModal.js';
+ const selectLocationElement = document.querySelector('select[name="locationPointOfInterestId"]');
+ const selectWeatherstationElement = document.querySelector('select[name="weatherStationPointOfInterestId"]') != null ? document.querySelector('select[name="weatherStationPointOfInterestId"]') : document.querySelector('select[name="weatherStationPointOfInterestIdDisabled"]');
+ //console.info(selectWeatherstationElement);
+
+ window.selectedPoiId = <#if forecastConfiguration.locationPointOfInterestId??>${forecastConfiguration.locationPointOfInterestId.pointOfInterestId!"undefined"}<#else>undefined</#if>;
+ window.selectedWeatherstationId = <#if forecastConfiguration.weatherStationPointOfInterestId??>${forecastConfiguration.weatherStationPointOfInterestId.pointOfInterestId!"undefined"}<#else>undefined</#if>;
+
+ // Read the list of locations into javascript array, to be able to dynamically manipulate it
+ window.locationList = [
+ <#list locationPointOfInterests as poi>
+ {
+ "pointOfInterestId": "${poi.pointOfInterestId}",
+ "name": "${poi.name?json_string}",
+ "pointOfInterestTypeId": ${poi.pointOfInterestTypeId},
+ "location": <#if poi.longitude?? && poi.latitude??>[${poi.longitude?c}, ${poi.latitude?c}]<#else>null</#if>
+ },
+ </#list>
+ ];
+
+
+ const createOption = (value, text, isSelected = false) => {
+ const option = document.createElement('option');
+ option.value = value;
+ option.textContent = text;
+ if (isSelected) option.selected = true;
+ return option;
+ };
+
+ renderPoiSelect(selectLocationElement, locationList, selectedPoiId);
+
+ // Setting weather station select list state correct on page load
+ <#if isGridForecastSupported && forecastConfiguration.forecastConfigurationId??>
+ setUseGridWeatherData(<#if forecastConfiguration.useGridWeatherData>"true"<#else>"false"</#if>)
+ handleWeatherDatasourceSelected(<#if forecastConfiguration.weatherStationPointOfInterestId?has_content && forecastConfiguration.weatherStationPointOfInterestId.pointOfInterestId?has_content>${forecastConfiguration.weatherStationPointOfInterestId.pointOfInterestId}</#if>);
+ </#if>
+
+ /**
+ * @param selectElement the select list to render to
+ * @param elementList the list of weather stations to list
+ * @param selectedId the id (optional) to be preselected
+ * @param coordinateToMatch [lon, lat] coordinate to match. Optional. If set: The closest weather stations are show at top of list, with distance to coordinate.
+ */
+ window.renderWeatherstationSelect = function(selectElement, elementList, selectedId, coordinateToMatch)
+ {
+ selectElement.options.length = 0;
+
+ // Add default option
+ selectElement.appendChild(createOption(
+ "-1",
+ "${i18nBundle.pleaseSelect} ${i18nBundle.weatherStationPointOfInterestId?lower_case}",
+ !selectedId
+ ));
+
+ // Render all weather stations, order by distance to coordinate
+ if(coordinateToMatch != null)
+ {
+ let stations = [];
+ elementList.forEach(poi => {
+ if(poi.pointOfInterestTypeId == POI_TYPE_WEATHERSTATION)
+ {
+ poi.distance = calculateDistanceBetweenCoordinates(poi.location[1], poi.location[0], coordinateToMatch[1], coordinateToMatch[0]).toFixed(1);
+ stations.push(poi);
+ }
+ });
+ stations.sort(function(a,b){
+ return a.distance - b.distance;
+ });
+ stations.forEach(poi => {
+ selectElement.appendChild(createOption(
+ poi.pointOfInterestId,
+ poi.name + (poi.distance > 0.0 ? " (" + poi.distance +" km)" : ""),
+ selectedId && poi.pointOfInterestId == selectedId
+ ));
+ });
+
+ }
+ else
+ {
+ // Render all weather stations alphabetically
+ elementList.forEach(poi => {
+ if(poi.pointOfInterestTypeId == POI_TYPE_WEATHERSTATION)
+ {
+ selectElement.appendChild(createOption(
+ poi.pointOfInterestId,
+ poi.name,
+ selectedId && poi.pointOfInterestId == selectedId
+ ));
+ }
+ });
+ }
+ }
+
+ // Populate select list for point of interest -> NOT GENERAL! Default value is specific to location.
+ function renderPoiSelect(selectElement, elementList, selectedId) {
+ selectElement.innerHTML = '';
+
+ // Add default option
+ selectElement.appendChild(createOption(
+ "-1",
+ "${i18nBundle.pleaseSelect} ${i18nBundle.locationPointOfInterestId?lower_case}",
+ !selectedId
+ ));
+
+ // Add options from elementList
+ elementList.forEach(poi => {
+ selectElement.appendChild(createOption(
+ poi.pointOfInterestId,
+ poi.name,
+ selectedId && poi.pointOfInterestId == selectedId
+ ));
+ });
+ }
+
+ renderWeatherstationSelect(selectWeatherstationElement, locationList, selectedWeatherstationId,
+ <#if forecastConfiguration.weatherStationPointOfInterestId??>[${forecastConfiguration.weatherStationPointOfInterestId.longitude?c},${forecastConfiguration.weatherStationPointOfInterestId.latitude?c}]<#else>null</#if>
+ );
+
+ window.selectPoi = function(selectElement, selectedId) {
+ if (selectedId) {
+ const optionIndex = Array.from(selectElement.options).findIndex(option => option.value == selectedId);
+ if (optionIndex !== -1) {
+ selectElement.selectedIndex = optionIndex;
+ } else {
+ console.error("No matching option found for poi.id=" + selectedId);
+ }
+ }
+ }
+
+ // Get id of currently selected poi from select element
+ function getSelectedPoiId(selectElement) {
+ const value = selectElement.value;
+ const parsedValue = parseInt(value, 10);
+ return (!isNaN(parsedValue) && parsedValue > 0) ? parsedValue : undefined;
+ }
+
+ function callbackOnCloseLocationMap(poiData) {
+ if(!poiData.pointOfInterestId) {
+ persistNewLocation(poiData, handleLocationChanged);
+ } else {
+ selectPoi(selectLocationElement, poiData.pointOfInterestId);
+ handleLocationChanged();
+ }
+
+ }
+
+ function persistNewLocation(poiData, callback) {
+ fetch("/rest/poi", {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'Accept': 'application/json',
+ 'Authorization': '${user.userUuid!'NOT LOGGED IN?'}'
+ },
+ body: JSON.stringify(poiData)
+ })
+ .then(response => response.json())
+ .then(poi => {
+ locationList.push(poi);
+ renderPoiSelect(selectLocationElement, locationList, poi.pointOfInterestId);
+ // Assuming that this is not a weather station, since weather stations cannot be created using the
+ // map, the user must have created a .... MAYBE HANDLED AUTOMATICALLY?? by the change event??
+ //console.info("Point of interest successfully persisted", poi);
+ callback();
+ })
+ .catch(error => {
+ console.error("Unable to persist new point of interest", error);
+ });
+ }
+
+ // Make function globally available
+ window.openLocationMap = () => {
+ let poiIds = locationList.map(poi => poi.pointOfInterestId);
+ fetch("/rest/poi/geojson", {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'Accept': 'application/json'
+ },
+ body: JSON.stringify(poiIds)
+ })
+ .then(response => response.json())
+ .then(geoJson => {
+ const isPoiMap = true; // Map should operate on pois (not only coordinates)
+ const allowNewPoints = true; // User should be able to create new pois
+ const locationMapInstance = new MapModal('location-map', geoJson, '${currentLanguage}', isPoiMap, allowNewPoints, callbackOnCloseLocationMap);
+ const selectedPoiId = getSelectedPoiId(selectLocationElement);
+ locationMapInstance.openModal(selectedPoiId, ${user.organizationId.defaultMapCenter.y?c}, ${user.organizationId.defaultMapCenter.x?c}, ${user.organizationId.defaultMapZoom} + 1);
+ })
+ .catch(error => {
+ console.error('Unable to open map', error);
+ });
+ }
+
</script>
<script type="text/javascript">
+ const POI_TYPE_WEATHERSTATION = 1;
$(document).ready(function() {
// Make sure that there is a date picker present for HTML5
// date input fields
@@ -190,6 +390,114 @@
}
}
};
+
+ window.handleWeatherDatasourceSelected = function(weatherStationPointOfInterestId) {
+ let weatherStationList = document.getElementById("weatherStationPointOfInterestId");
+ let listContainer = document.getElementById("weatherstationListContainer");
+ weatherStationPointOfInterestIdHiddenField = document.getElementById("weatherStationPointOfInterestIdHidden");
+ // Which data source is selected?
+ let useGridWeatherData;
+ const radios = document.getElementsByName("useGridWeatherData");
+ for(const radio of radios)
+ {
+ if(radio.checked)
+ {
+ useGridWeatherData = radio.value;
+ break;
+ }
+ }
+ //console.info("useGridWeatherData=" + useGridWeatherData)
+ if(useGridWeatherData == "true")
+ {
+ // Select weatherStationId -2
+ weatherStationList.selectedIndex = 0;
+ // Disable the weatherstation select list
+ weatherStationList.disabled=true;
+ listContainer.style.display="none";
+ weatherStationList.name="weatherStationPointOfInterestIdDisabled";
+
+ // Enable the hidden field
+ weatherStationPointOfInterestIdHiddenField.disabled=false
+ weatherStationPointOfInterestIdHiddenField.name="weatherStationPointOfInterestId";
+ }
+ else if(useGridWeatherData == "false")
+ {
+ // Select weatherStationId -1 OR the optionally provided weatherStationPointOfInterestId
+ if(weatherStationPointOfInterestId == undefined || weatherStationPointOfInterestId == null)
+ {
+ weatherStationList.selectedIndex = 1;
+ }
+ else
+ {
+ for(let i=0;i<weatherStationList.options.length;i++)
+ {
+ weatherStationList.options[i].selected = parseInt(weatherStationList.options[i].value) == weatherStationPointOfInterestId;
+ }
+ }
+ // Enable the weather station select list
+ weatherStationList.disabled=false;
+ listContainer.style.display="block";
+
+ weatherStationList.name="weatherStationPointOfInterestId";
+ // Disable the hidden field
+ weatherStationPointOfInterestIdHiddenField.disabled=true
+ weatherStationPointOfInterestIdHiddenField.name="weatherStationPointOfInterestIdDisabled";
+ }
+ };
+
+ window.setUseGridWeatherData = function(useGridWeatherData)
+ {
+ //console.info("setuseGridWeatherData, input value=" + useGridWeatherData);
+ const radios = document.getElementsByName("useGridWeatherData");
+ for(const radio of radios)
+ {
+ //console.info("radio value=" + radio.value + ", so the radio should " + (radio.value == useGridWeatherData ? "": "NOT") + " be checked" );
+ radio.checked = radio.value == useGridWeatherData;
+ }
+ }
+
+
+
+ window.handleLocationChanged = function(){
+ let weatherstationSelect = document.getElementById("weatherStationPointOfInterestId");
+ let weatherDatasourceFieldset = document.getElementById("weatherDatasourceFieldset");
+ // Which location has been selected?
+ let selectedPoiId = document.getElementById("locationPointOfInterestId").options[document.getElementById("locationPointOfInterestId").selectedIndex].value;
+ if(selectedPoiId <= 0)
+ {
+ if(weatherDatasourceFieldset != null) weatherDatasourceFieldset.disabled = true;
+ weatherstationSelect.selectedIndex = 0;
+ return;
+ }
+ // Enable the weather datasource fieldset
+ if(weatherDatasourceFieldset != null) weatherDatasourceFieldset.disabled = false;
+
+ let selectedLocation = undefined;
+ for(let i=0; i<locationList.length;i++)
+ {
+ if(locationList[i].pointOfInterestId == selectedPoiId)
+ {
+ selectedLocation = locationList[i];
+ }
+ }
+
+ if(selectedLocation.pointOfInterestTypeId == POI_TYPE_WEATHERSTATION)
+ {
+ renderWeatherstationSelect(weatherstationSelect,locationList, selectedLocation.pointOfInterestId, selectedLocation.location);
+ }
+ else
+ {
+ renderWeatherstationSelect(weatherstationSelect,locationList, null, selectedLocation.location);
+ weatherstationSelect.selectedIndex = 0;
+ }
+
+ <#if isGridForecastSupported>
+
+ setUseGridWeatherData(selectedLocation.pointOfInterestTypeId == POI_TYPE_WEATHERSTATION ? "false" : "true");
+ handleWeatherDatasourceSelected(selectedLocation.pointOfInterestTypeId == POI_TYPE_WEATHERSTATION ? selectedLocation.pointOfInterestId: undefined);
+
+ </#if>
+ }
</script>
</#macro>
<#macro custom_css>
@@ -198,10 +506,13 @@
<#macro page_contents>
<div class="singleBlockContainer">
<p><a href="/forecastConfiguration" class="btn btn-default back" role="button">${i18nBundle.back}</a></p>
- <h1>${i18nBundle.viewForecastConfiguration}</h1>
- <div id="errorMsgEl" class="alert alert-danger" <#if !formValidation?has_content> style="display:none;"</#if>>
- <#if formValidation?has_content>${formValidation.validationMessages?replace("\n", "<br>")}</#if>
+ <h1>${i18nBundle.viewForecastConfiguration}</h1>
+ <div id="errorMsgEl" class="alert alert-danger" <#if !formValidation?has_content> style="display:none;"</#if>>
+ <#if formValidation?has_content>${formValidation.validationMessages?replace("\n", "<br>")}</#if>
</div>
+ <#if multipleNew>
+ <div class="alert alert-warning">${i18nBundle.multipleNewWarningMsg}</div>
+ </#if>
<#if messageKey?has_content>
<div class="alert alert-success">${i18nBundle(messageKey)}</div>
</#if>
@@ -253,6 +564,7 @@
<#if ! user.isSuperUser() && ! user.isOrganizationAdmin()> readonly="readonly" disabled="disabled"</#if>/>
</label>
${i18nBundle.isPrivate}
+ <span class="help-block" id="${formId}_isPrivate_validation"></span>
</div>
</div>
<div class="form-group">
@@ -272,24 +584,52 @@
<#if !multipleNew?has_content || !multipleNew>
<div class="form-group">
<label for="locationPointOfInterestId">${i18nBundle.locationPointOfInterestId}</label>
- <select class="form-control" name="locationPointOfInterestId" onblur="validateField(this);">
- <option value="-1">${i18nBundle.pleaseSelect} ${i18nBundle.locationPointOfInterestId?lower_case}</option>
- <#list locationPointOfInterests?sort_by("name") as poi>
- <option value="${poi.pointOfInterestId}"<#if forecastConfiguration.locationPointOfInterestId?has_content && poi.pointOfInterestId == forecastConfiguration.locationPointOfInterestId.pointOfInterestId> selected="selected"</#if>>${poi.name}</option>
- </#list>
- </select>
+ <div class="select-container" style="flex: 1; display: flex; align-items: center;">
+ <select class="form-control" id="locationPointOfInterestId" name="locationPointOfInterestId" onchange="handleLocationChanged();" onblur="validateField(this);" style="width: calc(100% - 30px);">
+ </select>
+ <button type="button" class="btn btn-primary" onclick="openLocationMap()"><i class="fa fa-map-marker fa-lg"></i> Velg i kart</button>
+
+ <div id="location-map" class="map-modal"></div>
+ </div>
<span class="help-block" id="${formId}_locationPointOfInterestId_validation"></span>
</div>
- <div class="form-group">
- <label for="weatherStationPointOfInterestId">${i18nBundle.weatherStationPointOfInterestId}</label>
- <select class="form-control" name="weatherStationPointOfInterestId" onblur="validateField(this);">
- <option value="-1">${i18nBundle.pleaseSelect} ${i18nBundle.weatherStationPointOfInterestId?lower_case}</option>
- <#list weatherStationPointOfInterests?sort_by("name") as poi>
- <option value="${poi.pointOfInterestId}"<#if forecastConfiguration.weatherStationPointOfInterestId?has_content && poi.pointOfInterestId == forecastConfiguration.weatherStationPointOfInterestId.pointOfInterestId> selected="selected"</#if>>${poi.name}</option>
- </#list>
- </select>
- <span class="help-block" id="${formId}_weatherStationPointOfInterestId_validation"></span>
- </div>
+ <#if isGridForecastSupported>
+ <div class="alert alert-info" role="alert">Velg sted ovenfor først, og velg deretter værdatakilde. Du kan enten velge en av de tilgjengelige værstasjonene (sortert etter avstand til stedet),
+ eller at ditt valgte steds plassering brukes til å hente værdata fra en ekstern tjeneste. Hvis ditt sted ligger nær
+ en av værstasjonene, gir det som oftest den beste kvaliteten på værdata.</div>
+ <#else>
+ <div class="alert alert-info" role="alert">Velg sted ovenfor først, og velg deretter værstasjon. Hvis stedet du har valgt ikke er en værstasjon, vil værstasjonslista sorteres etter avstand til ditt sted.</div>
+ </#if>
+ <#if isGridForecastSupported>
+ <fieldset id="weatherDatasourceFieldset" <#if !forecastConfiguration.weatherStationPointOfInterestId?has_content>disabled</#if>>
+ <legend style="margin-bottom: 0px;">${i18nBundle.weatherDatasource}</legend>
+
+ <input type="hidden" id="weatherStationPointOfInterestIdHidden" name="weatherStationPointOfInterestIdDisabled" value="-2" disabled="disabled"/>
+ <div class="form-group">
+ <div class="radio">
+ <label>
+ <input type="radio" id="useGridWeatherData" value="true" name="useGridWeatherData"<#if forecastConfiguration.useGridWeatherData?has_content && forecastConfiguration.useGridWeatherData == true> checked="checked"</#if> onclick="handleWeatherDatasourceSelected();"/>
+ </label>
+ ${i18nBundle.useGridWeatherData}
+ </div>
+ </#if>
+ <#if isGridForecastSupported><div class="radio">
+ <label>
+ <input type="radio" name="useGridWeatherData" id="useWeatherstationRadio" value="false" onclick="handleWeatherDatasourceSelected();">
+ ${i18nBundle.useWeatherStation}
+ </label>
+ </#if>
+ <div class="form-group" id="weatherstationListContainer" style="display: <#if isGridForecastSupported>none<#else>block</#if>;">
+ <#if !isGridForecastSupported><label for="weatherStationPointOfInterestId">${i18nBundle.weatherStationPointOfInterestId}</label></#if>
+ <select class="form-control" id="weatherStationPointOfInterestId" name="weatherStationPointOfInterestId" onblur="if(document.getElementById('useWeatherstationRadio') == null || document.getElementById('useWeatherstationRadio').checked) {validateField(this);}">
+
+ </select>
+ <span class="help-block" id="${formId}_weatherStationPointOfInterestId_validation"></span>
+ </div>
+ <#if isGridForecastSupported>
+ </div>
+ </fieldset>
+ </#if>
<#else>
<input type="hidden" name="multipleNew" value="true"/>
<div class="form-group">
diff --git a/src/main/webapp/templates/forecastConfigurationList.ftl b/src/main/webapp/templates/forecastConfigurationList.ftl
index 7cc0da099ce8a128cf684f5e8ccf749aa1f56112..804aa699a88ac3bf421094c61f07a20cfefe9be6 100755
--- a/src/main/webapp/templates/forecastConfigurationList.ftl
+++ b/src/main/webapp/templates/forecastConfigurationList.ftl
@@ -68,7 +68,7 @@
</form>
</div>
</div>
- <button type="button" class="btn btn-default" onclick="window.location.href='/forecastConfiguration?action=viewForecastConfiguration&forecastConfigurationId=-1&multipleNew=true'">${i18nBundle.addMultipleNew}</button>
+ <button type="button" class="btn btn-default" onclick="window.location.href='/forecastConfiguration?action=viewForecastConfiguration&forecastConfigurationId=-1&multipleNew=true'">${i18nBundle.addNewForMultipleWeatherStations}</button>
</#if>
<h2>${i18nBundle.privateForecasts}</h2>
<div class="table-responsive">
diff --git a/src/main/webapp/templates/master.ftl b/src/main/webapp/templates/master.ftl
index 0027c08c231fb3c53e0a7141a1e240a62efbf4d2..712e6aafac85f7a6ec85871ea3f78bac317a28ec 100755
--- a/src/main/webapp/templates/master.ftl
+++ b/src/main/webapp/templates/master.ftl
@@ -59,6 +59,9 @@
<#else>
<li><a href="/user?action=viewUser&userId=${user.userId}">${i18nBundle.myAccount}</a></li>
</#if>
+ <#if user.isOrganizationAdmin() || user.isSuperUser()>
+ <li><a href="/weatherstationdatasource">${i18nBundle.weatherStationDataSources}</a></li>
+ </#if>
<li><a href="/poi">${i18nBundle.pois}</a></li>
<#if user.isOrganizationAdmin() || user.isSuperUser() || user.isMessageAuthor()>
<li><a href="/message">${i18nBundle.messages}</a></li>
diff --git a/src/main/webapp/templates/organizationForm.ftl b/src/main/webapp/templates/organizationForm.ftl
index 50ac1afc38f3741305c4cec59726a0e8d09ee2c6..cb907e210e7a0fffae2d438bd39fc540d2b57633 100644
--- a/src/main/webapp/templates/organizationForm.ftl
+++ b/src/main/webapp/templates/organizationForm.ftl
@@ -119,7 +119,7 @@
<input type="text" class="form-control" name="vipswebUrl" placeholder="${i18nBundle.vipswebUrl}" value="${(organization.vipswebUrl)!""}" onblur="validateField(this); "/>
<span class="help-block" id="${formId}_vipswebUrl_validation"></span>
</div>
- <div class="form-group">
+ <div class="form-group">
<label for="archiveUserId">${i18nBundle.archiveUserId}</label>
<select class="form-control" name="archiveUserId" onblur="validateField(this);">
<option value="-1">${i18nBundle.pleaseSelect} ${i18nBundle.archiveUserId?lower_case}
@@ -131,21 +131,33 @@
</select>
<span class="help-block" id="${formId}_archiveUserId_validation"></span>
</div>
- <div class="form-group">
+ <div class="form-group">
<label for="defaultVipsCoreUserId">${i18nBundle.defaultVipsCoreUserId}</label>
<input type="number" class="form-control" name="defaultVipsCoreUserId" placeholder="${i18nBundle.defaultVipsCoreUserId}" value="${(organization.defaultVipsCoreUserId)!""}" onblur="validateField(this); "/>
<span class="help-block" id="${formId}_defaultVipsCoreUserId_validation"></span>
</div>
- <div class="form-group">
+ <div class="form-group">
<label for="defaultMapZoom">${i18nBundle.defaultMapZoom}</label>
<input type="number" class="form-control" name="defaultMapZoom" placeholder="${i18nBundle.defaultMapZoom}" value="${(organization.defaultMapZoom)!""}" onblur="validateField(this); "/>
<span class="help-block" id="${formId}_defaultMapZoom_validation"></span>
</div>
- <div class="form-group">
+ <div class="form-group">
<label for="defaultMapCenter">${i18nBundle.defaultMapCenter} (WGS84 longitude,latitude)</label>
<input type="text" class="form-control" name="defaultMapCenter" placeholder="${i18nBundle.defaultMapCenter}" value="${(defaultMapCenterLon?c)!""},${(defaultMapCenterLat?c)!""}" onblur="validateField(this); "/>
<span class="help-block" id="${formId}_defaultMapCenter_validation"></span>
</div>
+ <div class="form-group">
+ <label for="defaultGridWeatherStationDataSourceId">${i18nBundle.defaultGridWeatherStationDataSource}</label>
+ <select class="form-control" name="defaultGridWeatherStationDataSourceId" onblur="validateField(this);">
+ <option value="-1">${i18nBundle.pleaseSelect} ${i18nBundle.defaultGridWeatherStationDataSource?lower_case}
+ <#list gridWeatherDataSources as dSource>
+ <option value="${dSource.weatherStationDataSourceId}"
+ <#if organization.defaultGridWeatherStationDataSource?has_content && organization.defaultGridWeatherStationDataSource.weatherStationDataSourceId == dSource.weatherStationDataSourceId>selected="selected"</#if>
+ >${dSource.name}</option>
+ </#list>
+ </select>
+ <span class="help-block" id="${formId}_defaultGridWeatherStationDataSourceId_validation"></span>
+ </div>
<button type="submit" class="btn btn-default">${i18nBundle.submit}</button>
<#if organization.organizationId?has_content>
<button type="button" class="btn btn-danger" onclick="if(confirm('${i18nBundle.confirmDelete}')){alert('Sorry, but this functionality has not yet been implemented');}">${i18nBundle.delete}</button>
diff --git a/src/main/webapp/templates/poiForm.ftl b/src/main/webapp/templates/poiForm.ftl
index 58fe8f499d7c016a75595b1ddc7100efed9f3be0..7e7287849cd1f53bb998f4eacb0da65abe7f648c 100755
--- a/src/main/webapp/templates/poiForm.ftl
+++ b/src/main/webapp/templates/poiForm.ftl
@@ -81,6 +81,14 @@
<input type="text" class="form-control" name="name" placeholder="${i18nBundle.name}" value="${(poi.name)!""}" onblur="validateField(this); checkPoiNameAvailability(this);"/>
<span class="help-block" id="${formId}_name_validation"></span>
</div>
+ <div class="form-group">
+ <div class="checkbox">
+ <label>
+ <input type="checkbox" name="isPrivate"<#if poi.isPrivate?has_content && poi.isPrivate == true> checked="checked"<#else></#if>/>
+ </label>
+ ${i18nBundle.isPrivate}
+ </div>
+ </div>
<div class="form-group">
<label for="pointOfInterestTypeId">${i18nBundle.pointOfInterestType}</label>
<select class="form-control" name="pointOfInterestTypeId" onblur="validateField(this);">
diff --git a/src/main/webapp/templates/weatherStationDataSourceForm.ftl b/src/main/webapp/templates/weatherStationDataSourceForm.ftl
new file mode 100644
index 0000000000000000000000000000000000000000..d386d502e3a02eaea22d83ad0139cc8254c53674
--- /dev/null
+++ b/src/main/webapp/templates/weatherStationDataSourceForm.ftl
@@ -0,0 +1,97 @@
+<#--
+ Copyright (c) 2024 NIBIO <http://www.nibio.no/>.
+
+ This file is part of VIPSLogic.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+--><#include "master.ftl">
+<#assign formId = "weatherStationDataSourceForm">
+<#macro page_head>
+ <title><#if weatherStationDataSource.weatherStationDataSourceId?has_content>${i18nBundle.editWeatherStationDataSource} ${weatherStationDataSource.name}<#else>${i18nBundle.newWeatherStationDataSource}</#if></title>
+</#macro>
+<#macro custom_css>
+ <link rel="stylesheet" type="text/css" href="/css/3rdparty/ol.css"/ >
+</#macro>
+<#macro custom_js>
+ <script type="text/javascript" src="/js/constants.js"></script>
+ <script type="text/javascript" src="/js/resourcebundle.js"></script>
+ <script type="text/javascript" src="/js/validateForm.js"></script>
+ <script type="text/javascript">
+ $(document).ready(function() {
+ // Load main form definition (for validation)
+ loadFormDefinition("${formId}");
+
+ });
+ function handleWeatherStationDataSourceDelete(weatherStationDataSourceId){
+ window.location.href="/weatherstationdatasource?action=deleteWeatherStationDataSource&weatherStationDataSourceId=" + weatherStationDataSourceId;
+ }
+
+ </script>
+</#macro>
+<#macro page_contents>
+<div class="singleBlockContainer">
+ <p><a href="/weatherstationdatasource" class="btn btn-default back" role="button">${i18nBundle.back}</a></p>
+ <h1><#if weatherStationDataSource.weatherStationDataSourceId?has_content>${i18nBundle.editWeatherStationDataSource} ${weatherStationDataSource.name}<#else>${i18nBundle.newWeatherStationDataSource}</#if></h1>
+ <div id="errorMsgEl" class="alert alert-danger" <#if !formValidation?has_content> style="display:none;"</#if>>
+ <#if formValidation?has_content>${formValidation.validationMessages?replace("\n", "<br>")}</#if>
+ </div>
+ <#if messageKey?has_content>
+ <div class="alert alert-success">${i18nBundle(messageKey)}</div>
+ </#if>
+ <div class="row">
+ <div class="col-md-12">
+ <form id="${formId}" role="form" action="/weatherstationdatasource?action=weatherStationDataSourceFormSubmit" method="POST" onsubmit="return validateForm(this);">
+ <input type="hidden" name="weatherStationDataSourceId" value="${weatherStationDataSource.weatherStationDataSourceId!"-1"}"/>
+ <div class="form-group">
+ <label for="name">${i18nBundle.name}</label>
+ <input type="text" class="form-control" name="name" placeholder="${i18nBundle.name}" value="${(weatherStationDataSource.name)!""}" onblur="validateField(this); "/>
+ <span class="help-block" id="${formId}_name_validation"></span>
+ </div>
+ <div class="form-group">
+ <label for="defaultDescription">${i18nBundle.description}</label>
+ <input type="text" class="form-control" name="defaultDescription" placeholder="${i18nBundle.description}" value="${(weatherStationDataSource.defaultDescription)!""}" onblur="validateField(this); "/>
+ <span class="help-block" id="${formId}_defaultDescription_validation"></span>
+ </div>
+ <div class="form-group">
+ <label for="uri">URI</label>
+ <input type="url" class="form-control" name="uri" placeholder="URI" value="${(weatherStationDataSource.uri)!""}" onblur="validateField(this); "/>
+ <span class="help-block" id="${formId}_uri_validation"></span>
+ </div>
+ <div class="form-group">
+ <label for="datafetchUriExpression">${i18nBundle.datafetchUriExpression}</label>
+ <input type="url" class="form-control" name="datafetchUriExpression" placeholder="${i18nBundle.datafetchUriExpression}" value="${(weatherStationDataSource.datafetchUriExpression)!""}" onblur="validateField(this); "/>
+ <span class="help-block" id="${formId}_datafetchUriExpression_validation"></span>
+ </div>
+ <div class="form-group">
+ <label for="infoUriExpression">${i18nBundle.infoUriExpression}</label>
+ <input type="url" class="form-control" name="infoUriExpression" placeholder="${i18nBundle.infoUriExpression}" value="${(weatherStationDataSource.infoUriExpression)!""}" onblur="validateField(this); "/>
+ <span class="help-block" id="${formId}_infoUriExpression_validation"></span>
+ </div>
+ <div class="form-group">
+ <div class="checkbox">
+ <label>
+ <input type="checkbox" id="isGrid" name="isGrid" value="true"<#if weatherStationDataSource.isGrid?has_content && weatherStationDataSource.isGrid == true> checked="checked"</#if>/>
+ </label>
+ ${i18nBundle.isGridWeatherDataSource}
+ <span class="help-block" id="${formId}_isGrid_validation"></span>
+ </div>
+ <button type="submit" class="btn btn-default">${i18nBundle.submit}</button>
+ <#if weatherStationDataSource.weatherStationDataSourceId?has_content>
+ <button type="button" class="btn btn-danger" onclick="if(confirm('${i18nBundle.confirmDelete}')){handleWeatherStationDataSourceDelete(${weatherStationDataSource.weatherStationDataSourceId});}">${i18nBundle.delete}</button>
+ </#if>
+ </form>
+ </div>
+ </div>
+</div>
+</#macro>
+<@page_html/>
\ No newline at end of file
diff --git a/src/main/webapp/templates/weatherStationDataSourceList.ftl b/src/main/webapp/templates/weatherStationDataSourceList.ftl
new file mode 100644
index 0000000000000000000000000000000000000000..82c6b0eb62b9c386636027ee68973a20de718fd0
--- /dev/null
+++ b/src/main/webapp/templates/weatherStationDataSourceList.ftl
@@ -0,0 +1,39 @@
+<#--
+ Copyright (c) 2024 NIBIO <http://www.nibio.no/>.
+
+ This file is part of VIPSLogic.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+--><#include "master.ftl">
+<#macro page_head>
+ <title>${i18nBundle.weatherStationDataSources}</title>
+</#macro>
+<#macro custom_css>
+</#macro>
+<#macro custom_js>
+</#macro>
+<#macro page_contents>
+<div class="singleBlockContainer">
+<#if messageKey?has_content>
+ <div class="alert alert-success">${i18nBundle(messageKey)}</div>
+</#if>
+<h1>${i18nBundle.weatherStationDataSources}</h1>
+<ul>
+<#list weatherStationDataSources as dSource>
+<li><a href="/weatherstationdatasource?action=editWeatherStationDataSource&weatherStationDataSourceId=${dSource.weatherStationDataSourceId}">${dSource.name}</a></li>
+</#list>
+</ul>
+<p><a href="/weatherstationdatasource?action=newWeatherStationDataSource" class="btn btn-default back" role="button">${i18nBundle.newWeatherStationDataSource}</a></p>
+</div>
+</#macro>
+<@page_html/>
diff --git a/src/main/webapp/templates/weatherstationForm.ftl b/src/main/webapp/templates/weatherstationForm.ftl
index cb0a0afd4225804dbd7e48e967bb728f792b50d9..07089514dc6edd1e353b7987412894b487a08845 100755
--- a/src/main/webapp/templates/weatherstationForm.ftl
+++ b/src/main/webapp/templates/weatherstationForm.ftl
@@ -71,6 +71,14 @@
</label>
</div>
</div>
+ <div class="form-group">
+ <div class="checkbox">
+ <label>
+ <input type="checkbox" name="isPrivate"<#if weatherStation.isPrivate?has_content && weatherStation.isPrivate == true> checked="checked"<#else></#if>/>
+ </label>
+ ${i18nBundle.isPrivate}
+ </div>
+ </div>
<div class="form-group">
<label for="location">${i18nBundle.location} (<a href="http://en.wikipedia.org/wiki/World_Geodetic_System#A_new_World_Geodetic_System:_WGS_84" target="new">WGS84</a>: ${i18nBundle.longitude},${i18nBundle.latitude})</label>
<input type="text" class="form-control" id="location" name="location" placeholder="${i18nBundle.location}" value="${(weatherStation.longitude?c)!""},${(weatherStation.latitude?c)!""}" onblur="validateField(this);" onchange="if(validateField(this)){updateMarkerPosition();}" />
diff --git a/src/test/java/no/nibio/vips/logic/forms/HTMLFormGeneratorTest.java b/src/test/java/no/nibio/vips/logic/forms/HTMLFormGeneratorTest.java
index e915e328a07c80238764e6bd4a5cd41c8ebba298..5c38d92f9104df1d97c4fd96b6db08823859c212 100755
--- a/src/test/java/no/nibio/vips/logic/forms/HTMLFormGeneratorTest.java
+++ b/src/test/java/no/nibio/vips/logic/forms/HTMLFormGeneratorTest.java
@@ -1,83 +1,81 @@
/*
- * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+ * Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+ * details.
*
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Affero General Public License along with this program. If not, see
+ * <https://www.gnu.org/licenses/>.
*
*/
package no.nibio.vips.logic.forms;
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import no.nibio.web.forms.HTMLFormGenerator;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.*;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import no.nibio.web.forms.HTMLFormGenerator;
/**
*
* @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class HTMLFormGeneratorTest {
-
- public HTMLFormGeneratorTest() {
- }
-
+
+ public HTMLFormGeneratorTest() {}
+
@BeforeClass
- public static void setUpClass() {
- }
-
+ public static void setUpClass() {}
+
@AfterClass
- public static void tearDownClass() {
- }
-
+ public static void tearDownClass() {}
+
@Before
- public void setUp() {
- }
-
+ public void setUp() {}
+
@After
- public void tearDown() {
- }
+ public void tearDown() {}
@Test
public void testGetHTMLForm() {
try {
- String language="no";
+ String language = "no";
HTMLFormGenerator t = new HTMLFormGenerator();
assertNotNull(t);
- InputStream in = this.getClass().getResourceAsStream("/HTMLFormGeneratorTest/forecastConfigurationForm.json");
- InputStreamReader reader = new InputStreamReader(in,"UTF-8");
+ InputStream in =
+ this.getClass().getResourceAsStream("/HTMLFormGeneratorTest/forecastConfigurationForm.json");
+ InputStreamReader reader = new InputStreamReader(in, "UTF-8");
ObjectMapper mapper = new ObjectMapper();
JsonFactory factory = mapper.getFactory();
JsonParser parser = factory.createParser(reader);
JsonNode formDefinition = mapper.readTree(parser);
- InputStream in2 = this.getClass().getResourceAsStream("/HTMLFormGeneratorTest/forecastConfigurationForm_result.html");
+ InputStream in2 =
+ this.getClass().getResourceAsStream("/HTMLFormGeneratorTest/forecastConfigurationForm_result.html");
InputStreamReader reader2 = new InputStreamReader(in2, "UTF-8");
java.util.Scanner s = new java.util.Scanner(reader2).useDelimiter("\\A");
String result = s.hasNext() ? s.next() : "";
- //System.out.println("expectedResult=\n" + result);
- String HTMLForm = t.getHTMLFormFields(formDefinition,"forecastConfigurationForm",language);
- //System.out.println("HTMLForm=\n" + HTMLForm);
- assertEquals(result,HTMLForm);
+ // System.out.println("expectedResult=\n" + result);
+ String HTMLForm = t.getHTMLFormFields(formDefinition, "forecastConfigurationForm", language);
+ System.out.println("HTMLForm=\n" + HTMLForm);
+ assertEquals(HTMLForm, result);
+
} catch (IOException ex) {
fail(ex.getMessage());
}
diff --git a/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm.json b/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm.json
index c5c4bb56d4d553486dbae47afa27f5b5b2d598cc..690b874fcbe92abc5e67ffdc873437c20d84ec8c 100755
--- a/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm.json
+++ b/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm.json
@@ -1,73 +1,122 @@
{
- "_comment" : "Structure of the forecastConfigurationForm and how to validate it",
+ "_comment": "Structure of the forecastConfigurationForm and how to validate it",
"fields": [
{
- "name" : "forecastConfigurationId",
- "fieldType" : "HIDDEN",
- "dataType" : "INTEGER",
- "webValue" : ["7"],
- "required" : true
+ "name": "forecastConfigurationId",
+ "fieldType": "HIDDEN",
+ "dataType": "INTEGER",
+ "webValue": [
+ "7"
+ ],
+ "required": true
},
{
- "name" : "vipsLogicUserId",
- "dataType" : "INTEGER",
- "fieldType" : "SELECT_SINGLE",
+ "name": "vipsLogicUserId",
+ "dataType": "INTEGER",
+ "fieldType": "SELECT_SINGLE",
"nullValue": "-1",
- "required" : true,
- "options":[
- {"value":"-1","label":"Vennligst velg bruker","selected":false},
- {"value":"1","label":"Skog, Tor-Einar","selected":true}
- ]
+ "required": true,
+ "options": [
+ {
+ "value": "-1",
+ "label": "Vennligst velg bruker",
+ "selected": false
+ },
+ {
+ "value": "1",
+ "label": "Skog, Tor-Einar",
+ "selected": true
+ }
+ ]
},
{
- "name" : "modelId",
- "fieldType" : "SELECT_SINGLE",
- "dataType" : "INTEGER",
+ "name": "modelId",
+ "fieldType": "SELECT_SINGLE",
+ "dataType": "INTEGER",
"nullValue": "-1",
- "required" : true,
- "options":[
- {"value":"-1","label":"Vennligst velg varslingsmodell","selected":false},
- {"value":"NAERSTADMO","label":"Nærstads modell","selected":true},
- {"value":"APPLESCABM","label":"Epleskurvmodell","selected":false}
- ]
+ "required": true,
+ "options": [
+ {
+ "value": "-1",
+ "label": "Vennligst velg varslingsmodell",
+ "selected": false
+ },
+ {
+ "value": "NAERSTADMO",
+ "label": "Nærstads modell",
+ "selected": true
+ },
+ {
+ "value": "APPLESCABM",
+ "label": "Epleskurvmodell",
+ "selected": false
+ }
+ ]
},
{
- "name" : "locationPointOfInterestId",
- "dataType" : "INTEGER",
- "fieldType" : "SELECT_SINGLE",
+ "name": "locationPointOfInterestId",
+ "dataType": "INTEGER",
+ "fieldType": "SELECT_SINGLE",
"nullValue": "-1",
- "required" : true,
- "options":[
- {"value":"-1","label":"Vennligst velg målestasjon","selected":false},
- {"value":"38","label":"Ullensvang","selected":false},
- {"value":"72","label":"Ås","selected":true}
- ]
+ "required": true,
+ "options": [
+ {
+ "value": "-1",
+ "label": "Vennligst velg værstasjon",
+ "selected": false
+ },
+ {
+ "value": "38",
+ "label": "Ullensvang",
+ "selected": false
+ },
+ {
+ "value": "72",
+ "label": "Ås",
+ "selected": true
+ }
+ ]
},
{
- "name" : "weatherStationPointOfInterestId",
- "dataType" : "INTEGER",
- "fieldType" : "SELECT_SINGLE",
+ "name": "weatherStationPointOfInterestId",
+ "dataType": "INTEGER",
+ "fieldType": "SELECT_SINGLE",
"nullValue": "-1",
- "required" : true,
- "options":[
- {"value":"-1","label":"Vennligst velg lokalitet","selected":false},
- {"value":"38","label":"Ullensvang","selected":false},
- {"value":"72","label":"Ås","selected":true}
- ]
+ "required": true,
+ "options": [
+ {
+ "value": "-1",
+ "label": "Vennligst velg lokalitet",
+ "selected": false
+ },
+ {
+ "value": "38",
+ "label": "Ullensvang",
+ "selected": false
+ },
+ {
+ "value": "72",
+ "label": "Ås",
+ "selected": true
+ }
+ ]
},
{
- "name" : "dateStart",
- "dataType" : "DATE",
- "required" : true
+ "name": "dateStart",
+ "dataType": "DATE",
+ "required": true
},
{
- "name" : "dateEnd",
- "dataType" : "DATE",
- "required" : true
+ "name": "dateEnd",
+ "dataType": "DATE",
+ "required": true
}
-
],
- "relations":[
- {"primaryField":"dateEnd","secondaryField":"dateStart", "relationType": "AFTER"}
+ "relations": [
+ {
+ "primaryField": "dateEnd",
+ "secondaryField": "dateStart",
+ "relationType": "AFTER"
+ }
]
-}
+}
\ No newline at end of file
diff --git a/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm.output b/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm.output
index ce39fc6dbe56f6d38a0b44ad4ba33d4921ad9003..fcd948a78e6b1fdb71deb7122742bb3e0bb2f617 100755
--- a/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm.output
+++ b/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm.output
@@ -26,7 +26,7 @@
<span class="help-block" id="forecastConfigurationForm_locationPointOfInterestId_validation"></span>
</div>
<div class="form-group">
-<label for="weatherStationPointOfInterestId">Målestasjon</label>
+<label for="weatherStationPointOfInterestId">Værstasjon</label>
<select class="form-control" name="weatherStationPointOfInterestId" onblur="validateField(this);">
<option value="-1">Vennligst velg lokalitet</option>
<option value="38">Ullensvang</option>
diff --git a/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result b/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result
index b09a9bb9259d82f9a2ce1f90c63783058b6eff9c..6fc69f7535dd88fd4844e4213ea0062fb4323524 100755
--- a/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result
+++ b/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result
@@ -130,9 +130,9 @@
<span class="help-block" id="forecastConfigurationForm_locationPointOfInterestId_validation"></span>
</div>
<div class="form-group">
- <label for="weatherStationPointOfInterestId">Målestasjon</label>
+ <label for="weatherStationPointOfInterestId">Værstasjon</label>
<select class="form-control" name="weatherStationPointOfInterestId" onblur="validateField(this);">
- <option value="-1">Vennligst velg målestasjon</option>
+ <option value="-1">Vennligst velg værstasjon</option>
<option value="54">Alvdal</option>
<option value="91" selected="selected">Apelsvoll</option>
<option value="30">Balestrand</option>
diff --git a/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result.html b/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result.html
index 4b2e97c64a691fd9ffe8d896aba1cf56feb0c8cb..1295df57636ab29e1f8a23d77b9f40808220267e 100755
--- a/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result.html
+++ b/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result.html
@@ -19,14 +19,14 @@
<div class="form-group">
<label for="locationPointOfInterestId">Sted</label>
<select class="form-control" name="locationPointOfInterestId" onblur="validateField(this);">
-<option value="-1">Vennligst velg målestasjon</option>
+<option value="-1">Vennligst velg værstasjon</option>
<option value="38">Ullensvang</option>
<option value="72" selected="selected">Ås</option>
</select>
<span class="help-block" id="forecastConfigurationForm_locationPointOfInterestId_validation"></span>
</div>
<div class="form-group">
-<label for="weatherStationPointOfInterestId">Målestasjon</label>
+<label for="weatherStationPointOfInterestId">Værstasjon</label>
<select class="form-control" name="weatherStationPointOfInterestId" onblur="validateField(this);">
<option value="-1">Vennligst velg lokalitet</option>
<option value="38">Ullensvang</option>
diff --git a/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result.txt b/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result.txt
index b09a9bb9259d82f9a2ce1f90c63783058b6eff9c..6fc69f7535dd88fd4844e4213ea0062fb4323524 100755
--- a/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result.txt
+++ b/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result.txt
@@ -130,9 +130,9 @@
<span class="help-block" id="forecastConfigurationForm_locationPointOfInterestId_validation"></span>
</div>
<div class="form-group">
- <label for="weatherStationPointOfInterestId">Målestasjon</label>
+ <label for="weatherStationPointOfInterestId">Værstasjon</label>
<select class="form-control" name="weatherStationPointOfInterestId" onblur="validateField(this);">
- <option value="-1">Vennligst velg målestasjon</option>
+ <option value="-1">Vennligst velg værstasjon</option>
<option value="54">Alvdal</option>
<option value="91" selected="selected">Apelsvoll</option>
<option value="30">Balestrand</option>