From 1e565d98f130722cc8c7be1959334e643c18e64d Mon Sep 17 00:00:00 2001 From: Octavian Ciubotaru Date: Thu, 8 Sep 2022 11:34:12 +0300 Subject: [PATCH 001/135] AMP-30351: Cache intermediate builds --- amp/Dockerfile | 147 ++++++++++++++---- .../ampTemplate/dashboard/dev/package.json | 3 +- .../ampTemplate/gisModule/dev/package.json | 3 +- .../node_modules/amp-boilerplate/package.json | 3 + .../node_modules/amp-filter/package.json | 3 +- .../node_modules/amp-settings/package.json | 3 +- .../gis-layers-manager/package.json | 3 +- amp/pom.xml | 124 ++++----------- 8 files changed, 163 insertions(+), 126 deletions(-) diff --git a/amp/Dockerfile b/amp/Dockerfile index 187f5a287cc..81d281260e9 100644 --- a/amp/Dockerfile +++ b/amp/Dockerfile @@ -1,39 +1,128 @@ -FROM maven:3.8.4-jdk-8 as base +FROM node:16.4.0 as node + +FROM node as compile-amp-state +WORKDIR /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-state +COPY TEMPLATE/ampTemplate/node_modules/amp-state . +RUN --mount=type=cache,target=/root/.npm \ + npm ci + +FROM node as compile-amp-translate +WORKDIR /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-translate +COPY TEMPLATE/ampTemplate/node_modules/amp-translate . +RUN --mount=type=cache,target=/root/.npm \ + npm ci + +FROM node as compile-amp-boilerplate +WORKDIR /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate +COPY TEMPLATE/ampTemplate/node_modules/amp-boilerplate . +COPY --from=compile-amp-translate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-translate ../amp-translate +RUN --mount=type=cache,target=/root/.npm \ + npm ci \ + && npm run build + +FROM node as compile-amp-filter +WORKDIR /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-filter +COPY --from=compile-amp-translate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-translate ../amp-translate +COPY TEMPLATE/ampTemplate/node_modules/amp-filter . +# HACK otherwise amp-filter won't compile! +COPY TEMPLATE/reamp/tools/log /tmp/amp/TEMPLATE/reamp/tools/log +RUN --mount=type=cache,target=/root/.npm \ + npm ci \ + && npm run build + +FROM node as compile-amp-settings +WORKDIR /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-settings +COPY --from=compile-amp-translate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-translate ../amp-translate +COPY TEMPLATE/ampTemplate/node_modules/amp-settings . +RUN --mount=type=cache,target=/root/.npm \ + npm ci \ + && npm run build + +FROM node as compile-gis-layers-manager +WORKDIR /tmp/amp/TEMPLATE/ampTemplate/node_modules/gis-layers-manager +COPY --from=compile-amp-translate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-translate ../amp-translate +COPY TEMPLATE/ampTemplate/node_modules/gis-layers-manager . +RUN --mount=type=cache,target=/root/.npm \ + npm ci \ + && npm run build + +FROM node as compile-gis-module +WORKDIR /tmp/amp/TEMPLATE/ampTemplate/gisModule +COPY --from=compile-amp-state /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-state ../node_modules/amp-state +COPY --from=compile-amp-translate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-translate ../node_modules/amp-translate +COPY --from=compile-amp-boilerplate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate ../node_modules/amp-boilerplate +COPY --from=compile-amp-filter /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-filter ../node_modules/amp-filter +# HACK otherwise amp-filter won't compile! +COPY TEMPLATE/reamp/tools/log /tmp/amp/TEMPLATE/reamp/tools/log +COPY --from=compile-amp-settings /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-settings ../node_modules/amp-settings +COPY --from=compile-gis-layers-manager /tmp/amp/TEMPLATE/ampTemplate/node_modules/gis-layers-manager ../node_modules/gis-layers-manager +COPY TEMPLATE/ampTemplate/gisModule . +RUN --mount=type=cache,target=/root/.npm \ + cd dev \ + && npm ci \ + && npm run test \ + && npm run build \ + && rm -rf node_modules + +FROM node as compile-dashboard +WORKDIR /tmp/amp/TEMPLATE/ampTemplate/dashboard +COPY --from=compile-amp-state /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-state ../node_modules/amp-state +COPY --from=compile-amp-translate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-translate ../node_modules/amp-translate +COPY --from=compile-amp-boilerplate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate ../node_modules/amp-boilerplate +COPY --from=compile-amp-filter /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-filter ../node_modules/amp-filter +# HACK otherwise amp-filter won't compile! +COPY TEMPLATE/reamp/tools/log /tmp/amp/TEMPLATE/reamp/tools/log +COPY --from=compile-amp-settings /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-settings ../node_modules/amp-settings +COPY TEMPLATE/ampTemplate/node_modules/amp-url ../node_modules/amp-url +COPY TEMPLATE/ampTemplate/dashboard . +RUN --mount=type=cache,target=/root/.npm \ + cd dev \ + && npm ci \ + && npm run build \ + && rm -rf node_modules + +FROM node as compile-reamp +WORKDIR /tmp/amp/TEMPLATE/reamp +COPY --from=compile-amp-boilerplate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate ../ampTemplate/node_modules/amp-boilerplate +COPY TEMPLATE/reamp . +RUN --mount=type=cache,target=/root/.npm \ + --mount=type=ssh \ + npm ci \ + && npm run build \ + && rm -rf node_modules + +FROM node as compile-reampv2 +WORKDIR /tmp/amp/TEMPLATE/reampv2 +COPY --from=compile-amp-boilerplate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate ../ampTemplate/node_modules/amp-boilerplate +COPY --from=compile-amp-filter /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-filter ../ampTemplate/node_modules/amp-filter +COPY --from=compile-amp-settings /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-settings ../ampTemplate/node_modules/amp-settings +COPY TEMPLATE/reampv2 . +RUN --mount=type=cache,target=/root/.npm \ + --mount=type=ssh \ + npm ci \ + && npm run build \ + && rm -rf node_modules + +FROM maven:3.8.4-jdk-8 as compile-mvn WORKDIR /tmp/amp COPY . . - -FROM base as compile +COPY --from=compile-amp-boilerplate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/dist TEMPLATE/ampTemplate/node_modules/amp-boilerplate/dist +COPY --from=compile-amp-filter /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/dist TEMPLATE/ampTemplate/node_modules/amp-filter/dist +COPY --from=compile-amp-settings /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/dist TEMPLATE/ampTemplate/node_modules/amp-settings/dist +COPY --from=compile-gis-layers-manager /tmp/amp/TEMPLATE/ampTemplate/node_modules/gis-layers-manager/dist TEMPLATE/ampTemplate/node_modules/gis-layers-manager/dist +COPY --from=compile-gis-module /tmp/amp/TEMPLATE/ampTemplate/gisModule/dist TEMPLATE/ampTemplate/gisModule/dist +COPY --from=compile-dashboard /tmp/amp/TEMPLATE/ampTemplate/dashboard/build TEMPLATE/ampTemplate/dashboard/build +COPY --from=compile-reamp /tmp/amp/TEMPLATE/reamp/modules TEMPLATE/reamp/modules +COPY --from=compile-reampv2 /tmp/amp/TEMPLATE/reampv2/build TEMPLATE/reampv2/build ARG BUILD_SOURCE -RUN mkdir -p -m 0600 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts -RUN --mount=type=ssh \ - --mount=type=cache,target=/root/.m2 \ - --mount=type=cache,target=/root/.npm \ +RUN --mount=type=cache,target=/root/.m2 \ mvn -B test war:exploded \ -DbuildSource=$BUILD_SOURCE \ -Djdbc.user=amp -Djdbc.password=amp122006 -Djdbc.db=amp -Djdbc.host=db \ -Djdbc.port=5432 -DdbName=postgresql -Djdbc.driverClassName=org.postgresql.Driver \ + -Dskip.npm -Dskip.installnodenpm \ && mv target/amp exploded \ - && rm -rf target \ - TEMPLATE/ampTemplate/node_modules/amp-boilerplate/node \ - TEMPLATE/ampTemplate/node_modules/amp-boilerplate/node_modules \ - TEMPLATE/ampTemplate/node_modules/gis-layers-manager/node \ - TEMPLATE/ampTemplate/node_modules/gis-layers-manager/node_modules \ - TEMPLATE/ampTemplate/node_modules/amp-settings/node \ - TEMPLATE/ampTemplate/node_modules/amp-settings/node_modules \ - TEMPLATE/ampTemplate/node_modules/amp-translate/node \ - TEMPLATE/ampTemplate/node_modules/amp-translate/node_modules \ - TEMPLATE/ampTemplate/node_modules/amp-state/node \ - TEMPLATE/ampTemplate/node_modules/amp-state/node_modules \ - TEMPLATE/ampTemplate/node_modules/amp-filter/node \ - TEMPLATE/ampTemplate/node_modules/amp-filter/node_modules \ - TEMPLATE/ampTemplate/gisModule/dev/node \ - TEMPLATE/ampTemplate/gisModule/dev/node_modules \ - TEMPLATE/ampTemplate/dashboard/dev/node \ - TEMPLATE/ampTemplate/dashboard/dev/node_modules \ - TEMPLATE/reamp/node \ - TEMPLATE/reamp/node_modules \ - TEMPLATE/reampv2/node \ - TEMPLATE/reampv2/node_modules + && rm -rf target FROM tomcat:8.5.79-jdk8 @@ -50,4 +139,4 @@ COPY docker/server.xml docker/tomcat-users.xml conf/ ENV AMP_REGISTRY_PRIVATE_KEY $AMP_REGISTRY_PRIVATE_KEY RUN rm -fr /usr/local/tomcat/webapps/ROOT -COPY --from=compile /tmp/amp/exploded /usr/local/tomcat/webapps/ROOT/ +COPY --from=compile-mvn /tmp/amp/exploded /usr/local/tomcat/webapps/ROOT/ diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/package.json b/amp/TEMPLATE/ampTemplate/dashboard/dev/package.json index a7a6b9fc0b8..732f2f7ae23 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/package.json +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/package.json @@ -5,7 +5,8 @@ "repository": "git://github.com/uniphil/amp-svn", "main": "gulpfile.js", "scripts": { - "test": "echo 'Testing not yet configured...'" + "test": "echo 'Testing not yet configured...'", + "build": "gulp build" }, "license": "TODO: what is the license for AMP?", "devDependencies": { diff --git a/amp/TEMPLATE/ampTemplate/gisModule/dev/package.json b/amp/TEMPLATE/ampTemplate/gisModule/dev/package.json index eb83d6679ce..6aa7af94623 100644 --- a/amp/TEMPLATE/ampTemplate/gisModule/dev/package.json +++ b/amp/TEMPLATE/ampTemplate/gisModule/dev/package.json @@ -5,7 +5,8 @@ "repository": "git://github.com/uniphil/amp", "main": "gulpfile.js", "scripts": { - "test": "echo 'Testing not yet configured...'" + "test": "gulp test", + "build": "gulp build" }, "license": "TODO: what is the license for AMP?", "browserify": { diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/package.json b/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/package.json index 6fdaf61fc03..bdf0e7871d5 100644 --- a/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/package.json +++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/package.json @@ -9,6 +9,9 @@ "brfs" ] }, + "scripts": { + "build": "gulp build" + }, "devDependencies": { "backbone": "1.1.2", "bootstrap": "3.4.1", diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/package.json b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/package.json index 736808f0a7b..f1d35a53b08 100644 --- a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/package.json +++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/package.json @@ -4,7 +4,8 @@ "description": "Filters to be used across many AMP modules (gis, etc)", "main": "dist/amp-filter.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "test": "echo \"Error: no test specified\" && exit 1", + "build": "gulp build" }, "browserify": { "transform": [ diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/package.json b/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/package.json index b0a336ffdc7..f09cd87b904 100644 --- a/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/package.json +++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/package.json @@ -4,7 +4,8 @@ "description": "Settings", "main": "index.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "test": "echo \"Error: no test specified\" && exit 1", + "build": "gulp build" }, "author": "", "license": "ISC", diff --git a/amp/TEMPLATE/ampTemplate/node_modules/gis-layers-manager/package.json b/amp/TEMPLATE/ampTemplate/node_modules/gis-layers-manager/package.json index 5c16792979d..632aa686086 100644 --- a/amp/TEMPLATE/ampTemplate/node_modules/gis-layers-manager/package.json +++ b/amp/TEMPLATE/ampTemplate/node_modules/gis-layers-manager/package.json @@ -4,7 +4,8 @@ "description": "GIS Layer Manager", "main": "index.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "test": "echo \"Error: no test specified\" && exit 1", + "build": "gulp build" }, "author": "", "license": "ISC", diff --git a/amp/pom.xml b/amp/pom.xml index 97036a70e31..4e7d39d6bde 100644 --- a/amp/pom.xml +++ b/amp/pom.xml @@ -1202,7 +1202,7 @@ - + com.github.eirslett frontend-maven-plugin @@ -1211,277 +1211,229 @@ v16.4.0 - - install node and npm for GIS install-node-and-npm - process-resources ${project.basedir}/TEMPLATE/ampTemplate/gisModule/dev - install node and npm for Dashboards install-node-and-npm - process-resources ${project.basedir}/TEMPLATE/ampTemplate/dashboard/dev - - install node and npm for amp-state install-node-and-npm - process-resources ${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-state - - npm install for amp-state + npm ci for amp-state npm - process-resources ci ${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-state - - install node and npm for amp-translate install-node-and-npm - process-resources ${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-translate - - npm install for amp-translate + npm ci for amp-translate npm - process-resources ci ${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-translate - - install node and npm for amp-boilerplate install-node-and-npm - process-resources ${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-boilerplate - - npm install for amp-boilerplate + npm ci for amp-boilerplate npm - process-resources ci ${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-boilerplate - - gulp build for amp-boilerplate + npm run build for amp-boilerplate - gulp + npm process-resources - build + run build ${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-boilerplate - - install node and npm for amp-filter install-node-and-npm - process-resources ${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-filter - - npm install for amp-filter + npm ci for amp-filter npm - process-resources ci ${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-filter - - gulp build for amp-filter + npm run build for amp-filter - gulp + npm process-resources - build + run build ${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-filter - - install node and npm for gis-layers-manager install-node-and-npm - process-resources ${project.basedir}/TEMPLATE/ampTemplate/node_modules/gis-layers-manager - - npm install for gis-layers-manager + npm ci for gis-layers-manager npm - process-resources ci ${project.basedir}/TEMPLATE/ampTemplate/node_modules/gis-layers-manager - - gulp build for gis-layers-manager + npm run build for gis-layers-manager - gulp + npm process-resources - build + run build ${project.basedir}/TEMPLATE/ampTemplate/node_modules/gis-layers-manager - - install node and npm for amp-settings install-node-and-npm - process-resources ${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-settings - - npm install for amp-settings + npm ci for amp-settings npm - process-resources ci ${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-settings - - gulp build for amp-settings + npm run build for amp-settings - gulp + npm process-resources - build + run build ${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-settings - - npm install for GIS + npm ci for GIS npm - process-resources - ci ${project.basedir}/TEMPLATE/ampTemplate/gisModule/dev - - gulp build for GIS + npm run build for GIS - gulp + npm - process-resources - - - build + run build ${project.basedir}/TEMPLATE/ampTemplate/gisModule/dev - gulp test for GIS + npm run test for GIS - gulp + npm test - test + run test ${project.basedir}/TEMPLATE/ampTemplate/gisModule/dev - install node and npm for reampv2 @@ -1493,7 +1445,7 @@ - npm install for reampv2 + npm ci for reampv2 npm @@ -1515,26 +1467,22 @@ - install node and npm for reamp install-node-and-npm - process-resources ${project.basedir}/TEMPLATE/reamp - npm install for reamp + npm ci for reamp npm - process-resources - ci ${project.basedir}/TEMPLATE/reamp @@ -1550,32 +1498,25 @@ ${project.basedir}/TEMPLATE/reamp - - npm install for Dashboards + npm ci for Dashboards npm - process-resources - ci ${project.basedir}/TEMPLATE/ampTemplate/dashboard/dev - gulp build for Dashboards + npm run build for Dashboards - gulp + npm - process-resources - - - build + run build ${project.basedir}/TEMPLATE/ampTemplate/dashboard/dev @@ -1734,7 +1675,6 @@ install-node-and-npm npm - gulp From c89bcedf908470e77e9d101cdc3a12edea67f83e Mon Sep 17 00:00:00 2001 From: Octavian Ciubotaru Date: Fri, 9 Sep 2022 14:07:31 +0300 Subject: [PATCH 002/135] AMP-30352: Route fix around language change --- .../module/aim/action/EditOrganisation.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/amp/WEB-INF/src/org/digijava/module/aim/action/EditOrganisation.java b/amp/WEB-INF/src/org/digijava/module/aim/action/EditOrganisation.java index 48b75f07c73..3ea4cf0ea13 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/action/EditOrganisation.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/action/EditOrganisation.java @@ -103,14 +103,13 @@ private boolean sessionChkForWInfo(HttpServletRequest request) { } return false; } - - @Override - protected ActionForward unspecified(ActionMapping mapping, ActionForm form,HttpServletRequest request, HttpServletResponse response)throws Exception { - if (sessionChk(request)) { - return mapping.findForward("index"); - } - return create(mapping, form, request, response); - } + + @Override + protected ActionForward unspecified( + ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) + throws Exception { + return mapping.findForward(sessionChk(request) ? "index" : "added"); + } public ActionForward create(ActionMapping mapping, ActionForm form,HttpServletRequest request, HttpServletResponse response) throws Exception { if (sessionChk(request)) { From 8e8449c82bda5bdbb156bd108f09bea4773e5843 Mon Sep 17 00:00:00 2001 From: Octavian Ciubotaru Date: Wed, 21 Sep 2022 14:55:26 +0300 Subject: [PATCH 003/135] AMP-30342: New admin boundaries for Chad --- .../aim/dbentity/AmpActivityLocation.java | 14 +- .../jobs/ChadActivityMigrationJob.java | 191 ++++++++++++++++++ amp/gis/boundaries/TD/adm-0.json | 2 +- amp/gis/boundaries/TD/adm-1.json | 2 +- amp/gis/boundaries/TD/adm-2.json | 2 +- amp/pom.xml | 1 - 6 files changed, 207 insertions(+), 5 deletions(-) create mode 100644 amp/WEB-INF/src/org/digijava/module/message/jobs/ChadActivityMigrationJob.java diff --git a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpActivityLocation.java b/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpActivityLocation.java index c8e1d7c944c..f7af1f80f57 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpActivityLocation.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpActivityLocation.java @@ -79,7 +79,19 @@ public Float getLocationPercentage() { public void setLocationPercentage(Float locationPercentage) { this.locationPercentage = locationPercentage; } - + + public AmpActivityLocation() { + } + + public AmpActivityLocation(AmpActivityVersion activity, AmpCategoryValueLocations location, + Float locationPercentage, String latitude, String longitude) { + this.activity = activity; + this.location = location; + this.locationPercentage = locationPercentage; + this.latitude = latitude; + this.longitude = longitude; + } + @Override public boolean equalsForVersioning(Object obj) { AmpActivityLocation aux = (AmpActivityLocation) obj; diff --git a/amp/WEB-INF/src/org/digijava/module/message/jobs/ChadActivityMigrationJob.java b/amp/WEB-INF/src/org/digijava/module/message/jobs/ChadActivityMigrationJob.java new file mode 100644 index 00000000000..7618b2b9cd9 --- /dev/null +++ b/amp/WEB-INF/src/org/digijava/module/message/jobs/ChadActivityMigrationJob.java @@ -0,0 +1,191 @@ +package org.digijava.module.message.jobs; + +import org.digijava.kernel.persistence.PersistenceManager; +import org.digijava.module.aim.dbentity.AmpActivityLocation; +import org.digijava.module.aim.dbentity.AmpActivityVersion; +import org.digijava.module.aim.dbentity.AmpCategoryValueLocations; +import org.digijava.module.categorymanager.dbentity.AmpCategoryValue; +import org.digijava.module.categorymanager.util.CategoryConstants; +import org.digijava.module.categorymanager.util.CategoryManagerUtil; +import org.hibernate.type.LongType; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.quartz.StatefulJob; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.List; + +/** + * Only for Chad. + * + * ADM-3 level was removed completely. All activities linked to ADM-3 will be updated to point to their corresponding + * parent locations at ADM-2 level. + * Special case only for N'Djamena (ADM-2): ADM-3 locations are now ADM-2 locations. + * Eg: '1er Arrondissement' (ADM-3) is now '1er Arrondissement' (ADM-2). The entity ids are different though. + * + * Script to add job: + * INSERT INTO amp_quartz_job_class (jc_id,jc_name, jc_class_fullname) VALUES + * (nextval('amp_quartz_job_class_seq'), + * 'Migrate Chad activities to new locations', + * 'org.digijava.module.message.jobs.ChadActivityMigrationJob'); + * + * Script to delete the job: + * delete from amp_quartz_job_class + * where jc_class_fullname='org.digijava.module.message.jobs.ChadActivityMigrationJob'; + */ +public class ChadActivityMigrationJob extends ConnectionCleaningJob implements StatefulJob { + + private static final int LEVEL_3 = 3; + + private final Logger logger = LoggerFactory.getLogger(ChadActivityMigrationJob.class); + + @Override + public void executeInternal(JobExecutionContext context) throws JobExecutionException { + logger.info("Migrating Chad activities to new administrative boundaries"); + + updateActivityLocations(); + + deleteSubPrefectures(); + + logger.info("Finished migrating Chad activities to new administrative boundaries"); + } + + private void deleteSubPrefectures() { + PersistenceManager.getSession() + .createSQLQuery("update amp_category_value_location\n" + + "set deleted=true\n" + + "where location_name='N''DJAMENA' and id=9612\n") + .executeUpdate(); + + PersistenceManager.getSession() + .createSQLQuery("update amp_category_value_location adm3\n" + + "set deleted=true\n" + + "from amp_category_value_location adm0\n" + + "join amp_category_value_location adm1 on adm1.parent_location=adm0.id\n" + + "join amp_category_value_location adm2 on adm2.parent_location=adm1.id\n" + + "where adm3.parent_location=adm2.id") + .executeUpdate(); + } + + private void updateActivityLocations() { + AmpCategoryValue zoneLocation = getCV(CategoryConstants.IMPLEMENTATION_LOCATION_KEY, + "Administrative Level 2", "Failed to find ADM2 implementation location"); + + AmpCategoryValue zoneLevel = getCV(CategoryConstants.IMPLEMENTATION_LEVEL_KEY, + "Zone", "Failed to find Zone implementation level"); + + AmpCategoryValue regionLocation = getCV(CategoryConstants.IMPLEMENTATION_LOCATION_KEY, + "Administrative Level 1", "Failed to find ADM1 implementation location"); + + AmpCategoryValue regionLevel = getCV(CategoryConstants.IMPLEMENTATION_LEVEL_KEY, + "Provincial", "Failed to find Provincial implementation level"); + + for (Long activityId : getADM3ActivityIds()) { + updateActivity(activityId, zoneLocation, zoneLevel); + } + + for (Long activityId : getADM2NdjamenaActivityIds()) { + updateActivity(activityId, regionLocation, regionLevel); + } + } + + private void updateActivity(Long activityId, + AmpCategoryValue zoneLocation, AmpCategoryValue zoneLevel) { + + AmpActivityVersion activity = (AmpActivityVersion) PersistenceManager.getSession() + .load(AmpActivityVersion.class, activityId); + + activity.getCategories().removeIf(cv -> + cv.getAmpCategoryClass().getKeyName().equals(CategoryConstants.IMPLEMENTATION_LOCATION_KEY) + || cv.getAmpCategoryClass().getKeyName().equals(CategoryConstants.IMPLEMENTATION_LEVEL_KEY)); + + activity.getCategories().add(zoneLocation); + activity.getCategories().add(zoneLevel); + + List newActivityLocations = new ArrayList<>(); + + for (AmpActivityLocation activityLocation : activity.getLocations()) { + + AmpCategoryValueLocations location = activityLocation.getLocation(); + + AmpCategoryValueLocations newLocation = getNewLocation(location); + + AmpActivityLocation newActivityLocation = newActivityLocations.stream() + .filter(al -> al.getLocation().equals(newLocation)) + .findFirst() + .orElseGet(() -> new AmpActivityLocation(activityLocation.getActivity(), newLocation, + 0f, activityLocation.getLatitude(), activityLocation.getLongitude())); + + if (activityLocation.getLocationPercentage() != null) { + newActivityLocation.setLocationPercentage( + newActivityLocation.getLocationPercentage() + activityLocation.getLocationPercentage()); + } + + newActivityLocations.add(newActivityLocation); + } + + activity.getLocations().clear(); + activity.getLocations().addAll(newActivityLocations); + } + + private AmpCategoryValueLocations getNewLocation(AmpCategoryValueLocations loc) { + AmpCategoryValueLocations parentLocation = loc.getParentLocation(); + if (parentLocation.getName().equals("N'DJAMENA") && getAdmLevel(loc) == LEVEL_3) { + return (AmpCategoryValueLocations) PersistenceManager.getSession().createQuery( + "from AmpCategoryValueLocations\n" + + "where name=:name\n" + + "and id<>:oldId") + .setString("name", loc.getName()) + .setLong("oldId", loc.getId()) + .uniqueResult(); + } else { + return parentLocation; + } + } + + private int getAdmLevel(AmpCategoryValueLocations loc) { + int level = 0; + while (loc.getParentLocation() != null) { + loc = loc.getParentLocation(); + level++; + } + return level; + } + + private AmpCategoryValue getCV(String implementationLocationKey, String o, String s) { + return CategoryManagerUtil.getAmpCategoryValueCollectionByKey(implementationLocationKey) + .stream() + .filter(cv -> cv.getValue().equals(o)) + .findFirst() + .orElseThrow(() -> new RuntimeException(s)); + } + + private List getADM3ActivityIds() { + return PersistenceManager.getSession().createSQLQuery( + "select distinct a.amp_activity_id\n" + + "from amp_activity a\n" + + " join amp_activity_location al on a.amp_activity_id=al.amp_activity_id\n" + + " join amp_category_value_location cvl on al.location_id = cvl.id\n" + + " join amp_category_value_location cvlp on cvl.parent_location=cvlp.id\n" + + " join amp_category_value_location cvlp2 on cvlp.parent_location=cvlp2.id\n" + + " join amp_category_value_location cvlp3 on cvlp2.parent_location=cvlp3.id\n" + + "where cvlp3.parent_location is null") + .addScalar("amp_activity_id", LongType.INSTANCE) + .list(); + } + + private List getADM2NdjamenaActivityIds() { + return PersistenceManager.getSession().createSQLQuery( + "select distinct a.amp_activity_id\n" + + "from amp_activity a\n" + + "join amp_activity_location al on a.amp_activity_id=al.amp_activity_id\n" + + "join amp_category_value_location cvl_adm2 on al.location_id = cvl_adm2.id\n" + + "join amp_category_value_location cvl_adm1 on cvl_adm2.parent_location = cvl_adm1.id\n" + + "join amp_category_value_location cvl_adm0 on cvl_adm1.parent_location = cvl_adm0.id\n" + + "where cvl_adm2.location_name='N''DJAMENA' and cvl_adm0.parent_location is null") + .addScalar("amp_activity_id", LongType.INSTANCE) + .list(); + } +} diff --git a/amp/gis/boundaries/TD/adm-0.json b/amp/gis/boundaries/TD/adm-0.json index 5b8db1386da..5648c309a8f 100644 --- a/amp/gis/boundaries/TD/adm-0.json +++ b/amp/gis/boundaries/TD/adm-0.json @@ -1 +1 @@ -{"type":"Topology","transform":{"scale":[0.0017802221846466015,0.0019179707679405778],"translate":[13.473475,7.441069]},"arcs":[[[445,1013],[-42,49],[-31,16],[-64,72],[2,31],[86,101],[12,43],[21,8],[139,7],[124,-32],[73,-13],[47,29],[47,11],[55,-20],[18,16],[45,-15],[13,16],[57,-13],[55,-20],[93,15],[47,12],[-20,22],[-43,18],[-48,30],[-20,36],[-54,54],[-25,8],[-17,52],[-22,34],[-54,35],[7,44],[-13,38],[-37,57],[14,32],[-6,42],[-18,24],[-8,41],[-6,108],[24,45],[-6,23],[47,77],[-25,17],[-18,63],[29,46],[-42,52],[11,75],[-29,37],[-16,-12],[-27,12],[-23,28],[9,55],[1,56],[-16,41],[-18,-1],[1,56],[-11,34],[-34,1],[-10,27],[-27,22],[-24,-3],[-43,15],[-19,20],[9,55],[-20,40],[-41,55],[-212,3],[-108,139],[-102,137],[-39,48],[-9,28],[-77,315],[-7,44],[11,16],[44,16],[39,5],[31,19],[-11,45],[39,32],[36,12],[-11,74],[44,93],[57,60],[172,225],[61,75],[127,117],[194,192],[170,164],[138,135],[19,366],[15,285],[16,305],[21,156],[25,171],[18,135],[26,172],[136,209],[-74,59],[-67,87],[-87,76],[-25,55],[45,43],[-189,245],[-51,31],[-4,259],[-30,156],[-79,371],[6,4],[243,104],[313,127],[149,-64],[404,-172],[323,-143],[386,-171],[271,-119],[258,-117],[457,-207],[197,-90],[179,-85],[142,-64],[247,-116],[179,-83],[229,-111],[241,-115],[302,-144],[277,-133],[218,-106],[36,-15],[0,-370],[0,-312],[0,-261],[0,-365],[0,-261],[0,-260],[1,-154],[-21,-1],[-89,20],[-81,8],[-47,-2],[-91,-32],[-46,-3],[-67,12],[-52,0],[-36,-27],[-13,-21],[-59,-35],[2,-45],[32,-25],[7,-56],[-2,-37],[-39,-42],[6,-26],[-39,-13],[-64,-57],[1,-29],[-31,-14],[-18,-22],[22,-57],[3,-27],[-56,-19],[-64,-11],[-51,-18],[-16,-46],[37,-18],[-3,-56],[10,-19],[-14,-28],[24,-22],[44,-2],[12,-23],[-24,-34],[-59,-36],[-22,0],[-57,-39],[-33,-15],[-47,-47],[-32,-42],[21,-31],[-7,-16],[15,-30],[40,-32],[4,-60],[34,-37],[1,-16],[-56,-55],[-32,-42],[-60,-13],[-10,-19],[-43,-29],[-42,-92],[-7,-33],[11,-38],[43,-50],[55,-1],[58,15],[33,22],[2,22],[50,-28],[96,-40],[-25,-65],[-23,-28],[28,-28],[12,-60],[18,-28],[9,-37],[0,-66],[33,17],[47,-14],[-45,-177],[7,-35],[54,-55],[51,-21],[20,-37],[88,7],[4,-55],[16,-8],[2,-50],[-58,-140],[-68,9],[-15,13],[-73,12],[-20,-7],[-27,13],[-54,-20],[-55,-7],[-21,-13],[-53,-12],[-24,-17],[-40,10],[-36,-5],[-47,-17],[-31,8],[-49,-37],[-1,-67],[-31,-8],[0,-48],[-9,-28],[19,-23],[8,-31],[-16,-44],[-35,-43],[-64,-14],[-14,9],[-38,-39],[-8,-36],[-34,-43],[-30,-20],[-44,16],[-26,-22],[-18,-31],[-28,-23],[-10,-29],[-51,-18],[3,-15],[-31,-42],[2,-16],[-57,-48],[-6,-20],[-55,-31],[-5,-14],[-55,-3],[-14,-41],[-61,11],[-41,-86],[-57,-23],[-45,-4],[-20,13],[-101,-2],[-26,-8],[-48,-34],[-86,-2],[-57,-19],[-77,-2],[-75,4],[-52,-9],[-51,12],[-47,-14],[-32,6],[-48,-19],[-9,-20],[-30,-8],[-31,-26],[31,-39],[54,-21],[57,-48],[-31,-16],[-13,-44],[-30,-22],[-38,-47],[-39,-60],[-26,-24],[-74,-25],[-24,-34],[4,-29],[-20,-23],[-231,-15],[-89,-5],[-62,-26],[-141,12],[-13,-19],[-39,-17],[-20,1],[-16,-24],[-36,2],[-76,-23],[-43,-34],[-10,-17],[-29,-12],[-5,-21],[-39,-4],[-28,-13],[-47,1],[-29,-11],[2,-28],[-37,-17],[-66,63],[-33,10],[0,36],[-41,16],[-6,34],[-38,5],[-15,-28],[-28,8],[-14,-16],[9,-29],[-31,-28],[-36,-8],[-43,-23],[-100,-15],[-10,-23],[-36,-26],[-93,-22],[-37,20],[-9,21],[-101,-4],[-22,8],[35,31],[14,46],[-2,53],[-46,10],[-32,52],[-35,76],[4,24],[-63,116],[-44,157],[-56,33],[-41,-2],[-61,51],[-14,20],[-29,-2],[-54,9],[-20,22],[-89,78],[-28,11],[-9,31],[-63,54],[2,48],[-38,41],[-29,9]]],"objects":{"chad_ADM0":{"type":"GeometryCollection","geometries":[{"arcs":[[0]],"type":"Polygon","properties":{"GADMID":216,"ISO":"TCD","NAME_ENGLI":"Chad","NAME_ISO":"CHAD","NAME_FAO":"Chad","NAME_LOCAL":"Tchad","NAME_OBSOL":null,"NAME_VARIA":null,"NAME_NONLA":null,"NAME_FRENC":"Tchad","NAME_SPANI":"Chad","NAME_RUSSI":"???","NAME_ARABI":"????","NAME_CHINE":"??","WASPARTOF":null,"CONTAINS":null,"SOVEREIGN":"Chad","ISO2":"TD","WWW":null,"FIPS":"CD","ISON":148,"VALIDFR":"19600811","VALIDTO":"Present","AndyID":48,"POP2000":7885299,"SQKM":1168002,"POPSQKM":6.751101,"UNREGION1":"Middle Africa","UNREGION2":"Africa","DEVELOPING":1,"CIS":0,"Transition":0,"OECD":0,"WBREGION":"Sub-Saharan Africa","WBINCOME":"Low income","WBDEBT":"Severely indebted","WBOTHER":"HIPC","CEEAC":1,"CEMAC":1,"CEPLG":0,"COMESA":0,"EAC":0,"ECOWAS":0,"IGAD":0,"IOC":0,"MRU":0,"SACU":0,"UEMOA":0,"UMA":0,"PALOP":0,"PARTA":0,"CACM":0,"EurAsEC":0,"Agadir":0,"SAARC":0,"ASEAN":0,"NAFTA":0,"GCC":0,"CSN":0,"CARICOM":0,"EU":0,"CAN":0,"ACP":1,"Landlocked":1,"AOSIS":0,"SIDS":0,"Islands":0,"LDC":1,"Shape_Leng":55.699394,"Shape_Area":107.136002,"ADM1_CODE":9048,"ADM0_CODE":2434508}}]}},"crs":{"type":"name","properties":{"name":"urn:ogc:def:crs:OGC:1.3:CRS84"}}} \ No newline at end of file +{"type":"Topology","arcs":[[[33291,2812],[-7,-13],[5,-32],[17,-33],[1,-44],[12,-39],[-6,-36],[-3,-54],[-16,-32],[-21,-18],[-35,-19],[-42,-2],[-63,22],[-19,13],[-8,27],[-4,26],[-20,44],[-29,24],[-37,16],[-16,-1],[-21,-12],[-5,-22],[6,-17],[-5,-23],[-31,-41],[-24,-20],[-51,-30],[-17,-14],[-3,-17],[16,-20],[27,-42],[5,-33],[-10,-12],[-26,-1],[-30,-7],[-10,-18],[-19,-52],[-18,-14],[-18,-3],[-36,8],[-65,1],[-38,-6],[-22,-20],[-34,-42],[-16,0],[-20,28],[-49,-4],[-20,-11],[-14,-23],[-5,-24],[-17,-27],[-5,-44],[19,-21],[18,-33],[0,-26],[-12,-16],[-22,-9],[-28,-3],[-20,-16],[-7,-30],[1,-19],[14,-32],[3,-32],[-17,-10],[-20,-2],[-41,11],[-23,-1],[-16,-17],[-24,-17],[-50,1],[-83,0],[-23,4],[-15,9],[-1,30],[-11,26],[-36,43],[-16,34],[-8,41],[-15,19],[-26,2],[-43,-8],[-31,4],[-16,11],[-11,16],[-14,27],[-25,10],[-23,-8],[-32,-3],[-18,-14],[-5,-19],[8,-20],[-3,-15],[-21,-7],[-13,-16],[15,-20],[24,-10],[-4,-56],[16,-22],[40,-41],[4,-20],[-19,-18],[-41,-9],[-55,4],[-45,-7],[-38,-30],[-40,-35],[-43,-20],[-52,36],[-30,16],[-28,6],[-47,-3],[-21,-18],[-9,-20],[-4,-41],[4,-22],[17,-44],[-11,-17],[-20,-8],[-89,-9],[-26,7],[-70,-2],[-74,-21],[-20,-1],[-47,24],[-38,14],[-28,-1],[-42,-21],[-27,7],[-25,19],[-17,8],[-26,7],[-12,-3],[-9,-15],[-12,-49],[-15,-16],[-23,-6],[-50,3],[-20,22],[-13,26],[-22,30],[-13,3],[-38,23],[-14,-2],[-20,-28],[-52,-11],[-13,-13],[-9,-29],[-15,-23],[-35,-20],[-62,-10],[-20,-12],[-14,-18],[-5,-20],[11,-39],[9,-23],[-3,-26],[-15,-12],[-46,-2],[-14,7],[-10,15],[-14,10],[-24,3],[-22,11],[-19,18],[-23,13],[-34,15],[-41,0],[-12,-11],[-7,-28],[4,-42],[12,-12],[13,-4],[53,-37],[6,-12],[-11,-28],[1,-14],[-14,-21],[-17,-6],[-25,-24],[-3,-22],[-10,-16],[-45,-48],[-5,-30],[6,-11],[43,-6],[73,-3],[20,-20],[15,-35],[5,-27],[-52,-65],[-30,-24],[-25,-12],[-22,1],[-73,31],[-11,14],[12,17],[31,4],[4,6],[-18,19],[-17,7],[-31,-7],[-39,6],[-35,-12],[-56,-8],[-22,-13],[-22,-23],[-4,-39],[9,-34],[-15,-33],[-27,-10],[-27,-17],[-11,-11],[-24,4],[-30,15],[-19,0],[-20,-8],[-18,-19],[-9,-15],[0,-17],[-7,-17],[-15,4],[-28,26],[-48,10],[-37,-10],[-36,13],[-9,-1],[-36,-14],[-30,4],[-13,16],[-23,81],[-23,47],[-15,17],[-44,23],[-25,16],[-24,25],[-13,36],[11,22],[13,41],[4,32],[-5,47],[-28,40],[-48,39],[-35,46],[-24,46],[-17,19],[-31,11],[-39,18],[-47,51],[-16,11],[-52,17],[-46,18],[-11,10],[-14,35],[-11,16],[-25,20],[-21,7],[-33,4],[-31,18],[-15,16],[-17,47],[-22,40],[-16,22],[-60,-9],[-92,10],[-64,13],[-25,7],[-45,5],[-32,-3],[-35,-21],[-35,25],[-27,26],[-5,22],[-33,52],[-16,11],[-69,12],[-16,15],[-8,57],[-1,52],[-12,38],[-2,23],[6,42],[8,34],[-6,23],[3,29],[-11,23],[-8,33],[10,28],[-1,16],[13,25],[1,24],[28,49],[6,17],[-7,27],[-23,45],[-32,20],[-26,10],[-33,23],[-30,28],[-7,15],[-37,16],[-18,13],[-16,-1],[-52,12],[-17,9],[-39,4],[-10,6],[-17,21],[-18,9],[-9,-2],[-29,-26],[-32,-9],[-45,-4],[-48,31],[-39,34],[-23,12],[-20,6],[-13,17],[14,30],[0,19],[-22,78],[-16,40],[0,29],[10,17],[-21,3],[-1,10],[10,15],[21,11],[15,-7],[6,14],[-8,34],[-29,-3],[-17,8],[-5,30],[1,22],[-20,-2],[-8,10],[5,27],[-2,14],[-12,24],[4,19],[19,12],[15,18],[1,23],[-33,24],[-7,22],[-13,19],[5,33],[-6,26],[12,24],[-16,27],[8,17],[17,9],[12,0],[15,14],[-8,17],[8,13],[19,8],[0,25],[28,1],[4,22],[-21,12],[-1,24],[23,27],[13,21],[-1,20],[-8,30],[-22,-29],[-40,-24],[-15,-13],[-20,-28],[-26,-17],[-54,16],[-16,-5],[-45,-31],[-13,-4],[-33,3],[-39,9],[-21,-7],[-6,-24],[10,-16],[22,-19],[4,-12],[-5,-15],[-18,-19],[-16,-9],[-87,17],[-38,-10],[-36,-51],[-15,-9],[-25,-5],[-42,-21],[-22,-4],[-79,10],[-39,-20],[-10,-23],[21,-32],[4,-34],[-8,-28],[-18,-24],[-20,-19],[-11,-22],[-3,-24],[-10,-18],[-14,-11],[-72,-34],[-27,-25],[-7,-34],[13,-28],[4,-20],[-11,-32],[-15,-24],[-21,-10],[-63,-3],[-32,-16],[-92,-24],[-76,-4],[-24,5],[-19,11],[11,25],[18,13],[6,15],[-4,27],[-12,22],[-17,22],[-23,8],[-33,-1],[-25,5],[-19,10],[-29,27],[-17,-13],[-6,-13],[-5,-42],[-23,-25],[-10,-37],[-11,-16],[-26,-18],[-19,-32],[-5,-32],[-17,-11],[-40,-16],[-40,-23],[-18,-31],[2,-16],[10,-17],[23,-18],[41,-46],[18,-32],[15,-38],[6,-31],[-7,-20],[-70,-32],[-12,-22],[3,-25],[36,-49],[16,-46],[17,-9],[44,-10],[19,-1],[5,-10],[-16,-44],[-12,-5],[-28,-23],[-10,-21],[-52,-38],[-17,-24],[1,-20],[-20,-13],[-26,-4],[-11,-10],[17,-27],[-5,-16],[-26,1],[-6,-6],[-9,-30],[-1,-19],[-12,-12],[-37,1],[-30,12],[-12,-9],[-4,-12],[0,-41],[-6,-14],[-14,-8],[-27,-2],[-23,7],[-28,-2],[-29,-29],[-14,-10],[-16,-19],[-12,-1],[-33,17],[-26,-5],[-24,-14],[-26,-10],[-28,1],[-38,22],[-16,2],[-36,-18],[-7,-15],[-3,-20],[-15,3],[-20,11],[-15,2],[-28,-7],[-47,-7],[-26,-1],[-57,-23],[-32,-16],[-73,-45],[-18,0],[-44,5],[-26,16],[-17,1],[-37,-22],[-49,-51],[-6,-18],[14,-30],[-14,-17],[-26,-7],[-18,-18],[-29,-16],[-33,-8],[-12,-8],[-18,-23],[-56,-7],[-29,-14],[-18,6],[2,10],[-25,-1],[-25,-27],[-11,-2],[-11,-31],[-6,-5],[-4,-21],[5,-19],[-18,-17],[-48,1],[-26,-12],[-26,-3],[-26,-11],[-30,-21],[-45,4],[-11,-3],[-44,-2],[-31,21],[-42,21],[-14,3],[-20,-5],[-19,8],[-17,-7],[-17,4],[-16,26],[-1,17],[-18,6],[-47,1],[-58,-11],[-39,-20],[-13,-16],[-22,-5],[-25,-22],[-8,-23],[-14,-20],[-1,-13],[-14,-11],[-26,-9],[-19,-28],[-21,-20],[-10,-2],[-41,6],[-22,-6],[-25,15],[-47,7],[-23,-9],[-12,2],[-28,-7],[-31,8],[-17,-4],[-5,-24],[-27,-1],[-7,-26],[-20,-10],[-36,30],[-14,-12],[-21,-7],[-35,28],[-28,5],[-13,-2],[-27,-16],[-8,4],[-8,19],[-21,-2],[-22,-21],[-38,8],[-27,-2],[-22,-19],[-14,-7],[-23,-2],[-10,5],[-35,-1],[-48,-13],[-11,4],[-23,-19],[-59,-26],[-51,-4],[-13,-16],[-9,-31],[-25,4],[-38,-3],[-5,-11],[-29,-18],[-11,-13],[-19,-9],[-25,-34],[-6,-28],[-12,-18],[5,-27],[-7,-20],[1,-21],[-15,-22],[2,-18],[9,-25],[-16,-26],[10,-28],[2,-27],[-19,-28],[-29,-1],[-29,-15],[-14,14],[-32,0],[-8,-9],[-10,-27],[-13,-10],[-15,-4],[-24,10],[-7,-15],[19,-10],[-7,-15],[-16,-11],[16,-17],[-34,-24],[-17,-35],[-14,-9],[-15,-1],[-24,-10],[-22,1],[-9,-8],[-33,-20],[-18,-16],[-18,-6],[-22,-22],[-12,-38],[-19,-10],[-54,-8],[-19,12],[-23,-12],[-6,-30],[-12,-21],[-28,16],[-45,-10],[-38,-15],[-53,3],[-12,-5],[-30,0],[-22,-8],[-24,-3],[-40,6],[-50,-4],[-22,-13],[-41,0],[-38,-9],[-16,-6],[-23,-39],[-29,-7],[-23,-19],[-38,-10],[-25,-19],[-19,2],[-64,-36],[-26,0],[-60,-7],[-47,-13],[-52,-26],[-72,-9],[-19,-8],[-51,-38],[-15,10],[-48,2],[-22,3],[-62,3],[-25,-3],[-39,-12],[-15,-19],[-17,-10],[-19,-22],[-16,-4],[-39,8],[-41,-2],[-76,7],[-16,-11],[-6,-12],[-16,-10],[-19,-1],[-12,18],[-10,26],[-13,8],[-29,48],[-42,24],[-14,-3],[-12,5],[-26,27],[-22,0],[-27,24],[-34,4],[-21,-12],[-39,11],[-15,2],[-34,-32],[-15,-20],[-17,1],[-14,38],[-43,4],[-18,6],[-11,18],[-15,7],[-1,19],[19,10],[-3,14],[-23,15],[-4,10],[-51,3],[-31,22],[-33,39],[-5,35],[-21,20],[-16,22],[-12,32],[-8,28],[-22,29],[-27,40],[21,14],[-5,50],[-42,4],[-29,-2],[-1485,-48],[-372,112],[-31,19],[55,35],[22,2],[30,11],[6,11],[-6,24],[5,13],[19,23],[5,15],[18,26],[14,1],[24,-9],[25,17],[24,35],[66,48],[17,5],[11,16],[3,24],[18,23],[21,13],[21,21],[24,11],[35,-1],[12,12],[5,38],[29,34],[47,13],[42,65],[13,27],[-2,13],[-14,10],[-20,25],[-21,16],[12,88],[20,0],[23,8],[52,68],[17,10],[14,34],[-1,55],[3,14],[21,11],[10,12],[5,24],[-11,37],[3,38],[-11,16],[-21,1],[-14,15],[-3,16],[12,7],[35,6],[8,7],[2,29],[11,11],[23,8],[10,9],[-3,31],[13,39],[19,7],[7,24],[1,45],[6,21],[11,11],[2,16],[-30,10],[-11,16],[1,31],[10,21],[-7,20],[-11,50],[9,50],[1,35],[14,16],[-14,13],[-27,13],[-2,17],[7,8],[5,29],[12,44],[4,28],[-5,9],[-31,13],[-5,25],[18,28],[14,48],[6,12],[26,25],[14,4],[-40,114],[-702,154],[-22,12],[-12,20],[-444,693],[-11,28],[-364,958],[-146,364],[20,355],[-293,584],[-799,1603],[-300,598],[-107,211],[-136,266],[-75,153],[-24,38],[-15,14],[-52,19],[-61,33],[-51,35],[-12,20],[-38,73],[-14,27],[-17,78],[-33,67],[-23,38],[-70,82],[-8,36],[-6,52],[-18,186],[-17,14],[-59,30],[-71,46],[-45,37],[-79,67],[-93,106],[-6,16],[-1,21],[5,47],[-9,52],[-5,9],[-34,16],[-105,38],[-88,41],[-134,40],[-16,9],[-36,30],[-22,12],[-19,5],[-37,1],[-62,-5],[-37,-12],[-27,-15],[-35,3],[-27,10],[-66,58],[-44,10],[-78,3],[-69,5],[-88,-13],[-55,4],[-8,10],[-1,16],[9,86],[19,36],[3,23],[30,52],[4,60],[4,31],[-4,16],[-25,34],[-29,31],[-53,47],[-33,19],[-38,10],[-52,4],[-63,26],[-31,38],[-25,26],[-33,11],[-46,-6],[-47,-23],[-51,2],[-57,-3],[-19,10],[-101,65],[13,21],[74,53],[25,22],[12,26],[-15,22],[-21,15],[-86,45],[10,17],[-5,21],[-44,6],[35,55],[-35,0],[-22,14],[-5,14],[-8,66],[-16,18],[-44,12],[-31,17],[-39,4],[-37,28],[-22,1],[-24,-23],[-17,10],[-5,20],[-22,19],[-9,-1],[-29,-21],[-33,-39],[-20,2],[-23,21],[-18,6],[-27,-5],[-12,-10],[-4,-17],[6,-30],[-15,-12],[-29,19],[-19,3],[-40,-12],[-31,-6],[-2206,1514],[-772,459],[-79,45],[-17,35],[-25,96],[-27,54],[-17,29],[-25,28],[-25,38],[-18,21],[-20,42],[-22,52],[-9,34],[-21,26],[-76,37],[-39,21],[-109,51],[-49,6],[-15,8],[-21,26],[-36,34],[-61,39],[-30,14],[-48,18],[-16,14],[-39,55],[-47,57],[-25,12],[-24,7],[-17,10],[-16,38],[-22,28],[-93,72],[-26,11],[-37,11],[-30,4],[-88,75],[19,10],[14,27],[-20,31],[-9,9],[-32,8],[-8,9],[-5,19],[7,47],[20,30],[21,15],[12,28],[-13,27],[11,17],[37,2],[25,9],[7,19],[-12,54],[26,3],[14,6],[10,16],[7,46],[11,42],[8,23],[21,37],[13,34],[16,70],[-8,41],[-20,122],[-5,22],[-33,29],[-57,23],[-206,68],[-31,23],[-10,18],[-40,123],[-12,28],[-15,20],[-74,95],[-42,67],[-32,60],[-29,66],[-12,8],[-21,0],[-25,-10],[-149,-53],[-28,-8],[-20,-17],[-57,-15],[-53,9],[-32,28],[-31,23],[-48,55],[-43,48],[-71,93],[-53,62],[-49,79],[-9,60],[0,59],[-185,148],[-28,57],[-9,29],[-24,-30],[-30,-7],[-37,2],[-32,13],[-19,25],[-4,47],[-17,31],[-12,14],[-35,10],[-6,26],[6,23],[-22,19],[-10,22],[-10,35],[-35,41],[-56,29],[-77,63],[-36,56],[-53,33],[-62,-6],[-40,4],[-47,2],[-47,25],[-27,12],[-53,36],[-48,34],[-28,26],[-15,23],[-8,28],[-7,52],[-38,95],[-28,51],[-32,31],[-27,7],[-58,4],[-54,26],[-38,54],[-28,20],[-16,22],[-96,93],[-88,123],[-45,32],[-8,57],[-12,43],[-42,15],[-72,33],[-63,25],[-103,5],[-14,11],[-44,6],[-215,172],[14,78],[406,637],[49,53],[409,336],[181,135],[128,98],[177,125],[25,23],[52,100],[307,580],[255,714],[8,56],[2472,-4],[249,-52],[1525,-299],[1007,-186],[1356,409],[345,-120],[74,-9],[201,0],[58,0],[22,-6],[46,-42],[157,-116],[21,-1],[17,5],[338,131],[32,11],[11,17],[17,60],[13,63],[19,26],[20,13],[28,4],[97,26],[44,8],[48,12],[89,18],[233,-66],[46,0],[115,39],[34,14],[98,-19],[22,-16],[22,-31],[267,33],[1055,-247],[433,-220],[928,143],[1175,267],[254,59],[52,18],[0,23],[-18,15],[-35,22],[-39,41],[-12,19],[-30,34],[-23,16],[-61,23],[-11,6],[-21,21],[-23,13],[-29,11],[-45,21],[-17,4],[-21,24],[-46,29],[-29,9],[-62,5],[-22,7],[-28,18],[-15,22],[-7,20],[-25,21],[-27,11],[-22,3],[-51,-12],[-33,-6],[-26,5],[-19,12],[-18,21],[-5,46],[-20,43],[-36,31],[-66,30],[-38,3],[-44,-11],[-52,1],[-18,10],[-25,25],[-10,27],[-2,20],[-12,19],[-16,10],[-48,20],[-62,11],[-46,16],[-26,22],[-20,65],[-36,31],[-34,-4],[-26,-16],[-29,-28],[-25,-14],[-28,-8],[-10,4],[-12,44],[0,41],[-5,22],[-9,22],[-26,20],[-46,46],[-41,52],[-12,8],[-50,-10],[-11,14],[-38,10],[-17,41],[-6,22],[-40,56],[-25,27],[-31,44],[-21,22],[-19,24],[-10,6],[-17,48],[-15,23],[-33,59],[-11,49],[-10,32],[-26,57],[-18,22],[-22,17],[-34,51],[-20,12],[-50,26],[-66,17],[-12,10],[-28,35],[-37,32],[-54,31],[-21,15],[-14,27],[0,21],[5,31],[-5,28],[-10,22],[-25,40],[-22,15],[-43,42],[-68,51],[-43,20],[-76,45],[-51,45],[-32,34],[-26,25],[-63,95],[-26,26],[-21,15],[-6,14],[-24,23],[-27,17],[-61,25],[-59,30],[-61,18],[-28,-8],[-47,1],[-43,16],[-11,7],[-3,48],[15,44],[11,24],[-1,20],[-23,25],[-21,15],[-52,25],[-29,22],[-11,17],[-9,26],[-6,41],[-13,33],[-24,35],[-26,27],[-35,96],[-16,84],[-4,67],[-10,67],[-24,74],[-53,79],[-33,51],[-26,48],[-36,40],[-32,2],[-26,10],[-29,32],[-20,29],[-16,36],[-11,39],[-8,39],[-22,76],[-25,47],[-43,54],[-80,76],[-37,34],[-64,53],[-40,18],[-25,26],[-38,13],[-46,26],[-53,22],[-43,-3],[-84,36],[-45,42],[-69,39],[-40,30],[-47,39],[-30,31],[-23,35],[-11,33],[-5,55],[1,26],[-1,74],[-5,52],[-12,54],[-1,60],[2,36],[4,32],[26,49],[51,60],[20,33],[13,53],[17,37],[3,12],[-7,59],[-10,35],[-25,98],[-24,63],[-33,49],[-28,31],[-14,25],[-18,36],[-18,45],[-15,56],[-10,47],[-15,56],[-19,49],[-9,49],[-15,36],[-23,29],[-45,41],[-41,26],[-37,45],[-78,109],[-46,68],[-11,29],[0,18],[-7,42],[-28,55],[-16,25],[-68,75],[-22,35],[-33,63],[-27,64],[-27,87],[-17,76],[-6,34],[6,35],[23,101],[9,69],[11,31],[16,20],[39,26],[40,24],[35,30],[19,33],[18,43],[7,68],[-2,52],[-7,33],[-15,54],[-27,117],[-26,116],[-18,62],[-26,65],[-22,72],[-20,46],[-48,58],[-29,37],[-26,23],[-18,24],[-5,30],[4,36],[-5,61],[-19,23],[-30,23],[-65,44],[-10,22],[-3,34],[12,23],[36,25],[7,32],[-7,23],[-32,28],[68,32],[24,15],[117,-11],[26,10],[56,45],[27,16],[38,1],[36,-6],[16,6],[0,16],[21,45],[15,24],[-6,33],[-9,82],[-12,29],[16,26],[39,23],[13,33],[-7,37],[15,21],[30,20],[2,30],[25,30],[0,23],[-13,24],[-34,15],[-40,28],[-13,18],[-14,52],[-5,35],[21,20],[-9,26],[1,38],[-6,23],[10,39],[-9,17],[3,51],[12,37],[-7,18],[7,49],[-10,36],[-15,18],[-9,29],[-3,50],[-12,16],[-50,16],[-39,30],[-14,27],[-51,52],[-14,23],[-29,69],[-13,23],[-26,34],[-2,26],[-19,53],[-13,22],[-14,43],[-11,63],[-17,24],[0,17],[11,15],[12,3],[29,21],[16,23],[1,50],[-7,42],[-25,41],[-6,16],[4,25],[-2,22],[-15,25],[-1,17],[-53,33],[-36,27],[-11,25],[14,20],[30,11],[21,57],[-1,45],[12,20],[36,34],[19,74],[23,14],[31,13],[20,17],[20,54],[-5,22],[-14,21],[-19,19],[-19,10],[-73,47],[-74,32],[-16,12],[2,28],[28,48],[32,30],[108,76],[0,32],[-5,29],[-10,19],[-16,48],[-15,59],[-26,38],[-18,16],[-6,18],[5,19],[35,28],[-25,73],[2,17],[19,17],[52,13],[4,19],[13,31],[2,62],[10,21],[25,-1],[15,5],[5,21],[-11,23],[-19,18],[-4,17],[6,9],[49,13],[46,35],[25,63],[38,81],[28,12],[49,38],[-3,17],[-31,43],[-5,13],[19,18],[51,-5],[22,3],[8,16],[0,19],[-5,39],[-1,25],[12,14],[36,15],[41,21],[66,17],[51,20],[10,8],[11,24],[-9,36],[0,34],[11,29],[40,41],[11,21],[5,54],[15,26],[6,26],[-8,19],[3,41],[10,26],[20,28],[-5,15],[-32,17],[-50,36],[-8,15],[-42,29],[-26,12],[-37,5],[-75,27],[-27,6],[-60,22],[-16,13],[-9,22],[-4,57],[2,47],[9,79],[-6,21],[-27,31],[-56,40],[-24,13],[-14,16],[-2,39],[4,22],[-1,17],[-8,18],[-17,20],[-42,27],[-12,15],[11,40],[33,24],[11,21],[7,25],[-7,31],[-62,67],[-12,24],[4,14],[10,63],[-2,59],[-20,28],[-32,55],[-18,24],[-42,80],[-4,21],[6,39],[34,29],[15,32],[16,23],[33,39],[20,8],[31,3],[39,-5],[49,-20],[39,-7],[59,-21],[17,4],[0,17],[-19,43],[-18,34],[-10,30],[-12,14],[-51,42],[-27,20],[-36,19],[-32,31],[-9,23],[0,20],[16,24],[3,13],[38,27],[66,29],[83,15],[28,4],[26,10],[45,10],[31,13],[14,22],[10,32],[-9,55],[-19,24],[-44,17],[-31,15],[-55,46],[-36,41],[-22,33],[-3,15],[-1,64],[9,65],[-6,40],[-15,28],[4,22],[-1,24],[-71,45],[-30,11],[-21,15],[-19,32],[-12,0],[-2,-45],[-20,-22],[-16,-10],[-50,-57],[-23,-7],[-24,4],[-58,32],[-41,63],[-23,47],[-9,33],[-1,14],[19,57],[-1,30],[-39,61],[-14,32],[-27,54],[-13,43],[3,76],[24,29],[66,34],[23,9],[41,30],[15,6],[26,26],[8,29],[15,34],[-3,36],[-17,30],[-70,106],[-32,30],[-22,42],[-2,17],[16,44],[25,31],[48,28],[24,18],[20,1],[58,-23],[33,-19],[19,-8],[33,13],[34,31],[24,38],[17,53],[3,23],[-13,54],[1,18],[-20,10],[-31,6],[-53,-6],[-20,-6],[-48,8],[-32,11],[-46,27],[-41,32],[-15,19],[-19,48],[-21,34],[-36,28],[-26,26],[-2,14],[25,19],[38,9],[25,-2],[40,-17],[16,3],[18,24],[6,55],[9,23],[10,14],[-2,37],[-12,30],[-8,35],[-26,50],[-30,34],[-51,19],[-21,5],[-39,19],[-14,28],[-11,43],[4,28],[3,43],[12,45],[0,16],[-18,18],[-15,40],[-20,30],[-31,20],[-61,31],[-39,15],[-76,14],[-32,2],[-35,-7],[-18,-20],[-27,-20],[-15,-34],[-18,-64],[-17,-47],[-35,-22],[-48,-5],[-41,15],[-10,-4],[-89,15],[-51,18],[-88,79],[-71,61],[-86,35],[-78,67],[-56,77],[-63,79],[-64,49],[-48,9],[-53,37],[-25,26],[-3,22],[4,24],[9,21],[20,13],[45,12],[39,18],[25,14],[21,20],[22,14],[11,32],[-8,28],[-20,23],[-58,27],[-25,19],[-20,19],[-10,17],[-1,35],[22,47],[36,41],[27,52],[0,37],[-6,31],[-18,33],[-17,20],[-16,26],[-27,52],[-2,26],[11,24],[28,42],[22,25],[26,23],[12,17],[5,29],[0,32],[-7,41],[-19,53],[-13,30],[-30,38],[-11,28],[0,45],[8,54],[18,35],[30,45],[24,56],[6,28],[-5,56],[-23,49],[-10,54],[5,50],[42,103],[16,46],[5,30],[-2,34],[-7,40],[-49,116],[-48,74],[-76,105],[-43,54],[-33,48],[-13,35],[2,62],[14,49],[2,17],[-15,50],[-15,30],[-19,19],[-22,11],[-34,4],[-21,-5],[-27,-27],[-15,-52],[-9,-16],[-19,-9],[-26,-1],[-44,18],[-40,52],[-5,23],[1,49],[8,31],[15,23],[17,17],[25,18],[28,14],[31,27],[3,60],[-9,51],[-27,68],[-23,67],[-8,125],[1,68],[12,72],[7,54],[0,40],[-6,18],[-13,12],[-55,84],[-15,29],[-11,36],[-9,50],[-6,65],[-33,157],[-46,145],[-23,16],[-43,9],[-33,-1],[-82,-5],[-58,2],[-83,-2],[-109,-40],[-35,5],[-45,18],[-27,16],[-52,52],[-14,37],[-13,82],[-1,67],[-15,59],[-29,52],[-28,36],[-30,22],[-27,7],[-30,0],[-35,-14],[-26,-18],[-25,-87],[-23,-53],[-40,-23],[-54,-21],[-54,-4],[-36,24],[-20,37],[-17,44],[-1,53],[20,37],[29,36],[45,41],[21,25],[20,30],[14,60],[1,28],[-21,53],[-32,29],[-32,20],[-50,16],[-51,6],[-30,1],[-55,-9],[-101,-50],[-39,-9],[-26,3],[-35,11],[-45,20],[-39,12],[-42,19],[-30,22],[-29,36],[-48,35],[-48,25],[-49,12],[-40,2],[-37,-1],[-24,4],[-14,8],[-3,16],[13,28],[14,16],[14,42],[11,53],[4,31],[-9,25],[-17,21],[-21,3],[-29,-9],[-31,-46],[-45,-61],[-43,-49],[-46,-27],[-43,-6],[-41,15],[-35,30],[-26,41],[-9,51],[-11,44],[-21,64],[-35,28],[-38,1],[-38,-31],[-28,-8],[-33,7],[-25,29],[-25,35],[-9,24],[-16,59],[1,26],[17,43],[10,30],[22,27],[25,43],[47,54],[21,41],[10,63],[-1,41],[-4,30],[-26,63],[-26,46],[-19,38],[-31,24],[-60,27],[-72,36],[-41,16],[-28,25],[-22,31],[-19,48],[-10,39],[-1,17],[8,26],[37,45],[10,19],[20,19],[11,50],[14,24],[-4,12],[-22,10],[1,23],[26,54],[19,50],[-7,18],[-3,23],[-9,22],[-9,41],[-29,68],[-16,43],[2,52],[55,21],[-60,79],[-638,840],[-3274,-14],[-1245,1671],[-308,414],[-1830,2415],[-540,713],[-519,2101],[-926,3649],[-20,350],[204,166],[24,21],[445,140],[226,99],[260,-37],[90,25],[145,18],[141,61],[93,61],[348,263],[-6,90],[-23,172],[11,227],[-198,165],[113,89],[225,176],[349,259],[188,-30],[357,224],[41,49],[-22,100],[-149,429],[-1,25],[-34,570],[520,1087],[23,0],[49,117],[137,272],[801,823],[303,405],[-1,0],[2162,2880],[318,398],[936,1136],[1374,1304],[748,714],[216,146],[3029,2286],[971,716],[3362,2509],[305,237],[273,9079],[0,17],[88,1552],[181,5802],[20,706],[254,1810],[872,5851],[277,1810],[2136,3321],[-607,367],[-959,834],[-427,835],[-1066,834],[-426,371],[-320,557],[-106,463],[533,742],[-1280,1855],[-853,1112],[-1599,1484],[0,4358],[-319,1298],[-320,742],[-1120,5846],[91,43],[5773,2455],[672,246],[1109,466],[41,44],[1202,468],[7173,-3077],[842,-375],[10323,-4599],[1218,-511],[4385,-1961],[3094,-1413],[11164,-5101],[2792,-1341],[3013,-1381],[615,-282],[3495,-1646],[161,-103],[2860,-1321],[4481,-2166],[1237,-597],[366,-205],[6746,-3231],[5693,-2788],[568,-243],[1,-21045],[1,-5446],[0,-4601],[-1,-131],[-31,0],[-144,14],[-195,131],[-380,-15],[-65,63],[-47,17],[-95,-9],[-50,-8],[-246,132],[-209,43],[-65,10],[-74,49],[-37,15],[-52,18],[-119,13],[-129,-34],[-89,-2],[-113,-26],[-250,-2],[-390,66],[-264,12],[-261,3],[-345,-62],[-403,-44],[-106,-77],[-333,-49],[-39,-42],[-106,-70],[-207,-93],[-227,-54],[-167,-55],[-131,17],[-142,-41],[-209,-78],[-171,3],[-133,33],[-164,81],[-294,18],[-116,-23],[-176,72],[-173,52],[-184,-37],[-252,37],[-22,10],[-131,35],[-232,-58],[-48,-7],[-132,-69],[-32,-74],[-4,-21],[-19,-62],[-29,-59],[-14,-18],[-29,-19],[-34,-14],[-21,-13],[-49,-22],[-61,-38],[-94,-59],[-36,-28],[-10,-12],[-26,-15],[-42,-163],[-254,-106],[-24,-24],[-25,-15],[-23,-7],[-8,-16],[-22,-26],[-21,-58],[-11,-14],[-37,-12],[-45,-11],[-10,-25],[-34,-18],[-33,-24],[-51,4],[-63,-13],[-32,-11],[-59,-22],[-41,-30],[-18,-19],[-43,-69],[-18,-11],[-16,-23],[-10,-23],[-13,-12],[-33,-19],[-14,-18],[-19,-38],[1,-23],[13,-44],[5,-26],[-4,-25],[-3,-54],[24,-49],[2,-24],[-4,-30],[-28,-37],[-24,-49],[-10,-27],[-22,-31],[-5,-17],[1,-32],[5,-16],[15,-25],[23,-56],[41,-55],[47,-54],[24,-19],[28,-14],[73,-47],[53,-49],[18,-12],[28,-10],[51,-34],[38,-35],[110,-116],[71,-77],[17,-26],[17,-34],[6,-28],[2,-45],[-5,-25],[-22,-55],[-30,-55],[-5,-32],[8,-47],[30,-96],[8,-35],[3,-74],[-8,-34],[-7,-56],[14,-28],[33,-35],[32,-42],[21,-42],[6,-18],[-8,-60],[-7,-21],[-13,-19],[-50,-44],[-23,-25],[-28,-38],[-12,-48],[0,-68],[3,-35],[-3,-15],[-14,-28],[-29,-31],[10,-24],[34,-30],[28,-33],[61,-35],[21,-19],[18,-25],[10,-35],[-2,-39],[-5,-19],[-28,-27],[-48,-24],[-27,-7],[-50,-17],[-14,-11],[-20,-35],[-6,-29],[0,-44],[-3,-26],[-14,-31],[-33,-43],[-66,-51],[-20,-30],[-21,-23],[-16,-12],[-30,-13],[-60,-13],[-96,-40],[-32,-11],[-19,-13],[-11,-25],[0,-58],[-14,-26],[-33,-41],[-5,-29],[17,-36],[46,-72],[13,-34],[26,-85],[5,-40],[-11,-63],[-9,-27],[-8,-12],[-42,-39],[-26,-17],[-42,-20],[-21,4],[-41,0],[-46,-5],[-41,4],[-91,0],[-23,1],[-85,-14],[-40,-15],[-108,-61],[-28,-33],[5,-28],[-3,-39],[-16,-49],[-15,-27],[-42,-53],[-11,-6],[-34,-35],[-53,-28],[-36,-13],[-92,-41],[-32,-7],[-98,-34],[4,-26],[-16,-14],[-8,-35],[-15,-26],[-30,-9],[-29,-15],[-43,-49],[-13,5],[-10,-19],[-28,-32],[-9,-20],[-28,-28],[-24,-21],[-33,-40],[-12,-22],[-19,-12],[-37,-5],[-34,-12],[-22,-40],[-8,-35],[-28,-21],[-23,-6],[-36,-14],[-10,-9],[-41,-21],[-14,-22],[7,-37],[-3,-19],[-25,-67],[-6,-10],[2,-15],[11,-24],[11,-33],[14,-24],[-3,-44],[13,-38],[28,-27],[-3,-32],[7,-23],[-16,-31],[4,-29],[49,-28],[16,-12],[3,-15],[-20,-15],[-31,-3],[-62,-26],[-19,-3],[-21,-12],[-28,-9],[-27,1],[-23,6],[-92,5],[-23,-1],[-26,-8],[-59,-10],[-83,-27],[-39,-25],[-24,-22],[-54,-27],[-37,-31],[-45,-26],[-16,-6],[-31,-56],[-20,-15],[-32,-16],[-34,-33],[-13,-22],[-8,-35],[5,-33],[409,-1019],[45,-251],[-1164,-373],[-969,-177],[-87,-14],[-185,-166],[-304,-31],[-45,-131],[-130,-381],[-83,-227],[18,-17],[39,-15],[43,5],[24,49],[21,-11],[213,-124],[218,-112],[-48,-413],[-24,-224],[28,-261],[121,-156],[42,-208],[-142,-94],[-51,-18],[-74,-47],[-18,-169],[391,-421],[34,0],[59,54],[131,-4],[368,-54],[198,-25],[-53,-63],[-13,-59],[-38,-68],[281,-211],[-324,-459],[-75,-95],[-388,-126],[-246,-203],[-294,-247],[-341,33],[-258,-262],[-335,-76],[-227,-254],[-382,-157],[-301,-154],[-143,-225],[-428,-409],[-180,-184],[-437,-596],[41,-33],[25,-25],[26,-31],[40,-30],[65,-18],[18,-17],[24,-36],[6,-30],[22,-16],[20,-8],[11,-25],[16,-15],[35,-12],[17,-41],[8,-48],[-2,-28],[34,-25],[7,-9],[2,-62],[-10,-35],[-34,-39],[-29,-64],[-19,-19],[-46,-28],[-8,-32],[32,-38],[30,-38],[28,-50],[1,-38],[16,-24],[59,-51],[11,-29],[16,-30],[50,-23],[16,-19],[-7,-27],[-11,-23],[-2,-30],[4,-24],[49,-65],[23,-21],[65,-86],[37,-64],[30,-39],[39,-26],[45,-22],[35,-10],[48,-22],[24,-16],[32,-15],[-1,-36],[5,-27],[21,-27],[44,-33],[27,-26],[8,-23],[0,-28],[17,-18],[25,-14],[20,-25],[38,5],[53,-4],[29,-14],[19,-24],[1,-29],[-11,-47],[-15,-35],[-40,-62],[-30,-58],[-2,-37],[-9,-35],[16,-22],[21,-15],[8,-59],[12,-41],[-13,-22],[-9,-29],[4,-30],[0,-25],[-20,-38],[-21,-57],[27,-30],[2,-45],[5,-22],[34,-43],[23,-8],[13,-20],[28,-8],[8,-13],[20,-6],[8,-44],[34,-49],[7,-14],[2,-35],[-5,-18],[7,-28],[15,-20],[25,-15],[9,-38],[42,-24],[31,-2],[21,-14],[32,-2],[24,-8],[25,-31],[32,-16],[52,-44],[4,-15],[21,-24],[19,-30],[13,-25],[9,-2],[4,-21],[11,-21],[2,-33],[-2,-36],[16,-67],[19,-28],[17,-32],[21,-4],[-21,-20],[-26,-3],[-34,-11],[0,-29],[3,-35],[-21,-17],[-27,-14],[-52,-22],[-45,-30],[-30,-73],[-100,-50],[1,-24],[22,-30],[-4,-42],[-24,-18],[-36,-6],[-31,3],[-41,-4],[-34,-30],[-20,-46],[-33,-26],[-40,-38],[-16,-27],[4,-46],[-24,-10],[-50,-3],[-35,-9],[-19,-29],[-31,-74],[-28,-23],[-41,-22],[-33,-11],[-89,-45],[-13,-61],[-2,-62],[-5,-40],[-26,-29],[-60,-44],[-52,-95],[-24,-19],[-76,-26],[-30,-38],[-12,-38],[-6,-42],[-19,-53],[-51,-39],[-11,-32],[-23,-27],[-41,-16],[-43,-6],[-101,-40],[-34,-5],[-75,28],[-59,9],[-40,-6],[-38,-16],[-23,-18],[-15,-6],[-35,-34],[-13,-21],[-6,-41],[-19,-36],[-29,-18],[-45,-1],[-50,4],[-41,-6],[-53,-25],[-34,-7],[-40,-1],[-73,14],[-47,1],[-37,8],[-28,2],[-30,-12],[-56,-38],[14,-52],[4,-29],[-11,-54],[-21,-57],[-22,-28],[-18,-12],[-36,-19],[-45,-10],[-32,-14],[-48,-44],[-26,-29],[-16,-39],[-20,-29],[-21,-23],[-34,-26],[-34,-15],[-39,-10],[-42,-3],[-35,-14],[-56,-11],[-16,-7],[-18,-38],[-16,-56],[-21,-19],[-23,-8],[-19,-20],[-54,-40],[-12,-20],[0,-32],[30,-74],[36,-31],[3,-14],[-19,-78],[-25,-21],[-83,-28],[-17,-16],[-12,-33],[-26,-42],[-29,-22],[-54,-48],[-22,-25],[-26,-23],[-14,-25],[-8,-25],[-2,-34],[-12,-39],[-16,-18],[-23,-35],[-21,-50],[-10,-62],[-34,-66],[0,-16],[-9,-56],[-10,-41],[-28,-76],[-17,-27],[-10,-24],[-39,-53],[-9,-50],[-12,-16],[-32,-28],[-11,-31],[-37,-121],[-17,-22],[-11,-25],[-14,-58],[-17,-26],[-19,-44],[-12,-75],[-3,-32],[8,-19],[-9,-18],[-47,-48],[-34,-38],[-41,-30],[-103,-41],[-69,-38],[-16,-51],[-2,-45],[2,-19],[16,-22],[29,-21],[30,-18],[30,-6],[44,-27],[47,-66],[16,-40],[30,-21],[70,-9],[36,-13],[21,-21],[14,-23],[10,-30],[3,-48],[3,-16],[-11,-29],[-21,-40],[-5,-31],[3,-42],[37,-53],[33,-39],[54,-47],[47,-35],[80,-79],[41,-49],[28,-76],[22,-46],[179,-107],[28,-26],[33,-18],[31,-30],[13,-24],[21,-58],[11,-22],[16,-21],[31,-13],[30,-8],[30,-63],[510,14],[852,103],[415,54],[120,39],[314,261],[67,102],[5,372],[150,-96],[908,-525],[809,-267],[291,-79],[202,-63],[-308,-704],[37,-237],[-15,9],[-13,-4],[-14,-14],[-11,-1],[-10,18],[-27,-6],[-45,1],[-21,-26],[-35,-2],[-14,-5],[-12,9],[-13,-12],[2,-28],[-3,-28],[-10,-13],[-30,-18],[-9,-22],[-19,-21],[-19,-36],[-17,-8],[-30,-4],[-27,-31],[-22,-11],[-2,-29],[11,-6],[-7,-17],[-23,-21],[-6,-18],[-14,-14],[-5,-27],[-6,-10],[8,-25],[-11,-20],[-42,-21],[-8,-9],[-24,-3],[-16,-10],[-10,-21],[2,-22],[-8,-19],[-21,-3],[-24,-25],[-1,-24],[11,-12],[5,-31],[12,-27],[12,-10],[37,-15],[50,-5],[26,16],[7,10],[24,-2],[46,-40],[46,-26],[18,-14],[7,-20],[2,-42],[7,-12],[15,-11],[47,-13],[10,-11],[33,-63],[26,-37],[67,-30],[24,-22],[46,-67],[9,-35],[-10,-14],[-13,-6],[-30,0],[-15,-3],[-8,-11],[5,-22],[32,-21],[-1,-27],[-15,-10],[-6,-17],[14,-20],[40,-39],[1,-17],[-16,-12],[-47,11],[-20,-15],[11,-28],[45,-20],[16,-13],[2,-14],[-15,-30],[-3,-14],[5,-18],[23,-14],[29,-13],[5,-14],[-13,-18],[-32,-5],[-9,-22],[11,-13],[19,-3],[16,4],[21,-5],[3,-14],[-17,-35],[-2,-20],[5,-16],[60,-60],[20,-23],[6,-34],[-40,-21],[-16,-21],[-13,-40],[0,-21],[9,-17],[20,-11],[44,-6],[27,-9],[8,-12],[-1,-16],[-10,-40],[-28,-34],[-2,-16],[24,-19],[20,-2],[58,14],[21,-16],[1,-14],[-14,-15],[-38,-15],[-13,-24],[15,-16],[24,1],[20,-11],[14,-22],[46,-25],[7,-23],[-8,-9],[-34,-12],[-34,0],[-6,-10],[12,-17],[31,1],[43,24],[27,-1],[7,-16],[3,-29],[9,-31],[3,-46],[-23,-30],[-3,-22],[14,-14],[24,-2],[15,-11],[0,-9],[-11,-25],[1,-10],[25,2],[13,-6],[21,-25],[3,-19],[-6,-49],[7,-20],[22,-26],[39,-58],[-5,-24],[-20,-36],[-2,-18],[7,-30],[7,-12],[24,-16],[21,-25],[7,-46],[-3,-16],[-13,-15],[-29,-24],[3,-24],[21,-24],[1,-29],[-11,-18],[6,-33],[-2,-26],[-15,-40],[-1,-31],[12,-38],[-3,-7],[-21,-12],[-9,-21],[4,-20],[9,-15],[-9,-21],[-32,-17],[-11,-17],[-1,-13],[17,-25],[-1,-23],[-26,-18],[5,-17],[11,-14],[1,-16],[-6,-27],[14,-36],[-17,-18],[-19,-5],[-29,-1],[-13,-8],[1,-11],[16,-11],[4,-23],[-3,-12],[-15,-22],[24,-16],[3,-12],[-10,-27],[-31,-29],[-6,-9],[1,-23],[6,-17],[-8,-26],[-12,-22],[1,-15],[30,-61],[-3,-13],[-30,-29],[35,-21],[75,-34],[40,2],[25,13],[19,22],[27,15],[42,7],[36,20],[54,45],[70,46],[62,34],[73,15],[28,10],[51,36],[30,3],[40,-4],[54,-12],[32,-5],[51,-3],[34,9],[79,29],[25,21],[54,18],[21,-5],[40,-35],[53,-23],[78,-15],[28,6],[29,27],[32,44],[5,29],[21,19],[33,7],[22,-8],[15,-19],[20,-9],[56,-3],[16,-4],[-125,-148],[-114,-367],[-149,-605],[-173,-615],[-206,-873],[-101,-430],[44,-279],[64,-244],[147,-167],[145,-188],[127,-178],[237,-239],[222,-165],[201,-74],[246,-84],[396,-177],[263,-238],[4,-329],[221,49],[148,21],[144,18],[588,32],[294,17],[44,-860],[97,-49],[172,-92],[16,-170],[54,-565],[-178,-465],[-28,-73],[-169,-432],[-128,-33],[-47,-139],[-420,-1157],[-36,21],[-21,0],[-18,6],[-12,18],[-32,5],[-35,-1],[-35,-10],[-10,3],[-39,35],[-34,-3],[-58,-19],[-72,9],[-69,15],[-59,20],[-118,30],[-36,0],[-23,-8],[-11,-9],[-46,4],[-20,11],[-44,2],[-18,-2],[-11,12],[-28,2],[-23,-2],[-14,11],[-22,-1],[-31,-24],[-29,2],[-8,11],[-35,28],[-27,2],[-1,12],[6,41],[11,9],[-2,12],[-23,12],[8,13],[-1,15],[-14,9],[-5,18],[-26,2],[3,22],[-12,-2],[-5,-17],[-18,10],[0,19],[-11,0],[-5,-27],[-12,-4],[-8,22],[-14,25],[-58,10],[-4,23],[-33,5],[-15,-5],[-39,16],[-13,-9],[-24,-31],[-11,3],[-7,20],[-14,2],[-7,-12],[-20,6],[-29,-18],[1,-17],[-8,-8],[-15,7],[3,14],[-6,11],[-28,-6],[-10,24],[-16,-11],[-17,21],[3,12],[15,14],[-19,7],[-4,-25],[-13,5],[-6,16],[-17,4],[-13,-11],[-10,9],[14,14],[-18,9],[-36,-29],[-36,-15],[-5,32],[-48,0],[-4,11],[7,15],[-16,2],[-13,-10],[1,-14],[-21,0],[-20,17],[-42,-2],[-21,-12],[-21,4],[3,-14],[-36,-6],[-14,21],[-17,13],[-31,-8],[-25,13],[-20,23],[-13,9],[-51,6],[-43,0],[-22,3],[-27,9],[-18,15],[-12,21],[-10,0],[-20,16],[-17,4],[2,15],[-21,-1],[-47,-24],[-6,-21],[-13,-15],[-41,-14],[-4,11],[-19,-1],[-20,-17],[-26,-2],[-35,-10],[-15,2],[-26,11],[-43,3],[-12,-3],[-13,13],[-12,-2],[-19,6],[-11,-2],[-18,8],[-20,0],[-6,14],[-11,2],[-9,17],[-18,-5],[-4,-14],[-15,10],[-28,4],[-18,12],[-17,-4],[-3,-12],[-14,-8],[-27,-1],[-31,-13],[-80,17],[-6,6],[-2,38],[-14,5],[-25,-11],[-14,2],[8,19],[-13,5],[-8,16],[-21,14],[-13,3],[-17,19],[9,6],[1,22],[-28,-7],[-17,0],[1,-18],[-27,-1],[-15,-9],[-14,5],[-29,-7],[-33,-4],[-7,13],[-22,-12],[-8,-16],[-13,-10],[-24,-1],[3,16],[-22,3],[-7,-14],[-29,-15],[9,-8],[-4,-21],[9,-5],[4,-32],[-14,-30],[-19,-6],[-25,18],[-34,16],[-23,-5],[-50,15],[-28,3],[-18,-10],[-20,-29],[-34,-41],[-22,-15],[-13,3],[-66,35],[-29,-2],[-9,12],[-13,-7],[-28,2],[-12,-15],[-15,31],[-17,11],[-12,1],[-12,-10],[-6,-18],[7,-14],[-4,-13],[-24,-12],[-4,-16],[13,-18],[5,-17],[-5,-19],[-33,-44],[-37,-35],[-18,-11],[-50,-17],[-37,1],[-25,22],[-44,13],[-35,-14],[8,-17],[-11,-8],[-44,-5],[-23,-12],[-37,-12],[-27,5],[-6,14],[-22,-7],[-25,2],[-11,6],[-9,16],[-17,-1],[-7,-17],[7,-37],[-19,-38],[-55,-5],[-6,-21],[-45,11],[-5,5],[-45,-2],[-19,4],[-5,14],[-15,3],[-1,-14],[-8,-14],[-43,20],[-23,1],[10,-22],[-14,-3],[-13,-11],[-14,-38],[-1,-24],[-18,-26],[-23,-11],[-75,-1],[-8,6],[-34,-3],[-19,-12],[-79,-23],[-18,-11],[-22,-34],[-21,-17],[-54,-42],[-44,-38],[-25,-16],[-17,-7],[-36,3],[-33,6],[-47,23],[-38,22],[-31,13],[-45,10],[-13,-2],[-23,-26],[-27,-4],[-13,-17],[-11,-3],[-13,-21],[-42,-1],[-9,22],[-4,23],[-27,-8],[15,-25],[-14,-7],[-32,20],[-7,-8],[0,-28],[-7,-4],[-20,9],[2,-24],[-20,-9],[-9,7],[-13,25],[-18,10],[-13,15],[-24,-4],[-20,-17],[-7,22],[-20,0],[-8,-26],[-20,-18],[-10,22],[-13,-9],[-2,-15],[-32,21],[-34,-12],[-33,-1],[0,-23],[-8,-5],[-23,26],[-10,1],[-25,-26],[-14,11],[-11,-1],[-14,-35],[-35,-3],[-7,-52],[-15,4],[-13,-11],[-23,-1],[-8,-5],[-66,-2],[-55,-5],[-23,12],[-9,16],[14,9],[11,-1],[4,18],[17,12],[-13,16],[-11,-10],[-15,-1],[-3,18],[-15,8],[-35,-13],[0,-19],[-7,-11],[-17,9],[6,19],[-6,21],[11,17],[-21,14],[13,14],[-20,13],[-10,-6],[-19,4],[-16,-18],[-16,1],[-23,29],[10,24],[-2,10],[-19,2],[-11,-15],[5,-19],[-18,-8],[-6,6],[-15,30],[1,10],[19,19],[-20,14],[-13,-9],[-6,-18],[-16,8],[10,25],[-18,6],[-37,-9],[-7,8],[14,12],[-4,10],[-22,-5],[-8,-24],[-21,12],[-15,-6],[-1,32],[-16,2],[-21,-10],[22,-24],[-19,-21],[-43,6],[-14,-10],[-6,-21],[-13,-4],[-15,27],[-29,-5],[-12,-21],[-24,2],[-3,-8],[7,-22],[11,-11],[-23,-10],[12,-14],[-19,-2],[-6,19],[-31,1],[-21,5],[-1,20],[-14,-6],[-5,-14],[5,-19],[-48,4],[-8,-7],[-22,7],[1,-12],[-12,-17],[16,-16],[-19,-6],[-26,-1],[-16,-15],[-11,17],[-17,-12],[-9,20],[-15,12],[-20,7],[-1,23],[-28,20],[19,8],[-3,15],[-19,5],[-19,-11],[1,15],[-13,13],[-10,-1],[-8,16],[11,17],[-1,11],[-38,19],[-14,-10],[-23,16],[-24,-13],[-34,5],[0,-14],[-30,0],[-12,-19],[-21,-18],[-22,3],[-15,10],[-32,2],[-28,-7],[-16,-11],[-28,2],[7,-16],[0,-18],[-14,-13],[-28,1],[-9,-7],[19,-41],[-25,-25],[-31,-13],[9,-30],[10,-17],[-14,-8],[-44,4],[-9,-7],[10,-27],[-7,-4],[-21,12],[-14,-3],[-23,9],[-20,-3],[-9,23],[-20,0],[-14,-12],[-30,-1],[-5,-19],[2,-22],[-49,-51],[-30,-2],[0,-7],[19,-8],[-17,-20],[17,-13],[-8,-10],[-17,-2],[-12,6],[-13,20],[-25,4],[-6,24],[-13,13],[-4,14],[-20,-21],[-33,-6],[11,-9],[0,-15],[-14,-1],[-15,13],[-9,-7],[24,-22],[24,-5],[-2,-14],[-38,-6],[-11,2],[-19,14],[-37,1],[-18,-8],[-14,-13],[-47,-2],[-22,15],[-12,1],[-91,-1],[-14,6],[-23,21],[-15,0],[-9,-17],[9,-21],[-25,-10],[5,-18],[16,-2],[7,-32],[-17,-15],[6,-17],[16,-4],[-2,-15],[-20,-14],[-14,3],[-9,10],[-12,-10],[-19,-1],[-13,-20],[-26,-22],[-8,-25],[-32,-7],[-33,11],[-38,5],[-39,37],[-10,-22],[-28,-29],[-21,-32],[9,-16],[24,-2],[-1,-14],[-25,-29],[-22,-14],[-52,-15],[-30,-22],[-14,-17],[-45,0],[-38,-11],[-8,7],[-11,25],[-11,14],[-31,10],[-11,7],[-30,0],[-11,-5],[-5,25],[-18,1],[4,12],[-17,4],[-14,-9],[-22,7],[-9,-13],[-16,-10],[10,-12],[5,-37],[-2,-17],[-43,-27],[-8,3],[-17,23],[-40,-1],[-24,-22],[-9,-25],[-10,10],[-23,-20],[10,-19],[-19,-5],[-7,-10],[-23,-14],[-9,-31],[9,-13],[0,-14],[-30,-18],[0,-9],[25,-16],[2,-8],[-15,-14],[8,-19],[-7,-22],[-13,9],[-8,23],[-12,0],[-23,-14],[-17,-30],[-11,-25],[-25,-5],[-26,-30],[-10,7],[-38,-2],[-26,-9],[-16,2],[-7,-20],[-1,-36],[6,-30],[-3,-29],[-9,-13],[18,-3],[14,-11],[-5,-23],[32,-8],[12,-26],[-3,-29],[1,-30],[-31,-4],[-6,-6],[5,-21],[-23,6],[-27,0],[-8,-20],[1,-16],[27,-31],[-6,-23],[-18,3],[-11,-6],[1,-17],[19,-9],[1,-9],[-14,-17],[3,-8],[42,-21],[-14,-15],[-14,-4],[-1,-14],[42,-22],[-9,-24],[6,-18],[17,3],[0,-18],[-17,-14],[6,-29],[-6,-9],[-16,9],[-13,-24],[-11,-10],[0,-13],[12,-15],[-13,-9],[-1,-28],[-6,-13],[-17,-7],[-1,-14],[16,-19],[16,-6],[16,-27],[18,-40],[-13,-3],[3,-34],[21,-15],[0,-13],[-25,5],[-5,-15],[-18,-16],[5,-13],[12,-5],[3,-13],[-11,-19],[-14,-7],[5,-23],[13,-11],[-7,-18],[-19,-3],[-1,-30],[-7,-11],[5,-15],[-24,-33],[-37,-28],[-18,-22],[-18,8],[-14,-15],[-17,6],[-21,-7],[-2,-16],[9,-12],[-17,-23],[-22,-6],[-9,10],[0,15],[-15,6],[-1,-17],[-9,-26],[-33,-1],[-13,6],[0,-26],[-20,-9],[-23,13],[-5,32],[22,15],[6,12],[-12,15],[-27,10],[-21,2],[-9,6],[-3,15],[6,16],[-32,15],[-24,-1],[-19,-7],[-32,-39],[-7,-30],[1,-17],[24,-42],[-2,-22],[-27,-20],[0,-31],[-12,-15],[-2,-24],[10,-21],[6,-48],[11,-19],[4,-15],[-10,-32],[7,-23],[-6,-33],[-15,-11],[-26,-13],[-24,-42],[20,-11],[-3,-23],[4,-17],[-7,-38],[10,-11],[4,-21],[-19,-8],[8,-16],[14,1],[-1,-30],[12,-11],[-2,-18],[18,-15],[12,1],[10,-16],[6,-27],[-26,-10],[-6,-17],[-1,-37],[-15,-44],[-22,1],[-12,-23],[16,-5],[4,-16],[14,-13],[1,-12],[25,-9],[1,-9],[-35,-24],[-2,-25],[5,-38],[-15,-2],[-1,16],[-8,18],[-14,0],[-13,-17],[-24,-6],[-20,2],[8,-25],[-8,-31],[5,-9],[17,4],[2,-19],[9,-15],[-42,-7],[10,-13],[-12,-26],[-1,-15],[-20,-6],[15,-32],[-2,-26],[6,-21],[12,-10],[-16,-22],[7,-22],[2,-25],[37,-14],[11,-8],[15,-36],[33,-27],[39,-15],[5,-9],[0,-26],[26,-25],[20,-9],[63,-9],[11,-4],[11,-16],[-2,-13],[34,-1],[6,-16],[-8,-12],[-3,-21],[-15,1],[5,-25],[-8,-5],[14,-17],[0,-16],[24,0],[8,-9],[15,5],[26,-14],[-2,-19],[14,-13],[-6,-31],[-19,-7],[0,-19],[-8,-10],[1,-13],[-15,-8],[-4,-19],[-17,-13],[-2,-34],[14,-16],[21,10],[38,-28],[4,14],[66,-2],[20,-7],[37,-2],[15,-16],[1,-15],[-12,-13],[-17,-3],[0,-18],[-20,-3],[-13,-18],[-22,-17],[-34,-51],[-16,-14],[-21,-7],[-49,-23],[-25,-24],[-10,-26],[0,-29],[-22,-13],[-9,12],[-10,-13],[-11,11],[-18,-2],[-6,-29],[-22,-15],[11,-17],[4,-18],[-19,-5],[6,-20],[-16,-13],[7,-29],[29,-6],[15,-33],[-2,-10],[-15,-7],[-5,15],[-18,-5],[4,-16],[18,-17],[-15,-9],[-4,-32],[-24,-29],[-13,-4],[-16,3],[-28,18],[-3,26],[-6,8],[-28,-25],[-3,-37],[4,-74],[37,-45],[51,-32],[27,-26],[5,-18],[-5,-28],[-10,-16],[24,-4],[14,-9],[-4,-15],[-21,-18],[-38,-41],[-22,-35],[-25,-27],[-15,-2],[-10,-22],[-20,-12],[-14,-4],[-3,-16],[-35,-11],[-15,-1],[-14,-35],[10,-16],[15,3],[-2,-16],[-8,-9],[-32,-12],[10,-10],[-7,-9],[-15,-1],[3,-18],[-24,-6],[-21,-9],[-34,10],[-14,19],[-14,4],[-15,-23],[-12,-5],[-30,11],[-23,-7],[-23,-13],[-9,14],[5,18],[-25,5],[-16,-13],[-12,11],[-17,-4],[-7,-11],[8,-10],[-6,-16],[-12,-11],[-21,-6],[23,-30],[31,-31],[15,-32],[-10,-21],[-13,-14],[-12,-2],[-16,8],[-24,-12],[-20,0],[-19,-13],[-48,-10],[-10,-6],[-6,-20],[12,-11],[9,-17],[15,-1],[10,11],[25,0],[14,-6],[11,-19],[6,-25],[7,-13],[19,-2],[13,-23],[12,-11],[-11,-22],[-20,-8],[-47,-4],[-36,-11],[-25,-1],[-28,-8],[-35,-3],[-15,-9],[-13,1],[-42,47],[-9,0],[-15,-33],[11,-4],[0,-13],[-23,-9],[-19,23],[-18,3],[-12,-7],[-4,-26],[15,-19],[-26,-11],[-20,0],[-25,9],[-21,20],[-28,21],[-39,-9],[-24,-14],[-13,-14],[-2,-37],[-11,-10],[-16,2],[-4,-14],[-42,-16],[-25,-23],[-20,4],[-8,14],[-15,-32],[-27,-18],[-20,7],[-20,-16],[-35,-12],[-10,14],[-4,18],[-53,34],[-14,1],[-35,-18],[-22,-25],[-9,16],[-32,3],[-18,-16],[-15,7],[-29,-26],[-18,0],[-39,34],[-6,17],[-12,19],[-41,35],[1,30],[-18,10],[-15,19],[-13,-5],[-7,-23],[-11,4],[-21,-13],[-10,1],[-7,-24],[-27,-3],[-34,-8],[-23,-20],[-14,0],[-25,-12],[-37,-44],[-40,-58],[-3,-20],[12,-32],[-14,-29],[-24,-14],[-23,-25],[-21,2],[-21,-5],[-19,-21],[-53,2],[-13,8],[-10,24],[-7,2],[-9,-20],[4,-35],[-2,-41],[-16,-38],[-2,-14],[15,-41],[14,-21],[-17,-41],[-26,9],[-21,19],[-10,-2],[2,-17],[-45,8],[2,18],[-24,-2],[-18,-23],[-13,-26],[-19,-19],[-41,-21],[-1,-11],[21,-4],[1,-16],[-8,-15],[31,-4],[-2,-29],[-38,-51],[1,-23],[-16,-13],[-12,-22],[-29,-22],[-19,-8],[-10,-21],[-16,9],[-19,-6],[-7,13],[-20,9],[-4,-13],[-20,-1],[-26,-15],[10,-15],[-8,-14],[7,-14],[22,-11],[30,-36],[-7,-10],[22,-21],[-9,-53],[-17,-25],[-8,-31],[4,-16],[13,-11],[23,-4],[2,-20],[-11,-15],[-25,-8],[-16,10],[-22,-2],[-8,-7],[8,-17],[-12,-7],[-14,8],[-36,-12],[-15,-21],[-12,-40],[-3,-28],[16,-20],[27,-27],[9,-35],[-14,-23],[-9,-27],[-20,-26],[-19,-16],[-35,13],[-30,-7],[-25,13],[-48,-3],[-21,-16],[-18,-19],[-12,-25],[-38,-42],[-25,-32],[-18,-56],[9,-33],[40,-66],[-41,-7],[-27,-27],[-29,-8],[-27,-57],[-2,-88],[-4,-22],[-17,-13],[-7,-13],[-39,-7],[-2,-20],[-9,-9],[-41,-3],[-30,-5],[-21,12],[-7,-5],[-10,-40],[-13,-12],[-31,-4],[-11,11],[1,33],[-26,18],[-15,3],[-22,-15],[-11,-33],[10,-23],[-13,-54],[-16,-51],[-12,-23],[-18,-17],[-19,-5],[-79,6],[-28,9],[-20,14],[-20,24],[0,13],[12,22],[-20,9],[-26,-15],[-8,-10],[-32,-13],[-26,5],[-13,23],[-18,17],[-9,25],[8,21],[21,4],[28,12],[-8,13],[-30,11],[-24,-12],[-30,12],[-49,4],[-16,-7],[3,-40],[-8,-29],[-35,-46],[-24,-15],[-8,3],[-9,17],[-35,8],[-20,24],[-15,-13],[-26,19],[-6,20],[-13,19],[3,10],[20,4],[0,13],[-45,21],[-20,-9],[-30,19],[-14,5],[-10,-8],[-17,17],[-24,3],[1,22],[-6,20],[-14,21],[-23,3],[-31,-9],[-36,-15],[-37,-37],[-9,-20],[-3,-40],[12,-33],[19,-16],[-14,-22],[-30,-2],[-33,4],[-5,-9],[18,-13],[-22,-14],[-5,-30],[-37,-34],[-68,-46],[-19,-3],[-14,8],[-20,-7],[-43,5],[-15,-4],[-19,-20],[-30,-12],[0,-20],[9,-51],[-8,-14],[8,-15],[-10,-23],[-26,-28],[-10,0],[-1,18],[-13,16],[-22,-5],[1,-26],[-16,-19],[-7,-16],[-5,-60],[-8,-16],[7,-26],[18,0],[18,-32],[27,-17],[0,-17],[-27,-21],[-17,-5],[-7,-16],[15,-4],[-17,-24],[-40,-20],[-22,0],[-4,-20],[-21,-15],[-24,18],[-15,-24],[-25,-25],[-9,3],[0,31],[-14,3],[-54,-14],[-11,-6],[-5,-22],[3,-17],[-14,-21],[-6,-20],[-58,1],[-24,-10],[-13,-17],[-32,-17],[-30,7],[-6,-6],[-3,-31],[-28,-26],[-31,-42],[-43,-7],[-19,-11],[-9,-20],[5,-23],[-5,-16],[-17,-17],[-35,-47],[-44,-37],[-32,-19],[-32,-10],[-12,-25],[0,-45],[27,-11],[12,-24],[-1,-11],[-21,-2],[-23,-17],[-12,2],[-29,-5],[-3,-13],[-17,-20],[15,-40],[25,-22],[5,-29],[35,-43],[3,-13],[-13,-23],[-14,2],[-27,11],[4,-23],[-7,-14],[-16,-5],[-22,-17],[-26,-44],[-34,-19],[-34,-13],[-91,-24],[-32,-15],[-21,6],[-20,-5],[-22,-15],[-11,-27],[-38,-37],[-43,-49],[-22,-4],[-25,6],[-44,22],[-34,9],[-32,13],[-11,16],[-7,28],[19,5],[10,11],[-2,13],[-21,28],[-25,1],[-18,-11],[-67,-17],[-25,-8],[-43,-26],[-23,-20],[-24,-29],[-8,-26],[-2,-23],[8,-26],[16,-24],[14,9],[16,2],[26,-13],[12,5],[6,16],[19,-6],[17,-20],[-5,-8],[-26,-6],[-7,-22],[12,-6],[17,10],[21,-16],[5,-12],[-3,-17],[17,-6],[10,-29],[0,-19],[-14,-16],[-14,-2],[-18,17],[-13,3],[-12,-13],[-6,-25],[-21,-21],[-4,-21],[-24,-6],[-20,7],[-1,13],[-22,-16],[-31,-7],[-30,4],[-41,29],[-47,45],[-19,24],[-9,27],[2,45],[-5,13],[-41,17],[-20,15],[-35,-3],[-21,-7],[-28,6],[-20,-7],[-19,-20],[-24,-15],[0,-24],[75,-85],[43,-40],[19,-38],[11,-48],[12,-24],[26,-19],[61,-21],[7,-7],[22,-41],[-2,-28],[-21,-27],[-15,0],[-27,10],[-50,27],[-21,8],[-50,6],[-20,-3],[-19,-14],[-20,-58],[14,-25],[26,-17],[49,-8],[63,-3],[17,-5],[16,-11],[9,-24],[-11,-27],[-15,-13],[-20,-11],[-61,-7],[-40,11],[-12,0],[-12,-16],[28,-49],[32,-20],[56,-16],[22,1],[35,13],[14,-5],[6,-18],[-2,-18],[-33,-26],[-18,-8],[-21,-2],[-31,4],[-18,7],[-46,24],[-19,15],[-38,39],[-13,1],[-12,-11],[19,-26],[6,-15],[2,-48],[5,-5],[49,1],[19,-7],[50,-38],[12,-32],[-10,-33],[-15,-22],[-20,-12],[-34,-7],[-41,1],[-52,11],[-24,7],[-30,16],[-15,2],[-18,-6],[-11,-10],[0,-22],[13,-18],[21,-18],[43,-13],[39,1],[37,6],[74,0],[12,-4],[5,-13],[5,-37],[-5,-20],[-16,-19],[-19,-15],[-27,-29],[-8,-33],[-17,-14],[-28,-2],[-33,16],[-43,16],[-47,23],[-22,8],[-67,2],[-23,-5],[-15,-8],[-11,-14],[-4,-34],[-7,-20],[2,-40],[29,-73],[21,-40],[11,-13],[-2,-13],[-16,-40],[0,-32],[5,-29],[-1,-46],[-6,-42],[-21,-35],[-3,-15],[-28,-4],[-18,7],[-31,28],[-16,27],[-35,35],[-24,8],[-35,-3],[-23,-16],[-9,-15],[-2,-18],[8,-76],[-1,-32],[-19,-39],[-14,-14],[-16,-5],[-34,5],[-35,-1],[-11,-16],[1,-23],[6,-13],[17,-8],[42,-6],[8,-6],[-5,-32],[4,-81],[-11,-41],[-12,-13],[-31,-4],[-19,11],[-24,23],[-21,30],[-16,31],[-2,32],[-16,13],[-29,-24],[-13,-22],[-11,-35],[-6,-26],[-12,-20],[-16,-6],[-21,2],[-26,14],[-54,33],[-18,3],[-19,-12],[-12,-40],[-5,-38],[-6,-25],[-13,-28],[-16,-18],[-16,-10],[-37,-15],[-20,-23],[-5,-21],[8,-20],[19,-37],[26,-60],[-7,-4],[-35,-3],[-13,-10],[-24,-1],[-25,4],[-46,13],[-44,21],[-29,-2],[-26,-17],[-45,-54],[-20,-34],[-17,-21],[-38,-81],[-8,-30],[13,-32],[19,-23],[11,-20],[-13,-11],[-16,1],[-1,-16],[7,-19],[-9,-97],[-12,-13],[-10,8],[-31,-3],[-13,-6],[-5,18],[-35,48],[-28,18],[-61,11],[-15,13],[-12,20],[17,5],[-1,18],[-11,2],[-13,-10],[-38,-8],[-23,-20],[0,-28],[-19,-7],[-21,13],[-22,-6],[-12,-23],[3,-13],[29,-13],[-1,-20],[-11,-11],[-14,1],[-5,10],[-15,0],[-14,-8],[-9,17],[-25,16],[-9,1],[13,-48],[-12,-5],[-25,11],[-18,4],[-28,16],[-13,-9],[-27,-8],[0,-47],[7,-18],[29,-30],[5,-36],[-3,-18],[-18,-15],[-24,-2],[-14,-19],[14,-15],[2,-24],[-14,-7],[-20,14],[-63,-17],[-11,15],[-27,0],[3,-22],[-19,-1],[-21,5],[-23,25],[-26,4],[-27,-24],[-8,-15],[-53,1],[-3,21],[-11,11],[-23,6],[-15,-15],[-14,-7],[-30,29],[-4,19],[-10,6],[-38,-5],[-13,-41],[-12,-14],[-22,6],[-11,-15],[-16,-7],[10,-32],[-29,-20],[-16,5],[1,16],[9,9],[-9,32],[12,15],[-22,3],[-20,-19],[-5,-14],[-18,8],[-25,-1],[-18,4],[-7,17],[-18,-4],[-11,5],[7,14],[-22,7],[-48,-21],[-4,-10],[-22,-1],[-39,19],[-62,-55],[-15,-22],[-7,-22],[-8,-52],[-21,-26],[-34,-17],[-6,-14],[2,-20],[33,-33],[-10,-19],[-22,-8],[-16,-24],[8,-29],[-16,-28],[0,-27],[17,-28],[11,-12],[35,-9],[1,-13],[-17,-7],[-14,5],[-16,-5],[-10,-14],[4,-18],[-17,-12],[12,-12],[-11,-7],[-17,4],[-21,-15],[4,-11],[35,-14],[8,-21],[21,-12],[1,-14],[-10,-11],[-13,0],[-7,-17],[23,-13],[-1,-20],[20,5],[0,-15],[-22,-12],[-10,-18],[-13,4],[-13,-9],[-10,-16],[-17,-7],[-95,25],[-39,12],[-15,9],[-29,-2],[-15,-20],[-25,-3],[-20,24],[-19,-5],[-14,-21],[-12,7],[-22,25],[-42,1],[-33,-7],[-14,-14],[-29,-7],[-10,27],[0,19],[6,12],[-33,58],[-16,33],[-18,9],[-40,9],[-9,8],[-4,23],[-17,0],[-4,-13],[-21,-18],[-5,-22],[-18,7],[-11,-14],[-14,0],[-21,15],[-14,-4],[-13,-12],[2,-13],[14,-17],[-56,-4],[-40,29],[-28,1],[-27,5],[-19,18],[-2,36],[-5,14],[-11,3],[-15,-11],[4,-16],[-6,-14],[-22,-10],[20,-19],[-1,-15],[-15,-2],[-23,10],[-8,20],[-24,-10],[-11,3],[-12,26],[-32,8],[-10,-8],[-27,-51],[-29,-9],[-4,-10],[3,-33],[-5,-20],[23,-24],[10,-30],[8,-8],[-29,-21],[-1,-31],[5,-19],[-2,-23],[-11,-10],[-43,-9],[-15,2],[-22,14],[-9,17],[-9,4],[-19,-8],[-15,-27],[-13,7],[-10,30],[-9,3],[-23,-20],[-3,-8],[22,-24],[-12,-11],[-14,4],[-21,22],[-8,0],[-35,-42],[-15,13],[-13,0],[-6,-40],[16,-19],[-18,-3],[11,-18],[27,-28],[0,-25],[8,-11],[28,-60],[22,-9],[3,-15],[37,-35],[1,-28],[13,-55],[33,-12],[6,-18],[-20,-32],[6,-28],[36,-8],[12,-10],[0,-19],[-10,-31],[7,-24],[24,-9],[9,-16],[-9,-33],[-12,-7],[-38,10],[-55,3],[-39,11],[-34,-6],[-13,6],[-8,17],[-17,6],[-27,-15],[-17,-3],[-14,-11],[-16,-39],[-62,-76],[-14,-11],[-25,6],[-63,20],[-12,-6],[-7,-18],[8,-27],[-1,-22],[-28,-41],[4,-22],[11,-9],[3,-17],[-11,-11],[-26,-11],[0,-39],[-16,-7],[-15,-13],[3,-34],[-7,-42],[-7,-16],[-18,-24],[-3,-15],[11,-4],[2,-14],[-18,-23],[-66,-50],[2,-33],[-6,-19],[-12,-4],[-37,16],[-25,-7],[-46,-31],[-43,5],[-5,29],[-15,19],[-60,4],[-20,-9],[-22,-16],[-40,3],[-45,-11],[-17,-11],[-17,7],[15,32],[-4,10],[-26,-7],[-16,-23],[-16,-11],[-31,-14],[-19,-2],[-9,-11],[-2,-20],[-20,-25],[-8,-19],[-24,-1],[-62,-16],[-26,15],[-3,-17],[25,-17],[-2,-10],[-22,-9],[1,-28],[-13,-60],[-37,-17],[-26,-19],[-35,7],[-45,17],[-30,-12],[-14,2],[-36,28],[-36,-3],[11,18],[0,16],[-13,10],[-11,20],[-20,5],[-22,14],[-18,-2],[-18,-11],[-13,-47],[-10,-13],[-21,-7],[-39,4],[-59,-9],[-26,-23],[-41,-7],[-25,8],[-14,15],[-14,41],[-14,13],[-17,0],[-19,-6],[-49,-29],[-26,-12],[-61,7],[-40,-7],[-21,4],[-20,13],[-39,-2],[-12,3],[-16,17],[-50,14],[-15,-4],[-37,29],[-34,18],[-1,10],[12,23],[12,11],[-3,21],[-13,4],[-37,1],[2,35],[-9,13],[-25,12],[-17,-4],[-28,-23],[-19,4],[-17,-6],[-16,14],[-18,11],[-36,12],[-31,30],[-15,24],[-20,12],[-32,2],[-10,-3],[-14,-22],[-17,-12],[-56,-19],[-13,-16],[6,-33],[1,-33],[-27,-13],[-25,-24],[-19,6],[-7,9],[-58,0],[-26,-21],[-11,11],[8,19],[-4,16],[-47,1],[-23,-12],[-15,-16],[-10,-3],[-24,30],[-10,7],[-16,-5],[-12,-23],[-12,-8],[-32,3],[-20,-9],[-39,9],[-49,1],[-16,-10],[-33,-4],[-29,12],[-13,-11],[-1,-29],[-19,-5],[-14,8],[10,12],[-15,4],[-4,12],[7,25],[20,18],[-12,28],[-36,12],[-19,1],[5,-14],[-16,-7],[-16,10],[-24,-4],[-17,-8],[-25,10],[-19,17],[-3,20],[3,25],[-5,19],[-16,11],[-51,13],[-19,13],[-22,-2],[-26,-12],[-32,2],[-15,-12],[-1,-18],[10,-13],[39,-17],[5,-35],[-2,-54],[-11,-9],[-47,-13],[-22,-18],[-9,-20],[-12,-8],[-20,-1],[-37,5],[-38,16],[-53,28],[-27,23],[-25,36],[-32,14],[-32,-19],[-19,6],[-19,12],[-21,-6],[-27,-14],[-10,-31],[2,-14],[16,-21],[-1,-8],[-17,-16],[-48,-16],[-20,-13],[-15,-34],[-17,-3],[-12,6],[-7,18],[-1,24],[-26,18],[-15,0],[-84,-37],[-18,-16],[-1,-22],[4,-49],[-4,-26],[8,-10],[20,-9],[51,4],[7,-9],[-1,-18],[-10,-26],[-9,-9],[-17,7],[-19,-4],[-35,-15],[-24,-14],[-23,18],[-5,24],[16,31],[-6,15],[-40,32],[-17,10],[-27,6],[-27,-5],[-29,-28],[-30,-16],[-20,-20],[-28,-13],[30,-77],[-15,0],[-13,-29],[-28,-19],[-24,-5],[-6,-24],[-30,-9],[-18,-24],[-32,-1],[-33,-14],[-33,-10],[-57,2],[-81,24],[-37,17],[-24,21],[-25,4],[-30,-6],[-4,-32],[-30,-68],[23,-21],[29,-6],[32,-19],[-2,-33],[-19,-22],[-30,-6],[-42,4],[-32,-17],[-31,2],[-21,24],[-10,33],[-24,22],[-17,22],[-27,16],[-32,-1],[-30,-17],[-30,-22],[-13,-23],[-47,-53],[-24,-9],[-31,-2],[-44,38],[-23,27],[-42,9],[-41,-14],[-52,-37],[-19,-26],[-24,-23],[-26,-7],[-26,-41],[-45,-17],[-48,0],[-11,26],[-22,12],[-18,16],[1,69],[-45,7],[-26,-14],[-51,-52],[-31,-13],[-28,6],[-26,-4],[-19,-18],[-29,-7],[-43,1],[-32,-3],[-34,11],[-16,35],[-49,0],[-72,19],[-40,0],[-26,-31],[-26,-24],[-14,-32],[-63,1],[-37,14],[-26,-14],[-17,-17],[-25,2],[-38,-22],[-34,-4],[-35,13],[-19,18],[-43,-7],[-33,-16],[-33,-12],[-24,-50],[-41,-20],[-28,-28],[-41,11],[-45,-6],[-35,-29],[-40,-40],[-27,7],[-8,26],[17,30],[-27,14],[-25,-10],[-18,-36],[-24,5],[-18,25],[-27,-10],[16,-23],[10,-21],[-54,-9],[-62,2],[-35,10],[-12,39],[-33,-9],[-12,-38],[-34,-26],[-31,1],[-21,-19],[-31,6],[-32,-12],[-66,4],[-44,6],[-30,11],[-28,18],[-41,6],[-18,-24],[-13,-27],[-43,2],[-35,-4],[-32,13],[-7,36],[11,29],[-69,3],[-40,7],[-4,32],[-45,-5],[-78,-19],[-96,-18],[-27,9],[-27,-6],[-12,20],[-22,-17],[-8,-36],[-17,-48],[-30,-13],[-24,-19],[-27,12],[-35,3],[-25,16],[-11,35],[-26,6],[-20,-18],[-12,-29],[-21,-23],[-43,5],[-37,29],[-4,36],[-8,25],[-32,9],[-30,-18],[-33,-47],[13,-27],[-25,-11],[-33,21],[-25,25],[-13,-21],[-4,-30],[-18,-32],[-31,-11],[-24,18],[-37,-6],[-16,-26],[-25,-20],[-28,-15],[-31,11],[-32,23],[-29,-1],[-25,-4],[-32,9],[-32,3],[41,54],[4,26],[-20,29],[-35,15],[-27,2],[-19,-15],[-6,-31],[-25,-6],[-38,8],[-60,-16],[-28,23],[-42,-6],[1,31],[15,30],[-36,-2],[-22,-18],[-31,-12],[-30,21],[-27,13],[-32,-11],[-21,-19],[-22,-70],[-36,-9],[-41,21],[-29,29],[-40,7],[-32,26],[-28,2],[-45,30],[-31,-4],[-20,-32],[-13,-27],[-32,-23],[13,-22],[-4,-24],[-47,19],[-37,8],[-26,23],[-48,16],[-44,-29],[-33,-9],[-48,-9],[-59,-17],[-34,-13],[-39,-7],[-25,3],[-29,-8],[-30,3],[-84,18],[-37,3],[-51,8],[-62,17],[-49,3],[-26,15],[-8,27],[0,36],[-17,39],[-36,2],[-66,-23],[-39,7],[-38,12],[-52,0],[-56,5],[-50,-5],[-37,7],[-34,1],[-31,-3],[-38,2],[-25,-12],[-38,-9],[-33,-13],[-65,-11],[-59,-15],[-50,-22],[-30,-35],[-31,-23],[-43,-6],[-73,-1],[-62,-24],[-50,2],[-50,5],[-44,1],[-79,-14],[-60,-14],[-52,-7],[-66,4],[-78,14],[-25,11],[-12,23],[-10,36],[-37,14],[-36,-10],[-30,-12],[-22,-18],[-7,-47],[-1,-38],[-23,-10],[-25,13],[-36,12],[-20,-28],[-7,-18],[16,-8],[-1,-18],[-32,-2],[-37,15],[-20,4],[-29,-6],[-18,-35],[-22,10],[-42,4],[-36,18],[-14,3],[-21,-12],[-44,-4],[-14,-5],[-15,-14],[-33,-22],[-15,-24],[2,-20],[-19,-30],[-12,-6],[-53,-1],[-7,-24],[-11,-6],[-29,0],[-25,20],[-13,5],[-27,2],[-35,-10],[-27,-21],[-14,-1],[-25,-18],[-9,-19],[-11,-37],[-16,-61],[2,-41],[-2,-15],[-11,-17],[-14,-11],[-19,5],[-22,-10],[-4,-30],[5,-19],[-5,-15],[-19,7],[-27,-6],[-21,7],[-23,-21],[-12,-38],[-9,-14],[-45,-9],[2,-26],[-3,-17],[-25,-11],[-35,14],[-44,28],[-29,12],[-25,-25],[-22,-10],[-18,-2],[-45,6],[-16,-4],[-32,-13],[-34,-7],[-12,-29],[-36,1],[-18,-21],[-14,-22],[10,-25],[1,-20],[-13,-41],[-18,1],[-22,-16],[-8,-20],[2,-40],[-24,7],[-19,-2],[-29,19],[-24,5],[-34,1],[-44,-20],[4,-29],[14,-6],[45,-3],[-3,-27],[-60,4],[0,-28],[-16,-3],[-15,7],[-10,-14],[1,-40],[-21,5],[-32,3],[-23,-27],[-37,1],[-14,-4],[-8,-49],[1,-33],[35,-64],[-15,-12],[-28,-14],[-4,-7],[11,-39],[7,-16],[18,-1],[14,6],[21,-6],[4,-24],[13,-23],[18,-6],[21,0],[23,10],[32,39],[27,20],[50,16],[30,5],[38,-3],[34,-9],[25,-13],[22,-25],[10,-47],[1,-27],[-2,-38],[-13,-57],[-3,-32],[3,-48],[12,-33],[19,-32],[29,-30],[23,-13],[25,-5],[36,5],[23,9],[14,23],[16,13],[38,19],[61,1],[44,-7],[43,-21],[39,-35],[16,-32],[-2,-60],[7,-26],[22,-22],[59,-32],[25,-18],[28,-29],[42,-34],[41,-17],[67,-6],[43,-11],[75,-36],[81,-23],[33,-21],[11,-19],[16,-50],[12,-28],[12,-17],[29,-24],[22,-14],[22,-42],[22,-29],[25,-26],[42,-31],[63,-18],[21,-9],[39,-26],[33,-15],[29,-31],[36,-15],[21,-4],[61,3],[29,5],[21,-1],[22,-6],[24,-12],[41,-40],[62,-23],[37,-26],[22,-25],[10,-24],[10,-46],[19,-27],[62,-51],[39,-23],[34,-14],[13,-28],[-8,-25],[-86,-32],[-30,-17],[-43,-28],[-34,-25],[-26,-29],[-34,-29],[-18,-20],[-60,-9],[-26,-25],[-4,-17],[-20,-28],[-26,-10],[-24,-3],[-27,1],[-28,9],[-15,-3],[0,-19],[12,-23],[18,-23],[3,-27],[-12,-65],[-16,-32],[-27,-36],[-48,-51],[-8,-11],[-30,-27],[-34,-23],[-13,-13],[-14,-27],[-3,-36],[14,-57],[-3,-36],[-9,-18],[-14,-8],[-11,-43],[-23,-17],[-6,-11],[5,-12],[17,8],[-5,-26],[-14,-7],[16,-27],[-33,-44],[-20,-33],[8,-19],[-3,-13],[-16,-8],[0,-13],[30,-14],[-3,-18],[-15,-10],[-15,11],[-9,-2],[6,-19],[1,-29],[-8,-11],[-18,18],[-8,-17],[-12,5],[-17,-2],[-6,-28],[-16,-24],[-20,-6],[0,17],[-31,0],[-4,-9],[17,-20],[-10,-12],[-47,4],[7,25],[-39,4],[-7,-9],[5,-20],[-9,-26],[-13,-9],[-7,13],[-31,-4],[-11,26],[-14,7],[-6,-33],[-10,-15],[-38,5],[-7,28],[-11,-6],[-7,-17],[-16,11],[-11,-1],[-11,-15],[13,-10],[-10,-12],[-26,-16],[-3,-16],[26,3],[26,-3],[39,-29],[-30,-10],[-15,1],[-12,-14],[9,-15],[17,-13],[-10,-11],[16,-35],[-5,-7],[-19,10],[-22,-16],[-2,16],[-8,11],[-17,-6],[-3,-10],[18,-6],[-15,-17],[-7,-24],[-9,1],[-5,20],[-19,18],[-17,3],[-6,-13],[11,-23],[-6,-25],[-14,-4],[-8,14],[-19,1],[-21,-7],[-15,-18],[5,-12],[20,14],[16,-24],[-2,-14],[-26,-7],[3,-21],[-7,-10],[6,-28],[-10,-17],[-4,-20],[-18,7],[-3,24],[-9,3],[-22,-12],[16,-9],[4,-24],[-33,-9],[-15,17],[-22,12],[-16,-3],[-1,-11],[15,-13],[0,-18],[-28,-31],[-32,13],[-16,-7],[-3,-16],[-22,-15],[5,-20],[-3,-13],[-37,15],[-12,-11],[8,-15],[1,-16],[-33,13],[-14,-4],[-4,-17],[23,-6],[-20,-26],[-18,-8],[35,-24],[-23,-4],[-11,-19],[-10,17],[-18,2],[-18,-10],[14,-11],[0,-15],[-10,-12],[-4,-24],[7,-21],[-3,-14],[-19,-4],[-7,28],[-44,-14],[-5,-20],[-22,-23],[5,-12],[40,-29],[-6,-22],[-15,-11],[9,-16],[-9,-10],[-21,9],[-24,-12],[1,-22],[14,-16],[35,-14],[24,3],[9,-15],[-5,-13],[-17,-4],[-20,1],[-7,-9],[25,-37],[0,-11],[-26,-32],[-50,6],[0,-22],[-20,-3],[-10,30],[-40,-12],[-7,-17],[19,-27],[-13,-33],[-13,3],[-33,-11],[16,-26],[-46,-9],[-2,-25],[-14,-16],[-2,-18],[-10,-25],[-12,-10],[-21,4],[-35,18],[-26,2],[-15,11],[-12,-13],[12,-18],[1,-28],[-22,-35],[-22,-4],[-5,8],[16,16],[-19,11],[-37,-9],[-11,-9],[-1,-12],[18,-18],[2,-19],[-43,-6],[0,-25],[29,-9],[7,-9],[-9,-14],[-20,-10],[-37,13],[-38,-5],[-8,3],[-3,28],[-24,-4],[-19,19],[-13,-4],[-16,-16],[-16,7],[12,-45],[-6,-20],[6,-8],[1,-24],[18,-16],[4,-15],[-8,-11],[-12,-30],[11,-23],[-21,-25],[-22,-36],[-20,-16],[-7,-62],[-24,-5],[-12,-24],[-23,-22],[-16,-25],[-4,-34],[-14,-22],[-31,-12],[-41,-21],[-29,-27],[-25,-41],[-24,-8],[-26,-17],[-32,-12],[-8,-31],[-34,-36],[-17,-7],[-7,-23],[-63,-12],[-41,-11],[-10,-25],[-39,-22],[-61,-27],[-49,7],[-23,-16],[-27,-7],[-37,-21],[-30,-7],[-31,-10],[-39,-10],[-36,0],[-33,-3],[-45,-10],[-38,-6],[-50,-35],[-39,-7],[-28,-14],[-31,-9],[-43,-22],[-34,-8],[-35,-2],[-35,-13],[-37,-16],[-29,-7],[-32,-13],[-21,-19],[-18,-6],[-24,-19],[-13,-34],[-52,3],[-5,-19],[-15,-20],[-12,-23],[-53,-38],[-9,-22],[-11,-8],[-46,-54],[-2,-68],[-46,-52],[-3,-19],[-12,-15],[-24,-15],[-7,-22],[-39,-16],[-11,-16],[-9,-27],[-12,-22],[-13,-44],[-19,-31],[-5,-24],[-26,-57],[3,-29],[6,-23],[7,-62],[7,-29],[-8,-22],[15,-46],[-5,-23],[14,-20],[-8,-25],[3,-32],[-5,-19],[10,-75],[-4,-36],[-22,-39],[-29,-11],[-36,-4],[-17,-21],[-19,-76],[5,-33],[-10,-27],[-24,-1],[-23,-29],[-31,-2],[-36,-8],[-34,-3],[-67,-15],[-18,-16],[-57,-35],[-43,-7],[-58,4],[-32,-3],[-62,-1],[-89,-35],[-62,-4],[-246,-9],[-122,-7],[-134,-5],[-113,4],[-126,7],[-241,-16],[-117,-5],[-122,-17],[-122,-7],[-124,-4],[-122,-7],[-115,-4],[-132,5],[-60,-6],[-112,-5],[-55,-9],[-65,-3],[-70,-6],[-122,-4],[-122,-7],[-124,-4],[-122,0],[-122,-7],[-115,-3],[-5,-2],[-1580,-74],[-201,-85],[-237,-139],[-378,-212],[-55,-33],[-73,-38],[-1674,193],[-62,9],[-17,-2],[-61,18],[-33,-1],[-23,-7],[-23,-13],[-35,-42],[-15,-26],[-18,-5],[-25,1],[-30,26],[-35,49],[-34,23],[-31,8],[-59,3],[-55,14],[-41,-3],[-31,-9],[-36,-23],[-37,-34],[-2,-46],[7,-32],[31,-36],[-1,-17],[-10,-14],[-29,-18],[-7,-28],[-34,-38],[-20,-29],[-14,-5],[-22,5],[-34,17],[-17,1],[-62,-14],[-22,-9],[-29,-43],[-45,-41],[-22,-15],[-52,-27],[-26,-4],[-48,57],[-30,8],[-69,-5],[-38,-19],[-35,-20],[-23,-31],[-21,-46],[-19,-34],[-17,-15],[-36,-13],[-29,-4],[-7,9],[-7,46],[-8,16],[-20,11],[-29,32],[-25,12],[-28,6],[-20,-6],[-22,-21],[-21,-14],[-26,-9],[-25,0],[-27,-8],[-3,-13],[18,-16],[13,-23],[-1,-25],[-36,-59],[-4,-35],[19,-35],[10,-36],[2,-23],[-6,-14],[-12,0],[-20,9],[-18,18],[-27,18],[-22,6],[-24,0],[-13,-9],[-6,-18],[-2,-55],[-28,-49],[-13,-26],[-16,-24],[-42,-16],[-32,4],[-18,13],[-16,20],[-30,48],[-20,13],[-44,9],[-10,9],[-14,24],[-11,10],[-49,18],[-22,51],[-25,18],[-60,20],[-39,-1],[-21,-17],[-6,-19],[-17,-68],[-12,-13],[-23,-5],[-21,7],[-33,15],[-26,1],[-27,-19],[-1,-12],[16,-15],[35,-26],[2,-23],[-26,-47],[-32,-18],[-58,-6],[-31,7],[-6,26],[22,51],[1,15],[-12,10],[-27,5],[-36,-14],[-56,-27],[-39,-29],[3,-21],[20,-16],[36,-18],[2,-21],[-26,-17],[-25,0],[-61,55],[-29,12],[-24,-1],[-15,-13],[2,-30],[9,-35],[-1,-44],[9,-26],[-2,-44],[-14,-13],[-27,-4],[-28,21],[-46,65],[-19,16],[-20,-7],[-1,-50],[-19,-19],[-33,-14],[-28,0],[-54,42],[-28,14],[-26,3],[-19,-9],[-27,-24],[-38,-48],[-32,-26],[-24,-8],[-54,23],[-18,-1],[-23,-13],[-14,-18],[-1,-27],[3,-55],[-11,-16],[-72,-33],[-30,5],[-32,10],[-39,21],[-55,15],[-56,0],[-19,-4],[-10,-11],[-2,-16],[3,-26],[1,-41],[4,-32],[-8,-24],[-24,-21],[-26,-9],[-27,1],[-59,8],[-31,1],[-7,-34],[-23,-40],[9,-29],[-5,-14],[-40,13],[-17,-6],[-10,-15],[-1,-23],[-8,-26],[-13,-1],[-27,8],[-22,0],[-7,-7]]],"transform":{"scale":[0.0001139406348717466,0.00012189923920778113],"translate":[13.4687010001511,7.443658000316532]},"objects":{"adm-0":{"type":"GeometryCollection","geometries":[{"arcs":[[0]],"type":"Polygon","properties":{"OBJECTID":1,"NOMPRO":"Chad","ADM0_CODE":"2434508"}}]}}} \ No newline at end of file diff --git a/amp/gis/boundaries/TD/adm-1.json b/amp/gis/boundaries/TD/adm-1.json index 2a5c9bb4007..b87b5587d39 100644 --- a/amp/gis/boundaries/TD/adm-1.json +++ b/amp/gis/boundaries/TD/adm-1.json @@ -1 +1 @@ -{"type":"Topology","transform":{"scale":[0.0022575777301927194,0.0022767059576283234],"translate":[13.469506,7.447676]},"arcs":[[[1623,716],[7,-47],[-3,-92],[-43,-57],[37,-38],[74,-109],[-37,-61],[-46,-12],[76,-141]],[[1688,159],[-10,-24],[-41,-16],[-5,-20],[-53,-15],[-36,2],[-41,-44],[-23,-2],[-16,31],[-22,19],[-28,8],[1,31],[-32,13],[-5,38],[-29,-7],[-13,-22],[-33,-7],[7,-26],[-24,-21],[-33,-6],[-22,-19],[-69,-9],[-53,-45],[-73,-18],[-34,16],[-7,15],[-78,-8],[17,56],[5,64],[-35,8],[-24,39],[-27,72],[1,19],[-75,161]],[[778,442],[12,4]],[[790,446],[58,-37],[27,-1],[48,-46],[58,26],[53,1],[26,45],[56,32],[57,44],[69,22],[34,-1],[25,27],[38,12],[45,67],[-12,27],[-28,16],[-34,54]],[[1310,734],[51,15],[24,-2],[78,-34],[95,-9],[65,12]],[[790,446],[-4,49],[21,55],[29,26],[4,78],[9,42],[24,13]],[[873,709],[59,-17],[35,17],[74,-10],[48,10],[13,23],[38,6],[50,-21],[25,32],[32,11],[35,29],[21,-28],[7,-27]],[[1809,944],[30,-24],[20,-41],[43,-6],[27,-61],[102,-46],[64,-7],[-44,-68],[-33,-10],[-13,-17],[10,-51],[18,-21],[-4,-59],[13,-42],[17,-8],[12,-58],[10,-17],[1,-74],[19,-81]],[[2101,253],[-80,-6],[-45,-25],[-119,14],[-8,-17],[-59,-33],[-18,13],[-84,-40]],[[1623,716],[39,39],[-65,41],[68,54],[0,38],[13,10],[-22,37],[48,8],[74,20],[31,-19]],[[864,774],[9,-65]],[[778,442],[-21,30],[-12,35],[-19,24],[-55,13],[3,16],[-39,38],[-28,0],[-112,81],[-43,27],[-11,25],[-49,35],[10,34],[-32,43],[-14,-5],[-19,28],[-36,36],[-13,2],[-38,48],[-26,16],[23,37],[46,39],[32,79],[119,0],[112,-24]],[[556,1099],[11,-123],[49,2],[40,11],[37,-17],[-3,-28],[27,-33],[0,-37],[22,-35],[59,-38],[66,-27]],[[1733,1045],[35,-18],[58,-50],[-17,-33]],[[864,774],[28,48],[47,54],[33,27],[8,36],[14,7],[6,33],[30,21],[38,-10],[15,-20],[52,20],[47,48],[55,97],[-11,65],[-18,13]],[[1208,1213],[15,-3],[112,-1],[45,28],[17,-13],[1,-39],[16,-33],[104,-35],[20,-20],[44,0],[54,-11],[11,-22],[30,-13],[56,-6]],[[2885,729],[-44,-20],[-73,-7],[-13,-8],[-48,3],[-51,-13],[-8,8],[-65,-6],[-43,9],[-42,-10],[-12,5],[-42,-18],[-56,-47],[20,-9],[31,-33],[65,-44],[-23,-20],[-16,-44],[-16,-7],[-34,-38],[-12,-28],[-20,-9],[-21,-35],[-52,-19],[-24,-36],[1,-26],[-24,-17],[-162,-7]],[[1733,1045],[47,152],[24,122]],[[1804,1319],[143,20],[43,-44],[46,-20],[17,6],[46,-19],[36,-26],[41,-6],[50,-27],[65,-71],[-4,-47],[46,-18],[25,1],[14,48],[93,0],[21,6],[35,67],[55,30],[31,33],[-5,20],[38,55],[29,12],[39,-8],[16,21],[37,27]],[[2761,1379],[-30,-131],[25,-10],[-19,-48],[2,-26],[-18,-14],[37,-68],[43,-119],[84,-234]],[[556,1099],[35,-7],[67,22],[46,-15],[41,20],[40,-2],[52,-11],[26,-13],[121,26],[-84,46],[-26,40],[-41,45],[-19,6],[-13,43],[-29,40],[-26,15],[2,39],[-12,38],[-28,51],[11,28],[-14,38],[-11,54]],[[694,1602],[86,50],[74,1],[18,-66],[42,-38],[5,-15],[46,-18],[43,-33],[72,-20],[39,0],[23,-12],[31,7],[14,-26],[-13,-107],[4,-66],[30,-46]],[[2851,2017],[7,-35],[40,10],[3,19],[97,7],[29,-3],[149,-70],[204,-104],[-2,-41],[206,36],[173,34],[31,-21],[63,-10],[133,-281]],[[3984,1558],[-125,-40],[-24,12],[-25,-8],[-24,6],[-20,-18],[-58,-15],[-24,-24],[-2,-58],[-23,-7],[-7,-68],[26,-30],[-15,-15],[-13,-47],[-46,-29],[-27,6],[-24,-18],[-43,-86],[-18,-14],[-43,14],[-19,-18],[-5,-23],[-21,-12],[-15,-33],[-55,-35],[-1,-41],[-19,-4],[-13,-41],[-20,0],[-51,-54],[-40,0],[-11,-40],[-51,11],[-17,-47],[-17,-27],[-38,-20],[-144,10],[-27,-16]],[[2761,1379],[10,57],[-14,125],[-95,20],[-33,25],[-64,22],[-115,52],[-15,18],[-29,8],[-12,64],[12,94],[68,-1],[15,-39],[56,17],[18,38],[38,57],[-13,56],[68,62],[51,-18],[75,-13],[69,-6]],[[2913,2410],[52,-42],[30,-17],[6,-16],[-31,-16],[-27,-50],[18,-36],[-32,-16],[-36,-48],[-27,-61],[-22,-74],[7,-17]],[[1804,1319],[-41,31],[-54,23],[11,43],[5,54],[-2,62],[-24,130],[13,106]],[[1712,1768],[19,31],[74,56],[60,4],[-20,51],[-40,50],[-1,18],[25,76]],[[1829,2054],[-14,33],[45,30],[95,78],[81,3],[13,15],[168,90],[314,-2],[13,12],[172,99],[78,40],[119,-42]],[[3697,2354],[17,-30],[39,-46],[95,15],[28,36],[48,-33],[65,-19],[-22,-52],[-25,-30],[29,-28],[3,-41],[24,-54],[-9,-52],[8,-10],[42,17],[27,3],[-29,-95],[-12,-70],[1,-27],[45,-50],[35,-13],[39,-31],[51,4],[-5,-48],[21,-6],[4,-36],[-26,-53],[-22,-75],[-117,32],[-50,4],[-17,-8]],[[2913,2410],[126,29],[12,26]],[[3051,2465],[81,-21],[99,2],[0,-56],[67,-16],[12,-23],[-4,-47],[68,-26],[61,16],[59,-10],[28,33],[52,37],[63,24],[60,-24]],[[3869,2842],[-29,-28],[-24,-36],[18,-18],[-5,-21],[43,-58],[4,-29],[31,-57],[-48,-47],[-21,-34],[-54,-12],[-33,-35],[-38,-96],[-16,-17]],[[3051,2465],[5,128],[-1,30],[-44,85],[12,62],[-11,33],[-94,56],[2,55]],[[2920,2914],[33,33],[47,62],[51,39],[57,-5],[53,17],[71,-21],[35,-20],[35,-31],[36,-43],[46,-11],[64,-39],[57,32],[24,6],[52,-11],[52,-4],[185,-54],[51,-22]],[[929,2549],[-61,29],[-22,33],[-66,-9],[12,-32],[25,-26],[38,-22],[-62,-42],[-31,46],[-72,23],[7,-35],[-11,-77],[-81,-1],[-137,-7]],[[468,2429],[-31,45],[-165,0],[-37,58],[-161,223],[-73,304],[-1,20],[44,23],[37,7]],[[81,3109],[40,-13],[84,3],[17,-24],[25,2],[25,-29],[6,-30],[27,-4],[23,-36],[27,-1],[17,-30],[57,-12],[29,-42],[50,-59],[63,-109],[23,21],[42,-6],[216,25],[48,-126],[23,-41],[6,-49]],[[3887,3719],[35,-12]],[[3922,3707],[18,-32],[40,-8],[107,-45],[60,-47],[41,-39]],[[4188,3536],[30,-38],[5,-76],[-30,-31],[2,-23],[-55,-35],[-29,-30],[4,-26],[-34,-13],[-7,-14],[23,-67],[-61,-18],[-31,-4],[-44,-20],[-6,-36],[20,-13],[-5,-36],[10,-33],[-13,-16],[55,-30],[9,-15],[-13,-30],[-23,-6],[-32,-25],[-41,-18],[-53,-41]],[[2920,2914],[-2,197],[-6,532]],[[2912,3643],[24,-6],[68,-43],[30,-5],[79,15],[22,-11]],[[3135,3593],[82,-25],[44,15],[120,55],[-1,43],[40,22],[73,1],[31,-6],[26,14],[90,-4],[36,3],[78,21],[31,18]],[[3785,3750],[102,-31]],[[2004,3541],[-181,-768],[-139,-43],[-17,-104],[4,-95],[-36,-49]],[[1635,2482],[-61,26],[-54,-21],[-24,11],[-38,-20],[-95,-9],[-35,-15],[-47,7],[-81,-12],[-80,9],[-14,34],[-25,23]],[[1081,2515],[8,15],[3,106],[-26,72],[8,31],[-4,28],[-49,5],[-6,-9],[-50,-1],[-20,6],[7,124],[73,63],[89,65],[150,299],[375,453]],[[1639,3772],[303,-136],[30,-55],[32,-40]],[[1829,2054],[-83,26],[-10,38],[-35,33],[-7,62],[-18,7],[-46,47],[-25,76],[-56,38],[14,30],[58,48],[14,23]],[[2004,3541],[108,-67],[81,-18],[104,-1],[76,19],[72,44],[45,39],[54,77],[18,47],[12,79],[-2,39],[29,5],[24,-14],[44,-77],[31,-30],[60,-5],[152,-35]],[[1081,2515],[-21,-9],[-48,4],[-83,39]],[[81,3109],[18,14],[-11,35],[64,45],[-9,58],[35,77],[41,44],[124,175],[64,83],[118,120],[247,194],[141,113]],[[913,4067],[252,-84],[263,-119],[211,-92]],[[2534,4920],[71,-71],[201,-209],[314,6],[14,-38],[-37,-415],[-27,-124],[75,-197],[78,-203],[-88,-76]],[[913,4067],[438,928],[999,3],[54,-70],[130,-8]],[[3327,5953],[-216,-439],[-435,0],[-3,-593],[-139,-1]],[[913,4067],[4,133],[13,433],[13,320],[17,121],[61,426],[98,168],[-30,19],[-49,45],[-21,45],[-76,64],[-21,55],[27,40],[-11,16],[-105,131],[-30,66],[-36,22],[0,213],[-66,324],[-23,123],[283,126],[172,76],[393,-193],[1801,-887]],[[719,1997],[-1,0]],[[718,1997],[-1,0]],[[717,1997],[-24,50],[-34,-5],[-31,29],[10,11]],[[638,2082],[17,9],[42,4]],[[697,2095],[40,-27],[18,-24],[-1,-23],[-35,-24]],[[697,2095],[75,18],[40,18],[31,28],[58,-62],[29,23],[51,28],[130,-1],[34,-6],[110,14],[84,-25],[77,-30],[26,-42],[-8,-61],[16,-27],[21,-13],[16,-78],[14,-22],[21,4],[50,-7],[31,-18],[22,-27],[87,-41]],[[694,1602],[-3,45],[19,53],[-6,43],[35,52],[-16,22],[-17,57],[25,32],[-35,49],[21,42]],[[718,1997],[1,0]],[[638,2082],[-8,9],[7,74],[-22,49],[-12,64],[-45,14],[-24,23],[-42,18],[-15,16],[4,29],[-14,16],[1,35]],[[3922,3707],[-35,12]],[[3785,3750],[16,135],[42,15],[81,104],[-27,45],[27,15],[10,24],[3,530],[-10,1040]],[[3927,5658],[692,-341],[51,-26],[-6,-1641],[0,-26],[-94,26],[-54,1],[-53,-4],[-58,-23],[-33,-6],[-55,13],[-41,2],[-39,-40],[-48,-34],[-1,-23]],[[3327,5953],[600,-295]]],"objects":{"chad_ADM1":{"type":"GeometryCollection","geometries":[{"arcs":[[0,1,2,3,4]],"type":"Polygon","properties":{"OBJECTID":1,"CODREG":"09","NOMREG":"Logone Oriental","ADM1_CODE":9267}},{"arcs":[[-4,5,6]],"type":"Polygon","properties":{"OBJECTID":2,"CODREG":"08","NOMREG":"Logone Occidental","ADM1_CODE":9252}},{"arcs":[[7,8,-1,9]],"type":"Polygon","properties":{"OBJECTID":3,"CODREG":"10","NOMREG":"Mandoul","ADM1_CODE":9278}},{"arcs":[[10,-6,-3,11,12]],"type":"Polygon","properties":{"OBJECTID":4,"CODREG":"12","NOMREG":"Mayo-Kebbi Ouest","ADM1_CODE":9311}},{"arcs":[[13,-10,-5,-7,-11,14,15]],"type":"Polygon","properties":{"OBJECTID":5,"CODREG":"16","NOMREG":"Tandjil�","ADM1_CODE":9485}},{"arcs":[[16,-8,-14,17,18,19]],"type":"Polygon","properties":{"OBJECTID":6,"CODREG":"13","NOMREG":"Moyen-Chari","ADM1_CODE":9333}},{"arcs":[[-15,-13,20,21]],"type":"Polygon","properties":{"OBJECTID":7,"CODREG":"11","NOMREG":"Mayo-Kebbi Est","ADM1_CODE":9289}},{"arcs":[[22,23,-20,24]],"type":"Polygon","properties":{"OBJECTID":8,"CODREG":"15","NOMREG":"Salamat","ADM1_CODE":9373}},{"arcs":[[25,-25,-19,26,27,28]],"type":"Polygon","properties":{"OBJECTID":11,"CODREG":"04","NOMREG":"Gu�ra","ADM1_CODE":9186}},{"arcs":[[29,-23,-26,30,31]],"type":"Polygon","properties":{"OBJECTID":12,"CODREG":"21","NOMREG":"Sila","ADM1_CODE":9358}},{"arcs":[[32,-32,33,34]],"type":"Polygon","properties":{"OBJECTID":14,"CODREG":"14","NOMREG":"Ouadda�","ADM1_CODE":9346}},{"arcs":[[35,36,37]],"type":"Polygon","properties":{"OBJECTID":15,"CODREG":"07","NOMREG":"Lac","ADM1_CODE":9232}},{"arcs":[[38,39,40,-35,41,42,43,44]],"type":"Polygon","properties":{"OBJECTID":16,"CODREG":"17","NOMREG":"Wadi Fira","ADM1_CODE":9487}},{"arcs":[[45,46,47,48]],"type":"Polygon","properties":{"OBJECTID":17,"CODREG":"19","NOMREG":"Barh-El-Gazal","ADM1_CODE":9122}},{"arcs":[[-42,-34,-31,-29,49,-46,50]],"type":"Polygon","properties":{"OBJECTID":18,"CODREG":"01","NOMREG":"Batha","ADM1_CODE":9109}},{"arcs":[[-48,51,-38,52,53]],"type":"Polygon","properties":{"OBJECTID":19,"CODREG":"06","NOMREG":"Kanem","ADM1_CODE":9216}},{"arcs":[[54,-43,-51,-49,-54,55]],"type":"Polygon","properties":{"OBJECTID":20,"CODREG":"02","NOMREG":"Borkou","ADM1_CODE":9144}},{"arcs":[[56,-56,57]],"type":"Polygon","properties":{"OBJECTID":22,"CODREG":"22","NOMREG":"Tibesti","ADM1_CODE":9486}},{"arcs":[[58,59,60,61,62]],"type":"Polygon","properties":{"OBJECTID":9,"CODREG":"18","NOMREG":"N'Djam�na","ADM1_CODE":9488}},{"arcs":[[63,-27,-18,-16,-22,64,-60,65,-63]],"type":"Polygon","properties":{"OBJECTID":10,"CODREG":"03","NOMREG":"Chari-Baguirmi","ADM1_CODE":9616}},{"arcs":[[-52,-47,-50,-28,-64,-62,66,-36]],"type":"Polygon","properties":{"OBJECTID":13,"CODREG":"05","NOMREG":"Hadjer-Lamis","ADM1_CODE":9205}},{"arcs":[[-40,67,-45,68,69]],"type":"Polygon","properties":{"OBJECTID":23,"CODREG":"23","NOMREG":"Ennedi Est","ADM1_CODE":9173}},{"arcs":[[-69,-44,-55,-57,70]],"type":"Polygon","properties":{"OBJECTID":20,"CODREG":"20","NOMREG":"Ennedi Ouest","ADM1_CODE":9161}}]}},"crs":{"type":"name","properties":{"name":"urn:ogc:def:crs:OGC:1.3:CRS84"}}} \ No newline at end of file +{"type":"Topology","arcs":[[[21289,33718],[-1839,-5913],[-293,-1168],[-1499,-396]],[[17658,26241],[-18,-95],[-166,-876]],[[17474,25270],[35,-994]],[[17509,24276],[-359,-462]],[[17150,23814],[-36,-45],[-120,61],[-178,17],[-182,84],[-126,-84],[-454,-117],[-141,-90],[-388,98],[-117,-87]],[[15408,23651],[-503,-43],[-503,-42]],[[14402,23566],[-253,-62],[-116,-88],[-201,41],[-300,30],[-468,-63],[-215,17],[-169,-71],[-332,34]],[[12348,23404],[-514,53]],[[11834,23457],[-34,306],[-283,237],[14,30],[-44,48]],[[11487,24078],[-20,-9]],[[11467,24069],[14,25],[-11,12],[28,41],[0,120],[-24,39],[-24,35],[-18,42],[-17,31],[-5,39],[29,41],[33,31],[4,52],[-7,70],[14,86],[-7,87],[-12,66],[-19,91],[22,70],[67,101],[0,10],[-65,205],[-131,198],[-75,284],[34,186],[27,59],[23,43],[-1,151],[189,23],[-205,245],[-312,-2],[-342,110],[-137,17],[-91,-122],[-145,95],[35,161],[-108,83]],[[10230,26894],[-31,622]],[[10199,27516],[1646,1169],[50,35]],[[11895,28720],[434,915]],[[12329,29635],[1026,2031]],[[13355,31666],[3964,4320]],[[17319,35986],[2961,-1155],[4,-29],[75,-124],[56,-76],[55,-81],[68,-91],[63,-86],[68,-76],[62,-76],[68,-65],[75,-86],[148,-118],[56,-54],[62,-49],[75,-43],[74,-59]],[[30565,34919],[-2,-6839]],[[30563,28080],[-11,-610]],[[30552,27470],[58,-26],[1055,-467]],[[31665,26977],[-6,-641],[-110,-293],[120,-120],[184,-226]],[[31853,25697],[3,-565]],[[31856,25132],[0,-29],[124,-795],[1,-678],[-91,-131],[-146,-140],[-1285,-172]],[[30459,23187],[-322,28],[-623,188],[-318,-148],[-19,2],[66,-52],[-145,-77],[-39,53],[-17,24],[-36,41],[-491,32],[-96,-21],[-199,-400],[-267,-70],[-70,-185],[-40,-119],[-49,-28],[-76,24],[-80,53],[-48,13],[-29,-4],[-24,-26],[3,-22],[28,-51],[7,-32],[18,-61],[-560,-245],[-104,-100],[-75,-26],[-67,-32],[-58,6],[-11,12],[-357,28],[-445,-18],[0,146],[-2673,64]],[[23243,22184],[-1120,-551]],[[22123,21633],[14,-151],[-105,-58],[-106,112],[-454,-223],[-217,-232]],[[21255,21081],[-50,-1]],[[21205,21080],[-722,-53],[-868,-608],[-48,-24],[-37,-28],[-14,-12],[-24,-36],[-20,-42],[-12,-14],[-2,-114],[-199,-63]],[[19259,20086],[-138,-113],[-48,-97],[-25,-76],[-5,-76],[-18,5],[-34,-26],[-31,19],[-16,-26],[-13,4],[-10,11],[-18,7],[-20,1],[-16,26],[-6,24],[-11,34],[-10,16],[-19,12],[-23,9],[-17,12],[-41,23],[-27,3],[-17,0],[-31,-8],[-27,-12],[-38,1],[-22,4],[-21,-4],[-25,-10],[-28,0],[-30,-15],[-23,9],[-15,1],[-16,18],[-6,16],[-14,4],[-40,1],[-14,12],[4,30],[-5,16],[-10,16],[-19,19],[-3,14],[-11,8],[-7,14],[1,17],[-3,13],[-9,14],[-1,9],[5,12],[0,16],[22,23],[8,14],[-7,28],[-6,34],[-18,15],[-5,23],[-6,9],[-11,23],[-20,-10],[-7,4],[-3,17],[-13,3],[-12,9],[-17,23],[-23,14],[-11,21],[-14,8],[4,26],[-23,26],[-12,0],[-9,7],[-6,16],[-23,-5],[-11,16],[-14,8],[-26,-1],[-10,-2],[-8,11],[-13,23],[-25,5],[-26,11],[-6,12],[2,23],[-12,17],[-30,-4],[-10,8],[-5,19],[-15,3],[-14,-3],[-1,33],[-12,18],[-23,5],[-4,16],[-1,34],[-2,21],[-7,10],[-3,21],[-11,13],[-11,6],[-4,11],[-2,77],[6,23],[-8,9],[4,12],[15,14],[-2,11],[-12,30],[3,19],[11,25],[8,44],[0,10],[-5,37],[-10,26],[-21,35],[-22,29],[-6,20],[5,13],[15,11],[31,10],[-8,6],[-4,12],[15,10],[-13,6],[-4,6],[-3,18],[-17,0],[-21,14],[-22,-2],[-10,-7],[-16,-1],[-14,3],[-28,-3],[-23,1],[-14,6],[-13,11],[-13,0]],[[17576,21290],[-291,298]],[[17285,21588],[-62,48],[-130,151],[-77,345],[-12,6],[-52,4],[-26,7],[-55,7],[-75,22],[-26,9],[-38,40],[-9,17],[-14,19],[-21,18],[-19,40],[-12,34],[-30,45],[1,21],[-1,66],[-19,43],[-12,40],[-233,153],[145,287],[38,263],[381,265],[223,276]],[[17509,24276],[-27,761],[-8,233]],[[17474,25270],[184,971]],[[21289,33718],[38,-20],[162,-91],[235,-121],[93,-51],[170,-73],[75,-25],[213,-66],[248,-64],[211,-49],[156,-23],[121,-13],[303,-32],[81,5],[220,4],[155,9],[258,36],[139,27],[208,46],[188,46],[78,30],[75,14],[122,50],[151,51],[127,62],[105,57],[5,2],[96,45],[99,61],[133,79],[58,40],[27,22],[43,30],[130,64],[49,30],[24,-1],[393,152],[251,111],[61,30],[205,100],[259,133],[242,137],[240,145],[183,122],[199,140],[263,197],[211,177],[15,6],[77,-18],[73,-15],[120,-30],[120,-19],[119,-14],[121,-13],[84,-6],[69,0],[87,-30],[52,-16],[170,-53],[133,-38],[86,-16],[121,-25],[127,-41],[171,-29]],[[30137,34986],[92,-20]],[[30229,34966],[121,-20],[139,-19],[76,-8]],[[35292,56957],[-2424,-4360],[-4603,0],[-1841,-5642],[350,-21],[743,-673]],[[27517,46261],[2111,-1994]],[[29628,44267],[12,-4]],[[29640,44263],[3319,56]],[[32959,44319],[143,-355]],[[33102,43964],[-386,-3957],[-172,-713]],[[32544,39294],[-112,-472],[794,-1884],[1040,-2000],[-165,3],[-133,-102],[-171,-105],[-277,-137],[-218,-200],[-23,11]],[[33279,34408],[-160,76],[-93,33],[-93,20],[-196,33],[-158,-17],[-75,-2],[-260,-42],[-145,-20],[-204,-19],[-285,2],[-83,20],[-83,32],[-93,101],[-265,142],[-181,101],[-126,20],[-214,31]],[[30229,34966],[-92,20]],[[17319,35986],[-639,259]],[[16680,36245],[-1591,624],[-879,345],[-2561,825],[-2007,735],[-4,2]],[[9638,38776],[5040,8878],[3585,6316]],[[18263,53970],[285,899],[-16,102]],[[18532,54971],[129,-54]],[[18661,54917],[171,95],[454,-284],[-69,-271],[-314,-241],[341,-526],[156,-288],[171,-332],[284,-142],[170,-283],[228,-237],[341,-332],[170,47],[398,427],[0,236],[-114,284],[-207,1442],[-64,151],[-128,301],[-226,0],[-26,787],[577,592],[188,136],[397,474],[341,142],[673,169],[464,-27],[191,137],[158,110],[262,0],[298,274],[200,187],[288,263],[341,285],[138,1111],[-59,7],[131,351],[341,395],[183,0],[341,483],[396,112]],[[26246,60952],[5952,-2605],[1488,-685],[1606,-705]],[[14509,18858],[547,-502],[21,-19]],[[15077,18337],[163,-147],[412,94],[703,160],[40,-185],[131,-9],[611,-49],[1,-86]],[[17138,18115],[7,-35],[-22,-34],[-8,-34],[-10,-25],[17,-43],[-3,-27],[2,-21],[-1,-13],[-9,-11],[-23,-13],[-26,-10],[-10,-12],[0,-25],[8,-24],[0,-53],[-6,-31],[0,-15],[-8,-62],[4,-15],[2,-39],[-15,-20],[-4,-11],[1,-27],[-4,-25],[14,-29],[-1,-26],[-10,-19]],[[17033,17416],[6,-7]],[[17039,17409],[-15,-6],[-5,-35],[2,-33],[5,-20],[-4,-33],[3,-13],[-13,-33],[-3,-27],[-11,-15],[-16,-35],[-16,-30],[-25,-29],[-25,-34],[-6,-16],[0,-16],[7,-23],[11,-26],[9,-14],[26,-19],[8,-12],[4,-24],[-5,-18],[-23,-31],[-8,-17],[9,-33],[1,-27],[3,-10],[-5,-23],[-18,-25],[0,-12],[20,-8],[11,-7],[3,-21],[-4,-18],[0,-15],[5,-13],[16,-28],[29,-27],[2,-12],[-9,-15],[-25,-25],[-8,-23],[1,-21],[4,-28],[6,-12],[33,-24],[5,-7],[-1,-15],[-6,-30],[-25,-23],[-13,-7],[-27,-34],[-12,-24],[-1,-13],[2,-43],[-4,-12],[-17,-32],[1,-13],[18,-55],[-8,-17],[1,-14],[11,-15],[1,-10],[-5,-18],[-7,-12],[-11,-10],[-38,-17],[-1,-12],[6,-15],[15,-12],[7,-11],[4,-26],[20,-25],[11,-19],[18,-9],[6,-8],[-5,-25],[10,-20],[0,-9],[-8,-8],[-17,-10],[3,-26],[-16,-9],[-5,-10],[1,-13],[36,-28],[2,-8],[-2,-21],[1,-26],[-17,-12],[-21,-3],[-14,-17],[-25,-22],[-13,-7],[-9,-9],[-7,-36],[-8,-15],[-4,-39],[-5,-11],[5,-20],[20,-25],[12,-19],[-3,-23],[0,-33],[-11,-30],[-16,-29],[-8,-24],[-11,-27],[13,-20],[0,-20],[8,-4],[23,-5],[13,9],[18,1],[8,-9],[20,-15],[7,-10],[-1,-19],[-16,-50],[-12,-22],[3,-16],[-3,-16],[-8,-11],[3,-14],[-10,-27],[1,-7],[10,-11],[25,-9],[17,-14],[25,-13],[24,-19],[6,-10],[64,-85],[-16,-16],[8,-16],[-8,-19],[3,-9],[17,-10],[0,-14],[-18,-13],[2,-18],[19,-20],[27,-18],[7,-24],[5,-9],[-3,-16],[4,-28],[-11,-16],[0,-25],[6,-16],[-12,-5],[-7,-15],[-12,-3],[8,-12],[-7,-7],[-7,-24],[5,-9],[26,3],[6,-10],[-4,-22],[-5,-9],[-12,-9],[-9,-14],[1,-11],[13,-2],[-9,-33],[11,-20],[1,-8],[-12,-3],[-5,-17],[-7,-11],[-3,-15],[5,-19],[-14,-15],[2,-17],[-19,-45],[12,-31],[29,-23],[23,-5],[21,-15],[0,-34],[-8,-31],[-15,-18],[-32,-21],[-14,-46],[0,-26],[26,-18],[53,-15],[9,-13],[-9,-18],[-14,-15],[23,-11],[0,-19],[17,-19],[-37,-18],[3,-26],[23,10],[17,-2],[4,-26],[17,-18],[47,-36],[6,-23],[12,-31],[17,-26],[7,-17],[35,-28],[-9,-49],[-10,-41],[-7,-60],[6,-28],[0,-57],[-5,-23],[-26,-52],[6,-33],[20,-3],[15,-7],[9,-21],[-3,-23],[0,-26],[9,-26],[0,-23],[-3,-23],[-5,-23],[-24,-23],[-38,-44],[-5,-47],[9,-41],[1,-33],[5,-16],[41,-17],[19,-20],[34,-5],[20,-9],[49,-17],[22,-24],[14,-30],[24,-12],[33,6],[18,0],[13,-4],[10,-15],[12,-25],[16,-12],[8,-18],[21,-3],[24,2],[22,9],[19,15],[19,19],[24,-9],[10,-18],[18,-12],[42,2],[42,-4],[15,-9],[17,-35],[-11,-13],[2,-14],[19,2],[14,-3],[-10,-11],[7,-40],[9,-30],[-1,-19],[-7,-17],[22,2],[19,6],[21,-6],[8,3],[14,26],[18,-4],[30,-12],[15,-9],[25,-23],[24,-12],[-7,-19],[12,-16],[16,-6],[11,-13],[38,-26],[42,-20],[2,-22],[16,-10],[22,-30],[11,-9],[44,-2],[10,-7],[7,-34],[18,1],[13,8],[16,0],[21,4],[26,12],[10,-3],[12,-36],[-1,-32],[10,-37],[16,-15]],[[18448,12124],[18,-8],[25,-5],[36,-58],[20,-45],[10,-18],[28,-37],[1,-26],[30,-35],[8,-14],[39,-20],[26,-6],[14,-15],[4,-19],[-15,-30],[-8,-23],[4,-26],[28,-38],[12,-22],[-6,-19],[15,-23],[55,-40],[24,-21],[23,-35],[12,-28],[0,-38],[12,-23],[39,-32],[23,-7],[23,-21],[20,-26],[40,-20],[37,-17],[14,-13],[11,-23],[14,-16],[10,-16],[19,-19],[14,-7],[16,-17],[22,-36],[11,-11],[24,-29],[36,-32],[22,-31],[8,-30],[0,-31],[-4,-23],[0,-36],[3,-30],[9,-32],[4,-24],[36,-51],[15,-33],[8,-26],[18,-19],[7,-18],[25,-36],[20,-14],[31,-10],[17,-14],[20,-37],[14,-18],[10,-33],[-5,-34],[3,-51],[8,-37],[9,-31],[5,-30],[-3,-41],[-12,-29],[-7,-28],[-3,-22],[8,-21],[23,-27],[24,-16],[23,-19],[43,-45],[12,-47],[12,-31],[26,-23],[22,-7],[35,-14],[23,-24],[19,-14],[32,0],[22,8],[48,1],[26,-15],[32,-31],[61,-31],[18,-20],[4,-58],[17,-16],[26,-12],[3,-25],[-11,-21],[4,-17],[16,-17],[-775,-381]],[[19287,9338],[-57,4],[-192,166],[-302,245],[-424,220],[-46,21],[-19,6],[-12,-1],[-28,7],[-27,0],[-31,-5],[-13,-4],[-40,7],[-27,2],[-30,7],[-20,2],[-19,7],[-13,9],[-31,7],[-26,11],[-37,12],[-34,9],[-17,1],[-38,-11],[-12,3],[-18,-4],[-23,-12],[-32,0],[-22,19],[-28,6],[-38,6],[-8,9],[-27,48],[-5,17],[-8,7],[-22,7],[-8,-1],[-7,-14],[-31,9],[-17,-5],[-12,9],[-33,17],[-9,8],[-12,3],[-48,19],[-15,20],[-2,24],[-7,24],[-12,22],[-6,23],[-10,48],[-10,17],[-29,12],[-21,16],[-19,19],[-29,13],[-9,13],[-18,-6],[-20,-1],[-10,-9],[-4,-12],[4,-13],[-3,-11],[-16,-14],[-8,-10],[-12,2],[-11,9],[-3,13],[-7,9],[-21,0],[-16,7],[-11,11],[-26,-13],[-4,7],[-342,81],[-167,-2]],[[16520,10510],[-217,2]],[[16303,10512],[-32,27],[-21,7],[0,20],[12,29],[6,22],[-5,7],[-16,6],[-24,-10],[-14,0],[-12,15],[-9,30],[-8,14],[-46,13],[-9,7],[-4,17],[9,16],[12,9],[20,8],[5,14],[-6,5],[-25,0],[-29,-10],[-19,-12],[-12,1],[-24,-15],[-18,-4],[-27,16],[-12,1],[-17,-6],[-5,-5],[-42,-19],[-50,8],[-4,22],[-23,18],[-44,3],[-13,3],[-25,-10],[-18,3],[1,27],[13,33],[0,17],[-19,8],[-15,-9],[-10,-13],[-17,-34],[-18,-13],[-15,-20],[-23,3],[-13,11],[-11,20],[-8,8],[-24,15],[-19,28],[-44,10],[-17,-4],[-1,-35],[15,-24],[-1,-9],[-17,-16],[-12,1],[-9,8],[-7,13],[-1,12],[-16,18],[-30,13],[-32,11],[-16,21],[-20,5],[-10,13],[0,26],[8,23],[-16,22],[-60,21],[-35,17],[-22,22],[-29,19],[-49,4],[-37,0],[-38,-8],[-12,1],[-29,15],[-19,-4],[-39,-16],[-22,26],[-12,34],[-23,34],[-3,16],[3,34],[-8,37],[5,13],[9,12],[-10,25],[-4,19],[1,22],[-3,25],[-11,14],[-47,14],[-33,-7],[-30,7],[-15,7],[-15,12],[-7,20],[2,17],[12,30],[6,22],[-15,28],[-11,37],[2,10],[45,34],[14,22],[0,18],[-4,19],[1,15],[9,47],[6,21],[-10,17],[-27,23],[-16,6],[-55,1],[-13,7],[-46,33],[-14,24],[-13,30],[-17,16],[-457,-319],[-674,20],[-506,16],[-11,-19]],[[12964,11561],[-13,-1],[-11,19],[-16,3],[-19,-12],[-30,-13],[-25,10],[-10,16],[-8,1],[-16,8],[6,26],[0,28],[-9,8],[-7,-3],[-1,-20],[-18,1],[-2,22],[-14,13],[-2,28],[9,8],[16,-10],[4,10],[-10,15],[1,7],[-6,23],[4,24],[-13,1],[4,28],[13,4],[-12,16],[2,10],[20,16],[-3,6],[-17,9],[-6,-13],[-10,1],[-3,20],[-9,4],[-17,-2],[-13,16],[-7,2],[-1,-22],[-29,15],[-4,15],[6,22],[-14,2],[-12,10],[-9,-6],[-15,10],[-13,-4],[-7,11],[-15,3],[3,15],[-15,-2],[-9,8],[15,5],[0,7],[-18,-1],[-10,5],[18,7],[-9,19],[-11,-3],[-16,18],[0,11],[-41,-3],[-43,657],[175,1126],[-30,14],[-40,10],[-21,13],[-32,17],[-19,6],[-33,16]],[[12467,13891],[-28,18]],[[12439,13909],[-30,14],[-78,-8],[-52,-7],[-43,-10],[-42,-14],[-32,-6],[-25,-11],[-61,3]],[[12076,13870],[-23,13]],[[12053,13883],[-19,11],[-41,15],[-32,4],[-35,8],[-48,20],[-13,21],[-28,22],[-26,8],[-18,1],[-26,-19],[-18,-11],[-31,-10],[-61,14],[-44,1],[-76,-7],[-21,-21],[-91,-17],[-51,2],[-74,24],[-41,15],[-100,46],[-48,10],[-45,4],[-31,11],[-37,16],[-34,11],[-109,-7],[-53,5],[-51,10],[-28,14],[-20,23],[-32,44],[-26,20],[-21,34],[-38,33],[-21,11],[-42,15],[-20,14],[-35,29],[-16,19],[-35,36],[-18,7],[-33,27],[-28,30],[-36,35],[-42,35],[-11,0],[-25,13],[-29,6],[-66,-9],[-38,-14],[-82,4],[-38,9],[-33,11],[-52,28],[-71,37],[-33,7],[-42,12],[-22,23],[-14,35],[-2,22],[7,32],[-5,48],[-14,24],[-136,126],[-8,29],[-3,22],[-13,27],[-22,15],[-42,18],[-46,10],[-47,6],[-40,10],[-29,21],[-82,34],[-12,3],[-21,27],[-10,17],[-20,42],[-13,32],[-6,30],[0,22],[8,30],[21,43],[-6,51],[-3,16],[-7,21],[-7,31],[-11,18],[-13,16],[-19,40],[-8,22],[7,67],[-18,40],[-3,37],[0,25],[-19,13],[-703,1],[-692,-504]],[[7667,15242],[1,15],[13,15],[0,12],[-7,12],[-18,8],[-21,15],[-7,9],[-10,44],[11,10],[-5,13],[0,20],[-3,12],[6,19],[-5,9],[1,26],[7,19],[-4,9],[5,25],[-7,18],[-7,10],[-5,14],[-1,26],[-7,8],[-34,13],[-13,11],[-15,22],[-20,18],[-8,12],[-15,35],[-21,29],[-1,14],[-10,27],[-7,11],[-7,22],[-6,32],[-9,12],[6,17],[13,6],[17,17],[1,15],[-4,33],[-17,28],[1,24],[-8,22],[-29,17],[-19,13],[-5,14],[7,10],[13,3],[7,9],[7,22],[0,23],[6,10],[19,18],[10,38],[29,13],[11,9],[10,27],[-2,12],[-18,21],[-10,4],[-39,25],[-40,15],[-8,7],[1,14],[15,25],[17,15],[58,39],[-3,31],[-5,10],[-9,24],[-8,31],[-14,18],[-10,9],[-3,9],[3,10],[18,14],[-12,37],[1,9],[9,9],[29,6],[8,26],[1,31],[6,12],[21,2],[3,10],[-6,12],[-10,9],[1,13],[26,7],[25,18],[13,32],[20,41],[15,6],[27,20],[-2,8],[-20,29],[10,9],[27,-2],[13,1],[4,8],[-3,43],[6,7],[42,19],[35,8],[32,14],[5,13],[-6,26],[8,24],[21,21],[6,10],[2,29],[8,12],[4,14],[-4,9],[1,22],[5,13],[11,14],[-3,8],[-17,9],[-26,17],[-5,9],[-22,14],[-14,6],[-20,3],[-86,28],[-9,7],[-4,11],[-2,29],[1,24],[4,41],[-9,18],[-20,17],[-31,18],[-7,8],[-2,20],[3,11],[-5,18],[-9,10],[-22,14],[-7,8],[6,20],[18,13],[9,23],[-3,16],[-33,34],[-7,12],[7,39],[-1,28],[-27,45],[-10,12],[-23,41],[-2,11],[3,20],[19,15],[8,16],[26,32],[27,5],[21,-3],[26,-9],[21,-4],[31,-11],[9,2],[0,9],[-17,35],[-8,20],[-6,7],[-42,31],[-19,10],[-17,16],[-5,11],[0,11],[11,19],[19,14],[36,15],[59,9],[38,10],[17,7],[12,27],[-4,28],[-11,13],[-23,8],[-17,8],[-29,24],[-20,20],[-11,17],[-2,8],[0,33],[5,33],[-4,21],[-8,13],[2,24],[-23,14],[-31,15],[-11,7],[-10,16],[-6,1],[-2,-23],[-18,-17],[-27,-29],[-12,-4],[-13,2],[-31,17],[-22,32],[-12,24],[-6,25],[11,28],[-1,16],[-21,31],[-22,44],[-7,22],[2,39],[12,14],[48,23],[30,18],[14,13],[12,32],[-2,18],[-35,55],[-11,15],[-17,15],[-12,21],[-1,9],[9,23],[13,16],[39,23],[10,1],[31,-12],[28,-14],[17,7],[19,15],[12,20],[11,39],[11,1]],[[7583,19058],[42,5],[102,25],[58,25],[11,9],[42,12],[55,28],[17,32]],[[7910,19194],[17,9]],[[7927,19203],[211,118],[-5,31],[-11,3],[-7,12],[3,15],[-2,23],[-7,10],[-17,13],[-8,16],[19,15],[4,9],[-8,15],[-20,10],[-15,0],[-7,6],[0,14],[-18,32],[0,11],[-14,18],[-14,12],[-2,17],[13,26],[24,27],[3,13],[-11,16],[-42,1],[-10,20],[-19,13],[1,19],[19,19],[30,11],[31,18],[22,32],[-24,28],[-71,33],[-28,21],[-51,27],[-15,10],[-30,27],[-39,16],[-27,4],[-12,12],[-8,15],[-53,22],[-33,12],[-25,12]],[[7654,20057],[27,23],[888,374],[108,17],[498,227],[417,-313],[575,19],[246,-129],[86,-144],[-47,-143],[100,-101],[79,82],[79,-1],[62,-125],[6,209],[168,61],[220,-357],[433,-13],[189,-33],[411,35],[478,-180],[51,-50],[53,9],[42,13],[73,10],[23,7],[98,-24],[468,-652],[1024,-20]],[[44235,33740],[-39,34]],[[44196,33774],[-386,339]],[[43810,34113],[-148,80],[-229,179],[-258,182],[-362,146],[-775,287],[-414,73],[-199,306],[-370,114],[-289,73],[-282,57],[-239,80],[-325,53]],[[39920,35743],[-210,246],[-222,434]],[[39488,36423],[-46,253],[-120,664]],[[39322,37340],[-147,444],[-89,465],[-67,88],[649,874]],[[39668,39211],[658,335]],[[40326,39546],[450,160],[434,41],[310,244],[39,-34]],[[41559,39957],[1,124],[28,3977]],[[41588,44058],[-105,10082]],[[41483,54140],[659,-305],[195,-105],[3596,-1649],[3035,-1424],[303,-124],[1,-10745],[0,-2781],[0,-2349],[-1,-67],[-16,0],[-77,7],[-104,67],[-202,-8],[-35,32],[-25,10],[-51,-5],[-26,-5],[-131,68],[-112,22],[-35,5],[-39,25],[-47,16],[-64,7],[-69,-17],[-47,-1],[-61,-13],[-132,-1],[-209,33],[-140,6],[-140,2],[-183,-31],[-215,-23],[-57,-39],[-177,-25],[-21,-22],[-56,-35],[-111,-48],[-121,-28],[-89,-27],[-70,8],[-75,-21],[-112,-40],[-91,2],[-71,16],[-88,42],[-156,9],[-62,-11],[-93,36],[-93,26],[-98,-18],[-135,19],[-11,5],[-70,18],[-123,-30],[-26,-3],[-71,-36],[-16,-38],[-13,-42],[-15,-30],[-8,-9],[-15,-10],[-18,-7],[-25,-13],[-22,-10],[-73,-44],[-39,-29],[-22,-83],[-136,-54],[-12,-12],[-26,-12],[-16,-21],[-11,-30],[-6,-7],[-44,-11],[-5,-13],[-18,-9],[-17,-13],[-28,2],[-33,-6],[-49,-17],[-22,-15],[-10,-10],[-22,-35],[-10,-6],[-14,-23],[-15,-9],[-17,-16],[-10,-20],[3,-25],[7,-23],[-4,-39],[13,-25],[-1,-28],[-15,-19],[-15,-34]],[[41588,44058],[-29,-4101]],[[40326,39546],[-241,-122],[-417,-213]],[[39322,37340],[166,-917]],[[39920,35743],[-262,-133],[-355,-86],[-59,-14],[-409,-100],[-337,-28],[-52,-4],[-553,23]],[[37893,35401],[-10,1],[-384,12]],[[37499,35414],[-3,0],[-273,-132],[-324,59],[-301,-30],[-472,15],[-425,-202],[7,-217],[3,-201],[-419,-178],[-132,-55],[-190,-81],[-392,-159],[-128,-52],[-459,-138],[-10,-4],[-208,73],[-86,11],[-130,26],[-219,65],[-219,69],[160,125]],[[32544,39294],[172,713],[386,3957]],[[32959,44319],[-118,-2],[-3201,-54]],[[29628,44267],[-1814,1714],[-297,280]],[[35292,56957],[328,-144],[1863,-841],[86,-52],[1525,-675],[2389,-1105]],[[41483,54140],[78,-7513],[27,-2569]],[[30459,23187],[757,-530],[47,4],[14,-9],[28,-32],[25,-45],[-14,-37],[-13,-57],[23,-58],[59,7],[-9,-39],[-14,-24],[-16,-43],[-47,-32],[-43,-23],[-19,-23],[-58,-3],[-41,17],[-35,3],[-46,-44],[-26,-38],[-26,-60],[1,-29],[-24,-14],[-42,-36],[-24,-49],[-28,-31],[-32,-59],[-28,-36],[-33,-59],[-32,-10],[16,-55],[14,-15],[-1,-36],[2,-29],[-4,-23],[23,-37],[28,-14],[32,-3],[17,-28],[40,-19],[31,-31],[10,-14],[9,-32],[14,-24],[-17,-25],[-25,-23],[-25,3],[-23,-19],[-46,-5],[-59,-23],[-18,-34],[-34,-15],[2,-35],[-25,-30],[-172,-119],[-39,-32],[-47,-22],[-70,-66],[-5,-44],[-31,-55],[-39,-19],[-40,-43],[-37,-26],[-32,-14],[10,-85],[-1,-77],[-34,-76],[-45,-78],[-39,-45],[-29,-80],[-16,-59],[-28,-71],[-13,-46],[-13,-88],[-18,-49],[-18,-58],[-35,-62],[-17,-50],[-7,-47],[-13,-34],[2,-79],[-53,-48],[-22,-30],[-7,-43],[-21,-17],[-18,-25],[22,-48],[7,-27],[-30,-32],[7,-37],[38,-9],[11,-13],[0,-46],[22,-43],[17,-19]],[[29871,19271],[-478,36],[-801,126],[-392,108],[-146,59],[-711,-591],[131,-532],[-397,-540],[-192,-369],[-594,-159],[-155,373],[-715,13],[-132,-901],[22,-157],[20,-157],[90,-298],[298,-72],[160,-166],[-42,-52],[45,-19],[33,6],[22,9],[16,4],[14,-25],[16,1],[15,-5],[18,-17],[22,-3],[6,-18],[12,-9],[26,4],[14,11],[9,-19],[0,-17],[6,-10],[14,-9],[38,4],[17,-14],[14,-21],[25,-3],[6,-12],[11,-2],[12,8],[18,5],[31,-16],[47,1],[19,-3],[-17,-12],[2,-13],[18,-8],[11,-13],[31,-7],[13,-7],[19,-20],[30,-9],[23,-21],[25,-3],[2,-19],[18,-10],[29,8],[13,0],[14,-11],[4,-16],[29,18],[18,5],[60,-14],[22,-3],[13,4],[16,0],[11,-14],[14,-10],[17,-3],[8,-14],[1,-26],[14,-9],[23,-3],[28,-20],[7,8],[18,8],[35,-8],[14,-8],[32,-31],[12,3],[16,22],[21,-3],[24,0],[36,-22],[13,-1],[17,-15],[12,-31],[7,-9],[35,-16],[14,-26],[33,2],[18,-37],[0,-13],[9,-4],[17,-16],[29,-8],[20,3],[23,-5],[14,-8],[9,2],[17,13],[16,3],[18,-4],[16,0],[13,7],[42,3],[23,7],[13,8],[13,-4],[3,-17],[-5,-17],[7,-7],[4,-11],[11,-11],[14,-9],[0,-12],[-10,-11],[8,-10],[26,0],[20,-18],[24,-5],[-13,-31],[13,-6],[45,2],[14,-5],[7,-13],[13,-14],[18,-5],[2,-11],[11,-14],[40,12],[23,-8],[24,0],[16,3],[33,26],[22,13],[34,12],[43,-9],[18,-11],[46,-19],[31,-18],[25,-21],[14,-22],[10,-17],[10,-12],[31,4],[44,0],[23,-2],[18,-9],[17,-13],[20,-1],[45,1],[27,-1],[18,-7],[13,-16],[14,-8],[40,-11],[22,-27],[33,-3],[23,3],[11,8],[11,3],[11,-11],[34,6],[20,-11],[9,-27],[18,-1],[4,-26],[4,-13],[23,-14],[22,-3],[27,2],[34,7],[17,-3],[27,2],[11,8],[20,-3],[8,-16],[-1,-9],[5,-10],[17,-10],[14,-1],[-14,-64],[1,-9],[13,-6],[15,12],[7,-11],[15,4],[4,-10],[0,-19],[-4,-18],[8,-16],[-1,-24],[-5,-10],[14,-9],[7,-12],[17,-5],[15,-15],[9,-3],[1,21],[12,14],[9,-2],[14,-10],[17,1],[10,-5],[15,-23],[-2,-13],[-16,-22],[-1,-19],[-8,-15],[-173,-135],[154,-655],[-122,-584]],[[28874,13223],[-78,-298]],[[28796,12925],[-418,-110],[-26,5],[-24,-17],[-12,-6],[-40,31],[-3,34],[-4,14],[-16,17],[-14,-2],[-15,-8],[-22,-7],[-18,-1],[-21,-13],[-25,0],[-19,-18],[-2,-11],[0,-34],[-14,-10],[-17,2],[-4,21],[6,14],[0,12],[16,27],[0,13],[-10,14],[-15,2],[-17,-5],[-13,-8],[-16,-22],[-13,-28],[-12,-15],[-23,-3],[-25,11],[0,12],[9,11],[20,13],[15,19],[-1,13],[-8,5],[-29,3],[-27,5],[-10,-1],[-10,-13],[-6,-25],[-15,-15],[-23,-5],[-26,5],[-21,0],[-32,6],[-16,-1],[-26,-12],[-10,-17],[-2,-17],[-10,-14],[-34,-20],[-11,3],[-22,28],[-18,-2],[-13,-17],[-25,-25],[-19,-12],[-20,-3],[-17,-8],[-20,-20],[-5,-16],[0,-27],[-20,-21],[-20,-8],[-14,5],[-18,0],[-10,-8],[-10,-17],[23,-15],[5,-18],[18,-18],[8,-16],[4,-20],[-2,-10],[-34,16],[-29,-16],[-9,-2],[-25,12],[-30,3],[-13,-4],[-13,-15],[-9,-17],[17,-25],[28,-14],[26,-20],[7,-40],[10,-9],[8,-19],[-4,-5],[-13,0],[-11,11],[-13,1],[-18,-14],[-16,-5],[-1,22],[-5,9],[-49,10],[-12,-13],[-13,-25],[-3,-28],[6,-14],[5,-22],[7,-19],[10,-17],[7,-27],[-3,-15],[-20,-8],[-10,6],[10,10],[-9,8],[-13,-3],[8,16],[-15,2],[-14,-9],[-15,6],[-20,-14],[-9,8],[10,13],[-11,4],[-15,-1],[-32,-9],[-5,-7],[10,-13],[-6,-26],[-2,-20],[7,-14],[10,-7],[27,9],[8,-9],[27,2],[19,-18],[6,-20],[-5,-19],[0,-15],[6,-15],[-1,-12],[-12,-8],[-31,-4],[-28,-5],[-21,-14],[19,-10],[4,-19],[37,16],[46,15],[23,-2],[6,-19],[-20,-6],[-12,-12],[-14,-3],[-16,-16],[-16,-10],[-13,2],[-27,17],[-39,17],[-13,1],[-9,-12],[-5,-20],[17,-10],[27,-1],[18,-6],[13,-29],[-11,-7],[-4,-12],[-7,-6],[-26,-5],[-37,-4],[-34,-8],[-27,-9],[-44,-30],[-14,-26],[1,-13],[-11,-11],[-8,-19],[9,-22],[1,-12],[-8,-14],[-15,-7],[-13,8],[-17,6],[-17,-25],[-17,-13],[-3,-19],[9,-13],[15,-5],[13,-14],[-25,-23],[-25,-4],[-19,-1],[-22,4],[-7,14],[-20,8],[-5,13],[-10,11],[-10,1],[-10,-15],[-1,-24],[-6,-11],[-15,4],[-21,-5],[-13,-9],[-25,-4],[-11,-8],[-4,-17],[-13,-12],[0,-39],[-32,-59],[7,-23],[0,-15],[-5,-33],[3,-27],[14,-27],[-2,-4],[-22,-4],[-20,-11],[-22,11],[-23,19],[-6,11],[-24,5],[-18,-3],[-12,-8],[-7,-17],[-13,-8],[-9,-24],[-21,-16],[-6,-13],[-12,-6],[-13,10],[-10,11],[-2,10],[19,0],[-2,31],[-13,17],[-16,-4],[-13,-10],[-23,0],[-14,-6],[-8,-29],[-22,-17],[-7,-9],[-5,-16],[7,-35],[-2,-22],[-8,-12],[-18,-15],[5,-21],[-17,-20],[19,-12],[-10,-8],[-1,-7],[-15,-16],[7,-19],[-5,-13],[-15,-2],[-17,-10],[-4,-8],[8,-15],[9,-7],[-2,-12],[-8,-10],[-2,-10],[17,-23],[-8,-5],[-11,4],[-8,-8],[-13,20],[-17,13],[-23,3],[-16,-9],[-35,-38],[-30,-19],[-9,-17],[4,-23],[-16,-8],[-13,-2],[-15,-13],[-6,-16],[7,-24],[-28,-28],[-2,-11],[-10,-4],[-12,-15],[-1,-27],[8,-12],[19,-20],[0,-6],[-112,1],[-808,-7],[-277,5],[-116,-464],[-18,-6],[-30,8],[-15,-1],[-16,-7],[-16,-2],[-19,8],[-31,-1],[-9,-15],[-14,-6],[-16,7],[-13,-1],[-26,-9],[-15,3],[-9,-6],[0,-12],[-12,1],[-11,23],[-12,14],[-12,3],[-44,4],[-14,3],[-16,22],[-28,33],[-12,10],[-51,14],[-14,22],[-20,1],[-32,-5],[-12,0],[-71,6],[-34,8],[-18,-8],[-29,9],[-28,-6],[-16,1],[-18,12],[-20,2],[59,342],[11,24],[3,20],[12,35],[5,35],[-52,39],[-37,25],[-11,10],[-4,12],[-9,7],[-8,16],[-25,16],[-21,46],[-22,17],[-20,9],[-23,4],[-15,10],[-5,8],[-3,18],[-8,15],[-14,3],[-14,15],[-5,22],[-20,3],[0,9],[-9,20],[-20,7],[-17,15],[-30,-2],[-9,8],[-24,2],[-5,11],[-11,10],[-16,8],[-16,4],[-4,13],[-16,11],[-8,2],[-5,20],[-8,8],[-4,12],[5,17],[-2,11],[-17,14],[-9,19],[-19,3],[-11,23],[-22,4],[0,15],[-8,3],[3,22],[-5,8],[1,25],[-8,6],[-17,3],[-7,24],[-25,9],[-9,1],[-5,14],[0,12],[-7,3],[-14,-3],[-6,11],[-8,3],[-9,10],[-18,-13],[-13,-2],[-6,4],[3,13],[-17,1],[-7,6],[-41,10],[-13,0],[-19,9],[-9,12],[-22,-1],[-12,-6],[-10,11],[-8,-9],[-25,2],[-8,8],[-25,-14],[-9,9],[-22,9],[-5,12],[24,7],[-8,19],[-16,7],[-40,8],[-7,36],[-34,18],[-6,9],[-6,18],[-15,6],[-26,-1],[-11,17],[-11,8],[-19,-14],[-25,-4],[-24,-12],[-34,0],[-2,19],[-15,20],[-20,-3],[-8,-5],[-33,-4],[-27,-9],[-7,8],[-7,19],[-17,5],[-11,-16],[18,-30],[1,-13],[-16,4],[-13,15],[2,21],[-12,8],[-27,-13],[-15,6],[-11,11],[-16,7],[-31,-4],[-21,10],[-20,1],[-2,14],[-10,3],[-18,-12],[-17,11],[-1,7],[32,30],[-13,15],[-3,26],[-8,4],[-19,1],[-23,-9],[-22,-15],[-16,2],[-7,9],[2,25],[-15,8],[-30,-2],[-14,1],[-3,8],[15,18],[-11,19],[0,8],[-18,0],[-13,-7],[-16,0],[-8,12],[12,5],[0,8],[16,3],[-2,11],[-12,4],[-14,9],[-14,2],[-11,-6],[-13,-17],[-4,-17],[-9,-9],[-28,7],[-5,14],[29,25],[-15,11],[-4,13],[-9,1],[-28,-14],[-29,4],[-3,20],[2,24],[-11,6],[-12,-2],[-12,10],[-12,-8],[-9,-28],[-31,5],[-24,11],[13,10],[-2,19],[-12,11],[2,30],[8,20],[-4,13],[-10,-2],[-12,-14],[-10,2],[-15,-19],[-14,6],[-8,-22],[-17,7],[0,30],[8,21],[13,14],[-8,10],[-31,-5],[-9,4],[-11,18],[-3,12],[5,24],[-22,-2],[-15,4],[-10,-8],[7,-8],[-16,-6],[-10,-8],[-32,-6],[4,-13],[15,-10],[4,-14],[-16,-12],[-32,16],[-13,14],[-9,-7],[3,-20],[12,-15],[7,-13],[13,-3],[9,-9],[-28,-11],[-16,2],[-5,10],[-23,11],[4,13],[-14,23],[-9,-1],[-13,-12],[-12,-7],[-9,3],[0,13],[11,34]],[[21622,12199],[2,17]],[[21624,12216],[-11,4],[-1,19],[-10,3],[-14,-9],[-8,-14],[3,-12],[-8,-18],[-15,1],[-1,18],[-13,0],[-4,6],[13,9],[-9,13],[-35,-3],[-6,7],[-9,-1],[-25,-24],[-8,-19],[-18,-20],[-4,-20],[-11,-1],[-13,40],[2,12],[25,6],[1,14],[-8,5],[-22,3],[-20,-10],[-2,-10],[-19,-22],[-9,-4],[-23,13],[-7,10],[-22,-6],[-12,23],[-12,2],[-13,-12],[-11,4],[-9,15],[-13,6],[-5,7],[-15,4],[-22,-10],[-18,2],[-17,30],[10,15],[0,12],[-16,13],[-43,0],[-23,26],[-23,11],[-22,1],[8,21],[-11,14],[-13,-5],[-17,-16],[-24,1],[-12,13],[-13,4],[-12,-6],[2,-11],[16,-17],[1,-8],[-9,-6],[-15,5],[-18,17],[-3,13],[-16,14],[-6,20],[-23,4],[-4,13],[11,13],[-14,20],[-372,395],[-1540,-215],[-292,-260],[-225,-254]],[[17039,17409],[-6,7]],[[17138,18115],[229,30],[20,-7],[27,-7],[56,-2],[62,-15],[26,26],[42,12],[53,94],[136,39],[136,-2],[1003,663],[73,156],[124,300],[-43,81],[20,45],[92,39],[32,79],[45,21],[32,20],[29,97],[23,183],[-30,65],[-30,26],[-36,28]],[[21205,21080],[50,1]],[[22123,21633],[511,251],[609,300]],[[9700,24438],[786,-282],[115,-48],[77,-23],[7,-27],[59,21],[437,-54],[131,20],[85,-3]],[[11397,24042],[90,36]],[[11834,23457],[514,-53]],[[14402,23566],[1006,85]],[[17285,21588],[170,-175],[121,-123]],[[15077,18337],[-568,521]],[[7654,20057],[-105,-3],[-92,-9],[-34,0],[-186,-54]],[[7237,19991],[-293,-85]],[[6944,19906],[-179,-20],[-27,-19]],[[6738,19867],[-5,14],[-10,12],[-31,14],[-24,19],[-5,9],[-1,18],[12,24],[19,21],[14,27],[0,18],[-3,16],[-9,17],[-19,23],[-13,26],[-1,14],[5,12],[15,22],[25,24],[7,9],[3,31],[-4,21],[-17,42],[-16,20],[-6,14],[0,23],[4,28],[10,18],[16,23],[13,28],[3,15],[-3,28],[-12,25],[-5,27],[2,26],[23,53],[8,23],[3,16],[-5,37],[-26,60],[-26,37],[-40,54],[-23,28],[-18,24],[-6,18],[0,31],[9,35],[-8,25],[-7,15],[-23,15],[-18,3],[-11,-3],[-14,-14],[-8,-26],[-5,-8],[-24,-6],[-24,9],[-21,27],[-2,12],[0,24],[4,17],[17,20],[28,16],[17,14],[2,31],[-5,26],[-15,35],[-11,34],[-5,64],[0,34],[11,65],[0,20],[-40,59],[-14,33],[-5,25],[-3,33],[-17,81],[-25,74],[-12,8],[-23,4],[-62,-3],[-30,1],[-44,-1],[-59,-20],[-18,2],[-24,9],[-15,9],[-28,26],[-7,20],[-6,41],[-1,35],[-9,30],[-15,26],[-15,18],[-16,12],[-14,3],[-16,0],[-19,-7],[-14,-9],[-13,-45],[-13,-26],[-20,-13],[-29,-10],[-29,-2],[-19,12],[-11,19],[-9,23],[-1,26],[12,19],[15,18],[24,21],[21,29],[8,30],[1,15],[-12,27],[-17,15],[-17,10],[-26,8],[-44,4],[-29,-5],[-54,-26],[-21,-4],[-32,7],[-24,10],[-21,6],[-22,10],[-16,11],[-16,19],[-26,17],[-25,13],[-26,6],[-54,2],[-9,13],[14,23],[8,21],[8,43],[-4,13],[-10,10],[-11,2],[-16,-5],[-40,-54],[-23,-25],[-25,-14],[-23,-4],[-21,9],[-19,14],[-14,22],[-5,26],[-16,55],[-19,14],[-21,1],[-20,-16],[-15,-4],[-17,3],[-27,33],[-13,43],[1,13],[13,37],[12,14],[13,22],[26,27],[11,21],[6,33],[-1,21],[-3,14],[-14,32],[-24,44],[-16,12],[-32,14],[-38,18],[-22,8],[-15,13],[-18,29],[-9,32],[4,22],[9,10],[16,22],[10,10],[6,25],[8,13],[-14,11],[0,11],[14,28]],[[4988,22974],[463,0],[37,301]],[[5488,23275],[246,0],[1014,-1]],[[6748,23274],[87,81]],[[6835,23355],[101,50]],[[6936,23405],[76,45],[79,19],[60,5],[33,-29],[57,-1],[49,9],[33,21],[24,5],[16,-24],[25,-12],[13,5],[17,-20],[13,-4],[41,6],[30,2],[30,-14],[-15,-33],[0,-26],[33,0],[11,37],[36,5],[24,9],[30,3],[11,4],[22,-5],[16,-7],[11,-12],[16,-10],[14,-2],[24,2],[16,-5],[-5,-50],[7,-19],[-5,-45],[16,-27],[20,6],[55,-4],[63,-47],[68,-58],[49,-52],[62,-11],[55,-22],[65,-35],[30,-64],[44,-62],[35,-33],[30,-47],[33,-24],[36,-16],[40,-3],[49,14],[47,7],[45,6],[66,4],[24,3],[41,-19],[52,-14],[49,-8],[59,-18],[33,-17],[38,-26],[79,-28],[71,24],[35,14],[27,47],[22,50],[54,12],[49,0],[79,64],[24,29],[8,54],[0,48],[-3,47],[3,31],[-19,31],[-36,52],[-11,52],[0,53],[-8,30],[-19,12],[-17,24],[22,35],[11,67],[-52,45],[-16,31],[0,42],[13,67],[-15,131],[10,49],[60,16],[113,1],[68,36],[36,25],[13,50],[-38,17],[-52,33],[-27,43],[-41,59],[-60,45],[-17,69],[17,19],[46,14],[65,-12],[52,-2],[112,29]],[[9640,24252],[60,186]],[[13355,31666],[-977,-1934],[-49,-97]],[[11895,28720],[-1696,-1204]],[[10199,27516],[26,-528],[5,-94]],[[11467,24069],[-70,-27]],[[9700,24438],[5,15],[-101,271],[-145,18],[-16,91],[-134,253],[-14,38],[-82,107],[201,154],[84,66],[-71,188],[180,61],[-49,126],[-95,107],[-226,59],[-5,95],[14,67],[38,64],[-16,52],[-63,76],[-73,107],[-76,-14],[-62,-59],[-12,-46],[-126,21],[-120,-42],[3,-69],[-36,-20],[-82,116],[-87,130],[-424,292],[252,393],[-301,150],[-134,-123],[-140,-96],[-140,-75],[-159,-98],[-82,-78],[-361,-406],[-363,-94],[-15,-183],[-40,5],[-28,-46],[-142,-5],[-125,-105],[-147,-17],[-79,-86],[-69,103],[-79,117],[-30,-14],[-96,211],[-40,66],[-31,50],[-252,-53],[-110,154],[-130,-41],[-66,82],[285,187],[-90,78],[-106,-72]],[[5292,26766],[-113,83]],[[5179,26849],[-191,11],[-29,168],[-76,36],[-79,-25],[-59,-50],[-15,38],[71,67],[348,184]],[[5149,27278],[-240,260]],[[4909,27538],[-67,69],[-284,456],[-307,84],[-212,75],[-309,-315],[-273,390],[-638,440],[-160,101],[-121,414],[-715,93],[-5,216],[-199,-6],[-155,-4],[-185,-5],[-61,64],[-350,58]],[[868,29668],[185,134],[-3,46],[-12,88],[5,116],[-105,84],[61,46],[119,89],[186,133],[101,-16],[191,115],[20,25],[-11,51],[-79,219],[-1,12],[-18,292],[277,555],[12,0],[27,60],[73,138],[427,420],[162,207],[-1,0],[1152,1471],[170,203],[499,580],[732,665],[399,365],[115,75],[1614,1167],[519,365],[1792,1281],[162,122]],[[16680,36245],[639,-259]],[[4909,27538],[240,-260]],[[5179,26849],[113,-83]],[[9700,24438],[-18,-54],[-42,-132]],[[6936,23405],[-101,-50]],[[6748,23274],[-1260,1]],[[4988,22974],[10,25],[-10,33],[-5,20],[-15,35],[-9,22],[2,27],[29,10],[-33,40],[-339,430],[-1746,-7],[-663,853],[-165,211],[-975,1233],[-288,364],[-277,1073],[-493,1863],[-11,179],[109,84],[13,12],[237,71],[120,50],[139,-19],[48,13],[77,9],[75,32],[50,31]],[[14029,6818],[10,-23]],[[14039,6795],[-8,-11],[-16,-11],[-3,-23],[37,-15],[12,-11],[18,-28],[36,-20],[29,-23],[16,-23],[13,-38],[13,-19],[17,-14],[19,-11],[16,-15],[11,-19],[15,-14],[13,-8],[18,-6],[11,-6],[8,-15],[10,-26],[18,-20],[13,1],[24,24],[11,9],[33,7],[25,-1],[19,-18],[7,-18],[-6,-50],[-14,-28],[-2,-24],[3,-16],[11,-10],[13,2],[14,8],[29,12],[17,3],[35,1],[20,-3],[12,-9],[10,-15],[-2,-11],[-9,-18],[-6,-21],[2,-11],[13,-10],[20,2],[21,19],[18,1],[6,-4],[20,-38],[1,-12],[-10,-37],[6,-19],[24,-30],[54,-36],[14,-13],[10,-19],[-11,-11],[-19,4],[-10,13],[-9,2],[-15,-7],[-2,-34],[-9,-7],[-37,1],[-11,-2],[-11,-14],[1,-15],[8,-27],[-13,-21],[-20,-14],[-9,-23],[-6,-10],[-18,-11],[-17,-26],[0,-19],[5,-21],[9,-19],[-1,-14],[-14,-18],[-17,-6],[-8,1],[-17,-6],[-9,-20],[2,-16],[7,-14],[-4,-23],[-11,-12],[-19,-10],[-47,-13],[-16,-8],[-17,-16],[-7,-14],[-2,-36],[-5,-18],[-27,-15],[-24,-5],[-9,-13],[15,-24],[4,-14],[-7,-15],[-30,-15],[-42,-1],[-17,-5],[-11,-14],[-34,-18],[-11,-8],[-14,1],[-26,-4],[-15,-11],[0,-35],[-9,-17],[-14,-4],[-30,8],[-23,0],[-7,-4],[-21,-21],[-14,5],[-16,14],[-14,5],[-29,-2],[-27,-29],[-22,-4],[-33,3],[-24,11],[-19,-6],[-15,-18],[-35,-4],[-20,-15],[-30,-31],[-16,-8],[-15,-1],[-20,-20],[0,-10],[9,-9],[4,-15],[-22,-31],[-12,-21],[0,-21],[-7,-46],[-17,-19],[-18,-5],[-53,1],[-18,-7],[-30,-15],[-34,-3],[-18,1],[-14,5],[-28,-9],[-33,-7]],[[13427,4988],[-15,3]],[[13412,4991],[-19,10],[-20,16],[-7,10],[1,23],[-8,10],[-9,0],[-23,-11],[-19,-2],[-38,-1],[-13,-6],[-30,-25],[-5,-7],[-31,-2],[-20,2],[-11,-5],[-15,-30],[-25,-20],[-23,16],[-16,3],[-27,2],[-25,6],[-36,-3],[-3,-15],[1,-20],[-16,-19],[-14,-2],[-15,5],[-34,23],[-32,7],[-31,-2],[-33,-38],[-15,-7],[-29,4],[-23,0],[-32,-38],[-33,-20],[-17,3],[-6,16],[0,20],[-6,10],[-13,0],[-14,-6],[-15,-43],[-12,-10],[-15,-25],[-22,-4],[-26,5],[-11,-8],[-14,-4],[-13,4],[-38,-1],[-14,-15],[-39,-28],[-22,-17],[-8,-26],[16,-58],[1,-15],[-5,-25],[0,-18],[-3,-23],[-5,-15],[-20,-45],[-17,-27],[-32,-36],[-25,-12],[-25,-6],[-14,-1],[-19,5],[-28,2],[-13,4],[-37,31],[-34,14],[-21,24],[-17,8],[-17,14],[-12,6],[-39,1],[-23,-13],[-47,-50],[-7,-10],[-3,-22],[-13,-19],[-6,-15],[-9,-13],[-18,-13],[-14,-1],[-11,-5],[-11,-15],[-8,-5],[-6,9],[-43,-1],[-17,-9],[-21,-6],[-12,-10],[-29,-31],[-35,-24],[-26,-8],[-27,-22],[-26,-36],[-17,1],[-20,11],[-23,-20],[-21,-31],[-23,-10],[-39,1],[-26,-8],[-7,-26],[-25,-21],[-37,2],[-1,-5],[-22,7],[-33,-24],[-20,-21],[-27,-35],[-37,-58],[-9,-30],[-1,-54],[3,-23],[-1,-36],[-39,-42],[-6,-26],[-12,-37],[-4,-33],[-12,-20],[-29,-27],[-30,-19],[-26,-3],[-16,3],[-21,8],[-15,0],[-14,-12],[-28,-21],[-33,-5],[-39,17],[-25,15],[-27,12],[-39,-24],[-16,-4],[-29,2],[-6,14],[0,19],[-5,7],[-13,-1],[-23,1],[-10,6],[-15,0],[-15,-10],[-15,5],[-8,14],[-9,7],[-18,-4],[-18,-8],[-29,6],[-19,-10],[-12,-13],[-15,-9],[-26,-3],[-15,2],[-15,-15],[7,-12],[-1,-10],[-29,-36],[-14,-33],[-2,-20],[-10,-12],[-20,1],[-27,-39],[-31,-7],[-23,-17],[-31,-8],[-44,9],[-43,-5],[-16,15],[-13,6],[-15,-37],[-18,0],[-16,12],[-24,-2],[-23,-17],[-28,-10],[-13,-12],[-4,-13],[-8,-43],[-11,-22],[-21,0],[-12,11],[-11,21],[-8,9],[-17,0],[-26,-11],[-31,5],[-32,23],[-49,8],[-18,12],[-4,14],[17,17],[8,21],[17,29],[-2,16],[-23,2],[-23,-12],[-19,1],[-11,5],[-12,18],[-22,7],[-20,1],[-18,20],[-36,17],[-17,27],[-11,26],[-13,25],[-34,31],[-8,12],[-3,20],[-6,11],[-29,0],[-17,-3],[-15,-6],[-18,1],[-10,32],[-4,35],[-5,17],[-20,21],[-21,-5],[-20,1],[-9,10],[-9,1],[-13,-10],[-16,2],[-6,8],[-11,-3],[-31,-13],[-4,-19],[-44,-2],[-30,13],[-23,13],[-3,7],[-14,8],[-15,-1],[-28,2],[-13,11],[-19,4],[-27,0],[-18,7],[-15,12],[-8,18],[-14,11],[-46,16],[-24,33],[-12,10],[-38,1],[-23,10],[-19,11],[-10,21],[-2,16],[-17,15],[-9,18],[-28,24],[-22,8],[-11,7],[-62,11],[-15,10],[-16,19],[-26,21],[-24,14],[-22,9],[-53,23]],[[8539,4190],[-43,168]],[[8496,4358],[18,6],[9,10],[0,17],[-5,10],[-12,8],[12,13],[7,24],[21,159],[-19,43],[-21,36],[-8,21],[8,17],[14,8],[20,7],[36,10],[34,7],[60,141],[1,208],[86,93],[6,7],[6,34],[5,10],[24,8],[23,-7],[38,23],[31,34],[39,46],[25,33],[0,12],[14,7],[15,20],[9,28],[-40,14],[-10,12],[-5,14],[0,17],[7,24],[11,13],[36,27],[-3,20],[-6,61],[5,81],[14,72],[0,94],[-4,40],[32,113],[17,85],[116,304],[0,91],[-6,81],[202,96]],[[9358,6710],[367,-76],[68,-17],[31,-3],[26,-7]],[[9850,6607],[10,5]],[[9860,6612],[17,-1],[23,6],[7,-1],[10,-10],[28,-20],[11,-17],[9,-9],[11,-2],[20,3],[295,139],[554,-7],[301,-51],[9,12],[2,10],[14,17],[28,15],[31,11],[25,15],[23,1],[5,15],[59,-1],[11,2],[25,-11],[10,-2],[7,-8],[53,-28],[48,17],[9,-2],[16,5],[11,0],[29,12],[15,3],[19,8],[18,-2],[-4,14],[27,43],[11,6],[8,13]],[[11655,6807],[140,159]],[[11795,6966],[13,15],[8,25],[27,21],[318,-3]],[[12161,7024],[137,-101],[145,-109]],[[12443,6814],[180,66],[60,20],[31,7],[52,19],[24,60],[28,36],[15,10],[26,21],[28,20],[29,26],[50,36],[42,29],[20,10],[16,6],[17,12],[2,9],[15,11],[4,15],[25,13],[17,3],[39,30],[9,14],[22,24],[19,22],[15,13],[55,20],[25,5],[26,12],[25,5],[21,8],[40,10],[21,7],[35,23],[21,12],[32,22],[34,30],[33,31],[4,28],[10,3],[4,-35],[0,-20],[4,-14],[28,-19],[36,-22],[23,-9],[16,-10],[13,-13],[12,-37],[11,-17],[26,-17],[23,-8],[38,-3],[13,-12],[23,-54],[8,-22],[6,-35],[-1,-24],[-9,-26],[-5,-22],[-7,-54],[7,-55],[13,-26],[21,-22]],[[13913,6986],[45,-37],[4,-14],[-1,-17],[3,-9],[16,-8],[12,-2],[9,-8],[4,-16],[5,-30],[19,-27]],[[17089,6814],[84,-305],[-44,-991]],[[17129,5518],[-443,-573]],[[16686,4945],[402,-415],[54,-77],[676,-941],[-23,-35],[-19,-2],[-30,-22],[6,-21],[-17,-18],[-2,-36],[-12,-16],[-10,-4],[-9,-9],[-13,-21],[-11,-31],[-37,-9],[-17,-12],[0,-24],[13,-13],[4,-22],[-19,-11],[-9,-19],[-13,-6],[-12,-13],[-38,-9],[-6,-11],[-7,-22],[-16,-19],[-3,-21],[-6,-18],[-15,-19],[-27,-13],[-21,-14],[-8,-11],[-15,-12],[-11,-2],[-23,-15],[-19,-19],[-67,-12],[-53,4],[-27,0],[-32,-4],[-30,-7],[-61,-19],[-40,2],[-29,-11],[-25,-13]],[[17009,2903],[-21,-9]],[[16988,2894],[-18,-11],[310,-566]],[[17280,2317],[73,-138],[398,-740]],[[17751,1439],[-8,-10],[3,-16],[9,-17],[0,-23],[7,-19],[-3,-19],[-2,-28],[-8,-16],[-30,-18],[-23,-2],[-33,11],[-10,7],[-7,27],[-11,23],[-15,12],[-20,8],[-20,-6],[-1,-32],[-17,-21],[-49,-33],[-2,-8],[23,-32],[3,-17],[-5,-6],[-30,-4],[-16,-36],[-19,-9],[-19,5],[-35,0],[-20,-3],[-30,-32],[-8,0],[-11,15],[-26,-2],[-11,-6],[-10,-24],[-9,-14],[-3,-23],[10,-10],[10,-17],[0,-13],[-6,-8],[-27,-7],[-11,-7],[-3,-26],[8,-15],[1,-17],[-20,-6],[-21,5],[-13,-1],[-21,-17],[-71,1],[-20,6],[-1,16],[-5,13],[-20,22],[-8,17],[-5,21],[-7,10],[-14,1],[-23,-4],[-17,2],[-9,6],[-13,21],[-13,6],[-13,-5],[-16,-1],[-9,-7],[-4,-10],[3,-17],[-11,-4],[-7,-9],[8,-9],[13,-5],[-2,-29],[29,-33],[3,-10],[-11,-9],[-21,-4],[-30,2],[-24,-4],[-41,-33],[-23,-11],[-44,27],[-15,3],[-25,-1],[-11,-9],[-5,-11],[-2,-20],[2,-12],[9,-22],[-5,-9],[-11,-4],[-48,-5],[-14,4],[-37,-1],[-39,-11],[-11,-1],[-13,8],[-27,10],[-20,1],[-23,-10],[-14,3],[-23,14],[-13,4],[-12,-9],[-6,-26],[-8,-8],[-12,-2],[-27,1],[-11,11],[-6,14],[-12,15],[-7,1],[-20,12],[-8,-1],[-11,-14],[-27,-6],[-7,-7],[-5,-15],[-8,-11],[-19,-10],[-32,-6],[-12,-6],[-9,-19],[11,-32],[-3,-13],[-7,-6],[-25,-1],[-20,16],[-25,7],[-10,9],[-31,15],[-21,0],[-6,-6],[-4,-14],[2,-22],[41,-27],[4,-6],[-6,-21],[-7,-11],[-9,-3],[-14,-13],[-1,-11],[-10,-13],[-15,-13],[-7,-11],[3,-16],[11,-2],[51,-3],[11,-10],[8,-18],[2,-14],[-27,-33],[-16,-12],[-14,-6],[-11,0],[-40,16],[-5,7],[6,9],[17,2],[-1,8],[-16,8],[-16,-3],[-21,3],[-19,-6],[-30,-4],[-11,-7],[-12,-12],[-2,-20],[4,-17],[-7,-17],[-15,-5],[-20,-14],[-13,2],[-16,8],[-16,-1],[-11,-9],[-9,-12],[1,-12],[-12,-3],[-15,13],[-26,5],[-13,-5],[-30,6],[-19,-7],[-20,5],[-8,17],[-5,22],[-7,18],[-15,22],[-32,16],[-18,17],[-7,18],[13,32],[2,29],[-3,12],[-15,20],[-26,20],[-18,24],[-13,23],[-9,10],[-37,15],[-25,26],[-9,5],[-46,15],[-12,8],[-13,27],[-25,13],[-17,2],[-17,9],[-8,9],[-9,24],[-20,31],[-33,-4],[-48,5],[-34,6],[-14,4],[-24,3],[-17,-2],[-18,-11],[-19,13],[-15,13],[-2,12],[-18,26],[-8,6],[-37,6],[-8,7],[-5,29],[-1,27],[-7,31],[7,39],[-1,27],[-10,28],[5,23],[6,12],[3,18],[5,5],[11,23],[-9,27],[-7,10],[-31,16],[-17,11],[-16,15],[-4,7],[-29,15],[-23,2],[-23,8],[-20,2],[-21,18],[-8,0],[-15,-14],[-18,-5],[-24,-1],[-25,16],[-21,17],[-23,9],[-7,9],[9,21],[-13,43],[-8,21],[0,15],[-6,10],[4,13],[23,9],[-4,17],[-16,-2],[-9,5],[-2,27],[-15,3],[2,22],[-7,12],[2,9],[18,16],[1,11],[-18,13],[-8,16],[0,21],[-3,14],[6,12],[-8,14],[5,8],[15,5],[8,7],[-5,9],[15,10],[-2,10],[17,4],[2,11],[-13,12],[5,13],[15,18],[-4,26],[-12,-15],[-22,-12],[-26,-27],[-6,-3],[-29,8],[-8,-3],[-24,-15],[-25,-1],[-21,5],[-11,-4],[-3,-12],[5,-9],[12,-9],[-1,-13],[-17,-15],[-47,9],[-20,-6],[-20,-26],[-21,-6],[-22,-11],[-12,-2],[-42,5],[-21,-11],[-5,-11],[11,-17],[2,-17],[-4,-14],[-21,-22],[-7,-24],[-12,-14],[-39,-18],[-14,-13],[-4,-17],[9,-25],[-6,-16],[-8,-12],[-11,-5],[-34,-2],[-17,-8],[-49,-12],[-40,-2],[-23,8],[5,13],[11,6],[0,22],[-15,22],[-12,5],[-32,1],[-10,6],[-15,14],[-12,-14],[-3,-21],[-12,-13],[-6,-19],[-19,-18],[-10,-16],[-3,-16],[-30,-14],[-22,-12],[-9,-15],[6,-17],[12,-9],[22,-24],[18,-36],[3,-16],[-3,-10],[-38,-16],[-8,-17],[3,-7],[19,-25],[9,-24],[9,-4],[33,-6],[3,-5],[-9,-22],[-16,-10],[-10,-15],[-28,-20],[-9,-12],[1,-11],[-11,-6],[-14,-2],[-6,-5],[9,-14],[-2,-8],[-17,-2],[-6,-25],[-6,-6],[-19,0],[-17,6],[-8,-11],[0,-21],[-11,-11],[-14,-1],[-20,4],[-12,-4],[-27,-27],[-24,8],[-14,-2],[-27,-13],[-14,1],[-21,11],[-8,1],[-19,-9],[-6,-18],[-26,8],[-15,-3],[-46,-6],[-41,-18],[-38,-23],[-34,2],[-13,8],[-9,1],[-20,-12],[-26,-25],[-4,-9],[8,-16],[-7,-9],[-15,-3],[-9,-10],[-16,-8],[-17,-4],[-16,-16],[-30,-3],[-15,-7],[-9,8],[-13,-1],[-14,-13],[-5,-1],[-12,-29],[3,-10],[-10,-9],[-25,1],[-14,-6],[-14,-2],[-14,-6],[-16,-10],[-24,2],[-29,-3],[-17,11],[-22,11],[-18,-1],[-10,4],[-19,-2],[-8,13],[0,9],[-10,3],[-25,1],[-31,-6],[-21,-10],[-7,-8],[-12,-3],[-13,-12],[-11,-21],[-1,-7],[-21,-10],[-10,-14],[-17,-12],[-22,4],[-11,-3],[-14,7],[-25,4],[-12,-5],[-21,-2],[-17,4],[-9,-2],[-3,-12],[-15,-1],[-3,-13],[-11,-5],[-19,15],[-18,-10],[-19,15],[-16,2],[-21,-9],[-8,12],[-11,-1],[-12,-11],[-20,4],[-14,-1],[-20,-13],[-36,1],[-26,-7],[-10,0],[-8,-7],[-31,-14],[-27,-2],[-7,-8],[-5,-16],[-13,2],[-20,-2],[-3,-5],[-32,-21],[-13,-16],[-3,-15],[-7,-9],[3,-14],[-3,-21],[-8,-12],[6,-21],[-12,-10],[9,-18],[1,-13],[-11,-15],[-8,1],[-22,-9],[-4,6],[-13,1],[-12,-3],[-6,-15],[-15,-7],[-13,4],[-3,-7],[11,-5],[-13,-13],[8,-9],[-16,-11],[-11,-19],[-28,-10],[-12,0],[-32,-22],[-9,-3],[-12,-12],[-6,-19],[-11,-5],[-29,-4],[-10,6],[-14,-10],[-1,-12],[-6,-10],[-15,8],[-24,-6],[-20,-7],[-29,2],[-22,-3],[-12,-4],[-20,-1],[-14,3],[-27,-2],[-11,-7],[-23,0],[-28,-8],[-12,-20],[-16,-4],[-12,-9],[-20,-5],[-14,-10],[-10,2],[-33,-19],[-47,-3],[-25,-8],[-28,-13],[-38,-4],[-10,-4],[-27,-20],[-8,5],[-47,4],[-37,-1],[-21,-6],[-27,-26],[-8,-2],[-21,4],[-22,-1],[-40,3],[-21,-16],[-10,-1],[-12,22],[-7,5],[-15,24],[-23,13],[-13,0],[-14,14],[-12,0],[-15,13],[-17,1],[-12,-5],[-29,6],[-18,-16],[-11,-13],[-6,3],[-7,20],[-29,2],[-9,11],[-7,2],[-1,14],[7,10],[-14,13],[-27,1],[-7,3],[-27,28],[-3,18],[-20,22],[-10,30],[-26,36],[11,7],[-3,25],[-22,2],[-807,-25],[-199,57],[-16,10],[29,18],[28,7],[3,5],[-3,12],[25,39],[21,-3],[13,8],[12,18],[36,24],[9,3],[7,20],[10,12],[23,18],[12,5],[15,-1],[10,7],[3,20],[15,16],[25,7],[23,34],[7,13],[-2,7],[-29,26],[6,45],[24,4],[27,35],[9,5],[8,17],[0,35],[12,6],[8,18],[-6,19],[2,20],[-6,8],[-12,0],[-9,13],[7,7],[19,2],[5,19],[23,15],[-1,15],[7,20],[10,4],[4,12],[0,23],[10,25],[-16,5],[-6,8],[1,18],[5,8],[-10,36],[3,13],[3,30],[8,9],[-22,13],[13,64],[-3,5],[-16,7],[-2,13],[9,13],[7,25],[18,19],[7,2],[-22,58],[-374,79],[-11,6],[-6,10],[-238,354],[-199,503],[-78,186],[11,182],[-157,298],[-425,819],[-160,304]],[[8276,4122],[38,23],[52,3],[56,23],[117,18]],[[8539,4189],[0,1]],[[13412,4991],[15,-3]],[[14039,6795],[-10,23]],[[13913,6986],[66,27],[63,-22],[36,-4],[42,-9],[47,2],[86,15],[51,10],[72,19],[73,19],[53,31],[71,18],[76,3],[190,-47],[31,-17],[-10,-15],[-9,-20],[9,-40],[25,-22],[19,-8],[15,2],[48,2],[65,-43],[346,-119],[996,-65],[173,30],[542,81]],[[19068,8972],[13,0],[14,-19],[6,-3],[3,-17],[9,-3],[29,-3],[11,-6],[6,-28],[0,-13],[23,-21],[4,-19],[0,-19],[11,-10],[13,-7],[14,-34],[20,-16],[6,-12],[173,-350],[543,-72]],[[19966,8320],[319,-595],[35,-65]],[[20320,7660],[896,-292],[38,-16],[110,-11],[94,-22],[176,-14],[90,-6],[126,-24],[24,-4],[96,-10],[50,0],[39,-3],[77,-1],[-10,-59],[-22,-44],[-28,-42],[-92,-127],[-77,-114],[-19,-30],[-96,-118],[-80,-87],[-40,-34],[-84,-12],[-38,-9],[-137,-40],[-93,-33],[-76,-74],[-33,-40],[-13,-10],[-17,-37],[0,-12]],[[21181,6335],[6,-123]],[[21187,6212],[2,-40],[13,-54],[17,-49],[23,-38],[4,-42],[38,-104],[5,-18],[26,-17]],[[21315,5850],[9,-17]],[[21324,5833],[6,-25],[69,-87],[44,-30],[30,-30],[15,-43],[2,-93],[-13,-28],[-25,-83],[-6,-16],[-10,-54],[-5,-18],[1,-175],[-2,-48],[15,-68],[23,-52],[10,-60],[21,-82],[29,-75],[40,-67],[53,-20],[19,-4],[27,-20],[15,-9],[29,1],[15,-8],[21,-19],[29,-69],[17,-77],[7,-99],[2,-77],[50,-155],[27,-3],[0,-33],[25,-22],[7,-66],[22,-17],[14,-31],[22,-29],[15,-25],[22,-4],[12,-16],[15,-13],[21,-30],[19,-18],[25,-6],[14,-17],[3,-39],[4,-28],[19,-48],[0,-25],[-7,-20],[12,-25],[12,-16],[7,-19],[0,-34],[-11,-15],[-4,-18],[-16,-50],[-23,-17],[-11,-26],[-10,-6]],[[22087,3427],[164,-993],[-53,-2],[-842,-38],[-107,-44],[-127,-71],[-201,-108],[-29,-17],[-39,-19],[-893,98],[-33,5],[-9,-1],[-33,9],[-17,-1],[-24,-10],[-19,-21],[-8,-14],[-23,-2],[-16,14],[-19,25],[-18,11],[-16,4],[-32,2],[-29,8],[-38,-7],[-20,-11],[-19,-18],[-1,-24],[3,-15],[17,-19],[-6,-16],[-15,-9],[-4,-14],[-19,-20],[-10,-15],[-7,-3],[-30,12],[-29,-3],[-26,-8],[-15,-22],[-10,-10],[-25,-19],[-28,-14],[-14,-2],[-26,30],[-15,4],[-37,-3],[-39,-20],[-12,-15],[-22,-41],[-9,-8],[-34,-9],[-4,5],[-4,23],[-5,8],[-10,6],[-16,16],[-28,9],[-10,-3],[-23,-17],[-14,-5],[-28,-4],[-1,-6],[16,-20],[-1,-14],[-19,-30],[-2,-17],[10,-18],[6,-19],[-2,-19],[-17,5],[-25,19],[-24,3],[-10,-14],[-1,-28],[-22,-38],[-8,-13],[-23,-8],[-17,2],[-10,6],[-24,36],[-11,6],[-23,5],[-19,22],[-26,9],[-12,26],[-13,9],[-32,10],[-21,0],[-11,-9],[-12,-44],[-7,-7],[-12,-3],[-29,12],[-14,0],[-14,-9],[-1,-7],[28,-21],[1,-11],[-14,-24],[-17,-10],[-31,-2],[-16,3],[-4,13],[12,26],[-6,13],[-14,3],[-49,-21],[-21,-15],[2,-11],[10,-8],[19,-10],[1,-10],[-14,-8],[-13,-1],[-32,29],[-16,6],[-12,-1],[-9,-7],[6,-33],[0,-22],[4,-14],[-1,-22],[-8,-7],[-13,-2],[-16,11],[-24,33],[-10,8],[-11,-3],[0,-26],[-10,-9],[-18,-8],[-15,0],[-29,22],[-15,7],[-13,1],[-10,-4],[-15,-12],[-20,-25],[-17,-13],[-13,-4],[-29,12],[-22,-8],[-7,-8],[1,-42],[-6,-9],[-38,-17],[-33,8],[-21,11],[-29,8],[-30,0],[-16,-8],[2,-42],[2,-17],[-5,-12],[-13,-11],[-14,-5],[-45,5],[-17,1],[-4,-18],[-12,-20],[5,-15],[-3,-7],[-21,7],[-15,-11],[-5,-25],[-20,4],[-12,-1]],[[17751,1439],[-471,878]],[[16988,2894],[21,9]],[[16686,4945],[443,573]],[[17089,6814],[28,31],[384,352],[-667,422],[713,495]],[[17547,8114],[-41,380]],[[17506,8494],[154,106],[3,25],[-23,14],[-7,12],[-25,13],[-4,10],[0,19],[-5,18],[-29,21],[-8,14],[-11,4],[-28,0],[-14,5],[-1,22],[-14,-13],[-5,9],[10,22],[-5,4],[-17,-3],[-24,8],[7,23],[-9,19],[0,19],[-9,15],[-30,36],[0,9],[196,85],[15,6],[19,11],[35,18],[44,42],[19,-18],[12,-7],[17,16],[30,3],[6,-12],[14,-9],[22,14],[14,-4],[26,-22],[14,-5],[24,-4],[30,-15],[36,11],[27,-4],[12,-5],[26,23],[24,24],[14,-13],[14,12],[26,9],[0,15],[53,22],[25,27],[10,-4],[32,2],[5,13],[18,3],[23,10],[9,-13],[34,4],[6,-14],[30,-3],[19,-14],[8,4],[15,-1],[11,9],[13,-3],[1,8],[16,13],[22,12],[13,18],[33,-9],[10,7],[17,22],[17,-1],[34,19],[22,-3],[20,6],[31,16],[41,-10],[24,2],[25,0],[19,-9],[4,-27],[10,-20],[6,-19],[8,-11],[0,-19],[15,-32],[9,-7],[35,-5],[3,-11],[32,3],[17,0],[42,-4],[35,-1],[19,-13],[14,-25],[6,-16],[3,-17],[18,-26],[8,-7]],[[12053,13883],[23,-13]],[[12439,13909],[28,-18]],[[12964,11561],[9,-9],[10,0],[12,-12],[12,-2],[-1,-19],[9,-12],[25,-1],[5,-8],[2,-18],[18,-25],[-16,-2],[0,-12],[7,-8],[12,-3],[7,-9],[-2,-25],[-20,3],[7,-17],[-5,-7],[-11,-1],[2,-15],[11,-6],[6,-14],[-8,-17],[12,-14],[-2,-29],[-13,-26],[15,-13],[-7,-10],[3,-16],[-28,-11],[1,-7],[14,-9],[6,-17],[-21,-23],[0,-12],[-10,-9],[3,-12],[25,0],[11,-8],[-3,-27],[21,-11],[0,-7],[-14,-12],[10,-7],[8,-16],[-3,-21],[4,-18],[-7,-11],[-8,0],[-14,-26],[-3,-13],[8,-5],[-50,-224],[-432,-656]],[[12581,10052],[-919,-761]],[[11662,9291],[-134,-32],[-85,7],[-141,90],[-19,102],[-70,40],[-52,7],[-99,-50],[-53,59],[-62,3],[-27,3]],[[10920,9520],[-24,12]],[[10896,9532],[-259,-293]],[[10637,9239],[-19,-42],[-15,-108],[-9,-55],[-16,-29],[-61,-39],[-18,-21],[-23,-42],[-22,-44],[-3,-37],[-48,-120],[-9,-63],[-9,-16],[-441,-396],[-55,-56],[-31,-57],[-1,-12],[-8,-10],[-26,-24],[-15,10],[-2,5],[-18,9],[-11,-4],[-23,-16],[-18,-35],[-11,-4],[-10,-33],[-15,-28],[-16,-10],[-16,-23],[-9,-18],[-15,-7],[-20,-26],[-24,-25],[-23,-47],[-6,0]],[[9571,7816],[-10,-13]],[[9561,7803],[-1,-15],[-15,0],[0,-11],[-19,-2],[-10,-37],[-22,-16],[-11,0],[-21,-36],[-11,-5],[0,-14],[-25,-27],[-7,-36],[-2,-30],[-6,-10],[-3,-18],[-15,1],[-8,6],[-6,-16],[2,-15],[-11,-2],[-13,-24],[-11,-14],[-15,-41],[-12,-11],[-22,3],[-10,-13],[0,-10],[-14,-8],[-17,2]],[[9256,7404],[-3,8],[-80,33],[-308,124],[-960,503]],[[7905,8072],[-161,305]],[[7744,8377],[49,244],[4,270]],[[7797,8891],[-97,132]],[[7700,9023],[-165,142],[82,108],[-198,162],[-272,149],[-22,13],[-126,-80],[-43,-52],[-168,-83],[-597,1],[4,28],[16,23],[-8,19],[8,12],[1,16],[-7,19],[-13,21],[-11,43],[9,11],[15,9],[0,19],[15,32],[-12,23],[2,31],[7,7],[0,23],[11,15],[6,29],[-15,29],[-15,89],[-11,19],[-1,28],[-4,26],[-15,12],[16,13],[6,23],[0,41],[-3,20],[6,28],[5,10],[-1,11],[-21,14],[-22,6],[-4,11],[1,18],[-12,9],[15,16],[-4,15],[-13,9],[-27,3],[3,23],[-1,21],[-14,16],[-38,2],[99,92],[48,36]],[[6212,10403],[22,31]],[[6234,10434],[723,209],[184,-62],[39,-4],[138,0],[12,-3],[24,-22],[84,-59],[20,2],[181,67],[17,6],[6,8],[9,31],[6,32],[11,13],[10,7],[15,2],[52,14],[96,19],[125,-34],[24,0],[62,20],[18,7],[52,-9],[12,-9],[11,-15],[142,16],[563,-126],[231,-112],[495,73],[626,137],[135,29],[28,10],[0,11],[-28,19],[-21,21],[-22,27],[-13,8],[-38,15],[-23,17],[-40,17],[-9,2],[-11,12],[-25,15],[-15,5],[-33,2],[-12,3],[-15,10],[-12,21],[-12,11],[-27,7],[-45,-9],[-24,8],[-9,12],[-3,23],[-11,21],[-19,17],[-35,15],[-20,2],[-24,-6],[-28,0],[-22,18],[-7,24],[-6,10],[-34,15],[-19,3],[-39,11],[-14,11],[-10,33],[-20,16],[-18,-2],[-21,-14],[-8,-8],[-28,-11],[-6,2],[-6,22],[0,21],[-7,23],[-14,10],[-25,23],[-22,27],[-6,4],[-27,-5],[-6,7],[-20,4],[-12,33],[-22,29],[-13,13],[-16,23],[-22,24],[-5,2],[-9,25],[-26,42],[-11,41],[-14,29],[-21,21],[-19,25],[-37,20],[-35,8],[-21,24],[-20,15],[-29,16],[-11,8],[-7,14],[3,27],[-3,13],[-18,32],[-13,8],[-23,22],[-36,26],[-23,10],[-40,23],[-27,23],[-32,30],[-33,49],[-25,20],[-16,19],[-15,9],[-32,13],[-31,15],[-33,9],[-15,-3],[-25,0],[-29,12],[-1,24],[13,35],[0,10],[-23,20],[-28,13],[-15,11],[-11,22],[-4,21],[-9,22],[-24,27],[-19,48],[-8,44],[-2,33],[-6,35],[-13,38],[-45,66],[-14,25],[-20,20],[-16,1],[-15,5],[-25,32],[-9,18],[-10,40],[-12,38],[-13,24],[-23,28],[-62,56],[-35,27],[-21,10],[-13,12],[-20,7],[-25,14],[-28,10],[-23,-1],[-45,19],[-24,21],[-36,20],[-22,15],[-25,20],[-16,16],[-12,18],[-6,17],[-3,28],[0,50],[-3,27],[-6,28],[0,31],[3,34],[14,25],[27,31],[11,17],[6,27],[11,25],[-3,30],[-19,68],[-13,32],[-18,25],[-15,16],[-16,31],[-10,23],[-13,53],[-9,28],[-9,25],[-6,26],[-7,18],[-13,15],[-24,21],[-22,13],[-19,23],[-58,78],[-14,27],[-4,30],[-24,42],[-36,38],[-12,18],[-17,32],[-15,32],[-13,45],[-13,56],[15,70],[5,34],[6,17],[8,9],[43,26],[18,15],[10,17],[10,22],[4,35],[-1,26],[-26,105],[-14,59],[-9,31],[-15,34],[-12,37],[-10,23],[-41,49],[-14,11],[-10,13],[-2,15],[2,18],[-3,31],[-10,12],[-50,34],[-6,12],[-2,17],[7,12],[19,13],[4,16],[-4,12],[-17,14],[36,16],[13,8],[63,-6],[13,5],[40,29],[25,3],[19,-3],[9,11],[10,23],[9,12],[-4,17],[-5,42],[-6,15],[9,13],[20,12],[8,17],[-4,19],[8,10],[16,11]],[[7700,9023],[97,-132]],[[7744,8377],[154,-293],[7,-12]],[[9256,7404],[4,-11],[17,-8],[-16,-25],[20,-19],[12,-16],[0,-22],[-5,-5],[0,-21],[8,-21],[0,-13],[11,-16],[5,-34],[-7,-15],[3,-26],[10,-24],[1,-23],[11,-12],[8,-19],[7,-8],[-18,-19],[-5,-11],[8,-26],[-11,-10],[-5,-21],[-4,-55],[9,-14],[5,-37],[-10,-54],[0,-26],[5,-11],[19,-6],[12,-23],[8,-33],[0,-10]],[[8496,4358],[43,-169]],[[8276,4122],[-57,108],[-73,136],[-40,78],[-13,20],[-8,7],[-27,9],[-33,17],[-27,18],[-7,10],[-27,52],[-9,39],[-18,35],[-12,19],[-38,42],[-7,45],[-10,95],[-9,7],[-31,15],[-38,24],[-66,53],[-50,54],[-3,8],[2,35],[-7,31],[-18,8],[-56,20],[-47,20],[-71,21],[-28,20],[-22,8],[-20,1],[-33,-3],[-20,-6],[-14,-8],[-19,2],[-14,5],[-36,30],[-23,5],[-78,4],[-47,-7],[-29,3],[-6,13],[6,44],[10,18],[1,12],[16,26],[5,47],[-3,8],[-13,17],[-15,16],[-28,24],[-29,13],[-37,4],[-34,13],[-30,33],[-17,5],[-25,-2],[-25,-13],[-27,1],[-30,-1],[-10,5],[-54,34],[7,10],[39,27],[14,12],[6,13],[-8,11],[-57,31],[6,11],[-4,8],[-23,3],[16,22],[1,9],[-17,-3],[-12,7],[-2,7],[-5,34],[-8,10],[-24,5],[-16,9],[-21,2],[-19,15],[-12,0],[-13,-12],[-9,5],[-3,11],[-12,9],[-12,-5],[-25,-26],[-11,1],[-12,11],[-18,3],[-13,-7],[1,-25],[-8,-6],[-9,8],[-16,3],[-38,-9],[-1176,773],[-412,235],[-42,22],[-9,18],[-13,49],[-24,43],[-12,14],[-24,30],[-22,48],[-5,17],[-12,14],[-40,18],[-20,12],[-59,26],[-26,3],[-8,4],[-11,13],[-19,17],[-33,20],[-41,16],[-9,8],[-21,28],[-25,29],[-26,10],[-13,10],[-5,14],[-11,14],[-50,37],[-33,11],[-16,2],[-48,39],[11,5],[8,13],[-16,21],[-17,4],[-6,14],[3,24],[10,15],[11,9],[7,14],[-7,14],[6,8],[19,1],[14,5],[4,10],[-7,27],[22,5],[5,8],[3,23],[11,33],[18,37],[8,35],[-4,22],[-13,73],[-18,15],[-30,11],[-110,35],[-17,12],[-5,9],[-21,63],[-14,25],[-40,48],[-23,34],[-16,31],[-16,33],[-17,5],[-14,-6],[-79,-27],[-16,-3],[-10,-9],[-30,-8],[-29,5],[-33,26],[-48,52],[-38,48],[-29,31],[-26,41],[-5,30],[0,30],[-98,76],[-15,29],[-5,15],[-13,-15],[-15,-4],[-20,1],[-17,6],[-11,14],[-2,23],[-8,16],[-8,7],[-18,6],[-3,13],[3,12],[-12,9],[-10,30],[-19,20],[-30,15],[-40,33],[-20,28],[-28,17],[-33,-4],[-47,3],[-39,20],[-29,18],[-25,17],[-15,14],[-8,11],[-8,42],[-20,48],[-15,25],[-17,17],[-14,3],[-31,2],[-29,14],[-20,27],[-15,10],[-9,12],[-51,47],[-47,63],[-24,16],[-5,29],[-6,22],[-22,8],[-38,17],[-34,13],[-55,2],[-8,6],[-23,3],[-115,87],[8,41],[216,325],[26,27],[219,171],[96,69],[69,50],[94,64],[13,12],[28,51],[164,296],[136,364],[3,29],[1318,-2],[133,-26],[813,-153],[537,-95]],[[6234,10434],[-22,-31]],[[28796,12925],[-238,-914]],[[28558,12011],[268,-86],[2,-13],[16,-6],[-4,-34],[9,-15],[8,-26],[12,-28],[-8,-7],[-27,13],[-5,-4],[5,-23],[-4,-24],[13,-6],[20,11],[-3,-13],[-37,-21],[5,-26],[-5,-21],[-13,-24],[3,-15],[8,-15],[-13,-16],[-14,11],[-11,0],[-9,-8],[-22,-5],[-9,-13],[-6,-47],[-9,-10],[-13,5],[-7,-2],[4,-29],[26,4],[16,-1],[10,-8],[-8,-10],[-23,1],[-8,-3],[-6,-10],[-10,-6],[-11,2],[-17,-14],[-24,-9],[-9,-7],[2,-10],[11,-7],[15,-4],[43,-2],[13,-5],[9,-10],[-4,-14],[-18,-8],[-16,2],[-14,15],[-14,-5],[-4,-21],[-4,-11],[-19,-3],[-15,2],[-1,-8],[13,-24],[17,-21],[26,-47],[-1,-36],[10,-17],[5,-16],[-11,-16],[-19,3],[-14,14],[-5,-23],[-11,-9],[-22,-7],[-9,0],[-7,13],[0,20],[-13,-15],[-6,-28],[-2,-25],[4,-26],[-8,-12],[-18,-11],[-16,-1],[-10,9],[-10,-2],[-11,-14],[-8,-6],[-20,13],[-9,-11],[-6,-12],[3,-11],[193,-335],[157,-259],[-15,41]],[[28809,10493],[1341,-3654]],[[30150,6839],[7,-23]],[[30157,6816],[-21,23],[-14,8],[-18,-1],[-32,-20],[-7,-12],[-24,-27],[-30,-5],[-23,19],[-12,13],[-23,5],[-22,-7],[-28,-19],[-23,-25],[-13,-3],[-14,-22],[-24,-8],[-26,0],[-6,13],[-21,15],[0,35],[-24,4],[-13,-8],[-27,-26],[-17,-7],[-15,3],[-14,-2],[-10,-9],[-15,-4],[-40,0],[-19,5],[-8,18],[-26,0],[-39,9],[-20,1],[-29,-28],[-7,-17],[-33,1],[-21,7],[-13,-7],[-9,-9],[-14,1],[-20,-11],[-18,-3],[-19,7],[-10,10],[-22,-4],[-36,-14],[-12,-26],[-23,-10],[-14,-14],[-22,5],[-24,-2],[-30,-26],[-10,-10],[-15,3],[-4,14],[9,15],[-14,7],[-13,-5],[-10,-18],[-13,3],[-10,12],[-14,-5],[14,-23],[-14,-3],[-31,-1],[-35,6],[-7,20],[-18,-5],[-6,-19],[-18,-13],[-17,1],[-11,-11],[-16,4],[-17,-7],[-36,2],[-23,4],[-16,5],[-15,9],[-22,4],[-10,-12],[-6,-15],[-23,1],[-19,-2],[-17,7],[-3,18],[5,15],[-37,2],[-21,3],[-2,17],[-24,-3],[-42,-9],[-51,-9],[-14,4],[-15,-3],[-6,10],[-12,-8],[-4,-19],[-9,-25],[-29,-16],[-14,6],[-19,2],[-13,8],[-6,18],[-14,3],[-11,-9],[-6,-15],[-11,-12],[-24,3],[-19,14],[-2,19],[-4,12],[-17,5],[-16,-9],[-18,-24],[7,-14],[-14,-5],[-17,10],[-13,13],[-7,-11],[-2,-15],[-10,-16],[-16,-6],[-13,9],[-20,-3],[-9,-13],[-13,-10],[-15,-8],[-16,6],[-17,11],[-29,-2],[-34,7],[22,27],[2,13],[-11,15],[-19,7],[-14,2],[-10,-8],[-3,-16],[-13,-3],[-21,4],[-32,-8],[-14,11],[-23,-3],[1,16],[7,15],[-19,-1],[-11,-8],[-18,-7],[-29,17],[-17,-5],[-12,-10],[-11,-35],[-20,-5],[-22,11],[-15,14],[-21,4],[-17,13],[-15,2],[-24,15],[-17,-3],[-18,-30],[-17,-11],[8,-12],[-3,-12],[-24,10],[-21,4],[-13,12],[-26,8],[-23,-14],[-44,-10],[-31,-9],[-18,-6],[-21,-4],[-14,2],[-15,-4],[-16,1],[-44,9],[-47,6],[-33,9],[-26,2],[-14,7],[-4,13],[0,19],[-9,20],[-19,1],[-36,-12],[-21,4],[-20,6],[-58,2],[-26,-2],[-38,4],[-17,-2],[-20,1],[-13,-6],[-38,-11],[-35,-6],[-31,-7],[-27,-12],[-16,-17],[-16,-12],[-23,-3],[-39,-1],[-34,-12],[-52,4],[-24,0],[-42,-7],[-32,-7],[-28,-4],[-35,2],[-41,8],[-14,5],[-6,12],[-5,18],[-20,7],[-35,-11],[-12,-9],[-4,-24],[0,-19],[-13,-6],[-32,13],[-15,-23],[9,-4],[-1,-9],[-17,-1],[-20,7],[-16,2],[-10,-3],[-10,-18],[-11,5],[-23,2],[-19,10],[-11,0],[-7,-5],[-31,-5],[-26,-18],[-8,-12],[1,-10],[-10,-16],[-6,-3],[-28,0],[-4,-13],[-22,-3],[-20,13],[-14,1],[-19,-5],[-14,-11],[-8,0],[-13,-10],[-14,-37],[-5,-22],[0,-29],[-13,-15],[-8,3],[-14,-5],[-3,-33],[-10,4],[-14,-3],[-11,4],[-12,-11],[-12,-27],[-24,-4],[0,-22],[-13,-5],[-20,6],[-23,15],[-15,6],[-13,-13],[-22,-6],[-23,3],[-26,-9],[-19,-3],[-6,-15],[-19,1],[-17,-23],[6,-23],[-7,-20],[-10,0],[-12,-8],[-4,-10],[1,-20],[-23,2],[-15,10],[-31,3],[-23,-11],[2,-14],[7,-3],[24,-2],[-2,-14],[-31,2],[0,-14],[-17,2],[-6,-7],[1,-20],[-28,3],[-12,-13],[-20,0],[-8,-2],[-4,-25],[1,-16],[19,-33],[-26,-17],[10,-28],[17,2],[11,-3],[2,-12],[7,-12],[21,-3],[12,5],[18,20],[14,10],[27,9],[15,2],[21,-2],[31,-11],[12,-12],[6,-24],[-2,-34],[-6,-29],[-2,-16],[1,-24],[7,-18],[10,-15],[16,-16],[12,-7],[13,-2],[19,2],[13,5],[16,19],[20,9],[33,1],[23,-4],[23,-11],[21,-18],[8,-16],[-1,-31],[4,-13],[11,-11],[32,-16],[14,-10],[15,-14],[22,-18],[22,-8],[35,-3],[23,-6],[40,-18],[44,-12],[17,-11],[6,-9],[8,-26],[13,-23],[27,-20],[12,-21],[25,-28],[22,-16],[35,-9],[31,-18],[18,-8],[15,-15],[30,-10],[33,1],[26,2],[25,-9],[22,-21],[33,-11],[20,-14],[12,-12],[5,-13],[5,-23],[10,-13],[34,-26],[20,-12],[19,-8],[6,-20],[-4,-7],[-46,-16],[-39,-23],[-18,-13],[-41,-39],[-32,-5],[-14,-13],[-2,-9],[-11,-13],[-14,-6],[-27,-1],[-15,4],[-8,-11],[16,-23],[1,-24],[-6,-23],[-9,-16],[-14,-19],[-46,-46],[-25,-17],[-7,-15],[-2,-18],[6,-19],[2,-21],[-9,-19],[-5,-2],[-6,-22],[-12,-8],[8,-8],[-3,-13],[-7,-4],[8,-17],[-17,-19],[-11,-17],[3,-16],[-9,-11],[17,-7],[-2,-9],[-8,-6],[-8,7],[-1,-26],[-6,-4],[-28,1],[-3,-15],[-8,-12],[-11,-4],[-4,10],[-15,-5],[9,-11],[-5,-6],[-25,5],[4,10],[-25,1],[1,-22],[-30,-4],[-2,8],[-11,8],[-4,-17],[-26,-12],[0,14],[-12,-5],[-15,6],[-6,-8],[2,-11],[-10,-4],[1,-11],[21,-2],[21,-14],[-28,-7],[2,-13],[9,-4],[-5,-11],[8,-15],[-25,2],[-6,5],[-9,-8],[2,-11],[-4,-13],[-18,20],[-12,-5],[6,-12],[-3,-12],[-12,4],[-22,-2],[15,-21],[-2,-7],[-16,-6],[3,-28],[-3,-16],[-13,1],[-20,-16],[-13,11],[-13,6],[-8,-7],[7,-7],[1,-9],[-15,-16],[-13,6],[-13,-2],[-1,-9],[-11,-5],[1,-13],[-10,-3],[-11,4],[-14,-15],[-12,-2],[-3,-8],[13,-4],[-11,-13],[-10,-4],[16,-9],[-18,-14],[-6,9],[-14,-2],[5,-9],[-7,-26],[4,-11],[-9,-10],[-6,16],[-23,-8],[-3,-10],[-12,-12],[24,-20],[-1,-8],[-10,-9],[0,-13],[-12,4],[-13,-6],[1,-12],[8,-8],[18,-7],[13,2],[3,-15],[-21,-1],[-3,-5],[13,-19],[0,-5],[-14,-16],[-26,3],[0,-12],[-11,-1],[-4,13],[-7,5],[-20,-13],[10,-19],[-5,-16],[-8,1],[-18,-5],[7,-10],[-8,-7],[-15,-2],[0,-10],[-8,-8],[-7,-24],[-10,-5],[-26,11],[-14,1],[-8,6],[-6,-7],[6,-9],[1,-18],[-12,-15],[-15,2],[10,11],[-11,3],[-30,-9],[16,-19],[-1,-6],[-23,-3],[0,-12],[15,-5],[-1,-12],[-10,-5],[-20,7],[-25,-1],[-2,14],[-12,-2],[-14,10],[-12,-10],[-8,3],[6,-24],[-3,-9],[4,-17],[11,-16],[-10,-20],[5,-13],[-11,-12],[-11,-19],[-11,-8],[-4,-31],[-13,-3],[-6,-12],[-21,-24],[-2,-17],[-7,-12],[-39,-16],[-15,-14],[-14,-21],[-12,-4],[-14,-9],[-18,-6],[-4,-16],[-18,-18],[-9,-4],[-3,-12],[-34,-5],[-22,-6],[-5,-13],[-54,-25],[-26,3],[-12,-8],[-14,-3],[-20,-11],[-54,-13],[-36,-2],[-44,-9],[-27,-17],[-21,-4],[-32,-12],[-23,-11],[-17,-4],[-19,-1],[-38,-15],[-33,-10],[-11,-10],[-9,-3],[-13,-9],[-8,-18],[-27,2],[-2,-10],[-16,-22],[-28,-19],[-10,-15],[-25,-28],[-1,-35],[-24,-27],[-2,-9],[-19,-15],[-4,-12],[-21,-8],[-16,-33],[-8,-22],[-10,-17],[-2,-12],[-15,-28],[6,-27],[3,-32],[4,-14],[-4,-12],[8,-23],[-3,-12],[8,-10],[-5,-13],[2,-17],[-3,-9],[6,-38],[-2,-19],[-12,-19],[-16,-7],[-19,-2],[-9,-10],[-10,-39],[2,-17],[-5,-14],[-13,0],[-12,-15],[-16,0],[-37,-7],[-36,-7],[-10,-9],[-30,-17],[-23,-4],[-31,2],[-18,-2],[-33,0],[-47,-18],[-164,-7],[-136,-6],[-128,6],[-128,-8],[-63,-2],[-65,-9],[-65,-4],[-91,-3],[-40,-3],[-61,-2],[-70,3],[-32,-3],[-61,-3],[-29,-4],[-72,-4],[-196,-9],[-65,0],[-76,-4],[-164,994]],[[21324,5833],[-9,17]],[[21187,6212],[-6,123]],[[20320,7660],[-312,580],[-42,80]],[[19068,8972],[46,48],[98,112],[75,206]],[[21624,12216],[-2,-17]],[[7927,19203],[-17,-9]],[[7583,19058],[-11,-1],[-7,28],[4,4],[-14,10],[-17,3],[-38,-6],[-26,4],[-17,5],[-25,14],[-22,17],[-7,9],[-7,17],[-15,24],[-27,21],[-7,15],[13,9],[21,5],[13,-1],[21,-9],[9,2],[9,12],[4,28],[10,19],[1,11],[-11,30],[-2,11],[-14,25],[-16,18],[-52,17],[-12,13],[-8,28],[4,36],[6,31],[-10,10],[-8,20],[-11,15],[-16,10],[-33,17],[-21,7],[-40,8],[-17,1],[-19,-4],[-23,-20],[-9,-18],[-9,-33],[-9,-24],[-19,-11],[-25,-2],[-75,13],[-28,9],[-46,40],[-38,31],[-46,19],[-41,34],[-30,39],[-34,40],[-34,25],[-26,5],[-28,19],[-13,13],[0,24],[5,10],[11,7],[23,6],[34,16],[24,18],[6,16]],[[6944,19906],[183,53],[110,32]],[[36696,27430],[89,81]],[[36785,27511],[15,23],[96,28],[66,17],[35,25],[12,14],[12,26],[13,16],[23,19],[22,15],[16,22],[2,18],[-2,25],[8,15],[25,33],[10,43],[26,52],[10,32],[38,56],[0,21],[-5,15],[-21,34],[-6,19],[52,-17]],[[37232,28062],[126,-30]],[[37358,28032],[124,-29],[95,-6],[41,5],[8,-5],[34,-4],[20,0],[33,11],[19,9],[8,9],[29,-20],[31,-16],[35,3],[44,22],[29,21],[3,6],[29,-11],[85,-79],[83,-26],[313,1],[146,-42],[458,-117],[910,-243],[222,-87],[-58,-62],[-6,-105],[56,-64],[205,-67],[134,-65],[149,-165]],[[40637,26906],[-95,-94],[-234,-304],[12,-9],[23,-21],[14,-16],[22,-15],[40,-13],[17,-24],[2,-12],[7,-8],[16,-7],[6,-13],[8,-7],[19,-7],[9,-20],[5,-42],[20,-15],[1,-31],[-5,-18],[-18,-20],[-16,-33],[-9,-9],[-25,-15],[-5,-16],[33,-39],[15,-25],[1,-20],[8,-12],[32,-26],[14,-30],[27,-12],[9,-10],[-10,-25],[1,-27],[26,-34],[12,-10],[35,-45],[19,-32],[17,-20],[21,-13],[24,-12],[18,-5],[26,-11],[30,-16],[2,-32],[11,-14],[24,-16],[14,-14],[4,-12],[0,-14],[9,-9],[14,-7],[10,-13],[21,3],[28,-2],[15,-8],[11,-12],[0,-15],[-6,-24],[-8,-18],[-22,-31],[-15,-30],[-1,-19],[-5,-18],[20,-18],[4,-31],[6,-21],[-7,-10],[-5,-16],[2,-28],[-10,-19],[-12,-29],[15,-15],[4,-34],[18,-23],[12,-4],[7,-10],[15,-4],[15,-10],[5,-22],[21,-32],[-1,-27],[3,-15],[8,-10],[14,-8],[5,-19],[22,-12],[16,-1],[11,-7],[18,-1],[12,-4],[14,-17],[17,-8],[27,-22],[3,-8],[11,-12],[29,-50],[0,-36],[10,-34],[19,-30],[0,-13],[-14,-1],[-19,-6],[2,-33],[-11,-8],[-42,-19],[-25,-15],[-15,-37],[-54,-26],[1,-12],[12,-15],[-2,-22],[-13,-9],[-19,-3],[-17,2],[-22,-2],[-18,-16],[-11,-23],[-39,-33],[-8,-14],[2,-23],[-13,-5],[-26,-2],[-19,-5],[-10,-14],[-17,-38],[-15,-12],[-22,-11],[-17,-6],[-48,-23],[-7,-31],[-3,-52],[-14,-14],[-32,-23],[-28,-49],[-12,-9],[-41,-14],[-16,-19],[-7,-19],[-3,-22],[-10,-27],[-27,-20],[-6,-16],[-12,-14],[-22,-8],[-23,-3],[-54,-21],[-18,-2],[-40,14],[-31,5],[-22,-4],[-20,-8],[-20,-12],[-18,-17],[-7,-11],[-4,-21],[-10,-18],[-15,-9],[-24,-1],[-27,2],[-22,-3],[-28,-13],[-18,-3],[-22,-1],[-39,7],[-25,1],[-34,5],[-16,-6],[-30,-19],[7,-27],[2,-15],[-5,-28],[-11,-29],[-12,-14],[-29,-16],[-24,-5],[-17,-7],[-12,-9],[-28,-28],[-8,-20],[-11,-15],[-11,-12],[-18,-13],[-18,-8],[-21,-5],[-23,-1],[-18,-8],[-38,-8],[-10,-20],[-9,-28],[-11,-10],[-12,-5],[-28,-22],[-17,-18],[0,-17],[15,-37],[20,-16],[1,-7],[-10,-40],[-13,-11],[-44,-14],[-9,-8],[-7,-17],[-14,-22],[-44,-35],[-25,-25],[-12,-25],[-2,-18],[-6,-20],[-21,-27],[-11,-26],[-5,-31],[-18,-34],[-5,-36],[-5,-21],[-15,-39],[-15,-26],[-20,-27],[-5,-26],[-7,-8],[-16,-14],[-6,-16],[-20,-62],[-15,-24],[-8,-30],[-9,-13],[-10,-22],[-8,-55],[4,-10],[-4,-9],[-26,-24],[-18,-20],[-21,-15],[-55,-20],[-37,-20],[-9,-26],[1,-33],[8,-11],[31,-20],[16,-3],[24,-14],[17,-23]],[[39137,22374],[-39,-47],[-147,-13],[-44,-36],[-48,-52],[-7,-11],[-78,-59],[-90,15],[-75,55],[-46,11],[-80,7]],[[38483,22244],[-149,52]],[[38334,22296],[-80,-24],[-126,-5],[-51,75],[-25,53],[-43,63],[-97,68],[-90,6],[64,77],[54,88],[49,67],[57,124],[-261,206],[1,7],[14,18],[20,41],[9,46],[1,34],[-14,33],[-12,13],[5,9],[0,28],[7,23],[2,27],[30,43],[1,15],[-9,27],[-3,24],[-9,14],[-4,15],[7,9],[28,1],[6,17],[23,16],[14,16],[2,16],[11,36],[22,13],[18,26],[-2,22],[-6,17],[-24,37],[-21,8],[-11,8],[3,37],[14,27],[11,16],[10,9],[16,23],[12,9],[1,25],[-13,23],[-3,34],[-6,18],[-30,16],[-45,9],[-49,-12],[-7,-14],[-27,-1],[-48,-8],[-56,-14],[-43,-15],[-25,-3],[-45,-20],[-56,-8],[-28,-1],[-45,12],[-16,11],[-17,-3],[-11,-16],[-23,-3],[-28,-14],[-14,-5],[-33,-21],[-21,0],[0,-14],[-27,-7],[-15,-12],[-13,8],[-16,-17],[-30,-2],[-12,-8],[-16,-2],[5,71],[-47,22],[-20,50],[-159,4],[-151,-2],[-79,-8],[-21,-8],[-111,-37],[-768,156],[-19,39],[-7,21],[-8,3],[-20,25],[-34,49],[-32,38],[-31,24],[-15,5],[-103,-13],[-28,7],[-28,15],[-37,16],[16,-28],[19,-43],[11,-29],[10,-24],[28,-27],[27,-8],[23,-15],[16,-43],[0,-10],[-47,-22],[-36,-8],[-17,-12],[-27,-9],[-35,-4],[-47,-18],[-19,6],[-15,-1],[-31,-36],[-40,-12],[13,-13],[22,-10],[15,-21],[0,-14],[-9,-6],[-72,-15],[-17,0],[-19,-5],[-36,4],[-28,-6],[-33,-27],[-19,-7],[-32,-19],[-19,-31],[-6,-16],[-18,-13],[-55,9],[-21,-10],[-90,-7],[-433,41],[-104,-18],[-41,-52],[-97,-49],[-150,-46],[-231,-149],[-14,-14],[-2,-53],[-35,-55],[-129,-3],[1,-19],[8,-5],[-9,-39],[0,-26],[-8,-17],[-26,-17],[-3,-16],[9,-14],[15,-11],[16,-3],[4,-15],[25,-10],[10,-13],[0,-13],[15,-9],[9,-22],[8,-9],[28,-9],[53,-4],[47,5],[38,-2],[19,-5],[8,-7],[8,-23],[6,-28],[-4,-15],[20,0],[21,9],[17,3],[35,-4],[32,-16],[54,3],[13,-1],[20,-18],[11,-4],[28,-4],[11,-9],[16,0],[7,-6],[17,-3],[20,5],[15,-2],[8,-9],[23,0],[23,-4],[16,-16],[32,-6],[3,-10],[18,-2],[4,-21],[30,-11],[37,-27],[12,-15],[2,-26],[17,-15],[41,-12],[20,-15],[6,-8],[42,-13],[26,-5],[28,-12],[35,-27],[12,-22],[7,-20],[-5,-23],[19,-27],[19,-23],[3,-12],[16,-26],[0,-21],[5,-12],[-3,-31],[8,-6],[3,-25],[13,-32],[4,-17],[8,-15],[21,-26],[4,-22],[5,-14],[17,-9],[16,-4],[-12,-21],[-26,-15],[-20,-6],[-23,-12],[2,-15],[-3,-17],[-42,-32],[-14,-13],[-23,-16],[-37,-7],[-25,0],[-22,6],[-20,3],[-62,-21],[-20,0],[-38,-15],[-22,-15],[-22,-11],[-23,-15],[-17,-4],[19,-19],[19,-8],[32,-7],[21,-12],[14,-3],[37,-23],[35,-3],[2,-29],[-11,-21],[-5,-31],[-15,-32],[3,-20],[-23,-34],[37,-26],[25,-9],[27,-4],[101,-82],[56,-100],[-42,-154],[-30,-43],[-52,-65],[-17,-32],[54,-7],[129,-18],[32,-10],[47,-27],[83,-35],[95,-24],[91,-28],[87,-1],[91,-4],[52,-5],[161,6],[82,4],[11,-14],[9,-17],[16,-16],[39,-17],[31,-25],[16,-19],[35,-3],[113,-22],[274,-91],[-90,-101],[-119,-121],[-81,-68],[-134,-102],[-45,-55],[-82,-42],[-18,-54],[55,-133],[7,-16],[33,-91],[11,-73],[46,-74],[54,-83],[74,-80],[-6,-55],[5,-50],[-1,-93],[14,-71],[-29,-51],[30,-108],[32,-63],[-53,-76],[-53,-87],[-15,-62],[-751,-1326]],[[35008,17814],[-2791,1256],[-52,28],[-248,124],[-229,115]],[[31688,19337],[-1106,-39]],[[30582,19298],[-200,-8],[17,-29],[-29,-15],[0,-47],[-8,-43],[35,-69],[-32,-87],[-35,-3],[-134,66],[-63,-42],[-49,16],[-89,-50],[-68,16],[13,45],[-35,19],[8,46],[-13,56],[29,15],[-11,37],[-31,31],[-16,19]],[[31856,25132],[-2,339],[-1,226]],[[31665,26977],[-1113,493]],[[30563,28080],[99,66],[98,78],[81,79],[162,141],[197,224],[86,107],[46,66],[11,28],[4,16],[16,13],[9,23],[59,51],[69,15],[43,21],[32,-1],[46,17],[3,51],[35,44],[75,2],[10,16],[15,2],[-1,35],[42,47],[31,64],[67,33],[54,10],[84,-14],[55,-14],[47,23],[79,-41],[48,29],[67,-24],[35,10],[28,-7],[60,-8],[30,-11],[28,8],[24,-20],[41,8],[52,-3],[32,33],[26,-8],[29,44],[101,59],[38,-21],[30,16]],[[32886,29387],[85,-18]],[[32971,29369],[63,12],[31,-14],[11,18],[96,11],[10,7],[73,-32],[118,-20],[117,-18],[146,-66],[99,-23],[62,5],[114,-41],[34,2],[8,-9],[49,-69],[63,-26],[21,0],[28,13],[132,-109],[91,0],[57,-81],[106,-14],[158,-233],[-30,-26],[55,-165],[88,-163],[105,-83],[123,-152],[72,-104],[41,-54],[83,-31],[12,6],[121,-52],[102,-35],[68,0],[85,-25],[111,-36],[135,-95],[105,-74],[181,-105],[168,-91],[101,1],[10,-45],[221,20],[81,57]],[[30582,19298],[673,24],[433,15]],[[35008,17814],[321,-134],[-9,-431],[1562,260]],[[36882,17509],[213,35],[2050,337]],[[39145,17881],[101,-39],[17,-27],[75,-32],[63,-60],[796,-133],[1406,-2877]],[[41603,14713],[-7,4],[-20,-2],[-10,2],[-13,-3],[-10,8],[-9,-4],[-18,4],[5,-11],[-14,-7],[-8,-19],[-1,-13],[-9,-13],[-12,-6],[-31,-1],[-13,4],[-19,-1],[-9,-6],[-43,-13],[-9,-5],[-13,-18],[-39,-29],[-24,-20],[-22,-12],[-36,5],[-26,12],[-37,17],[-31,5],[-12,-14],[-14,-2],[-13,-10],[-9,-11],[-20,0],[-7,23],[-14,-4],[7,-13],[-7,-3],[-20,9],[-1,-18],[-14,3],[0,-14],[-15,0],[-7,14],[-16,12],[-13,-2],[-11,-9],[-4,11],[-10,0],[-4,-13],[-11,-9],[-5,11],[-12,-13],[-14,12],[-23,-7],[-12,0],[-4,-14],[-13,13],[-5,1],[-13,-14],[-14,5],[-7,-17],[-18,-2],[-4,-26],[-8,1],[-13,-7],[-46,-2],[-30,-3],[-12,7],[-4,8],[13,3],[2,10],[9,6],[-7,8],[-9,-6],[-6,10],[-15,2],[-13,-6],[-3,-15],[-9,6],[3,9],[-3,11],[7,9],[-12,7],[7,7],[-8,6],[-18,-1],[-13,-10],[-17,17],[6,12],[-11,6],[-6,-8],[1,-13],[-11,3],[-9,15],[11,15],[-11,7],[-10,-14],[-8,5],[6,12],[-10,3],[-20,-5],[-11,14],[-3,-13],[-12,6],[-8,-3],[-1,17],[-17,-3],[10,-14],[-10,-10],[-24,3],[-10,-17],[-11,2],[-4,11],[-17,-4],[-5,-10],[-13,-5],[6,-17],[-6,-12],[-8,1],[-3,9],[-16,-7],[-9,6],[-3,15],[-10,-11],[3,-9],[-18,1],[-12,-2],[-10,3],[-9,-12],[9,-11],[-9,-3],[-29,0],[-9,-6],[-4,10],[-19,10],[-1,12],[-13,8],[10,7],[-11,9],[-12,3],[-17,14],[6,14],[-19,10],[-12,-5],[-11,8],[-10,-6],[-19,2],[-14,-7],[-19,-19],[-20,6],[-17,1],[-15,-3],[-20,-13],[-3,-14],[-24,-5],[10,-21],[-13,-13],[-17,-6],[10,-24],[-8,-4],[-23,2],[-4,-4],[5,-14],[-35,8],[-12,0],[-3,10],[-11,0],[-7,-7],[-17,0],[-1,-21],[-26,-26],[-16,-1],[12,-10],[-11,-8],[5,-11],[-16,1],[-7,10],[-13,2],[-3,13],[-10,14],[-10,-11],[-19,-16],[0,-8],[12,-10],[-21,-3],[-16,9],[-19,0],[-24,-12],[-18,1],[-18,8],[-49,-1],[-28,14],[-5,-9],[5,-10],[-13,-6],[2,-9],[9,-1],[4,-16],[-9,-8],[10,-19],[-10,-7],[-13,6],[-16,-5],[-7,-9],[-14,-12],[-4,-13],[-17,-3],[-18,5],[-20,3],[-21,19],[-5,-12],[-15,-14],[-11,-17],[4,-8],[13,-1],[-6,-15],[-19,-14],[-28,-8],[-16,-11],[-7,-8],[-24,-1],[-21,-5],[-15,24],[-23,8],[-16,0],[-18,11],[-23,6],[-17,-11],[6,-6],[3,-24],[-25,-18],[-19,19],[-3,-6],[-12,1],[-35,-29],[5,-10],[-26,-15],[-5,-12],[6,-15],[-17,-17],[13,-8],[-7,-11],[5,-10],[-11,-6],[-5,11],[-18,-7],[-15,-28],[-13,-2],[-14,-16],[-6,4],[-42,-5],[-4,-10],[0,-18],[3,-24],[-5,-15],[10,0],[7,-11],[-4,-6],[16,-4],[7,-13],[-1,-31],[-20,-4],[3,-11],[-27,3],[-3,-19],[12,-11],[1,-12],[-18,-6],[0,-8],[11,-5],[-5,-17],[22,-11],[-15,-17],[22,-11],[-5,-13],[4,-8],[11,-3],[-11,-13],[3,-14],[-14,-1],[-11,-16],[6,-15],[-6,-4],[-4,-22],[-10,-10],[18,-13],[12,-26],[-2,-39],[-12,-15],[10,-17],[-13,-12],[3,-13],[6,-5],[-3,-9],[-10,-2],[-2,-28],[-13,-17],[-13,-10],[-16,-16],[-10,4],[-7,-7],[-9,3],[-11,-4],[3,-10],[-2,-9],[-12,-10],[-11,5],[-8,11],[-6,-22],[-17,-1],[-7,-10],[-11,-4],[-12,7],[-3,16],[15,14],[-6,7],[-26,6],[-6,11],[3,8],[-17,8],[-13,0],[-14,-8],[-12,-16],[-4,-24],[13,-22],[-2,-11],[-14,-10],[0,-16],[-6,-8],[-1,-12],[5,-10],[3,-25],[8,-17],[-5,-17],[4,-11],[-3,-18],[-17,-8],[-18,-25],[10,-5],[1,-29],[-4,-12],[8,-15],[6,-43],[22,-15],[2,-14],[-13,-5],[-4,-27],[-5,-20],[-17,-5],[-4,-9],[9,-3],[9,-14],[1,-7],[14,-9],[-19,-12],[-1,-13],[3,-19],[-8,-1],[-6,17],[-13,-9],[-24,-1],[4,-18],[-4,-11],[14,-4],[-1,-9],[-13,-18],[-7,-20],[-10,-3],[8,-17],[-1,-13],[9,-18],[-8,-9],[5,-24],[25,-11],[8,-19],[18,-13],[21,-8],[2,-18],[14,-13],[11,-4],[33,-5],[10,-6],[1,-11],[18,0],[3,-8],[-6,-17],[-9,-1],[7,-31],[25,-2],[14,-7],[-1,-10],[7,-6],[-3,-16],[-10,-4],[-4,-23],[-9,-12],[-10,-7],[-2,-12],[9,-13],[11,5],[20,-14],[3,7],[34,-1],[31,-5],[8,-8],[-6,-15],[-9,-1],[0,-9],[-11,-1],[-18,-19],[-18,-26],[-9,-7],[-37,-15],[-13,-12],[-6,-14],[0,-14],[-22,-8],[-15,5],[-4,-15],[-11,-7],[8,-19],[-10,-2],[3,-10],[-9,-7],[5,-15],[15,-3],[6,-11],[-20,-9],[2,-8],[10,-9],[-8,-4],[-2,-16],[-13,-16],[-15,-1],[-17,13],[-1,15],[-17,-13],[-2,-19],[2,-38],[20,-23],[27,-17],[15,-13],[2,-9],[-2,-14],[-6,-8],[21,-7],[-2,-7],[-32,-31],[-21,-29],[-12,-3],[-6,-12],[-16,-7],[-3,-8],[-25,-5],[-9,-20],[12,-15],[-12,-8],[-14,-22],[-26,-7],[-16,5],[-11,12],[-12,-12],[-12,-2],[-10,4],[-13,-3],[-12,-7],[-10,20],[-17,-7],[-13,3],[1,-10],[-9,-14],[-12,-2],[12,-16],[18,-17],[7,-13],[-1,-7],[-11,-13],[-15,2],[-13,-6],[-11,0],[-10,-6],[-25,-5],[-9,-14],[10,-11],[15,2],[20,-3],[14,-29],[10,-1],[12,-17],[-5,-12],[-10,-4],[-26,-2],[-19,-5],[-28,-5],[-19,-1],[-15,-5],[-22,24],[-5,0],[-8,-16],[6,-10],[-12,-4],[-10,12],[-17,-2],[-2,-13],[8,-10],[-13,-6],[-25,5],[-26,21],[-21,-5],[-19,-14],[-1,-19],[-17,-11],[-22,-8],[-13,-12],[-21,1],[-2,-8],[-15,-9],[-10,3],[-11,-8],[-19,-6],[-7,16],[-28,18],[-8,0],[-19,-9],[-11,-13],[-5,8],[-17,2],[-10,-8],[-8,3],[-15,-13],[-10,0],[-20,17],[-10,19],[-22,18],[0,15],[-13,12],[-9,2],[-6,-13],[-6,2],[-16,-7],[-4,-12],[-32,-6],[-13,-10],[-21,-6],[-33,-41],[-9,-16],[6,-22],[-7,-14],[-13,-7],[-12,-13],[-23,-2],[-10,-10],[-28,0],[-10,9],[-11,-1],[2,-39],[-10,-27],[5,-15],[10,-16],[-6,-16],[-6,-6],[-22,15],[-8,-14],[-9,7],[-11,2],[1,9],[-17,-5],[-12,-22],[-16,-13],[-16,-7],[10,-8],[-3,-15],[16,-3],[-1,-14],[-19,-23],[-1,-15],[-15,-18],[-29,-19],[-21,-5],[-3,6],[-24,-2],[-13,-9],[5,-21],[11,-5],[4,-9],[12,-10],[-3,-5],[11,-11],[-4,-27],[-10,-12],[-4,-16],[9,-14],[12,-2],[1,-11],[-12,-11],[-21,6],[-20,-14],[-19,-6],[-8,-10],[-6,-21],[-2,-14],[23,-24],[4,-18],[-11,-26],[-21,-22],[-19,7],[-16,-3],[-14,7],[-25,-2],[-21,-18],[-6,-12],[-34,-39],[-9,-28],[5,-17],[21,-34],[-22,-3],[-15,-14],[-15,-4],[-14,-30],[-1,-44],[-2,-12],[-13,-12],[-23,-6],[-4,-13],[-38,-4],[-15,1],[-5,-18],[-7,-6],[-17,-2],[-6,5],[1,17],[-13,10],[-9,1],[-11,-7],[-6,-18],[5,-11],[-7,-28],[-9,-26],[-15,-20],[-11,-3],[-42,3],[-26,12],[-10,12],[7,18],[-11,5],[-18,-13],[-17,-7],[-14,3],[-7,12],[-13,13],[2,19],[27,8],[-16,12],[-12,-6],[-31,8],[-16,1],[-9,-4],[2,-20],[-5,-16],[-18,-23],[-13,-8],[-9,11],[-18,4],[-11,12],[-8,-7],[-14,10],[-10,20],[15,12],[-23,13],[-10,-6],[-20,11],[-13,-2],[-10,9],[-12,1],[-1,15],[-10,17],[-12,2],[-35,-12],[-20,-19],[-5,-11],[-2,-20],[6,-17],[11,-8],[-8,-11],[-33,1],[7,-11],[-12,-8],[-3,-15],[-19,-17],[-37,-24],[-17,2],[-11,-3],[-23,3],[-7,-2],[-11,-10],[-16,-6],[5,-37],[-4,-7],[4,-8],[-5,-11],[-15,-15],[-12,18],[-12,-3],[1,-13],[-12,-18],[-3,-31],[-4,-7],[4,-14],[9,0],[9,-16],[15,-9],[0,-9],[-27,-21],[8,-5],[-9,-9],[-22,-11],[-11,0],[-2,-10],[-12,-7],[-12,9],[-9,-12],[-13,-13],[-5,17],[-25,-2],[-17,-7],[-1,-19],[-10,-21],[-31,0],[-13,-5],[-7,-9],[-21,-8],[-16,0],[-1,-16],[-15,-13],[-16,-21],[-23,-4],[-13,-9],[1,-23],[-31,-37],[-31,-24],[-27,-10],[-6,-12],[0,-23],[12,-3],[10,-19],[-10,-1],[-16,-10],[-23,-2],[0,-7],[-9,-10],[8,-20],[14,-11],[2,-15],[19,-22],[-1,-15],[-23,-6],[-5,-10],[-20,-11],[-14,-22],[-36,-17],[-47,-11],[-18,-8],[-12,3],[-11,-3],[-12,-8],[-5,-14],[-11,-9],[-32,-34],[-12,-3],[-13,3],[-24,12],[-36,11],[-9,20],[16,11],[-1,7],[-12,14],[-12,0],[-11,-5],[-49,-13],[-22,-13],[-13,-10],[-13,-16],[-4,-25],[4,-13],[8,-12],[16,6],[14,-7],[9,10],[10,-2],[10,-11],[-17,-7],[-4,-8],[21,-4],[16,-23],[5,-25],[-15,-9],[-16,11],[-6,-7],[-4,-13],[-11,-11],[-2,-10],[-12,-3],[-11,3],[-29,-5],[-16,2],[-22,15],[-25,23],[-10,12],[-5,14],[1,23],[-3,6],[-32,17],[-23,-5],[-28,2],[-15,-13],[-12,-8],[0,-12],[39,-43],[23,-21],[10,-19],[6,-24],[7,-13],[14,-10],[33,-10],[14,-25],[-1,-14],[-11,-14],[-12,2],[-43,20],[-31,4],[-11,-2],[-10,-7],[-11,-29],[8,-12],[13,-10],[40,-5],[20,0],[17,-8],[5,-13],[-6,-13],[-18,-13],[-33,-3],[-28,5],[-6,-8],[15,-25],[17,-10],[30,-8],[12,0],[19,7],[11,-12],[-7,-14],[-22,-12],[-28,1],[-34,16],[-30,27],[-14,-5],[14,-21],[0,-25],[30,-1],[10,-4],[26,-19],[7,-16],[-5,-18],[-9,-11],[-10,-6],[-18,-4],[-22,1],[-28,5],[-29,13],[-17,-2],[-6,-6],[0,-11],[18,-18],[23,-7],[20,0],[20,4],[39,-1],[10,-8],[3,-19],[-3,-10],[-33,-32],[-5,-17],[-9,-8],[-14,0],[-78,32],[-22,1],[-26,-3],[-14,-11],[-1,-18],[-4,-10],[1,-20],[15,-37],[17,-27],[-10,-33],[3,-26],[0,-23],[-4,-22],[-11,-17],[-1,-9],[-15,-1],[-10,3],[-16,15],[-9,14],[-19,17],[-12,4],[-19,-1],[-17,-16],[0,-26],[3,-22],[0,-16],[-10,-20],[-17,-10],[-36,2],[-6,-8],[4,-19],[35,-10],[-2,-16],[2,-41],[-6,-21],[-6,-7],[-17,-2],[-23,17],[-11,16],[-11,22],[1,10],[-8,7],[-16,-13],[-6,-11],[-10,-31],[-6,-10],[-20,-3],[-43,25],[-9,1],[-14,-13],[-8,-46],[-7,-14],[-17,-14],[-20,-8],[-11,-11],[-2,-11],[28,-60],[-23,-3],[-6,-5],[-27,1],[-24,7],[-24,10],[-15,-1],[-14,-8],[-24,-28],[-20,-28],[-20,-41],[-4,-16],[7,-16],[15,-22],[-15,-5],[3,-18],[-4,-50],[-36,-6],[-8,17],[-13,16],[-15,9],[-32,6],[-15,16],[10,3],[-1,10],[-34,-9],[-12,-10],[1,-14],[-10,-4],[-12,7],[-8,-1],[-10,-14],[2,-7],[15,-7],[0,-10],[-13,-5],[-8,7],[-13,-4],[-2,7],[-18,3],[6,-19],[-6,-2],[-41,16],[-3,-5],[-15,-4],[0,-24],[3,-9],[16,-16],[3,-18],[-2,-9],[-10,-8],[-12,-1],[-8,-10],[8,-7],[1,-12],[-8,-5],[-11,8],[-33,-9],[-6,8],[-15,0],[2,-11],[-21,2],[-13,13],[-13,2],[-15,-13],[-4,-7],[-28,0],[-7,17],[-13,3],[-15,-12],[-16,15],[-8,12],[-20,-2],[-10,-27],[-15,2],[-14,-11],[5,-17],[-16,-9],[-8,2],[5,13],[-5,8],[-5,18],[-11,-11],[-12,-2],[-23,1],[-4,9],[-23,11],[-40,-16],[-20,10],[-33,-28],[-8,-12],[-8,-38],[-12,-13],[-18,-9],[-1,-17],[17,-16],[-5,-11],[-12,-3],[-9,-13],[4,-15],[-8,-14],[0,-14],[15,-20],[18,-5],[-8,-9],[-15,-1],[-7,-7],[3,-9],[-8,-8],[-21,-14],[2,-5],[13,-6],[16,0],[-6,-12],[11,-7],[1,-6],[-18,-12],[14,-10],[-2,-21],[-12,-7],[-21,-16],[-51,12],[-29,11],[-15,-1],[-8,-10],[-13,-2],[-11,13],[-10,-3],[-7,-10],[-19,16],[-22,1],[-18,-5],[-7,-7],[-15,-3],[-6,14],[3,15],[-25,47],[-31,9],[-8,16],[-22,-16],[-2,-11],[-10,4],[-14,-7],[-11,7],[-14,-8],[8,-15],[-30,-3],[-21,15],[-29,4],[-10,9],[-1,18],[-9,8],[-8,-5],[-1,-15],[-12,-6],[11,-9],[-8,-9],[-13,6],[-4,10],[-19,-4],[-6,13],[-17,4],[-6,-4],[-14,-26],[-16,-4],[0,-23],[-3,-10],[13,-12],[9,-22],[-15,-8],[-1,-16],[2,-21],[-6,-5],[-23,-5],[-8,1],[-21,18],[-10,-4],[-5,-10],[-10,0],[-10,16],[-14,-13],[11,-13],[-13,-4],[-16,12],[-18,-22],[-16,7],[-4,-32],[6,-9],[15,-14],[0,-13],[19,-36],[11,-5],[4,-14],[18,-12],[0,-14],[7,-27],[18,-7],[3,-9],[-11,-17],[4,-14],[19,-4],[6,-5],[-5,-25],[4,-13],[12,-4],[5,-9],[-4,-16],[-7,-4],[-20,5],[-30,2],[-20,5],[-18,-3],[-12,12],[-9,3],[-31,-15],[-8,-20],[-33,-38],[-8,-6],[-38,11],[-15,-1],[-3,-13],[3,-21],[-15,-21],[10,-25],[-20,-11],[0,-20],[-16,-10],[1,-17],[-4,-22],[-15,-25],[7,-12],[-9,-12],[-36,-26],[1,-16],[-3,-9],[-13,-1],[-13,7],[-23,-9],[-14,-11],[-23,2],[-3,16],[-8,9],[-32,2],[-23,-12],[-21,1],[-24,-6],[-15,-6],[-3,4],[8,19],[-16,-1],[-9,-12],[-25,-13],[-10,-1],[-6,-15],[-10,-13],[-4,-10],[-19,-1],[-27,-8],[-14,9],[-2,-9],[14,-9],[-14,-10],[1,-14],[-7,-31],[-12,-4],[-21,-14],[-19,3],[-24,9],[-16,-6],[-8,1],[-19,14],[-19,-1],[6,17],[-13,15],[-22,10],[-19,-7],[-7,-24],[-17,-10],[-31,2],[-18,-2],[-17,-14],[-21,-4],[-14,5],[-8,7],[-7,21],[-7,7],[-19,-3],[-41,-21],[-32,3],[-22,-3],[-11,2],[-10,6],[-27,1],[-9,9],[-27,7],[-8,-2],[-19,14],[-18,10],[1,10],[10,13],[-1,10],[-27,2],[1,18],[-9,10],[-12,3],[-20,-13],[-20,-1],[-18,12],[-19,6],[-16,16],[-8,12],[-11,6],[-23,-1],[-16,-17],[-30,-9],[-6,-5],[2,-38],[-14,-6],[-13,-13],[-14,9],[-30,-1],[-15,-10],[-6,5],[5,10],[-2,8],[-25,0],[-13,-5],[-8,-9],[-23,17],[-9,-2],[-12,-15],[-18,1],[-10,-5],[-21,5],[-26,0],[-8,-5],[-18,-2],[-16,7],[-6,-7],[-1,-14],[-17,1],[-6,10],[4,17],[11,9],[-6,15],[-24,7],[-12,-11],[-8,5],[-22,-6],[-13,5],[-11,9],[0,23],[-2,9],[-9,5],[-27,8],[-10,6],[-25,-7],[-17,1],[-9,-6],[5,-16],[21,-9],[3,-18],[-1,-27],[-7,-5],[-24,-6],[-12,-10],[-11,-14],[-31,2],[-48,23],[-14,12],[-14,18],[-17,7],[-17,-10],[-15,8],[-11,1],[-19,-9],[-6,-17],[9,-18],[-9,-12],[-26,-8],[-10,-6],[-8,-18],[-16,2],[-4,21],[-14,9],[-8,0],[-45,-18],[-10,-8],[2,-37],[-2,-13],[15,-10],[27,2],[3,-14],[-9,-17],[-10,3],[-29,-10],[-12,-7],[-13,9],[-3,12],[9,16],[-3,8],[-21,16],[-24,9],[-14,-3],[-16,-15],[-15,-7],[-11,-11],[-15,-7],[16,-39],[-8,1],[-7,-15],[-15,-10],[-13,-3],[-3,-12],[-16,-5],[-10,-12],[-17,-1],[-35,-12],[-30,2],[-44,12],[-19,8],[-13,11],[-13,2],[-16,-3],[-2,-16],[-16,-35],[12,-11],[15,-3],[17,-9],[-1,-17],[-10,-12],[-16,-3],[-23,2],[-16,-9],[-17,2],[-10,12],[-7,17]],[[30150,6839],[-1256,3423],[-85,231]],[[28558,12011],[316,1212]],[[38334,22296],[130,-45],[19,-7]],[[39137,22374],[8,-11],[8,-20],[17,-11],[37,-5],[19,-6],[19,-23],[5,-15],[3,-32],[-17,-36],[-2,-16],[1,-21],[20,-27],[17,-20],[30,-24],[25,-17],[19,-19],[37,-37],[8,-10],[14,-39],[13,-23],[95,-55],[14,-14],[19,-9],[16,-15],[7,-12],[11,-30],[14,-22],[33,-10],[16,-33],[272,8],[454,52],[221,28],[64,20],[167,133],[36,52],[3,190],[79,-49],[485,-268],[431,-137],[155,-40],[108,-32],[-164,-360],[20,-120],[-8,4],[-21,-10],[-8,10],[-11,-4],[-25,1],[-10,-13],[-27,-4],[-9,4],[-5,-15],[1,-19],[-22,-16],[-5,-11],[-10,-10],[-10,-19],[-25,-6],[-14,-16],[-14,-10],[3,-22],[-12,-11],[-11,-16],[-6,-19],[5,-13],[-7,-10],[-39,-17],[-12,-10],[0,-17],[-5,-10],[-11,-1],[-13,-13],[-1,-12],[6,-6],[3,-16],[13,-19],[20,-8],[26,-2],[18,13],[12,-1],[25,-21],[24,-12],[10,-8],[3,-10],[2,-22],[12,-11],[25,-7],[5,-6],[18,-32],[13,-18],[36,-16],[13,-11],[25,-35],[4,-17],[-12,-11],[-24,-1],[-1,-17],[16,-11],[0,-13],[-8,-6],[-3,-8],[7,-11],[22,-19],[0,-9],[-8,-6],[-25,5],[-11,-7],[6,-14],[23,-10],[10,-7],[-1,-14],[-7,-9],[1,-16],[29,-14],[2,-7],[-7,-9],[-17,-3],[-5,-11],[6,-7],[30,-1],[1,-7],[-8,-19],[1,-18],[32,-31],[10,-12],[3,-17],[-21,-10],[-8,-11],[-7,-21],[5,-19],[11,-6],[23,-3],[14,-5],[5,-6],[-6,-28],[-16,-18],[0,-8],[12,-9],[11,-1],[31,7],[12,-8],[-7,-15],[-21,-8],[-7,-12],[8,-8],[13,0],[11,-5],[7,-12],[25,-12],[4,-12],[-5,-5],[-18,-6],[-18,0],[3,-13],[16,0],[24,12],[14,-1],[10,-38],[1,-23],[-11,-16],[0,-15],[18,-5],[8,-5],[-6,-17],[21,-8],[12,-12],[1,-10],[-4,-25],[5,-10],[11,-13],[21,-30],[-3,-12],[-11,-19],[0,-16],[7,-14],[13,-9],[11,-13],[4,-23],[-2,-8],[-22,-20],[1,-12],[11,-12],[1,-15],[-6,-9],[3,-17],[-1,-14],[-8,-20],[0,-16],[6,-19],[-13,-10],[-5,-10],[8,-19],[-6,-10],[-16,-9],[-7,-15],[9,-13],[0,-12],[-15,-8],[10,-17],[-3,-22],[7,-13],[-2,-10],[-17,-7],[-15,0],[-7,-10],[8,-6],[3,-11],[-10,-18],[13,-8],[2,-6],[-6,-14],[-19,-19],[3,-21],[-11,-24],[1,-8],[16,-31],[-2,-7],[-15,-14],[18,-11],[40,-17],[21,1],[14,6],[10,11],[14,8],[22,4],[20,10],[29,23],[37,24],[33,17],[39,7],[15,5],[27,19],[16,1],[21,-2],[29,-6],[44,-4],[19,5],[42,15],[13,10],[29,10],[11,-3],[21,-18],[29,-12],[41,-8],[14,3],[17,15],[17,22],[2,15],[11,10],[18,3],[12,-4],[8,-10],[11,-5],[29,-1],[8,-2],[-66,-75],[-61,-188],[-79,-309],[-92,-314],[-110,-446],[-54,-219],[24,-143],[34,-124],[78,-86],[77,-95],[68,-92],[126,-121],[119,-85],[107,-38],[131,-43],[211,-90],[140,-121],[3,-168],[117,25],[79,11],[77,9],[313,16],[157,9],[23,-439],[52,-25],[92,-48],[8,-86],[29,-288],[-95,-238],[-15,-37],[-90,-221],[-68,-17],[-25,-71],[-224,-591],[-19,11],[-21,3],[-6,9],[-36,3],[-19,-6],[-25,20],[-19,-2],[-31,-10],[-38,5],[-37,8],[-32,10],[-62,16],[-20,0],[-23,-10],[-19,3],[-11,5],[-33,0],[-5,6],[-28,1],[-8,5],[-11,0],[-17,-13],[-15,2],[-23,19],[-15,1],[0,11],[8,27],[-12,7],[3,14],[-10,13],[-21,3],[-9,5],[-9,-4],[-22,24],[-27,3],[-2,12],[-18,2],[-8,-2],[-20,8],[-8,-5],[-13,-16],[-9,13],[-16,-7],[-6,5],[-27,-19],[-1,12],[-16,-3],[-13,7],[-9,11],[9,13],[-10,4],[-21,0],[-15,10],[-19,-15],[-19,-7],[-3,16],[-25,0],[-3,15],[-22,-12],[-11,8],[-22,-1],[-21,-11],[-19,-3],[-7,11],[-9,6],[-17,-4],[-14,6],[-17,17],[-27,3],[-23,0],[-26,6],[-10,8],[-6,10],[-26,11],[-2,10],[-32,-16],[-3,-10],[-8,-8],[-21,-7],[-13,5],[-10,-9],[-14,0],[-19,-6],[-22,7],[-23,2],[-13,5],[-22,1],[-21,4],[-10,9],[-5,10],[-18,-7],[-15,2],[-10,6],[-8,-2],[-10,-10],[-14,0],[-17,-7],[-42,9],[-5,22],[-5,3],[-15,-6],[-3,11],[-12,10],[-18,9],[-4,6],[0,18],[-25,-5],[2,-10],[-14,2],[-31,-6],[-36,-4],[-2,-5],[-14,-12],[-4,14],[-11,2],[-15,-19],[5,-26],[-7,-19],[-11,-4],[-25,16],[-18,0],[-27,7],[-18,1],[-7,-4],[-28,-36],[-12,-8],[-7,1],[-35,18],[-16,-1],[-26,4],[-7,-8],[-7,16],[-10,6],[-10,-1],[-6,-13],[4,-7],[-15,-13],[-2,-8],[10,-18],[-4,-10],[-16,-22],[-21,-18],[-9,-6],[-27,-8],[-22,2],[-11,9],[-23,7],[-16,-4],[1,-12],[-6,-4],[-23,-2],[-32,-13],[-24,7],[-19,0],[-10,12],[-9,-1],[-4,-8],[3,-12],[-3,-15],[-7,-12],[-29,-2],[-3,-11],[-24,5]],[[39145,17881],[-1314,-216],[-949,-156]],[[16303,10512],[60,-1],[157,-1]],[[17506,8494],[41,-380]],[[12443,6814],[-282,210]],[[11795,6966],[-140,-159]],[[9860,6612],[-10,-5]],[[9561,7803],[10,13]],[[10637,9239],[259,293]],[[10896,9532],[24,-12]],[[11662,9291],[33,26],[886,735]],[[18661,54917],[-129,54]],[[18263,53970],[-8625,-15194]],[[9638,38776],[145,4635],[48,801],[96,2963],[11,360],[135,925],[465,2987],[148,924],[1138,1696],[-323,187],[-512,426],[-227,426],[-568,426],[-228,190],[-170,284],[-57,236],[284,380],[-682,946],[-454,569],[-852,757],[0,2225],[-171,663],[-171,379],[-596,2985],[48,22],[3078,1253],[357,126],[592,238],[22,22],[641,239],[3823,-1571],[449,-192],[5503,-2348],[649,-261],[2338,-1000],[1649,-722]],[[43810,34113],[71,-62],[315,-277]],[[44235,33740],[-14,-21],[-3,-8],[3,-25],[8,-13],[12,-28],[22,-29],[25,-27],[13,-10],[15,-7],[39,-23],[28,-26],[25,-11],[26,-18],[21,-17],[96,-98],[18,-32],[4,-14],[1,-23],[-3,-12],[-11,-28],[-17,-29],[-2,-16],[4,-24],[16,-49],[4,-18],[2,-38],[-8,-45],[8,-15],[17,-18],[17,-21],[15,-31],[-3,-20],[-6,-21],[-6,-10],[-27,-22],[-28,-33],[-5,-24],[1,-53],[-9,-21],[-13,-12],[2,-17],[19,-15],[15,-17],[32,-18],[12,-10],[13,-20],[1,-30],[-3,-9],[-15,-14],[-15,-9],[-52,-16],[-15,-16],[-6,-22],[-2,-36],[-7,-16],[-18,-22],[-29,-20],[-27,-33],[-25,-13],[-32,-6],[-11,-5],[-58,-21],[-10,-7],[-6,-13],[0,-30],[-7,-13],[-18,-20],[-3,-15],[10,-18],[24,-38],[7,-17],[14,-43],[3,-21],[-6,-32],[-9,-20],[-23,-19],[-13,-10],[-22,-10],[-12,3],[-22,0],[-24,-3],[-22,2],[-61,1],[-45,-7],[-22,-8],[-57,-31],[-16,-17],[4,-15],[-2,-19],[-9,-26],[-7,-13],[-23,-27],[-24,-21],[-28,-14],[-20,-7],[-48,-21],[-17,-4],[-53,-17],[2,-13],[-8,-7],[-4,-19],[-9,-12],[-31,-13],[-23,-25],[-12,-7],[-18,-20],[-5,-10],[-25,-21],[-17,-21],[-7,-12],[-19,-8],[-23,-3],[-9,-7],[-8,-17],[-4,-17],[-16,-11],[-31,-11],[-27,-14],[-8,-12],[4,-18],[-2,-11],[-13,-33],[-2,-14],[19,-41],[-1,-22],[7,-20],[15,-13],[-2,-17],[3,-17],[-8,-11],[3,-14],[34,-21],[2,-7],[-11,-8],[-17,-2],[-32,-13],[-11,-1],[-26,-11],[-27,3],[-49,3],[-70,-13],[-41,-14],[-24,-20],[-29,-14],[-19,-16],[-33,-16],[-20,-32],[-24,-13],[-19,-17],[-10,-22],[2,-24],[218,-520],[24,-128],[-621,-191],[-516,-90],[-46,-7],[-99,-85],[-162,-15],[-93,-262],[-45,-116],[10,-8],[21,-8],[23,2],[13,25],[11,-5],[113,-64],[116,-57],[-25,-211],[-13,-114],[15,-134],[65,-79],[22,-106],[-76,-48],[-27,-9],[-39,-25],[-11,-85],[209,-215],[19,0],[31,27],[70,-2],[196,-28],[106,-12],[-29,-33],[-7,-29],[-19,-35],[149,-108],[-173,-234],[-40,-49],[-207,-64],[-131,-104],[-156,-126],[-182,17],[-138,-134],[-178,-39],[-122,-129],[-203,-80],[-161,-79],[-75,-115],[-229,-209]],[[37358,28032],[-126,30]],[[36785,27511],[-89,-81]],[[32971,29369],[-85,18]],[[37499,35414],[394,-13]]],"transform":{"scale":[0.00021373812712952172,0.00023874222175242297],"translate":[13.4687010001511,7.443658000316532]},"objects":{"adm-1":{"type":"GeometryCollection","geometries":[{"arcs":[[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16]],"type":"Polygon","properties":{"OBJECTID":1,"NOMPRO":"Barh El Gazal","Shape_Leng":8.81714997204,"Shape_Area":4.12118523609,"ADM1_CODE":"19"}},{"arcs":[[17,18,19,20,21,22,23,24,25,26,27,28,29,30,-4,31,32,-1,33,34,35]],"type":"Polygon","properties":{"OBJECTID":2,"NOMPRO":"Batha","Shape_Leng":12.6327956284,"Shape_Area":7.44450239038,"ADM1_CODE":"01"}},{"arcs":[[36,37,38,39,40,41,42,43,-36,44,-34,-17,45,46,47,48,49,50,51]],"type":"Polygon","properties":{"OBJECTID":3,"NOMPRO":"Borkou","Shape_Leng":23.8736888249,"Shape_Area":19.826952873,"ADM1_CODE":"02"}},{"arcs":[[52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70]],"type":"Polygon","properties":{"OBJECTID":4,"NOMPRO":"Chari Baguirmi","Shape_Leng":11.0477733841,"Shape_Area":3.37520561248,"ADM1_CODE":"03"}},{"arcs":[[71,72,73,74,75,76,77,78,79,80,81]],"type":"Polygon","properties":{"OBJECTID":5,"NOMPRO":"Ennedi Est","Shape_Leng":12.7548729574,"Shape_Area":7.41991621815,"ADM1_CODE":"23"}},{"arcs":[[82,-79,83,-77,84,-75,85,86,87,-43,88,-41,89,-39,90,-37,91,92]],"type":"Polygon","properties":{"OBJECTID":6,"NOMPRO":"Ennedi Ouest","Shape_Leng":15.7296936461,"Shape_Area":10.6605437697,"ADM1_CODE":"20"}},{"arcs":[[93,94,95,96,97,98,-57,99,-55,100,-28,101,-26,102,-24]],"type":"Polygon","properties":{"OBJECTID":7,"NOMPRO":"Guéra","Shape_Leng":14.1925123533,"Shape_Area":5.41204279916,"ADM1_CODE":"04"}},{"arcs":[[103,104,-9,105,-7,106,-5,-31,107,-29,-101,-54,108,-71,109,110,111,112,113,114,115,116,117,118]],"type":"Polygon","properties":{"OBJECTID":8,"NOMPRO":"Hadjer Lamis","Shape_Leng":9.72950884038,"Shape_Area":2.46412943208,"ADM1_CODE":"05"}},{"arcs":[[-16,119,-14,120,121,-11,122,-104,123,124,125,126,127,128,-47,129]],"type":"Polygon","properties":{"OBJECTID":9,"NOMPRO":"Kanem","Shape_Leng":12.6478437438,"Shape_Area":6.01056506726,"ADM1_CODE":"06"}},{"arcs":[[130,-126,131,-124,132,-118,133,-116,134,-114,135,-128]],"type":"Polygon","properties":{"OBJECTID":10,"NOMPRO":"Lac","Shape_Leng":7.70445051939,"Shape_Area":1.80481922388,"ADM1_CODE":"07"}},{"arcs":[[136,137,138,139,140,141,142,143,144,145,146,147,148,149]],"type":"Polygon","properties":{"OBJECTID":11,"NOMPRO":"Logone Occidental","Shape_Leng":4.37036958386,"Shape_Area":0.73008617342,"ADM1_CODE":"08"}},{"arcs":[[150,151,152,153,154,155,156,157,158,-140,159,-138,160,-150,161]],"type":"Polygon","properties":{"OBJECTID":12,"NOMPRO":"Logone Oriental","Shape_Leng":8.84322522646,"Shape_Area":1.87536902108,"ADM1_CODE":"09"}},{"arcs":[[162,163,164,165,166,167,168,169,170,-155,171,-153,172,-151,173,174,175]],"type":"Polygon","properties":{"OBJECTID":13,"NOMPRO":"Mandoul","Shape_Leng":6.26856248817,"Shape_Area":1.45414449841,"ADM1_CODE":"10"}},{"arcs":[[176,-64,177,-62,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,-66]],"type":"Polygon","properties":{"OBJECTID":14,"NOMPRO":"Mayo-Kebbi Est","Shape_Leng":7.43956727427,"Shape_Area":1.46686614743,"ADM1_CODE":"11"}},{"arcs":[[193,-189,194,-187,195,-142,196,-158,197,198,-191]],"type":"Polygon","properties":{"OBJECTID":15,"NOMPRO":"Mayo-Kebbi Ouest","Shape_Leng":5.35902922952,"Shape_Area":1.10780844884,"ADM1_CODE":"12"}},{"arcs":[[199,200,201,202,203,-169,204,-167,205,-165,206,-163,207,-58,-99,208,-97]],"type":"Polygon","properties":{"OBJECTID":16,"NOMPRO":"Moyen-Chari","Shape_Leng":12.5715036126,"Shape_Area":3.28475963326,"ADM1_CODE":"13"}},{"arcs":[[209,-68,210,-112,211,-110,-70]],"type":"Polygon","properties":{"OBJECTID":17,"NOMPRO":"N'Djaména","Shape_Leng":1.01911650953,"Shape_Area":0.04265926189,"ADM1_CODE":"18"}},{"arcs":[[212,213,214,215,216,217,218,219,220,221,222,-94,-23,223,-21,224,-19,225,226,227]],"type":"Polygon","properties":{"OBJECTID":18,"NOMPRO":"Ouaddaï","Shape_Leng":12.5276658065,"Shape_Area":3.33103325249,"ADM1_CODE":"14"}},{"arcs":[[228,-221,229,230,231,232,-203,233,-201,234,-95,-223]],"type":"Polygon","properties":{"OBJECTID":19,"NOMPRO":"Salamat","Shape_Leng":14.5166860321,"Shape_Area":5.67463796584,"ADM1_CODE":"15"}},{"arcs":[[235,-218,236,-232,237,-230,-220]],"type":"Polygon","properties":{"OBJECTID":20,"NOMPRO":"Sila","Shape_Leng":10.1087883971,"Shape_Area":2.33252835418,"ADM1_CODE":"21"}},{"arcs":[[238,-59,-208,-176,239,-174,-162,-149,240,-147,241,-145,242,-143,-196,-186,243,-184,244,245,-181,246,-179,-61]],"type":"Polygon","properties":{"OBJECTID":21,"NOMPRO":"Tandjilé","Shape_Leng":6.95563245492,"Shape_Area":1.43956529125,"ADM1_CODE":"16"}},{"arcs":[[247,-49,248,249,-51]],"type":"Polygon","properties":{"OBJECTID":22,"NOMPRO":"Tibesti","Shape_Leng":19.5199937974,"Shape_Area":11.3247727949,"ADM1_CODE":"16"}},{"arcs":[[250,-72,251,-216,252,-214,253,-228,254,-226,-18,-44,-88,255,-86,-74]],"type":"Polygon","properties":{"OBJECTID":23,"NOMPRO":"Wadi Fira","Shape_Leng":10.4325093555,"Shape_Area":4.41661836077,"ADM1_CODE":"17"}}]}}} \ No newline at end of file diff --git a/amp/gis/boundaries/TD/adm-2.json b/amp/gis/boundaries/TD/adm-2.json index 77c302c4702..5ef6411b14d 100644 --- a/amp/gis/boundaries/TD/adm-2.json +++ b/amp/gis/boundaries/TD/adm-2.json @@ -1 +1 @@ -{"type":"Topology","transform":{"scale":[0.0019078033291116336,0.0019032536550576485],"translate":[13.469506,7.447676]},"arcs":[[[1907,359],[47,-88]],[[1954,271],[-118,-3],[-95,-19],[-22,8],[-61,55]],[[1658,312],[15,15],[25,108],[55,73]],[[1753,508],[81,1],[11,-73],[37,-58],[25,-19]],[[1563,534],[42,-74],[49,-77],[4,-71]],[[1954,271],[43,-81]],[[1997,190],[-11,-29],[-49,-19],[-5,-24],[-63,-18],[-43,3],[-49,-52],[-27,-3],[-18,37],[-27,23],[-33,10],[1,37],[-37,15],[-6,46],[-35,-10],[-16,-26],[-39,-8],[9,-31],[-27,-24]],[[1522,117],[-21,125],[-21,74],[17,51],[-18,60],[-6,73],[58,30],[32,4]],[[2005,446],[-43,-73],[-55,-14]],[[1753,508],[16,31],[3,53]],[[1772,592],[103,30]],[[1875,622],[44,-45],[86,-131]],[[1504,635],[10,-39],[31,-29],[18,-33]],[[1522,117],[-40,-9],[-26,-22],[-82,-11],[-62,-54],[-87,-21],[-41,19],[-8,18],[-92,-10],[-20,15],[27,23],[14,30],[5,76],[-42,10],[-28,46],[-31,87],[1,23],[-90,192]],[[920,529],[15,4]],[[935,533],[69,-44],[32,-1],[57,-55],[49,21]],[[1142,454],[19,10],[62,2],[31,53],[67,39],[2,13],[43,18],[22,21],[81,27],[35,-2]],[[2487,303],[-23,96],[-1,89],[-21,49],[-1,22],[-2,10]],[[2439,569],[14,6],[15,0],[59,15],[15,7],[29,35],[19,30],[16,16],[12,50],[18,15],[17,9],[18,-12],[26,-54],[35,-30],[38,-2],[34,-20],[66,2],[33,12],[22,-4],[16,-19],[0,0],[-24,-57],[-18,-8],[-41,-46],[-15,-33],[-23,-11],[-25,-42],[-61,-22],[-29,-44],[1,-30],[-29,-21],[-190,-8]],[[2110,612],[-16,-26],[-39,-30],[-38,-97],[-12,-13]],[[1875,622],[50,69],[5,84]],[[1930,775],[78,-11],[111,-84],[-23,-23],[14,-45]],[[2487,303],[-96,-7],[-53,-30],[-141,16],[-9,-20],[-70,-39],[-21,15],[-100,-48]],[[2110,612],[42,24],[54,64],[47,21],[60,47],[21,5],[20,10],[19,11]],[[2373,794],[12,-60],[20,-26],[-5,-70],[16,-51],[20,-10],[3,-8]],[[1378,808],[34,-60],[57,10],[60,-18],[-18,-53],[12,-33]],[[1523,654],[-19,-19]],[[1142,454],[-10,39],[10,32],[49,11],[-29,29],[23,33],[1,56],[26,46]],[[1212,700],[75,25],[-10,50],[60,33],[41,0]],[[1103,828],[72,-81],[32,-27],[5,-20]],[[935,533],[-4,59],[24,66],[34,31],[5,94],[11,50],[28,15]],[[1033,848],[70,-20]],[[1523,654],[62,28],[53,81],[-15,31],[-32,19],[-29,46]],[[1562,859],[69,-22],[71,-67],[26,-73],[-6,-19],[25,-42],[-1,-24],[26,-20]],[[1349,883],[28,-16]],[[1377,867],[1,-59]],[[1103,828],[41,20],[88,-12],[57,12],[15,28]],[[1304,876],[14,7]],[[1318,883],[31,0]],[[1921,857],[9,-82]],[[1562,859],[-12,19]],[[1550,878],[61,18],[28,-2],[92,-41],[112,-11],[78,15]],[[1377,867],[32,-10]],[[1409,857],[29,39]],[[1438,896],[34,11]],[[1472,907],[4,3]],[[1476,910],[41,34]],[[1517,944],[25,-33],[8,-33]],[[2141,1129],[35,-28],[24,-50],[51,-6],[25,-47],[1,-6],[2,-2],[1,-3],[3,-16],[9,-2],[4,-3],[23,-11],[16,-8],[10,-5],[26,-12],[5,-8],[28,-6],[76,-8],[-28,-52],[-11,-15],[-9,-11],[-1,-1],[-3,-3],[-6,-1],[-4,0],[-4,-2],[-15,-5],[-11,-4],[-1,-1],[-3,-3],[-4,-5],[-6,-6],[-1,-5]],[[1921,857],[46,46],[-77,50],[81,63],[-1,47],[15,11],[-25,44],[57,10],[87,24],[12,-13],[25,-10]],[[839,1109],[10,-63],[26,-43],[69,-45],[79,-32]],[[1023,926],[10,-78]],[[920,529],[-24,35],[-15,42],[-22,29],[-65,15],[4,20],[-47,46],[-33,0],[-132,97],[-51,32],[-13,29],[-58,42],[12,41],[-38,52],[-30,8]],[[408,1017],[75,26],[71,-16],[27,-21],[32,22],[12,34],[23,10],[24,57],[-1,39]],[[671,1168],[58,2],[47,13],[44,-20],[-3,-34],[22,-20]],[[1218,1196],[-35,-25],[-7,-39],[-16,-8],[-9,-44],[-40,-32],[-55,-65],[-33,-57]],[[839,1109],[30,19],[14,46],[34,23],[70,21],[94,12],[74,2],[48,32]],[[1203,1264],[16,-12],[-1,-56]],[[671,1168],[-8,78]],[[663,1246],[-5,68]],[[658,1314],[42,-7],[79,25],[54,-18],[49,25],[47,-2],[62,-14],[30,-16],[124,27]],[[1145,1334],[35,-50],[23,-20]],[[2050,1250],[42,-22],[68,-59],[-8,-26],[-11,-14]],[[1517,944],[-11,23]],[[1506,967],[-23,27]],[[1483,994],[-9,15]],[[1474,1009],[-5,20]],[[1469,1029],[-10,18]],[[1459,1047],[-15,41]],[[1444,1088],[-28,28],[-68,24],[-37,25]],[[1311,1165],[32,19],[56,57],[65,116],[-13,79],[-22,15]],[[1429,1451],[18,-4],[133,-1],[53,34],[20,-16],[1,-46],[19,-40],[123,-42],[24,-24],[52,0],[65,-13],[12,-26],[36,-16],[34,-7],[31,0]],[[3263,1294],[52,-142],[99,-280]],[[3414,872],[-52,-23],[-87,-9],[-15,-10],[-56,4],[-61,-16],[-9,10],[-78,-7],[-50,11],[-95,-19],[-29,32],[-62,34],[-8,63],[6,38],[-2,16],[-33,-12],[-8,-24],[-35,-11],[-25,-24],[-64,-2],[-14,14],[-10,23],[-12,18],[-44,25],[-29,51],[-11,38],[17,78],[25,77],[19,-2],[15,11],[15,-9],[18,17],[13,17],[13,8],[40,9]],[[2706,1298],[55,-22],[30,1],[16,58],[110,0],[24,7],[42,80],[65,37],[37,39],[-6,24],[45,65],[35,15],[46,-10],[18,25],[44,33]],[[3267,1650],[-35,-157],[30,-12],[-23,-58],[3,-31],[-22,-16],[43,-82]],[[1392,1739],[12,-26],[-14,-128],[4,-79],[35,-55]],[[1311,1165],[-29,-5],[-18,24],[-46,12]],[[1145,1334],[11,12],[-91,47],[-30,49],[-49,53],[-23,8],[-16,51],[-33,47],[-31,18],[2,48],[-23,54]],[[862,1721],[36,55],[42,10],[23,-8],[35,-58],[20,-6],[27,30],[20,-11],[58,-1],[41,-18],[20,-71],[48,-15],[36,-21],[39,5],[21,41],[51,56],[13,30]],[[2022,1643],[64,-28],[49,-37]],[[2135,1578],[-28,-147],[-57,-181]],[[1392,1739],[-40,-3]],[[1352,1736],[-5,43],[11,33],[19,9],[132,19],[58,24],[132,31],[147,25],[57,-47],[12,-19],[13,-74],[-7,-32],[9,-28],[47,-35],[7,-29],[38,-13]],[[862,1721],[-24,52],[13,34],[-17,45],[-12,65]],[[822,1917],[101,59],[87,2]],[[1010,1978],[22,-80],[50,-45],[5,-18],[55,-22],[51,-38],[85,-25],[46,0],[28,-14]],[[2684,2081],[79,-15],[85,-26]],[[2848,2040],[33,-9],[18,-21],[137,-63],[75,-26],[39,-29],[113,-25]],[[3263,1867],[16,-149],[-12,-68]],[[2706,1298],[5,56],[-76,85],[-61,32],[-48,8],[-42,31],[-55,23],[-19,-8],[-55,25],[-52,52],[-72,-10],[-96,-14]],[[2022,1643],[13,51],[6,65],[-2,73],[-29,156],[16,126]],[[2026,2114],[22,38],[88,68],[71,4]],[[2207,2224],[35,-15],[50,-7],[106,-3],[68,-18],[178,-77],[40,-23]],[[4715,1864],[-148,-49],[-29,16],[-30,-11],[-28,8],[-24,-22],[-69,-18],[-28,-28],[-2,-70],[-27,-8],[-8,-81],[31,-36],[-18,-18],[-16,-57],[-55,-35],[-32,8],[-28,-21],[-51,-103],[-21,-17],[-51,17],[-22,-23],[-6,-27],[-25,-14],[-18,-39],[-65,-43],[-1,-48],[-23,-5],[-15,-49],[-23,-1],[-27,-35],[-34,-28],[-47,-1],[-14,-47],[-60,13],[-19,-56],[-21,-33],[-45,-24],[-170,12],[-32,-19]],[[3263,1294],[94,30],[61,8],[48,-3],[50,19],[126,-6],[105,-12],[64,29],[7,68],[19,77],[41,88],[20,65],[29,66],[22,85],[44,98],[33,60],[54,73],[61,73],[17,70]],[[4158,2182],[83,14],[205,41],[36,-25],[75,-12],[158,-336]],[[3976,2215],[23,-12],[-1,-50],[160,29]],[[3263,1867],[35,0],[62,24],[70,38],[23,1],[55,35],[-23,71],[5,36],[-36,72],[-40,44],[-5,40],[9,26],[64,96],[19,61]],[[3501,2411],[81,-1],[176,-84],[218,-111]],[[3374,2413],[8,-42],[47,11],[4,24],[68,5]],[[2848,2040],[-15,77],[15,113]],[[2848,2230],[80,-2],[17,-46],[67,20],[21,46],[45,68],[-15,66],[80,74],[60,-21],[90,-15],[81,-7]],[[1010,1978],[14,37],[-28,61],[6,46],[25,61],[-28,68],[24,-3],[23,46],[-34,65],[15,95],[40,55]],[[1067,2509],[34,27],[60,33],[153,-1]],[[1314,2568],[41,-7],[130,17],[100,-31],[90,-35],[31,-50],[-9,-73],[19,-33],[24,-15],[19,-93],[17,-26],[25,4],[60,-9],[36,-21],[26,-32],[103,-50]],[[2207,2224],[-24,61],[-47,60],[-1,21],[29,92]],[[2164,2458],[-16,38],[53,36],[112,94],[71,3]],[[2384,2629],[41,18],[123,70]],[[2548,2717],[58,-103],[25,-76],[-9,-47],[58,-7],[31,-29],[9,-30],[-21,-48],[-49,-32],[-43,-16],[27,-83],[26,-57],[24,-108]],[[2548,2717],[75,38],[271,-1],[59,3]],[[2953,2757],[-7,-70],[15,-118],[32,-91],[1,-46],[-18,-28],[-94,-90],[-28,-51],[-6,-33]],[[4374,2816],[21,-36],[46,-55],[112,18],[34,43],[57,-39],[77,-23],[-27,-62],[-29,-37],[34,-32],[4,-50],[28,-64],[-11,-63],[10,-12],[49,20],[32,4],[-34,-113],[-14,-84],[1,-33],[53,-60],[42,-15],[46,-36],[61,4],[-7,-58],[26,-6],[4,-44],[-31,-63],[-26,-90],[-138,39],[-59,4],[-20,-9]],[[3976,2215],[31,51],[11,51],[42,44],[30,79],[-33,96],[10,52],[27,15],[16,46],[22,35],[3,48]],[[4135,2732],[33,39],[62,45],[74,28]],[[4304,2844],[70,-28]],[[1429,2717],[-19,-43],[-58,-81],[-38,-25]],[[1067,2509],[-69,74],[-38,-34],[-47,-22],[-88,-21]],[[825,2506],[-50,-4],[-21,-12]],[[754,2490],[0,-2]],[[754,2488],[0,2]],[[754,2490],[-8,11],[8,89],[-26,59],[-14,76],[-53,17],[-29,27],[-50,22],[-17,19],[4,35],[-16,18],[1,43]],[[554,2906],[162,8]],[[716,2914],[0,-73],[33,-23],[54,-1],[54,-45],[42,-44],[40,-27],[78,-15],[96,4],[23,-9],[75,1],[121,27],[97,8]],[[3447,2883],[61,-51],[36,-20],[7,-19],[-37,-19],[-31,-60],[21,-43],[-38,-20],[-42,-57],[-32,-73],[-27,-88],[9,-20]],[[2953,2757],[42,-4],[16,13],[203,119],[92,49],[141,-51]],[[3823,2926],[1,-67],[79,-19],[13,-28],[-4,-55],[81,-32],[72,19],[70,-12]],[[3447,2883],[150,35],[14,30]],[[3611,2948],[95,-24],[117,2]],[[1935,2969],[-16,-28],[-70,-57],[-16,-36],[66,-45],[30,-91],[55,-57],[20,-7],[9,-74],[41,-40],[12,-45],[18,-16],[31,2],[49,-17]],[[1429,2717],[-27,53],[16,67],[-36,59],[1,38]],[[1383,2934],[37,-5],[96,15],[56,-9],[41,19]],[[1613,2954],[113,11],[44,24],[28,-14],[65,25],[72,-31]],[[3823,2926],[58,13],[47,2],[99,26],[134,26],[46,5],[71,29]],[[4278,3027],[-3,-121],[29,-62]],[[1100,3049],[98,-46],[56,-5],[25,10]],[[1279,3008],[30,-27],[16,-41],[58,-6]],[[716,2914],[96,1],[12,92],[-17,38]],[[807,3045],[95,-23],[37,-55],[72,50],[-45,26],[-29,31],[-14,39],[78,11],[26,-40],[73,-35]],[[1935,2969],[42,59],[-4,114]],[[1973,3142],[113,36],[85,-21],[76,13],[135,-2],[18,-78],[-4,-61],[2,-77],[-14,-58],[-27,-47],[-12,-50],[-2,-53],[14,-52],[27,-63]],[[807,3045],[-72,90],[-59,124]],[[676,3259],[27,25],[49,-6],[256,29]],[[1008,3307],[57,-150],[27,-50],[8,-58]],[[1008,3307],[56,3],[12,32],[44,37]],[[1120,3379],[-2,-68],[23,-8],[60,2],[7,10],[58,-5]],[[1266,3310],[5,-34],[-10,-36],[31,-86],[-3,-128],[-10,-18]],[[4579,3399],[-35,-33],[-29,-43],[22,-22],[-5,-25],[49,-69],[6,-34],[37,-69],[-57,-56],[-25,-41],[-64,-15],[-40,-41],[-45,-115],[-19,-20]],[[4278,3027],[26,36],[10,31],[-24,90],[-64,80],[-19,42],[-34,8],[-40,47],[-7,64],[-46,38]],[[4080,3463],[67,38],[29,8]],[[4176,3509],[62,-13],[61,-5],[219,-65],[61,-27]],[[3611,2948],[5,154],[-1,36],[-52,102],[15,74],[-14,39],[-112,67],[4,66]],[[3456,3486],[38,40],[56,74],[61,46],[67,-6],[63,20],[84,-24],[41,-25],[41,-37],[43,-51],[54,-13],[76,-47]],[[564,3435],[37,-44],[75,-132]],[[554,2906],[-37,53],[-196,1],[-43,69],[-190,267],[-86,364],[-2,24],[53,27],[43,8]],[[96,3719],[47,-15],[99,3],[21,-28],[30,1],[29,-34],[7,-35],[32,-6],[28,-43],[31,-1],[21,-35],[67,-15],[56,-76]],[[1376,3728],[-58,-115]],[[1318,3613],[-39,-29]],[[1279,3584],[-66,-49],[-86,-75],[-7,-81]],[[564,3435],[102,86],[117,173],[17,70],[73,-19],[36,6],[57,-28],[36,-35],[51,-25],[46,-9],[30,29],[53,12],[35,-14],[51,39],[108,8]],[[4176,3509],[-2,65],[6,42],[33,118],[-7,62],[-13,24]],[[4193,3820],[14,31],[147,96],[78,12]],[[4432,3959],[51,-3]],[[4483,3956],[113,-147],[89,-59]],[[4685,3750],[-5,-35],[24,-16],[-6,-43],[11,-39],[-15,-20],[66,-36],[10,-18],[-16,-36],[-27,-7],[-37,-29],[-49,-22],[-62,-50]],[[3446,4358],[7,-637],[3,-235]],[[2953,2757],[9,97],[-17,16],[-47,111],[-75,-1],[-62,31],[-14,34],[6,28],[65,67],[26,67],[7,64],[34,205],[9,80],[200,214],[58,83],[49,110],[61,113],[117,297]],[[3379,4373],[67,-15]],[[4307,4436],[-23,-33]],[[4284,4403],[-28,-56]],[[4256,4347],[-11,-49]],[[4245,4298],[-2,-48],[-17,-44]],[[4226,4206],[-24,-44],[-23,-39],[-21,-27],[-18,-13]],[[4140,4083],[-23,-15]],[[4117,4068],[-70,-7]],[[4047,4061],[-85,-72]],[[3962,3989],[-12,-64],[40,-2],[84,-20],[78,-47],[41,-36]],[[3446,4358],[28,-8],[81,-50],[36,-7],[92,19],[27,-14]],[[3710,4298],[97,-30],[52,17],[141,66],[-1,53],[48,25],[87,2],[36,-7],[30,16],[107,-4]],[[2371,4236],[-213,-919],[-165,-52]],[[1993,3265],[-43,32],[-96,55],[-183,17],[-77,12]],[[1594,3381],[-138,4],[-4,34]],[[1452,3419],[-22,43]],[[1430,3462],[-83,96]],[[1347,3558],[-29,55]],[[1376,3728],[120,242],[444,542]],[[1940,4512],[358,-163],[36,-65],[37,-48]],[[1973,3142],[20,123]],[[2371,4236],[129,-81],[95,-20],[123,-2],[90,22],[85,53],[53,46],[64,93],[21,56],[15,95],[-2,46],[33,6],[29,-17],[52,-92],[38,-35],[70,-6],[113,-27]],[[1868,4544],[72,-32]],[[96,3719],[21,17],[-13,42],[76,54],[-11,69],[42,92],[48,53],[147,209],[76,99],[140,143],[291,233],[168,135]],[[1081,4865],[297,-100],[312,-142],[178,-79]],[[3646,4927],[-13,-59],[89,-237],[91,-242],[-103,-91]],[[1868,4544],[428,393],[553,505],[98,19],[33,29],[17,55],[322,6]],[[3319,5551],[373,6],[16,-44]],[[3708,5513],[-43,-497],[-19,-89]],[[2999,5885],[83,-84],[237,-250]],[[1081,4865],[518,1110]],[[1599,5975],[1182,4],[64,-84],[154,-10]],[[3937,7121],[-255,-525],[-516,0]],[[3166,6596],[-2,-709],[-165,-2]],[[1599,5975],[198,343],[249,444],[37,128],[-99,58],[-234,209],[-38,188],[-6,6],[125,147],[-28,63],[0,178],[3,443]],[[1806,8182],[2131,-1061]],[[1081,4865],[4,160],[15,517],[16,382],[20,145],[72,511],[116,200],[-36,23],[-57,54],[-26,53],[-89,78],[-25,65],[32,47],[-13,20],[-125,157],[-35,79],[-43,26],[0,254],[-77,388],[-28,147],[335,151],[203,91],[466,-231]],[[848,2388],[-28,61],[-40,-6],[-26,45]],[[825,2506],[48,-32],[20,-29],[0,-27],[-45,-30]],[[822,1917],[-4,54],[22,63],[-7,50],[42,63],[-19,27],[-20,67],[29,39],[-42,58],[25,50]],[[384,1343],[142,0],[132,-29]],[[663,1246],[-69,-56],[-40,-8],[-53,34],[-53,-2],[-49,49],[-38,9]],[[361,1272],[23,71]],[[408,1017],[-9,19],[-42,43],[-16,2],[-45,57],[-31,20],[27,45],[55,46],[14,23]],[[658,1314],[-132,29],[-142,0]],[[384,1343],[141,0],[133,-29]],[[1444,1088],[8,-27]],[[1452,1061],[4,-10]],[[1456,1051],[13,-22]],[[1469,1029],[5,-22],[3,-5]],[[1477,1002],[4,-4]],[[1481,998],[3,-5]],[[1484,993],[5,-7]],[[1489,986],[2,-4]],[[1491,982],[13,-13]],[[1504,969],[13,-25]],[[1476,910],[-21,-7]],[[1455,903],[-17,-7]],[[1409,857],[-60,26]],[[1318,883],[-12,3]],[[1306,886],[-13,45],[22,51],[53,30],[45,52],[31,24]],[[1306,886],[-2,-10]],[[1349,883],[28,-16]],[[1452,1061],[7,-14]],[[1459,1047],[-3,4]],[[1474,1009],[3,-7]],[[1472,907],[-17,-4]],[[1489,986],[2,-4]],[[1481,998],[2,-4]],[[1483,994],[1,-1]],[[1506,967],[-2,2]],[[1504,969],[2,-2]],[[3962,3989],[24,21]],[[3986,4010],[61,51]],[[4117,4068],[25,16]],[[4142,4084],[18,16],[18,21],[14,23]],[[4192,4144],[34,61]],[[4226,4205],[17,44],[2,49]],[[4256,4347],[51,89]],[[4307,4436],[133,27]],[[4440,4463],[39,22]],[[4479,4485],[162,-51]],[[4641,4434],[22,-38],[46,-9],[128,-55]],[[4837,4332],[40,-35]],[[4877,4297],[31,-20]],[[4908,4277],[45,-45]],[[4953,4232],[2,-2]],[[4955,4230],[36,-45],[7,-91],[-31,-35]],[[4967,4059],[-72,-10],[-27,-15],[-76,12],[-28,-13],[-55,18],[-26,21],[-48,-5],[-21,13],[-66,10],[7,-33],[-63,8],[-72,-8],[9,-39],[22,-37]],[[4451,3981],[-19,-22]],[[4967,4059],[-3,-31],[-65,-41],[-34,-35],[4,-32],[-40,-15],[-8,-18],[27,-79],[-72,-22],[-37,-5],[-54,-31]],[[4483,3956],[-32,25]],[[4837,4332],[29,-23]],[[4866,4309],[11,-12]],[[4641,4434],[-74,24]],[[4567,4458],[74,-24]],[[4226,4205],[0,1]],[[3962,3989],[24,21]],[[4479,4485],[-17,-9]],[[4462,4476],[17,10]],[[4479,4486],[0,-1]],[[4140,4083],[2,1]],[[4284,4403],[-28,-56]],[[4612,4843],[-741,173]],[[3871,5016],[-209,-1],[46,498]],[[3319,5551],[-320,332],[165,4]],[[3164,5887],[2,709]],[[3937,7121],[710,-353]],[[4647,6768],[12,-1244],[-4,-633],[-12,-30],[-31,-18]],[[4612,4843],[31,-53]],[[4643,4790],[-95,-125],[-50,-18],[-19,-161]],[[4462,4476],[-19,-11],[-40,-11],[-7,-2],[-46,-12],[-43,-4]],[[3646,4927],[19,88],[206,1]],[[3164,5887],[-165,-2]],[[5031,4488],[-281,33],[-107,269]],[[4647,6768],[819,-407],[60,-31],[1,-1594],[-496,-248]],[[5031,4488],[490,245],[-2,-398],[-111,31],[-64,2],[-62,-6],[-69,-27],[-39,-7],[-66,15],[-48,2],[-47,-48],[-56,-40],[-2,-27]],[[4953,4232],[-45,45]],[[4908,4277],[-42,32]],[[4567,4458],[-88,28]],[[1266,3310],[98,-25],[15,18],[94,-5],[79,-76],[98,-145],[-50,-96],[13,-27]],[[1279,3584],[39,29]],[[1347,3558],[83,-96]],[[1452,3419],[4,-34],[138,-4]],[[2137,1578],[96,14],[70,10],[52,-52],[26,-8],[29,-17],[19,8],[58,-23],[42,-31],[46,-8],[60,-32],[76,-85],[-3,-56],[-18,-7],[-24,-2],[-13,-7],[-13,-18],[-18,-17],[-15,9],[-31,-10],[-8,-18],[-5,-16],[-13,-42],[-17,-78],[11,-38],[29,-51],[45,-25],[12,-18],[6,-14],[1,-9],[14,-14],[67,2],[25,24],[34,11],[8,24],[31,11],[-4,-53],[7,-63],[63,-34],[28,-32],[-35,-35],[-21,-1],[-28,-30],[24,-11],[36,-39],[77,-52],[-5,-6],[-11,-9],[-3,-1],[-2,-1],[0,-1],[-1,-2],[-38,23],[-33,-12],[-66,-2],[-34,20],[-38,2],[-35,29],[-27,55],[-17,11],[-17,-8],[-18,-15],[-12,-50],[-16,-17],[-19,-29],[-15,-17],[-14,-18],[-15,-7],[-59,-15],[-16,0],[-13,-6],[-3,8],[-20,10],[-16,51],[5,70],[-20,26],[-13,60],[2,5],[5,6],[9,9],[10,4],[16,5],[13,3],[4,3],[1,1],[9,11],[11,15],[27,52],[-76,8],[-27,6],[-5,8],[-26,12],[-10,5],[-39,19],[-4,3],[-9,2],[-3,16],[-1,3],[-2,2],[-1,6],[-25,47],[-52,6],[-23,50],[-35,28],[11,14],[8,26],[-68,59],[-42,22],[57,181],[28,147],[2,0]]],"objects":{"chad_ADM2":{"type":"GeometryCollection","geometries":[{"arcs":[[0,1,2,3]],"type":"Polygon","properties":{"CODDEP":"0903","CODDEPNUM":3,"CODREGNUM":9,"NOMCHEF":"Beboto","NOMDEP":"Kouh Ouest","NOMREG":"Logone Oriental","SHAPE_LENG":1.723935,"SHAPE_AREA":2088.419543,"ORIG_FID":0,"ADM2_CODE":9269}},{"arcs":[[4,-2,5,6,7]],"type":"Polygon","properties":{"CODDEP":"0905","CODDEPNUM":5,"CODREGNUM":9,"NOMCHEF":"Gor�","NOMDEP":"La Nya Pende","NOMREG":"Logone Oriental","SHAPE_LENG":3.560556,"SHAPE_AREA":4630.306251,"ORIG_FID":5,"ADM2_CODE":9274}},{"arcs":[[8,-4,9,10,11]],"type":"Polygon","properties":{"CODDEP":"0902","CODDEPNUM":2,"CODREGNUM":9,"NOMCHEF":"Bodo","NOMDEP":"Kouh Est","NOMREG":"Logone Oriental","SHAPE_LENG":1.562873,"SHAPE_AREA":1549.766312,"ORIG_FID":1,"ADM2_CODE":9273}},{"arcs":[[12,-8,13,14,15,16]],"type":"Polygon","properties":{"CODDEP":"0906","CODDEPNUM":6,"CODREGNUM":9,"NOMCHEF":"Ba�bokoum","NOMDEP":"Monts de Lam","NOMREG":"Logone Oriental","SHAPE_LENG":4.530032,"SHAPE_AREA":10179.003426,"ORIG_FID":2,"ADM2_CODE":9268}},{"arcs":[[17,18]],"type":"Polygon","properties":{"CODDEP":"1302","CODDEPNUM":2,"CODREGNUM":13,"NOMCHEF":"Maro","NOMDEP":"Grande Sido","NOMREG":"Moyen-Chari","SHAPE_LENG":2.976728,"SHAPE_AREA":5516.05237,"ORIG_FID":3,"ADM2_CODE":9342}},{"arcs":[[19,-12,20,21]],"type":"Polygon","properties":{"CODDEP":"1003","CODDEPNUM":3,"CODREGNUM":10,"NOMCHEF":"B�djondo","NOMDEP":"Mandoul Occidental","NOMREG":"Mandoul","SHAPE_LENG":1.798951,"SHAPE_AREA":1920.260042,"ORIG_FID":4,"ADM2_CODE":9285}},{"arcs":[[-18,22,-6,-1,-9,-20,23,24]],"type":"Polygon","properties":{"CODDEP":"1002","CODDEPNUM":2,"CODREGNUM":10,"NOMCHEF":"Moissala","NOMDEP":"Barh Sara","NOMREG":"Mandoul","SHAPE_LENG":0,"SHAPE_AREA":8526.430688,"ORIG_FID":0,"ADM2_CODE":9280}},{"arcs":[[25,26,-17,27,28]],"type":"Polygon","properties":{"CODDEP":"0801","CODDEPNUM":1,"CODREGNUM":8,"NOMCHEF":"Moundou","NOMDEP":"Lac Wey","NOMREG":"Logone Occidental","SHAPE_LENG":2.515091,"SHAPE_AREA":2898.447691,"ORIG_FID":6,"ADM2_CODE":9462}},{"arcs":[[29,-28,-16,30,31]],"type":"Polygon","properties":{"CODDEP":"0802","CODDEPNUM":2,"CODREGNUM":8,"NOMCHEF":"Beinamar","NOMDEP":"Dodje","NOMREG":"Logone Occidental","SHAPE_LENG":2.252348,"SHAPE_AREA":3279.202272,"ORIG_FID":7,"ADM2_CODE":9460}},{"arcs":[[-10,-3,-5,-13,-27,32,33]],"type":"Polygon","properties":{"CODDEP":"0904","CODDEPNUM":4,"CODREGNUM":9,"NOMCHEF":"B�b�djia","NOMDEP":"La nya","NOMREG":"Logone Oriental","SHAPE_LENG":2.602042,"SHAPE_AREA":2844.033605,"ORIG_FID":8,"ADM2_CODE":9270}},{"arcs":[[34,35,-29,-30,36,37,38]],"type":"Polygon","properties":{"CODDEP":"0803","CODDEPNUM":3,"CODREGNUM":8,"NOMCHEF":"Krim Krim","NOMDEP":"Gueni","NOMREG":"Logone Occidental","SHAPE_LENG":1.522855,"SHAPE_AREA":1056.667448,"ORIG_FID":9,"ADM2_CODE":9461}},{"arcs":[[39,-21,-11,-34,40,41]],"type":"Polygon","properties":{"CODDEP":"0901","CODDEPNUM":1,"CODREGNUM":9,"NOMCHEF":"Doba","NOMDEP":"La Pende","NOMREG":"Logone Oriental","SHAPE_LENG":2.187254,"SHAPE_AREA":2514.252053,"ORIG_FID":10,"ADM2_CODE":9271}},{"arcs":[[-41,-33,-26,-36,42,43,44,45,46,47]],"type":"Polygon","properties":{"CODDEP":"0804","CODDEPNUM":4,"CODREGNUM":8,"NOMCHEF":"Benoye","NOMDEP":"Ngourkosso","NOMREG":"Logone Occidental","SHAPE_LENG":1.756192,"SHAPE_AREA":1653.738379,"ORIG_FID":11,"ADM2_CODE":9463}},{"arcs":[[48,-24,-22,-40,49]],"type":"Polygon","properties":{"CODDEP":"1001","CODDEPNUM":1,"CODREGNUM":10,"NOMCHEF":"Koumra","NOMDEP":"Mandoul Oriental","NOMREG":"Mandoul","SHAPE_LENG":3.690351,"SHAPE_AREA":7030.812806,"ORIG_FID":12,"ADM2_CODE":9281}},{"arcs":[[50,51,-31,-15,52,53,54]],"type":"Polygon","properties":{"CODDEP":"1201","CODDEPNUM":1,"CODREGNUM":12,"NOMCHEF":"Pala","NOMDEP":"Mayo Dallah","NOMREG":"Mayo Kebbi Ouest","SHAPE_LENG":3.985498,"SHAPE_AREA":8163.711661,"ORIG_FID":13,"ADM2_CODE":9323}},{"arcs":[[55,-51,56,57]],"type":"Polygon","properties":{"CODDEP":"1102","CODDEPNUM":2,"CODREGNUM":11,"NOMCHEF":"Gounou Gaya","NOMDEP":"La Kabbia","NOMREG":"Mayo Kebbi Est","SHAPE_LENG":2.176359,"SHAPE_AREA":3199.06283,"ORIG_FID":15,"ADM2_CODE":9302}},{"arcs":[[-57,-55,58,59,60,61]],"type":"Polygon","properties":{"CODDEP":"1104","CODDEPNUM":4,"CODREGNUM":11,"NOMCHEF":"Fianga","NOMDEP":"Mont Illi","NOMREG":"Mayo Kebbi Est","SHAPE_LENG":2.664796,"SHAPE_AREA":2950.835176,"ORIG_FID":16,"ADM2_CODE":9290}},{"arcs":[[62,-50,-42,-48,63,64,65,66,67,68,69,70,71]],"type":"Polygon","properties":{"CODDEP":"1601","CODDEPNUM":1,"CODREGNUM":16,"NOMCHEF":"La�","NOMDEP":"Tandjile Est","NOMREG":"Tandjil","SHAPE_LENG":5.010943,"SHAPE_AREA":12535.479045,"ORIG_FID":18,"ADM2_CODE":9577}},{"arcs":[[72,73,74,75]],"type":"Polygon","properties":{"CODDEP":"1303","CODDEPNUM":3,"CODREGNUM":13,"NOMCHEF":"Kyab�","NOMDEP":"Lac Iro","NOMREG":"Moyen-Chari","SHAPE_LENG":6.010974,"SHAPE_AREA":17715.310395,"ORIG_FID":20,"ADM2_CODE":9345}},{"arcs":[[76,-71,77,-58,-62,78,79]],"type":"Polygon","properties":{"CODDEP":"1101","CODDEPNUM":1,"CODREGNUM":11,"NOMCHEF":"Bongor","NOMDEP":"Mayo Boneye","NOMREG":"Mayo Kebbi Est","SHAPE_LENG":4.228602,"SHAPE_AREA":8561.866132,"ORIG_FID":21,"ADM2_CODE":9303}},{"arcs":[[80,81,-72,-77,82,83]],"type":"Polygon","properties":{"CODDEP":"0303","CODDEPNUM":3,"CODREGNUM":3,"NOMCHEF":"Bousso","NOMDEP":"Loug Chari","NOMREG":"Chari Baguirmi","SHAPE_LENG":4.786497,"SHAPE_AREA":14361.072202,"ORIG_FID":22,"ADM2_CODE":9619}},{"arcs":[[-83,-80,84,85,86]],"type":"Polygon","properties":{"CODDEP":"1103","CODDEPNUM":3,"CODREGNUM":11,"NOMCHEF":"Guelendeng","NOMDEP":"Mayo Lemy�","NOMREG":"Mayo Kebbi Est","SHAPE_LENG":3.206197,"SHAPE_AREA":3519.112425,"ORIG_FID":23,"ADM2_CODE":9291}},{"arcs":[[87,88,89,-75,90,-81,91,92,93]],"type":"Polygon","properties":{"CODDEP":"0403","CODDEPNUM":3,"CODREGNUM":4,"NOMCHEF":"Melfi","NOMDEP":"Barh Signaka","NOMREG":"Guera","SHAPE_LENG":7.099555,"SHAPE_AREA":32443.917081,"ORIG_FID":24,"ADM2_CODE":9188}},{"arcs":[[94,-73,95,96]],"type":"Polygon","properties":{"CODDEP":"1503","CODDEPNUM":3,"CODREGNUM":15,"NOMCHEF":"Haraze Mangueigne","NOMDEP":"Haraze Mangueigne","NOMREG":"Salamat","SHAPE_LENG":8.857904,"SHAPE_AREA":29853.451527,"ORIG_FID":25,"ADM2_CODE":9381}},{"arcs":[[97,-96,-76,-90,98,99]],"type":"Polygon","properties":{"CODDEP":"1501","CODDEPNUM":1,"CODREGNUM":15,"NOMCHEF":"Am Timan","NOMDEP":"Bahr Azoum","NOMREG":"Salamat","SHAPE_LENG":6.939332,"SHAPE_AREA":26803.459582,"ORIG_FID":26,"ADM2_CODE":9380}},{"arcs":[[100,-99,-89,101,102]],"type":"Polygon","properties":{"CODDEP":"1502","CODDEPNUM":2,"CODREGNUM":15,"NOMCHEF":"Aboudeia","NOMDEP":"Aboudeia","NOMREG":"Salamat","SHAPE_LENG":4.466371,"SHAPE_AREA":11453.622916,"ORIG_FID":27,"ADM2_CODE":9379}},{"arcs":[[-92,-84,-87,103,104,105]],"type":"Polygon","properties":{"CODDEP":"0301","CODDEPNUM":1,"CODREGNUM":3,"NOMCHEF":"Massenya","NOMDEP":"Baguirmi","NOMREG":"Chari-Baguirmi","SHAPE_LENG":7.130062,"SHAPE_AREA":27258.478981,"ORIG_FID":29,"ADM2_CODE":9617}},{"arcs":[[-94,106,107,108,109]],"type":"Polygon","properties":{"CODDEP":"0402","CODDEPNUM":2,"CODREGNUM":4,"NOMCHEF":"Bitkine","NOMDEP":"Abtouyour","NOMREG":"Guera","SHAPE_LENG":3.95383,"SHAPE_AREA":9637.357252,"ORIG_FID":31,"ADM2_CODE":9195}},{"arcs":[[-102,-88,-110,110,111]],"type":"Polygon","properties":{"CODDEP":"0401","CODDEPNUM":1,"CODREGNUM":4,"NOMCHEF":"Mongo","NOMDEP":"Guera","NOMREG":"Guera","SHAPE_LENG":4.109141,"SHAPE_AREA":8428.967527,"ORIG_FID":32,"ADM2_CODE":9189}},{"arcs":[[112,-97,-98,113,114,115]],"type":"Polygon","properties":{"CODDEP":"2101","CODDEPNUM":1,"CODREGNUM":21,"NOMCHEF":"Goz Beida","NOMDEP":"Kimiti","NOMREG":"Sila","SHAPE_LENG":7.081443,"SHAPE_AREA":21089.780654,"ORIG_FID":33,"ADM2_CODE":9566}},{"arcs":[[116,-105,117,118,119,120,121,122,123]],"type":"Polygon","properties":{"CODDEP":"0503","CODDEPNUM":3,"CODREGNUM":5,"NOMCHEF":"Massaguet","NOMDEP":"Haraze Al Biar","NOMREG":"Hadjer Lamis","SHAPE_LENG":4.557099,"SHAPE_AREA":6091.533119,"ORIG_FID":34,"ADM2_CODE":9430}},{"arcs":[[124,-103,-112,125]],"type":"Polygon","properties":{"CODDEP":"0404","CODDEPNUM":4,"CODREGNUM":4,"NOMCHEF":"Mangalme","NOMDEP":"Mangalme","NOMREG":"Guera","SHAPE_LENG":4.756846,"SHAPE_AREA":10762.907821,"ORIG_FID":35,"ADM2_CODE":9194}},{"arcs":[[126,-114,-100,-101,-125,127,128]],"type":"Polygon","properties":{"CODDEP":"2102","CODDEPNUM":2,"CODREGNUM":21,"NOMCHEF":"Am Dam","NOMDEP":"Djourf Al Ahmar","NOMREG":"Sila","SHAPE_LENG":5.277258,"SHAPE_AREA":14770.833486,"ORIG_FID":36,"ADM2_CODE":9367}},{"arcs":[[129,-107,-93,-106,-117,130,131,132]],"type":"Polygon","properties":{"CODDEP":"0502","CODDEPNUM":2,"CODREGNUM":5,"NOMCHEF":"Bokoro","NOMDEP":"Dababa","NOMREG":"Hadjer-Lamis","SHAPE_LENG":6.115054,"SHAPE_AREA":16256.763709,"ORIG_FID":37,"ADM2_CODE":9428}},{"arcs":[[-115,-127,133,134]],"type":"Polygon","properties":{"CODDEP":"1402","CODDEPNUM":2,"CODREGNUM":14,"NOMCHEF":"Abdi","NOMDEP":"Abdi","NOMREG":"Ouadda�","SHAPE_LENG":2.551324,"SHAPE_AREA":3848.602036,"ORIG_FID":38,"ADM2_CODE":9351}},{"arcs":[[135,136,-131,-124,137,138]],"type":"Polygon","properties":{"CODDEP":"0501","CODDEPNUM":1,"CODREGNUM":5,"NOMCHEF":"Massakory","NOMDEP":"Dagana","NOMREG":"Hadjer-Lamis","SHAPE_LENG":4.300306,"SHAPE_AREA":8442.935976,"ORIG_FID":39,"ADM2_CODE":9429}},{"arcs":[[-108,-130,139,140]],"type":"Polygon","properties":{"CODDEP":"0103","CODDEPNUM":3,"CODREGNUM":1,"NOMCHEF":"Yao","NOMDEP":"Fittri","NOMREG":"Batha","SHAPE_LENG":4.222495,"SHAPE_AREA":11740.678235,"ORIG_FID":40,"ADM2_CODE":9119}},{"arcs":[[-139,141,142,143]],"type":"Polygon","properties":{"CODDEP":"0702","CODDEPNUM":2,"CODREGNUM":7,"NOMCHEF":"Ngouri","NOMDEP":"Wayi","NOMREG":"Lac","SHAPE_LENG":2.817378,"SHAPE_AREA":3514.889617,"ORIG_FID":41,"ADM2_CODE":9451}},{"arcs":[[-136,-144,144,145,146]],"type":"Polygon","properties":{"CODDEP":"0603","CODDEPNUM":3,"CODREGNUM":6,"NOMCHEF":"Mondo","NOMDEP":"Wadi Bissam","NOMREG":"Kanem","SHAPE_LENG":2.176451,"SHAPE_AREA":2905.421143,"ORIG_FID":42,"ADM2_CODE":9227}},{"arcs":[[147,-116,-135,148,149,150]],"type":"Polygon","properties":{"CODDEP":"1403","CODDEPNUM":3,"CODREGNUM":14,"NOMCHEF":"Adr�","NOMDEP":"Assoungha","NOMREG":"Ouadda�","SHAPE_LENG":4.006995,"SHAPE_AREA":8127.318145,"ORIG_FID":43,"ADM2_CODE":9352}},{"arcs":[[-149,-134,-129,151,152]],"type":"Polygon","properties":{"CODDEP":"1401","CODDEPNUM":1,"CODREGNUM":14,"NOMCHEF":"Ab�ch�","NOMDEP":"Ouara","NOMREG":"Ouadda�","SHAPE_LENG":4.974175,"SHAPE_AREA":17901.532572,"ORIG_FID":45,"ADM2_CODE":9347}},{"arcs":[[153,-142,-138,-123,154,155]],"type":"Polygon","properties":{"CODDEP":"0701","CODDEPNUM":1,"CODREGNUM":7,"NOMCHEF":"Bol","NOMDEP":"Mamdi","NOMREG":"Lac","SHAPE_LENG":5.039775,"SHAPE_AREA":16326.400017,"ORIG_FID":46,"ADM2_CODE":9450}},{"arcs":[[156,157,158,-145,-143,-154,159]],"type":"Polygon","properties":{"CODDEP":"0601","CODDEPNUM":1,"CODREGNUM":6,"NOMCHEF":"Mao","NOMDEP":"Kanem","NOMREG":"Kanem","SHAPE_LENG":4.204635,"SHAPE_AREA":9735.338066,"ORIG_FID":47,"ADM2_CODE":9231}},{"arcs":[[-151,160,161,162,163,164]],"type":"Polygon","properties":{"CODDEP":"1702","CODDEPNUM":2,"CODREGNUM":17,"NOMCHEF":"Gu�r�da","NOMDEP":"Dar Tama","NOMREG":"Wadi Fira","SHAPE_LENG":3.641715,"SHAPE_AREA":9537.086661,"ORIG_FID":48,"ADM2_CODE":9635}},{"arcs":[[165,-152,-128,-126,166,167]],"type":"Polygon","properties":{"CODDEP":"0102","CODDEPNUM":2,"CODREGNUM":1,"NOMCHEF":"Oum Hadjer","NOMDEP":"Batha Est","NOMREG":"Batha","SHAPE_LENG":8.069299,"SHAPE_AREA":30670.206313,"ORIG_FID":49,"ADM2_CODE":9110}},{"arcs":[[168,169,170,171,172,173,174,175,176,-161,-150,-153,-166,177,178]],"type":"Polygon","properties":{"CODDEP":"1701","CODDEPNUM":1,"CODREGNUM":17,"NOMCHEF":"Biltine","NOMDEP":"Biltine","NOMREG":"Wadi Fira","SHAPE_LENG":7.589188,"SHAPE_AREA":23628.539456,"ORIG_FID":50,"ADM2_CODE":9604}},{"arcs":[[179,180,181,182,183,184,-157,185,186]],"type":"Polygon","properties":{"CODDEP":"1902","CODDEPNUM":2,"CODREGNUM":19,"NOMCHEF":"Salal","NOMDEP":"Barh-El-Gazel Nord","NOMREG":"Barh-El-Gazel","SHAPE_LENG":6.82269,"SHAPE_AREA":35733.620035,"ORIG_FID":52,"ADM2_CODE":9123}},{"arcs":[[-167,-111,-109,-141,187,-180,188]],"type":"Polygon","properties":{"CODDEP":"0101","CODDEPNUM":1,"CODREGNUM":1,"NOMCHEF":"Ati","NOMDEP":"Batha Ouest","NOMREG":"Batha","SHAPE_LENG":11.666189,"SHAPE_AREA":49027.070011,"ORIG_FID":53,"ADM2_CODE":9115}},{"arcs":[[189,-186,-160,-156,190,191]],"type":"Polygon","properties":{"CODDEP":"0602","CODDEPNUM":2,"CODREGNUM":6,"NOMCHEF":"Nokou","NOMDEP":"Nord Kanem","NOMREG":"Kanem","SHAPE_LENG":9.913252,"SHAPE_AREA":58961.244853,"ORIG_FID":54,"ADM2_CODE":9226}},{"arcs":[[192,-178,-168,-189,-187,-190,193,194,195]],"type":"Polygon","properties":{"CODDEP":"0201","CODDEPNUM":1,"CODREGNUM":2,"NOMCHEF":"Faya","NOMDEP":"Borkou","NOMREG":"Borkou","SHAPE_LENG":11.244538,"SHAPE_AREA":72749.952134,"ORIG_FID":55,"ADM2_CODE":9145}},{"arcs":[[196,-194,-192,197,198]],"type":"Polygon","properties":{"CODDEP":"0202","CODDEPNUM":2,"CODREGNUM":2,"NOMCHEF":"Kirdimi","NOMDEP":"Borkou Yala","NOMREG":"Borkou","SHAPE_LENG":11.219552,"SHAPE_AREA":76471.024368,"ORIG_FID":56,"ADM2_CODE":9156}},{"arcs":[[199,200,-199,201,202]],"type":"Polygon","properties":{"CODDEP":"2201","CODDEPNUM":1,"CODREGNUM":22,"NOMCHEF":"Barda�","NOMDEP":"Tibesti Est","NOMREG":"Tibesti","SHAPE_LENG":16.038058,"SHAPE_AREA":126684.106975,"ORIG_FID":59,"ADM2_CODE":9594}},{"arcs":[[-202,-198,203]],"type":"Polygon","properties":{"CODDEP":"2202","CODDEPNUM":2,"CODREGNUM":22,"NOMCHEF":"Zouar","NOMDEP":"Tibesti Ouest","NOMREG":"Tibesti","SHAPE_LENG":15.96702,"SHAPE_AREA":88028.077351,"ORIG_FID":60,"ADM2_CODE":9595}},{"arcs":[[204,-120,-119,205]],"type":"Polygon","properties":{"CODDEP":"1801","CODDEPNUM":1,"CODREGNUM":18,"NOMCHEF":"N'Djamena","NOMDEP":"N'Djamena","NOMREG":"N'Djamena","SHAPE_LENG":0.823378,"SHAPE_AREA":418.698414,"ORIG_FID":28,"ADM2_CODE":9612}},{"arcs":[[-118,-104,-86,206,-206]],"type":"Polygon","properties":{"CODDEP":"0302","CODDEPNUM":2,"CODREGNUM":3,"NOMCHEF":"Mandelia","NOMDEP":"Chari","NOMREG":"Chari-Baguirmi","SHAPE_LENG":3.560563,"SHAPE_AREA":4407.604008,"ORIG_FID":30,"ADM2_CODE":9618}},{"arcs":[[207,-60,208,209]],"type":"Polygon","properties":{"CODDEP":"1203","CODDEPNUM":3,"CODREGNUM":12,"NOMCHEF":"Binder","NOMDEP":"Mayo-Binder","NOMREG":"Mayo-Kebbi Ouest","SHAPE_LENG":0,"SHAPE_AREA":0,"ORIG_FID":0,"ADM2_CODE":9325}},{"arcs":[[-209,-59,-54,210]],"type":"Polygon","properties":{"CODDEP":"1202","CODDEPNUM":2,"CODREGNUM":12,"NOMCHEF":"Guelo","NOMDEP":"Lac Lere","NOMREG":"Mayo Kebbi Ouest","SHAPE_LENG":2.387807,"SHAPE_AREA":4434.075405,"ORIG_FID":17,"ADM2_CODE":9324}},{"arcs":[[213,214,215,216,217,218,219,220,221,222,-47,223,224,-44,225,-39,226,227]],"type":"Polygon","properties":{"CODDEP":"1603","CODDEPNUM":3,"CODREGNUM":16,"NOMCHEF":"B�r�","NOMDEP":"Tandjil� Centre","NOMREG":"Tandjil�","SHAPE_LENG":0,"SHAPE_AREA":0,"ORIG_FID":0,"ADM2_CODE":9579}},{"arcs":[[[-70,-228,228,-37,-32,-52,-56,-78]],[[-215,230,231]],[[-217,-67,232]],[[-46,233,-224]]],"type":"MultiPolygon","properties":{"CODDEP":"1602","CODDEPNUM":2,"CODREGNUM":16,"NOMCHEF":"K�lo","NOMDEP":"Tandjile Ouest","NOMREG":"Tandjil","SHAPE_LENG":2.687223,"SHAPE_AREA":5065.244617,"ORIG_FID":14,"ADM2_CODE":9580}},{"arcs":[[-177,239,240,-175,241,242,243,244,-171,245,246,247,248,249,250,251,252,253,254,255,256,-162]],"type":"Polygon","properties":{"CODDEP":"1704","CODDEPNUM":4,"CODREGNUM":17,"NOMCHEF":"Matadjana","NOMDEP":"M�gri","NOMREG":"Wadi Fira","SHAPE_LENG":0,"SHAPE_AREA":0,"ORIG_FID":0,"ADM2_CODE":9639}},{"arcs":[[[257,-164,258,-256]],[[-251,259,260]],[[-245,263,-172]],[[265,266,267]],[[-174,268,-242]]],"type":"MultiPolygon","properties":{"CODDEP":"1703","CODDEPNUM":3,"CODREGNUM":17,"NOMCHEF":"Iriba","NOMDEP":"IRIBA","NOMREG":"Wadi Fira","SHAPE_LENG":5.709268,"SHAPE_AREA":18653.372741,"ORIG_FID":51,"ADM2_CODE":9647}},{"arcs":[[270,271,-195,272,273,-200,274,275]],"type":"Polygon","properties":{"CODDEP":"2001","CODDEPNUM":1,"CODREGNUM":20,"NOMCHEF":"Fada","NOMDEP":"Fada","NOMREG":"Ennedi Ouest","SHAPE_LENG":0,"SHAPE_AREA":0,"ORIG_FID":0,"ADM2_CODE":9167}},{"arcs":[[-271,276,277,-267,278,-179,-193,279]],"type":"Polygon","properties":{"CODDEP":"2002","CODDEPNUM":2,"CODREGNUM":20,"NOMCHEF":"Kala�t","NOMDEP":"Mourtcha","NOMREG":"Ennedi Ouest","SHAPE_LENG":15.72502,"SHAPE_AREA":124688.328666,"ORIG_FID":58,"ADM2_CODE":9169}},{"arcs":[[281,-277,-276,282]],"type":"Polygon","properties":{"CODDEP":"2301","CODDEPNUM":1,"CODREGNUM":23,"NOMCHEF":"Am-Djarass","NOMDEP":"Am-Djarass","NOMREG":"Ennedi Est","SHAPE_LENG":0,"SHAPE_AREA":0,"ORIG_FID":0,"ADM2_CODE":9175}},{"arcs":[[-282,283,-254,284,285,-260,-250,-263,286,-278]],"type":"Polygon","properties":{"CODDEP":"2302","CODDEPNUM":2,"CODREGNUM":23,"NOMCHEF":"Baha�","NOMDEP":"Wadi Hawar","NOMREG":"Ennedi Est","SHAPE_LENG":12.480389,"SHAPE_AREA":87335.791463,"ORIG_FID":57,"ADM2_CODE":9408}},{"arcs":[[287,-132,-137,-147]],"type":"Polygon","properties":{"CODDEP":"1903","CODDEPNUM":3,"CODREGNUM":19,"NOMCHEF":"Chadra","NOMDEP":"Barl-El-Gazal Ouest","NOMREG":"Barh-El-Gazel","SHAPE_LENG":0,"SHAPE_AREA":0,"ORIG_FID":0,"ADM2_CODE":9133}},{"arcs":[[-181,-188,-140,-133,-288,-146,-159,288,-185,289,-183,290]],"type":"Polygon","properties":{"CODDEP":"1901","CODDEPNUM":1,"CODREGNUM":19,"NOMCHEF":"Moussoro","NOMDEP":"Barh-El-Gazel Sud","NOMREG":"Barh-El-Gazel","SHAPE_LENG":5.197884,"SHAPE_AREA":14870.700916,"ORIG_FID":44,"ADM2_CODE":9128}},{"arcs":[[291]],"type":"Polygon","properties":{"CODDEP":"1301","CODDEPNUM":1,"CODREGNUM":13,"NOMCHEF":"Sarh","NOMDEP":"Bahr Koh","NOMREG":"Moyen Chari","SHAPE_LENG":7.701822,"SHAPE_AREA":18374.279107,"ORIG_FID":19,"ADM2_CODE":9344}}]}},"crs":{"type":"name","properties":{"name":"urn:ogc:def:crs:OGC:1.3:CRS84"}}} \ No newline at end of file +{"type":"Topology","arcs":[[[18200,10717],[170,11],[90,-2],[112,3],[120,43],[140,69],[89,24],[146,90],[118,62],[126,66],[128,10],[99,42],[74,41],[82,47],[58,65],[-33,137],[-60,154],[-37,120],[14,100],[17,105],[-47,122],[-75,112],[-83,179],[-120,119],[-105,135],[-34,109],[5,121],[53,146],[122,166],[79,128],[75,111],[83,150],[59,153],[26,84],[19,110],[4,62]],[[19714,13911],[273,12]],[[19987,13923],[300,-173],[33,-20],[1760,-904]],[[22080,12826],[203,-97],[-6,-310],[985,187]],[[23262,12606],[135,25]],[[23397,12631],[-6,-190],[-76,-308],[-82,-109],[-76,-112],[-96,-113],[-88,-84],[-76,-107],[-64,-92],[-111,-138],[-56,-79],[-35,-84],[-70,-131],[-79,-134],[-47,-128],[-47,-108],[-55,-138],[-100,-189],[-55,-233],[-28,-114],[-37,-139],[-53,-152],[-59,-125],[-51,-98],[-32,-90],[-48,-150],[-33,-136],[-44,-83],[-51,-100],[-67,-147],[-21,-88],[-52,-88],[-43,-162],[-23,-139],[-40,-138],[-18,-224],[-20,-167],[-79,-71],[-143,-69],[-138,-25],[-208,24],[-92,14],[-150,13],[-140,16],[-93,4],[-156,0],[-141,-4],[-94,8],[-109,14],[-116,12],[-120,-27],[-84,-55],[-81,-31],[-114,7],[-156,16],[-177,-24],[-163,-24],[-160,-44],[-142,-69],[-134,-37],[-95,-21],[-149,-53]],[[18224,7388],[-53,167]],[[18171,7555],[9,-30],[-99,187],[-122,241],[-1,7],[3,10],[6,7],[12,-8],[6,3],[6,10],[6,2],[7,-7],[10,1],[12,8],[5,8],[-3,19],[1,11],[4,27],[8,-3],[5,-9],[19,5],[7,6],[3,17],[9,-10],[12,-2],[7,11],[-10,23],[1,27],[-16,34],[-11,15],[-8,17],[22,6],[5,23],[9,4],[9,-11],[10,-1],[11,5],[2,11],[-5,7],[-8,3],[-27,2],[-10,3],[-7,5],[-1,6],[5,6],[16,7],[11,10],[7,-2],[14,14],[15,-1],[5,8],[-6,5],[-10,1],[-17,-3],[-3,21],[14,-2],[5,7],[4,33],[6,10],[13,4],[7,5],[6,0],[9,-7],[8,11],[-5,10],[-2,12],[8,17],[3,15],[-3,19],[24,14],[1,11],[-12,-9],[-8,5],[2,17],[-3,16],[3,4],[17,-10],[5,5],[-8,20],[-5,19],[-5,10],[3,25],[-11,4],[-1,10],[-169,62]],[[18012,8648],[199,872]],[[18211,9520],[77,421],[-96,471],[109,97],[5,12],[0,14],[10,15],[0,14],[-8,12],[-6,3],[-15,1],[-10,7],[-5,-4],[-4,-10],[0,-11],[-15,13],[-11,4],[-4,8],[-9,7],[3,7],[1,18],[-5,11],[2,13],[-2,20],[-9,-2],[-5,7],[-10,-8],[-7,4],[-2,7],[10,43],[-5,3]],[[25296,14256],[-103,30],[-89,25],[-118,0],[-38,-18],[-239,8],[-310,-126],[-151,-81],[-168,-139],[-2,-6],[-154,-124],[-89,-114],[-56,-94],[-14,-105],[0,-88],[20,-271],[-3,-51],[36,-61],[-18,-127],[44,-102],[17,-93]],[[23861,12719],[-599,-113]],[[22080,12826],[474,954],[10,45],[33,63],[33,54],[-20,46],[-18,77],[18,37],[-9,51],[0,67],[-3,36],[4,40],[-46,57],[-35,61],[-29,53],[-7,53],[-20,65],[-5,11],[-35,96],[11,39],[53,30],[28,40],[84,73],[51,49],[76,87],[56,73]],[[22784,15083],[292,304],[205,305],[242,262],[130,133],[202,136]],[[23855,16223],[57,-5],[61,-49],[27,-45],[16,-38],[32,-54],[80,4],[50,17]],[[24178,16053],[82,-33]],[[24260,16020],[-56,-186],[39,-214],[-18,-100],[322,-124],[380,-111],[292,-64],[269,-14],[71,-97],[-165,-208],[-39,-121],[-41,-338],[-18,-187]],[[14888,12088],[-41,-109],[-97,-63],[-44,-51],[-15,-51],[-45,-49],[-67,-39],[-71,-75],[-121,-142],[-101,-172],[-59,-157],[284,-81],[239,-18],[182,-51],[151,-40],[74,-102],[20,-178],[-50,-184],[-53,-124],[-44,-120],[-27,-148],[-91,-169],[-94,-214],[-56,-274],[-10,-185],[-20,-220],[-89,-93],[-94,9],[-136,39],[-91,45],[-92,24],[-144,-32],[-115,-133],[-142,-34],[-151,-87],[-39,-17]],[[13639,8793],[0,2]],[[13639,8795],[-7,4],[0,13],[-8,2],[-8,-7],[-5,-9],[2,-10],[-5,-12],[-9,0],[-1,13],[-9,0],[6,12],[-6,9],[-22,-3],[-9,4],[-16,-17],[-5,-13],[-11,-14],[-2,-15],[-8,-1],[-8,30],[1,8],[16,4],[1,10],[-5,4],[-14,2],[-13,-7],[-1,-7],[-12,-16],[-5,-3],[-15,9],[-5,7],[-13,-4],[-8,16],[-8,2],[-8,-9],[-6,3],[-7,11],[-10,10],[-11,2],[-13,-6],[-11,1],[-11,21],[6,11],[0,9],[-10,10],[-27,-1],[-10,13],[-11,11],[-8,3],[-14,0],[5,15],[-7,10],[-9,-3],[-9,-11],[-15,0],[-8,9],[-8,3],[-8,-4],[1,-8],[10,-12],[-5,-10],[-10,3],[-7,8],[-10,21],[-6,3],[-4,14],[-14,3],[-2,10],[6,9],[-1,5],[-242,294],[-971,-154],[-184,-188],[-142,-183]],[[11636,8729],[-10,11],[-7,27],[1,23],[-8,26],[-6,2],[-17,-9],[-22,-3],[-9,-5],[-12,-1],[-4,24],[-6,5],[-27,2],[-8,7],[-14,21],[-10,7],[-1,16],[-27,14],[-24,19],[-6,9],[-10,5],[-8,11],[5,14],[-9,2],[-32,29],[-19,9],[-11,3],[-9,-18],[-5,-2],[-14,3],[-25,-6],[4,12],[1,14],[-6,22],[-4,29],[6,8],[-21,0],[-1,11],[7,9],[-11,25],[-9,6],[-27,3],[-26,-1],[-12,9],[-6,12],[-15,7],[-11,-13],[-13,-12],[-14,-6],[-15,-1],[-13,2],[-6,13],[-9,9],[-14,29],[-20,2],[-21,-4],[-15,9],[-9,21],[-14,18],[-30,11],[-13,7],[-21,4],[-12,15],[-26,11],[-4,12],[0,24],[-6,29],[4,34],[24,32],[14,16],[6,34],[-1,16],[-5,19],[0,19],[2,16],[-6,15],[-9,6],[-13,1],[-4,24],[16,37],[4,17],[0,41],[-4,20],[4,43],[6,30],[6,35],[-22,20],[-4,13],[-11,19],[-8,22],[-3,17],[-30,25],[-11,13],[-2,19],[-11,1],[-15,-7],[-2,19],[24,13],[-11,13],[1,14],[-16,8],[10,11],[5,13],[-5,9],[-33,11],[-17,13],[0,19],[8,33],[21,15],[9,13],[5,22],[0,24],[-13,12],[-14,3],[-19,17],[-7,22],[11,27],[0,17],[8,12],[-3,13],[2,10],[8,21],[7,2],[-7,20],[5,24],[-8,2],[-1,8],[6,10],[7,6],[6,14],[0,13],[-4,2],[-16,-1],[-3,6],[4,17],[5,5],[-5,9],[8,2],[4,10],[8,4],[-4,12],[-1,18],[8,12],[-3,19],[2,12],[-8,24],[-11,8],[-18,19],[-1,13],[11,9],[1,11],[-11,7],[-2,6],[5,15],[-5,10],[10,12],[-50,75],[-25,16],[-11,11],[-16,6],[-7,13],[5,13],[0,14]],[[10660,10829],[7,22],[-2,12],[8,15],[10,36],[0,14],[-4,7],[-18,17],[-11,-1],[-8,-5],[-20,5],[0,15],[-8,14],[7,20],[4,17],[11,21],[7,22],[0,23],[1,18],[-7,13],[-12,17],[-3,15],[2,8],[3,28],[5,11],[5,26],[19,16],[19,24],[20,4],[4,6],[-1,19],[2,15],[-2,6],[-23,20],[3,16],[11,7],[-3,19],[11,7],[6,12],[-7,15],[3,17],[-4,6],[-11,7],[-7,13],[-13,19],[-3,18],[-13,16],[-4,11],[1,9],[24,12],[7,7],[7,22],[0,8],[-7,11],[-1,9],[5,13],[-4,9],[-7,30],[-1,10],[11,22],[2,9],[-2,31],[1,9],[9,18],[16,24],[8,5],[16,16],[4,22],[1,11],[-4,5],[-20,17],[-4,9],[-3,36],[5,16],[16,18],[5,11],[-1,9],[-13,12],[-16,27],[-3,9],[3,24],[-2,15],[-19,11],[-1,8],[12,19],[3,16],[-2,8],[-1,20],[-5,23],[5,12],[14,22],[4,14],[-3,16],[-5,9],[-16,14],[-6,9],[-9,27],[-2,21],[4,12],[10,18],[21,26],[10,22],[10,26],[7,10],[2,20],[8,23],[-2,10],[3,24],[-4,14],[-1,24],[4,25],[9,5]],[[10747,12535],[-4,4]],[[10743,12539],[6,15],[1,18],[-9,21],[3,17],[-1,20],[2,7],[11,16],[-3,27],[-2,11],[10,84],[-1,32],[-4,17],[0,19],[5,7],[17,8],[14,9],[6,8],[-1,25],[2,19],[-10,31],[6,18],[5,25],[13,25],[-3,24]],[[10810,13042],[144,22],[29,-10],[35,-1],[40,-12],[16,19],[27,9],[33,68],[86,28],[85,-2],[633,477]],[[11938,13640],[91,-167],[262,-347],[136,-350],[198,-85],[280,-42],[295,6],[304,-24],[381,-100],[295,-126],[304,-133],[404,-184]],[[7807,21406],[-60,5],[-460,-16],[-148,-34],[-286,-220],[-195,79],[-301,-70],[-165,-163],[-263,49],[-286,142],[-200,204],[-325,157],[-201,-30],[-410,106],[-98,-401],[-191,-278],[-183,-286],[-280,-428],[-349,-302],[-76,-63],[-3,-3],[-151,-124],[-1,-1]],[[3175,19729],[-79,98]],[[3096,19827],[-42,50],[-179,328],[-193,60],[-135,54],[-194,-226],[-173,280],[-402,317],[-101,73],[-76,298],[-451,67],[-3,155],[-126,-4],[-98,-3],[-117,-4],[-38,47],[-221,41]],[[547,21360],[118,97],[-3,33],[-7,63],[3,84],[-66,60],[38,33],[75,65],[117,95],[64,-11],[120,82],[14,18],[-7,37],[-51,158],[0,9],[-12,210],[175,399],[8,0],[17,44],[46,99],[269,303],[102,149],[726,1058],[107,147],[315,417],[462,479],[251,263],[73,54],[1018,840],[327,264],[1130,922],[103,87]],[[6079,27918],[2,-1],[1267,-529],[1614,-595],[555,-248],[1003,-449]],[[10520,26096],[403,-187]],[[10923,25909],[-2500,-3110]],[[8423,22799],[-616,-1393]],[[3298,19304],[-16,-7],[-253,-183],[-153,-64],[-79,-33],[-216,-21],[-105,-22],[-137,-38],[-132,-37],[-110,-17],[-132,-75],[-42,54],[-169,91],[-247,17],[-95,64],[-258,-107],[-311,-183],[-169,-91]],[[674,18652],[-181,262],[-175,773],[-311,1341],[-7,129],[69,60],[8,9],[149,51],[76,36],[88,-13],[30,8],[49,8],[47,22],[31,22]],[[3096,19827],[151,-187]],[[3247,19640],[-219,-133],[-44,-48],[8,-27],[38,36],[50,17],[48,-25],[18,-121],[120,-8]],[[3266,19331],[32,-27]],[[26164,38980],[416,-220],[123,-75],[2268,-1188],[1914,-1025],[191,-89],[1,-7736],[-1324,-22],[-2443,-86],[-822,64],[-275,255],[18,2863],[-67,7259]],[[20714,31907],[-830,2175],[-336,1294]],[[19548,35376],[1183,2493],[1529,3139]],[[22260,41008],[207,-104],[1174,-605],[55,-37],[961,-486],[1507,-796]],[[26164,38980],[50,-5410],[-1980,-37],[-169,-775],[-948,-1141]],[[23117,31617],[-842,345],[-1487,-54]],[[20788,31908],[-74,-1]],[[18695,31868],[-1820,-29],[-34,-211],[-60,-105],[-189,-167],[-241,-70],[-233,-10],[-77,-26],[-3116,-2902]],[[12925,28348],[-2405,-2252]],[[6079,27918],[3179,6392]],[[9258,34310],[6401,17],[362,-477]],[[16021,33850],[866,-58]],[[16887,33792],[468,-485]],[[17355,33307],[1332,-1435]],[[18687,31872],[8,-4]],[[5728,11326],[-69,117],[108,132],[-32,79]],[[5735,11654],[0,0],[389,181],[248,105],[265,127],[251,82],[86,132],[44,87],[77,145],[227,218],[236,141],[207,106],[348,132],[333,46],[260,36],[98,-18],[165,-27],[73,24],[292,21],[162,24]],[[9496,13216],[13,-14]],[[9509,13202],[103,-106],[260,68],[444,115],[24,-133],[83,-7],[386,-34],[1,-63]],[[10743,12539],[4,-4]],[[10660,10829],[-263,201],[-401,-79],[-428,-63],[-248,-66],[-183,-43],[-313,-66],[-327,-142],[-402,-57],[-342,-48],[-103,-52],[-65,-193],[25,-230]],[[7610,9991],[-8,4]],[[7602,9995],[-12,8],[-26,11],[-20,3],[-22,6],[-30,15],[-9,14],[-18,16],[-16,6],[-11,1],[-28,-22],[-19,-7],[-38,10],[-28,1],[-49,-6],[-13,-14],[-57,-13],[-32,2],[-46,17],[-26,11],[-63,33],[-31,8],[-29,2],[-19,8],[-24,12],[-21,7],[-41,-3],[-28,-2],[-33,4],[-32,8],[-17,9],[-13,17],[-21,31],[-16,15],[-13,24],[-25,25],[-12,7],[-27,11],[-13,10],[-22,21],[-32,39],[-11,6],[-21,19],[-17,22],[-23,25],[-27,25],[-7,0],[-16,10],[-18,3],[-42,-6],[-23,-10],[-52,3],[-24,6],[-21,8],[-78,48],[-20,4],[-27,8],[-13,17],[-10,26],[-1,15],[5,23],[-4,35],[-8,18],[-86,90],[-7,37],[-8,19],[-14,11],[-27,13],[-29,7],[-29,4],[-26,8],[-18,14],[-31,16],[-28,11],[-13,20],[-7,13],[-12,29],[-8,23],[-4,22],[0,16],[5,21],[13,31],[-3,37],[-12,49],[-6,13],[-8,12],[-13,29],[-4,15],[0,15],[4,33],[-11,29],[-2,27],[0,17]],[[9976,3412],[-52,-106],[24,-114],[13,-85],[-54,-87],[-38,-94]],[[9869,2926],[-63,-66],[-81,-94],[-62,-81],[-61,-96],[-38,-80],[-38,-145],[-19,-90],[-39,-141],[-28,-143],[-18,-100],[-84,-89]],[[9338,1801],[-38,112],[23,161],[-8,136],[-52,107],[-56,72],[-56,83],[-57,107],[-56,71],[-56,98],[-64,137],[-70,115],[-45,76]],[[8803,3076],[-41,99],[-64,94],[-71,66],[-99,96],[-62,115],[3,45]],[[8469,3591],[20,6],[18,6],[9,-4],[11,0],[22,2],[19,11],[11,4],[34,0],[11,3],[11,15]],[[8635,3634],[4,32],[0,15],[22,38],[-3,11],[-6,6],[3,11],[10,10],[9,2],[11,5],[19,22],[12,11],[22,3],[10,13],[11,4],[16,-7],[20,-2],[14,3],[17,20],[19,2],[9,-4],[9,-10],[10,-4],[12,16],[5,2],[14,0],[20,-5],[9,2],[6,18],[-1,20],[9,8],[26,2],[9,7],[19,12],[7,10],[11,3],[26,1],[19,10],[5,11],[-4,11],[-8,17],[5,9],[16,4],[16,11],[3,12],[1,27],[6,10],[9,11],[11,6],[30,10],[12,6],[6,9],[3,17],[-5,10],[-1,11],[6,15],[11,4],[5,-1],[11,5],[9,12],[1,10],[-7,14],[-3,15],[0,14],[12,18],[10,9],[10,24],[13,9],[7,16],[-4,19],[-1,11],[7,9],[7,2],[23,-1],[6,6],[1,25],[10,5],[5,-2],[7,-9],[12,-3],[6,8],[-6,13],[-9,10],[-34,25],[-15,22],[-3,14],[5,26],[0,10],[-12,26],[-4,4],[-12,-2],[-13,-13],[-13,-1],[-8,7],[-1,7],[10,37],[-5,11],[-8,6],[-13,2],[-22,0],[-10,-3],[-28,-14],[-8,-1],[-7,6],[-2,12],[2,18],[9,20],[3,35],[-4,13],[-13,13],[-15,1],[-21,-5],[-22,-23],[-8,-1],[-12,13],[-6,20],[-5,10],[-6,5],[-20,10],[-10,10],[-7,14],[-15,15],[-18,14],[-8,13],[-8,27],[-10,17],[-18,17],[-23,14],[-12,20],[-7,8],[-23,11],[2,16],[10,8],[5,9]],[[8855,4893],[114,7],[114,-39],[99,-42],[58,-74],[69,-68],[99,-83],[90,-72],[85,-92],[20,-131],[59,-154],[68,-132],[-34,-110],[52,-96],[88,-144],[-3,-137],[84,-53],[59,-61]],[[8469,3591],[-9,3]],[[8460,3594],[-12,7],[-14,12],[-3,6],[0,17],[-5,7],[-6,0],[-14,-7],[-12,-2],[-24,-1],[-16,-11],[-15,-16],[-19,-2],[-13,2],[-7,-4],[-9,-22],[-16,-14],[-14,12],[-28,3],[-16,4],[-22,-2],[-1,-25],[-11,-13],[-8,-2],[-10,4],[-21,16],[-20,5],[-20,-1],[-20,-28],[-10,-5],[-18,3],[-15,0],[-20,-27],[-21,-14],[-10,2],[-4,11],[-1,14],[-3,8],[-8,0],[-9,-5],[-9,-31],[-8,-7],[-9,-18],[-15,-3],[-16,4],[-6,-6],[-10,-2],[-8,2],[-24,-1],[-9,-10],[-25,-20],[-13,-12],[-5,-19],[10,-42],[1,-11],[-3,-18],[-2,-29],[-16,-44],[-19,-30],[-12,-15],[-16,-8],[-16,-5],[-8,-1],[-12,4],[-18,2],[-9,3],[-23,22],[-21,10],[-13,17],[-11,6],[-11,10],[-8,4],[-24,1],[-14,-10],[-30,-36],[-4,-7],[-3,-15],[-8,-14],[-9,-20],[-12,-10],[-8,0],[-8,-4],[-6,-11],[-10,3],[-26,-1],[-11,-6],[-14,-5],[-7,-6],[-18,-23],[-22,-18],[-17,-5],[-17,-16],[-16,-26],[-11,1],[-12,7],[-15,-14],[-13,-22],[-15,-7],[-24,1],[-17,-6],[-4,-19],[-16,-15],[-23,2],[-1,-4],[-13,5],[-10,-7],[-24,-25],[-17,-26],[-9,-14],[-14,-27],[-6,-22],[-1,-39],[2,-16],[-1,-27],[-24,-29],[-11,-46],[-3,-24],[-8,-14],[-18,-20],[-19,-13],[-16,-2],[-23,7],[-10,0],[-26,-23],[-21,-4],[-25,12],[-16,12],[-17,8],[-12,-8],[-12,-9],[-11,-3],[-18,1],[-4,10],[0,14],[-2,5],[-23,0],[-6,4],[-10,0],[-10,-7],[-9,4],[-11,15],[-23,-9],[-18,5],[-12,-8],[-17,-16],[-16,-2],[-10,1],[-9,-10],[5,-9],[-2,-7],[-18,-26],[-8,-24],[-1,-14],[-7,-9],[-12,1],[-18,-28],[-19,-5],[-14,-13],[-20,-5]],[[6489,2487],[-58,129],[-54,227],[57,183],[89,36],[103,2],[81,22],[-86,77],[-75,92],[48,97],[82,93],[8,212],[-2,110],[90,131],[54,133]],[[6826,4031],[103,25],[129,67],[104,22],[88,31],[-16,119],[-42,163],[27,145],[122,-58],[73,60],[117,47],[108,-7],[124,2]],[[7763,4647],[84,-88],[51,-135],[56,-120],[96,24],[222,34],[119,-74],[121,3],[100,-29],[-27,-109],[-45,-79],[-31,-121],[29,-111],[39,-77],[58,-131]],[[10283,7568],[37,0]],[[10320,7568],[-5,-16],[-16,-76],[-6,-77],[-9,-70],[8,-77],[29,-82],[14,-58],[8,-135],[32,-66],[33,-58],[5,-89],[-11,-75],[-4,-67],[-16,-106],[-17,-116],[-4,-78],[-4,-95],[-90,38],[-53,18],[-63,20],[-69,10],[-47,12],[-71,5],[-63,21],[-52,30],[-28,30],[-47,-32],[-34,-93],[-11,-56],[-21,-37],[-58,-4],[-76,-14],[-59,-5],[-107,-2],[-38,-8],[-80,-37],[-20,-12],[-8,-8],[4,-30],[4,-60],[0,-21],[-2,-36],[2,-35],[-2,-43],[1,-41],[8,-23],[-9,-24],[-10,-14],[-8,-20],[-13,-50],[-10,-41],[-3,-21],[0,-31],[12,-16],[11,-12],[19,-12],[33,-24],[32,-21],[19,-17],[-9,-31],[-8,-24],[-8,-32],[-13,-38],[-21,-50],[-14,-38],[-8,-16],[-2,-19],[-8,-15],[-7,-20],[-7,-30],[-7,-16],[-1,-21],[-5,-18],[8,-35]],[[9240,5108],[-48,-1],[-45,-14],[-34,-22],[-91,-27],[-32,-8],[-55,-11],[-29,-1],[-26,7],[-23,2],[-40,17],[-42,-20]],[[8775,5030],[-13,16],[-8,19],[-4,39],[4,39],[3,16],[6,19],[0,17],[-4,25],[-19,55],[-8,8],[-24,3],[-14,5],[-17,12],[-7,13],[-8,26],[-7,10],[-25,14],[-23,15],[-18,14],[-2,10],[-2,39],[2,13]],[[8587,5457],[-73,38],[-32,67],[-72,75],[-57,79],[-52,85],[-29,115],[-55,105],[-45,118],[-42,116]],[[8130,6255],[-1,2],[-69,80],[-87,80],[-87,42],[-57,17],[-102,31],[-46,14],[-92,37],[-94,94],[-114,49],[-5,7]],[[7376,6708],[559,529]],[[7935,7237],[273,473],[31,161],[-5,3],[2,10],[9,18],[5,0],[4,8],[-2,13],[2,15],[-6,12],[-6,5],[9,8],[-14,19],[2,14],[-6,6],[-16,0],[-2,9],[6,6],[0,9],[14,17],[-4,11],[-9,7],[-1,5],[18,8],[-2,11],[5,7],[-10,10],[8,19],[2,21],[-8,9],[5,14],[-4,9],[-6,5],[-2,10],[10,6],[-4,12],[12,-2],[2,18],[-4,6],[-13,8],[0,9],[10,1],[-9,13],[-3,18],[-3,5],[-16,2],[-6,9],[3,10],[-10,4],[-7,9],[-7,0],[-5,7]],[[8177,8324],[7,14],[319,-12],[425,-15],[288,230],[11,-11],[8,-22],[9,-17],[7,-7],[30,-22],[35,0],[10,-5],[17,-17],[6,-11],[-8,-40],[-2,-21],[3,-13],[0,-13],[-9,-16],[-29,-25],[-1,-6],[7,-27],[10,-21],[-4,-15],[-8,-22],[-1,-12],[4,-15],[19,-14],[19,-4],[21,4],[29,-10],[7,-10],[2,-18],[0,-16],[9,-31],[-9,-18],[5,-26],[-2,-25],[2,-12],[15,-24],[7,-25],[14,-18],[24,11],[13,3],[18,-10],[16,0],[15,4],[24,0],[31,-2],[18,-14],[14,-16],[22,-13],[38,-15],[10,-15],[-5,-17],[0,-18],[5,-10],[14,-4],[4,-9],[9,-7],[36,-16],[10,-13],[5,-18],[6,-6],[7,-1],[11,12],[0,6],[-8,18],[0,25],[10,3],[28,-7],[12,-21],[21,-16],[6,-14],[8,-9],[15,-1],[10,14],[11,9],[10,25],[7,9],[9,7],[12,-6],[0,-12],[-8,-24],[1,-22],[10,0],[15,8],[9,-3],[27,-2],[15,-13],[2,-16],[32,-6],[40,22],[8,-1],[17,-11],[11,3],[15,11],[8,0],[12,8],[18,7],[16,0],[4,-4],[-3,-10],[-13,-6],[-8,-6],[-5,-12],[2,-12],[6,-5],[29,-10],[5,-10],[6,-21],[8,-11],[8,0],[15,8],[10,-5],[4,-5],[-12,-37],[0,-14],[14,-5],[20,-20]],[[23169,19774],[61,-101],[-11,-172],[53,-199],[53,-88],[112,-78],[56,-103],[192,-45],[109,-241],[142,-190],[220,-269],[131,-518],[-53,-178],[-103,-70],[-42,-135],[-162,-126]],[[23927,17261],[-19,11],[-28,7],[-31,-9],[-5,-10],[-16,0],[-31,-6],[-35,-10],[-27,-11],[-16,-3],[-28,-14],[-36,-5],[-18,-1],[-27,8],[-11,8],[-10,-2],[-8,-11],[-14,-3],[-18,-10],[-9,-3],[-20,-16],[-14,0],[0,-9],[-17,-6],[-9,-8],[-8,5],[-11,-12],[-19,-1],[-7,-6],[-10,-1],[3,51],[-29,16],[-13,36],[-100,3],[-96,-2],[-49,-5],[-13,-6],[-71,-26],[-484,111],[-12,29],[-4,14],[-5,3],[-13,18],[-21,35],[-21,27],[-19,17],[-10,4],[-65,-9],[-18,5],[-40,22],[18,-41],[10,-31],[7,-17],[18,-20],[16,-5],[15,-11],[10,-31],[0,-7],[-29,-16],[-23,-6],[-11,-9],[-17,-6],[-21,-3],[-31,-13],[-12,5],[-9,-1],[-19,-26],[-26,-9],[8,-9],[15,-8],[9,-14],[0,-10],[-6,-5],[-21,-4],[-25,-7],[-22,-3],[-23,2],[-17,-3],[-21,-20],[-24,-12],[-8,-6],[-12,-22],[-4,-13],[-12,-9],[-34,7],[-13,-8],[-58,-5],[-272,30],[-66,-13],[-26,-38],[-61,-35],[-95,-33],[-146,-107],[-8,-11],[-1,-37],[-22,-40],[-82,-2]],[[21194,16804],[-112,-20]],[[21082,16784],[41,247],[-8,172],[-27,157],[21,87],[32,115],[6,84],[15,169],[109,250],[224,184],[122,69],[132,13],[201,-97],[144,-159],[121,-43],[80,-6],[-106,287],[115,99],[-65,163],[12,166],[-106,84],[-183,109],[-384,-18],[-165,27],[-216,33],[-41,-141],[-150,-203],[-186,-150],[-225,-88],[-394,-42],[-109,-14]],[[20092,18338],[-1,164]],[[20091,18502],[-116,162],[-76,87],[69,211],[4,461]],[[19972,19423],[-702,355]],[[19270,19778],[7,440]],[[19277,20218],[62,46],[62,56],[51,58],[103,101],[124,161],[54,77],[29,48],[9,32],[10,9],[6,16],[37,37],[44,11],[27,15],[20,-1],[29,13],[1,37],[23,31],[47,2],[7,11],[9,1],[-1,26],[27,33],[20,47],[41,23],[35,7],[53,-9],[35,-11],[29,17],[50,-29],[30,20],[42,-16],[23,6],[18,-5],[37,-5],[19,-8],[18,5],[15,-14],[26,5],[33,-1],[20,23],[16,-5],[18,32],[64,42],[24,-16],[19,12]],[[20742,21158],[54,-13]],[[20796,21145],[40,9],[19,-10],[7,13],[60,8],[7,4],[46,-22],[74,-15],[74,-12],[92,-48],[62,-17],[40,4],[72,-29],[21,1],[5,-7],[31,-50],[40,-18],[13,0],[18,9],[83,-78],[58,-1],[35,-57],[67,-11],[100,-168],[-19,-18],[35,-119],[55,-118],[66,-60],[78,-108],[45,-75],[26,-39],[52,-23],[8,5],[77,-38],[63,-25],[44,0]],[[22390,20032],[53,-18],[70,-26],[85,-68],[66,-53],[115,-75],[105,-67],[64,1],[7,-32],[139,14],[51,41]],[[23145,19749],[24,25]],[[22242,22538],[-245,-31],[-212,-96],[-213,-157],[-292,-199],[-274,-374],[-181,-395],[-42,-138]],[[20783,21148],[-41,10]],[[19277,20218],[1,4923]],[[19278,25141],[135,-22],[79,-14],[115,-73],[167,-102],[58,-73],[53,-23],[52,-14],[180,-2],[129,13],[91,15],[164,31],[47,1],[100,12],[123,-24],[59,-14],[59,-24],[101,-55]],[[20990,24773],[-101,-90],[139,-49],[137,-48],[82,-18],[54,-8],[131,-52],[7,2],[289,100],[81,37],[247,115],[203,98],[265,128],[-2,144],[-5,156],[269,146],[297,-11],[190,22],[205,-42],[171,95],[2,0]],[[23651,25498],[249,-10],[349,-17]],[[24249,25471],[-126,-184],[-162,-325],[-58,-282],[-15,-273],[-94,-253],[-137,-255],[-126,-224],[-121,-151],[-100,-76],[-129,-88],[-204,-36],[-189,-3],[-249,-187],[-231,-226],[-56,-200],[-10,-170]],[[12278,4928],[-1,-36],[-30,-37],[-20,6],[-65,-21],[-50,-9],[-165,-54],[-157,-19],[-91,-8],[-136,-50],[-118,-34],[-48,-44],[-47,-54],[-63,-64],[-26,-44],[45,-64],[97,-85],[71,-50],[78,-52],[-58,-117],[84,-55]],[[11578,4037],[-17,-22],[-24,-35],[-32,-33],[-12,-21],[-28,-34],[-17,-13],[-18,-19],[-20,-12],[-15,-10],[-25,-6],[-16,-8],[-13,-2],[-45,-37],[-11,-16],[-19,-36],[-8,-11],[-11,-19],[-55,-80],[-21,-21],[-13,10],[-32,29],[-21,19],[-15,15],[-10,21],[-6,33],[-7,45],[-43,-13],[-29,-18],[-41,-6],[-29,-7],[-35,-10],[-40,-15],[-41,-20],[-38,-19],[-33,-14],[-22,-11],[-32,-14],[-127,-46],[-33,-20]],[[10524,3561],[279,412]],[[10803,3973],[28,713],[-52,220]],[[10779,4906],[17,23],[242,253],[-421,303],[450,358]],[[11067,5843],[26,-31],[102,-80],[91,-52],[63,-92],[28,-60],[-21,-62],[6,-63],[101,0],[45,8],[101,45],[84,13],[79,-7],[75,-24],[62,-59],[60,-49],[40,-53],[25,-46],[9,-36],[2,-19],[12,-42],[2,-11],[25,-40],[16,-12],[20,-19],[12,-17],[43,-31],[23,-19],[31,-22],[23,-18],[26,-17]],[[21194,16804],[1,-14],[5,-3],[-5,-29],[0,-18],[-6,-13],[-16,-11],[-2,-12],[5,-10],[10,-8],[10,-2],[3,-12],[16,-6],[6,-10],[0,-9],[9,-7],[5,-16],[6,-6],[17,-6],[34,-3],[29,3],[24,-1],[12,-3],[5,-6],[6,-17],[3,-20],[-2,-11],[12,0],[13,7],[12,2],[21,-3],[21,-12],[34,3],[7,-1],[14,-12],[6,-3],[18,-4],[7,-6],[10,0],[15,-6],[13,3],[10,-1],[4,-7],[21,0],[8,-3],[10,-11],[21,-5],[2,-7],[11,-1],[2,-16],[20,-6],[23,-20],[7,-11],[2,-19],[11,-11],[25,-8],[17,-17],[26,-9],[16,-4],[18,-9],[22,-20],[8,-15],[4,-14],[-3,-17],[23,-36],[3,-9],[10,-19],[0,-14],[3,-9],[-2,-22],[5,-5],[2,-18],[16,-45],[13,-19],[5,-27],[21,-9],[-7,-15],[-17,-11],[-12,-4],[-14,-9],[-1,-22],[-27,-24],[-8,-9],[-15,-11],[-23,-6],[-16,0],[-27,7],[-38,-15],[-13,0],[-24,-11],[-14,-11],[-28,-18],[-11,-3],[12,-14],[12,-6],[20,-5],[13,-8],[9,-3],[23,-16],[23,-3],[1,-20],[-7,-16],[-3,-21],[-10,-24],[2,-14],[-14,-24],[23,-19],[16,-7],[17,-3],[63,-59],[36,-72],[-26,-111],[-19,-31],[-33,-46],[-11,-24],[34,-5],[81,-12],[21,-8],[29,-19],[52,-25],[60,-17],[58,-21],[55,0],[57,-4],[33,-3],[102,5],[51,3],[13,-23],[10,-12],[25,-12],[19,-18],[10,-13],[22,-3],[71,-15],[173,-66]],[[19987,13923],[-698,-29]],[[19289,13894],[-126,-5],[10,-21],[-18,-11],[0,-35],[-5,-30],[22,-49],[-20,-64],[-23,-2],[-84,48],[-39,-30],[-32,11],[-55,-35],[-43,10],[8,33],[-22,14],[5,33],[-8,41],[18,11],[-7,26],[-20,22],[-10,14]],[[18840,13875],[-10,14],[-14,31],[0,33],[-8,9],[-23,7],[-4,26],[19,23],[-5,20],[-14,33],[11,20],[14,11],[4,31],[14,22],[34,35],[-2,56],[8,25],[4,34],[11,36],[23,44],[11,42],[11,35],[8,64],[8,33],[18,51],[10,42],[18,58],[25,33],[29,56],[21,55],[1,55],[-6,61],[20,10],[23,19],[26,31],[24,13],[19,40],[3,31],[45,48],[29,16],[25,23],[108,86],[16,21],[-1,26],[22,10],[11,25],[37,16],[29,4],[14,14],[16,-2],[16,16],[10,18],[-8,17],[-6,23],[-6,10],[-20,23],[-25,13],[-11,20],[-20,3],[-17,10],[-15,27],[2,16],[-1,21],[1,26],[-9,11],[-10,39],[20,8],[21,42],[18,26],[20,42],[18,22],[14,36],[27,26],[15,9],[0,22],[16,43],[16,28],[29,31],[22,-2],[26,-13],[37,3],[12,16],[27,17],[30,23],[9,30],[10,18],[5,28],[-37,-5],[-14,42],[8,41],[9,27],[-17,32],[-17,23],[-8,6],[-31,-3],[-477,383]],[[19211,16695],[811,123],[91,101],[58,94]],[[20171,17013],[158,-79],[405,-119],[348,-31]],[[20171,17013],[0,488],[-78,573],[0,20]],[[20093,18094],[-1,244]],[[23169,19774],[32,33]],[[23201,19807],[9,17],[62,21],[41,11],[22,19],[7,9],[8,20],[9,11],[14,13],[14,11],[10,16],[1,13],[-1,18],[20,35],[7,30],[16,38],[6,23],[25,40],[0,16],[-4,10],[-13,25],[-4,14],[33,-13]],[[23483,20204],[80,-22]],[[23563,20182],[78,-21],[60,-4],[26,4],[5,-4],[21,-2],[13,0],[20,8],[12,6],[5,6],[19,-14],[19,-12],[23,3],[27,15],[18,16],[2,4],[18,-8],[54,-57],[53,-19],[197,1],[92,-30],[289,-84],[574,-175],[140,-63],[-37,-45],[-3,-75],[35,-46],[129,-49],[84,-46],[95,-119]],[[25631,19372],[-60,-68],[-147,-219],[22,-21],[8,-12],[14,-11],[25,-9],[11,-18],[5,-14],[11,-4],[9,-15],[13,-6],[4,-13],[4,-31],[12,-10],[1,-23],[-4,-13],[-11,-14],[-10,-24],[-6,-7],[-15,-10],[-3,-12],[21,-28],[9,-18],[0,-14],[6,-9],[20,-18],[9,-22],[16,-9],[6,-7],[-6,-19],[0,-19],[17,-24],[8,-7],[22,-32],[12,-24],[10,-14],[13,-10],[15,-8],[12,-4],[16,-7],[19,-12],[1,-23],[7,-10],[15,-12],[9,-10],[3,-19],[14,-11],[7,-9],[13,1],[17,-1],[10,-5],[7,-9],[0,-10],[-4,-18],[-5,-13],[-13,-22],[-10,-22],[-4,-26],[5,-9],[8,-5],[2,-22],[4,-15],[-7,-18],[1,-21],[-7,-14],[-7,-20],[9,-12],[2,-24],[12,-16],[8,-3],[4,-7],[9,-3],[10,-7],[3,-16],[14,-23],[-1,-20],[2,-10],[14,-14],[2,-13],[15,-9],[10,-1],[7,-5],[19,-4],[8,-11],[11,-6],[18,-16],[1,-6],[21,-29],[4,-16],[0,-25],[6,-25],[12,-21],[0,-10],[-20,-5],[1,-24],[-7,-6],[-27,-13],[-15,-11],[-10,-27],[-34,-18],[1,-9],[7,-11],[-1,-16],[-8,-6],[-12,-2],[-24,0],[-12,-12],[-7,-16],[-24,-24],[-6,-10],[2,-17],[-8,-3],[-17,-2],[-12,-3],[-6,-11],[-11,-27],[-9,-8],[-14,-8],[-11,-4],[-30,-17],[-5,-23],[-2,-37],[-8,-10],[-20,-16],[-18,-35],[-8,-8],[-25,-9],[-11,-14],[-4,-14],[-2,-16],[-6,-19],[-17,-14],[-4,-12],[-8,-10],[-14,-6],[-14,-2],[-34,-15],[-11,-1],[-26,10],[-20,3],[-13,-3],[-13,-5],[-13,-9],[-16,-20],[-2,-15],[-6,-13],[-10,-7],[-15,-1],[-17,2],[-13,-2],[-18,-9],[-25,-3],[-25,5],[-16,0],[-22,4],[-9,-4],[-19,-15],[6,-29],[-4,-20],[-7,-21],[-7,-10],[-18,-12],[-15,-3],[-11,-5],[-17,-17],[-8,-11],[-6,-14],[-13,-19],[-12,-9],[-11,-6],[-13,-4],[-15,-1],[-11,-5],[-24,-7],[-6,-13],[-6,-21],[-7,-7],[-8,-3],[-18,-17],[-10,-12],[0,-13],[9,-26],[13,-12],[-1,-14],[-5,-20],[-8,-7],[-28,-11],[-6,-5],[-4,-13],[-8,-15],[-28,-26],[-17,-17],[-7,-19],[0,-12],[-4,-15],[-14,-19],[-7,-19],[-3,-22],[-11,-25],[-4,-26],[-3,-15],[-9,-28],[-10,-19],[-12,-19],[-4,-18],[-14,-17],[-4,-11],[-12,-45],[-10,-17],[-4,-22],[-7,-9],[-6,-16],[-5,-39],[3,-8],[-9,-13],[-21,-25],[-14,-11],[-35,-14],[-23,-15],[-5,-18],[0,-24],[5,-8],[20,-14],[10,-3],[15,-10],[10,-15]],[[24684,16110],[-24,-35],[-93,-9],[-28,-26],[-29,-38],[-5,-7],[-49,-43],[-57,11],[-47,39],[-30,8],[-50,5]],[[24272,16015],[-94,38]],[[23855,16223],[40,55],[35,63],[30,49],[36,89],[-164,148],[1,6],[8,12],[13,30],[5,33],[1,25],[-8,23],[-8,10],[3,6],[0,20],[5,17],[0,16],[5,12],[14,22],[1,11],[-5,20],[0,8],[-8,18],[-3,12],[5,6],[18,0],[4,13],[14,12],[8,11],[2,11],[6,26],[15,10],[11,18],[-1,16],[-4,12],[-15,27],[-14,6],[-6,6],[2,26],[8,20],[14,18],[10,16],[7,7],[1,18],[-8,16],[-2,25],[-4,13]],[[26823,12980],[-258,25],[-215,54],[-151,54],[-130,112]],[[26069,13225],[-41,78],[-33,49],[-32,102],[-20,157],[11,94],[21,114],[35,181],[-91,60],[-112,94],[-198,39],[-301,63],[-12,0]],[[24260,16020],[12,-5]],[[24684,16110],[6,-9],[5,-15],[10,-7],[24,-3],[12,-6],[12,-16],[3,-10],[2,-24],[-11,-25],[-1,-12],[1,-15],[23,-34],[18,-17],[16,-13],[27,-29],[13,-18],[10,-28],[7,-17],[61,-39],[9,-10],[11,-6],[10,-12],[5,-9],[7,-21],[9,-16],[21,-7],[9,-23],[172,5],[287,37],[140,20],[40,15],[105,96],[22,38],[2,136],[51,-35],[305,-193],[272,-99],[97,-29],[69,-22],[-104,-260],[13,-87],[-10,2],[-5,-5],[-8,7],[-8,-3],[-15,0],[-7,-9],[-17,-2],[-6,1],[-2,-10],[0,-14],[-16,-14],[-13,-26],[-16,-4],[-9,-12],[-9,-7],[2,-16],[-8,-7],[-6,-12],[-4,-14],[3,-9],[-4,-7],[-17,-11],[-8,-1],[-8,-8],[-3,-19],[-7,-1],[-8,-10],[5,-24],[4,-10],[17,-9],[17,-2],[11,9],[8,0],[15,-15],[22,-14],[3,-23],[7,-9],[16,-4],[4,-5],[10,-23],[9,-13],[23,-11],[8,-8],[15,-25],[3,-13],[-7,-7],[-16,-1],[-1,-12],[11,-8],[0,-10],[-7,-10],[5,-8],[13,-14],[-5,-10],[-16,4],[-6,-6],[3,-10],[15,-7],[6,-10],[-5,-12],[1,-11],[17,-10],[-2,-12],[-11,-2],[-3,-10],[10,-4],[12,0],[1,-5],[-5,-13],[1,-13],[27,-31],[2,-12],[-14,-8],[-5,-7],[-5,-15],[4,-15],[6,-4],[15,-2],[12,-7],[-4,-21],[-9,-13],[-1,-5],[8,-8],[6,0],[21,5],[6,-6],[-4,-11],[-13,-5],[-4,-9],[5,-6],[8,1],[7,-5],[4,-8],[16,-9],[2,-8],[-14,-8],[-11,0],[2,-10],[10,1],[15,8],[9,0],[6,-28],[1,-17],[-7,-11],[-2,-8],[5,-5],[13,-5],[-4,-12],[13,-6],[7,-9],[2,-7],[-3,-18],[23,-38],[-1,-9],[-7,-13],[0,-12],[4,-10],[8,-6],[7,-9],[1,-23],[-13,-14],[0,-9],[7,-9],[1,-11],[-4,-6],[2,-12],[-1,-10],[-5,-14],[0,-12],[4,-14],[-8,-7],[-3,-7],[4,-18],[-13,-9],[-5,-12],[6,-9],[0,-8],[-9,-7],[6,-11],[-3,-16],[5,-10],[-5,-10],[-16,-2],[-4,-7],[6,-12],[-6,-13],[10,-10],[-4,-10],[-12,-15],[1,-19],[-6,-14],[10,-26],[0,-5],[-10,-11],[11,-8],[26,-12],[13,0],[24,19],[14,2],[12,8],[18,17],[24,17],[21,12],[24,5],[10,4],[17,13],[10,2],[31,-7],[28,-2],[12,3],[26,11],[9,7],[18,7],[7,-2],[13,-13],[18,-9],[27,-5],[9,2],[10,11],[10,16],[2,10],[7,7],[11,3],[8,-3],[4,-8],[8,-3],[24,-2],[-42,-54],[-39,-135],[-50,-223],[-58,-226],[-69,-321]],[[25353,12664],[368,187],[348,374]],[[26823,12980],[-34,-158],[14,-103],[22,-89],[49,-61],[49,-69],[43,-66],[80,-88],[74,-60],[68,-28],[82,-31],[134,-64],[88,-88],[2,-121],[74,18],[50,7],[48,7],[198,12],[99,6],[14,-316],[33,-18],[58,-34],[5,-62],[18,-208],[-60,-171],[-9,-27],[-57,-159],[-43,-12],[-16,-51],[-141,-425],[-12,7],[-13,2],[-4,7],[-11,2],[-14,-1],[-10,-3],[-15,14],[-12,-1],[-20,-7],[-24,3],[-24,6],[-19,7],[-40,12],[-12,0],[-11,-7],[-16,1],[-7,4],[-17,-1],[-7,6],[-17,0],[-12,4],[-11,-10],[-10,1],[-14,15],[-9,1],[2,19],[3,8],[-13,25],[-8,0],[-11,5],[-9,-5],[-6,16],[-4,3],[-17,3],[-2,10],[-13,-2],[-13,5],[-5,-1],[-10,-13],[-6,9],[-10,-4],[-5,2],[-16,-13],[-1,9],[-10,-2],[-8,5],[-6,7],[6,12],[-19,0],[-8,8],[-18,-13],[-8,-3],[-2,12],[-12,-1],[-6,12],[-13,-10],[-7,7],[-14,-2],[-13,-7],[-12,-3],[-11,13],[-10,-3],[-8,5],[-7,8],[-13,4],[-31,3],[-13,6],[-7,11],[-15,7],[0,7],[-20,-9],[-8,-15],[-14,-5],[-8,3],[-6,-6],[-21,-4],[-19,6],[-13,-1],[-6,5],[-26,3],[-8,12],[-13,-3],[-17,6],[-9,-9],[-10,-1],[-10,-4],[-27,6],[-2,14],[-4,4],[-10,-4],[-2,8],[-8,9],[-10,4],[-6,8],[2,10],[-12,-2],[-1,-7],[-15,-4],[-7,2],[-18,-4],[-2,5],[-21,-19],[-1,10],[-19,-7],[5,-15],[0,-14],[-4,-9],[-7,-2],[-19,12],[-8,-1],[-17,6],[-11,0],[-4,-4],[-18,-25],[-8,-6],[-26,15],[-11,-2],[-14,4],[-6,-7],[-5,12],[-6,4],[-8,-3],[-1,-17],[-8,3],[0,-16],[5,-10],[-2,-7],[-11,-16],[-19,-17],[-16,-6],[-15,1],[-6,8],[-15,4],[-10,-3],[1,-10],[-18,-3],[-20,-9],[-6,-1],[-10,6],[-12,0],[-6,8],[-9,-6],[3,-14],[-7,-14],[-19,-2],[-1,-7],[-15,3]],[[26240,10593],[-887,2071]],[[25353,12664],[-501,96],[-40,44],[-48,22],[-11,20],[-63,28]],[[24690,12874],[-829,-155]],[[18200,10717],[-15,8],[-3,13],[-5,12],[-13,2],[-6,-5],[-17,-2],[-11,3],[-9,-4],[-30,-4],[-13,3],[-15,10],[-5,28],[-11,1],[-6,20],[-12,7],[-22,-4],[-7,8],[-14,-8],[-14,-2],[-21,2],[-14,19],[-25,8],[-9,6],[-8,11],[-11,5],[-17,1],[-29,-1],[-13,1],[-10,9],[-12,7],[-42,1],[-19,-2],[-7,8],[-15,29],[-16,14],[-19,13],[-10,3],[-19,11],[-12,8],[-27,7],[-21,-9],[-14,-9],[-21,-19],[-25,-2],[-15,6],[-25,-10],[-6,11],[-2,7],[-11,4],[-13,20],[-9,3],[-29,-1],[-7,4],[7,22],[-15,4],[-12,13],[-16,0],[-6,7],[7,8],[0,9],[-9,6],[-14,21],[4,13],[-3,12],[-8,3],[-8,-7],[-24,-5],[-17,-1],[-8,-6],[-10,0],[-11,4],[-11,-3],[-10,-9],[-6,-1],[-9,6],[-15,3],[-12,-2],[-19,6],[-10,11],[-6,3],[0,9],[-11,27],[-20,-1],[-10,18],[-21,11],[-5,8],[-8,21],[-10,12],[-8,0],[-23,16],[-15,0],[-14,2],[-10,-16],[-7,-2],[-21,23],[-8,5],[-23,6],[-11,-6],[-4,-5],[-17,13],[-15,3],[-10,6],[0,19],[-5,10],[-11,2],[-9,7],[-7,11],[-10,0],[-8,-4],[-13,3],[-38,10],[-12,-4],[-18,-12],[-2,11],[-10,8],[-7,0],[-19,-6],[-11,7],[-1,14],[-16,3],[-15,14],[-19,7],[-12,14],[-8,6],[-19,4],[-7,10],[-12,5],[-1,9],[11,9],[-12,3],[-30,-1],[-19,11],[-11,-3],[-9,-6],[-6,1],[-4,9],[-16,2],[-9,15],[-10,10],[-24,-3],[-9,7],[-4,7],[0,13],[-6,13],[-9,-8],[-16,-3],[-8,7],[-3,12],[-14,3],[-11,12],[-10,4],[-10,-1],[-9,18],[-10,-2],[-14,-8],[-20,-4],[-29,14],[27,37],[-101,120],[-189,52]],[[16033,11723],[-56,214],[-13,113],[-13,114]],[[15951,12164],[82,648],[452,-9]],[[16485,12803],[97,-268],[375,114],[121,265],[251,389],[-83,384],[449,425],[91,-43],[248,-78],[504,-90],[302,-26]],[[19289,13894],[425,17]],[[13639,8795],[-2,-12]],[[13637,8783],[-6,-25],[0,-9],[5,-2],[8,5],[8,9],[5,1],[10,-17],[-3,-9],[14,-8],[4,-8],[10,-1],[18,8],[-6,7],[-9,1],[-11,21],[-2,14],[5,5],[8,-10],[20,-12],[11,10],[-3,9],[-9,7],[-3,10],[20,4],[7,6],[9,4],[-4,6],[7,6],[9,-3],[14,1],[-2,-17],[1,-9],[7,-13],[5,-2],[20,3],[5,-7],[-8,-10],[-5,-15],[0,-22],[11,-5],[5,16],[9,-4],[9,14],[6,-2],[8,10],[6,1],[3,-9],[-5,-15],[-2,-21],[8,-8],[1,-13],[-8,-8],[15,-8],[20,-3],[5,20],[8,6],[8,-8],[7,2],[7,-4],[-1,-18],[2,-14],[18,-3],[18,10],[5,-1],[2,-9],[11,-8],[-19,-17],[3,-11],[18,-5],[5,6],[2,13],[9,11],[7,6],[9,-2],[8,-7],[8,-3],[2,-7],[-10,-3],[0,-6],[-8,-3],[5,-9],[10,0],[8,6],[12,0],[0,-7],[6,-13],[-9,-13],[2,-6],[27,1],[10,-6],[-1,-18],[4,-7],[10,0],[14,10],[15,6],[17,-3],[1,-19],[9,-11],[-21,-21],[1,-5],[11,-8],[12,8],[6,-2],[1,-9],[13,-1],[13,-8],[20,4],[9,-6],[7,-7],[10,-5],[17,10],[8,-6],[-2,-16],[9,-11],[9,-2],[0,9],[-11,22],[6,11],[12,-3],[4,-14],[4,-6],[17,7],[21,2],[5,5],[12,1],[10,-14],[1,-14],[21,0],[16,9],[16,3],[11,10],[7,-6],[8,-12],[16,1],[10,-5],[7,-19],[21,-13],[5,-26],[16,-3],[19,-8],[5,-14],[-15,-4],[3,-9],[14,-7],[6,-6],[16,10],[4,-5],[16,-2],[5,6],[7,-8],[7,4],[14,1],[6,-9],[11,-6],[8,0],[27,-7],[4,-5],[11,0],[-2,-9],[12,-2],[11,10],[12,-10],[3,-8],[13,0],[3,-18],[21,-8],[5,-17],[11,-3],[5,-4],[-1,-18],[3,-5],[-1,-16],[5,-2],[0,-11],[14,-3],[6,-16],[13,-3],[5,-14],[11,-9],[1,-8],[-3,-12],[7,-15],[4,-15],[5,0],[10,-9],[2,-9],[21,-9],[6,-7],[3,-8],[16,-2],[5,-5],[19,1],[11,-10],[13,-6],[5,-13],[0,-8],[13,-2],[3,-15],[9,-11],[8,-3],[6,-10],[5,-19],[9,-7],[15,-3],[12,-6],[14,-13],[14,-33],[15,-11],[14,-25],[6,-8],[24,-17],[21,-20],[12,-9],[-3,-24],[-8,-26],[-4,-20],[-5,-11],[-37,-247],[13,-2],[11,-8],[10,-1],[18,5],[18,-7],[11,6],[22,-6],[29,-3]],[[15221,7456],[-41,-15],[-46,-19],[-120,-9],[-76,-46],[-75,-101],[-98,-97],[-85,52],[-85,-61],[-107,7],[-42,-106],[-31,-91],[-37,-142],[-33,-102],[-20,-113],[-41,-167],[-25,-120],[-16,-17]],[[14243,6309],[-54,-44]],[[14189,6265],[-66,-30],[-46,-47],[-65,-55],[-66,-41],[-102,-31],[-58,-54],[-27,-18],[-85,33],[-47,74],[-58,7],[-49,-29],[-39,-11],[-100,-21],[-49,2],[-52,-6],[-74,-39],[-60,-14],[-73,-23],[-46,-10],[-68,-13],[-49,1],[-43,8],[-52,2],[-38,5],[-27,-9],[-41,5],[-89,-18]],[[12620,5933],[-27,57]],[[12593,5990],[-342,52],[-109,252],[-4,9],[-13,11],[-9,25],[-15,11],[0,15],[-3,14],[-14,15],[0,9],[-4,20],[-7,5],[-23,3],[-2,13],[-13,15],[-9,0]],[[12026,6459],[30,35],[61,81],[48,148]],[[12165,6723],[488,274],[-9,12],[-3,13],[7,15],[-2,18],[-16,9],[-11,11],[-3,43],[-11,13],[-14,10],[-25,13],[-20,22],[-16,10],[-30,0],[-14,-6],[-20,0],[-13,11],[-14,17],[-22,10],[-14,5],[-17,16],[-7,23],[-7,33],[-28,33],[-14,14],[-15,11],[-14,20],[-6,15],[2,16],[5,20],[7,20],[2,30],[-3,22],[-11,49],[-2,36],[3,24],[-6,25],[-8,13],[-13,26],[-11,10],[-20,8],[-12,10],[-16,25],[-5,13],[-10,14],[-6,19],[-9,24],[-23,36],[-8,41],[-2,21],[0,26],[3,17],[0,22],[-6,21],[-14,22],[-22,24],[-15,21],[-7,8],[-14,26],[-10,12],[-9,5],[-12,14],[-15,23],[-7,16],[-8,9],[-25,13],[-24,15],[-13,18],[-15,15],[-14,6],[-24,22],[-8,17],[0,28],[-8,19],[-14,26],[-15,15],[-35,28],[-10,17],[4,14],[-7,15],[-18,28],[-3,19],[5,16],[10,22],[-2,14],[-10,10],[-16,5],[-24,14],[-5,10],[-19,25],[-1,19],[-18,26],[-6,14],[-13,32],[-9,16],[-13,26],[-16,3],[-11,6]],[[16560,3600],[-2,2],[-86,107],[-126,21],[-108,-25],[-77,-42],[-147,6],[-127,2],[-97,-21],[-115,38],[-78,77],[-130,11],[-86,-1],[-90,100],[-106,73],[-20,118],[-79,60],[-49,136],[-100,64],[-95,-47],[-102,-90],[-21,-106],[-11,-87],[-35,-93],[-90,-93],[-60,-85],[-47,-85],[-86,-98],[-76,-102],[-83,-40],[-124,-26],[-109,-38],[-100,-23],[-88,1],[-75,-37]],[[13735,3277],[-18,49]],[[13717,3326],[-14,14],[-10,6],[-18,-1],[-26,21],[-12,3],[-34,14],[-24,49],[-19,53],[-13,60],[-7,42],[-14,38],[-10,49],[1,35],[0,125],[4,14],[6,38],[19,71],[8,21],[-1,67],[-9,31],[-20,22],[-27,21],[-43,63],[-4,17]],[[13450,4199],[-6,13]],[[13444,4212],[-16,12],[-4,13],[-23,75],[-3,31],[-15,26],[-11,36],[-8,39],[-1,28]],[[13363,4472],[-3,89]],[[13360,4561],[-1,9],[11,26],[8,8],[21,29],[49,52],[58,25],[86,29],[24,6],[53,8],[25,24],[37,47],[14,16],[60,85],[13,22],[48,83],[58,91],[17,29],[14,32],[7,43],[-49,1],[-24,2],[-32,0],[-60,7],[-95,20],[-69,6],[-99,8],[-59,16],[-70,9],[-24,11],[-565,210]],[[12816,5515],[-196,418]],[[14189,6265],[35,29]],[[14224,6294],[25,-13],[37,-89],[27,-128],[44,-98],[48,-104],[71,-93],[96,-51],[81,-42],[73,-51],[68,-100],[57,-135],[78,-80],[120,-3],[100,22],[139,-6],[77,63],[64,71],[81,24],[113,44],[44,134],[94,38],[94,32],[10,-94],[-20,-126],[-9,-90],[3,-133],[8,-135],[29,-95],[105,-75],[116,-58],[129,-63],[117,-120],[45,-63],[-8,-7]],[[16380,4670],[-6,-3],[-5,-9],[1,-7],[-10,-14],[-18,0],[-3,-9],[-9,-3],[-17,10],[-14,0],[-16,-10],[-13,-8],[-9,-26],[-3,-17],[0,-20],[-8,-11],[-5,3],[-9,-4],[-2,-24],[-6,3],[-9,-2],[-7,2],[-8,-8],[-7,-19],[-15,-3],[0,-16],[-9,-4],[-12,5],[-24,15],[-8,-9],[-14,-5],[-15,3],[-16,-7],[-12,-2],[-4,-11],[-11,0],[-12,-15],[4,-17],[-4,-15],[-6,1],[-8,-7],[-3,-7],[1,-14],[-14,1],[-10,8],[-19,2],[-15,-8],[1,-10],[20,-4],[-1,-10],[-20,2],[0,-10],[-10,1],[-4,-5],[0,-15],[-18,3],[-7,-10],[-17,-1],[-2,-10],[0,-20],[12,-23],[-16,-13],[5,-20],[11,2],[7,-2],[6,-18],[13,-2],[8,4],[11,14],[9,8],[16,6],[24,0],[19,-8],[7,-9],[4,-17],[-1,-24],[-4,-21],[0,-29],[4,-13],[7,-12],[9,-10],[16,-7],[13,2],[7,3],[11,14],[12,6],[21,1],[15,-3],[14,-8],[13,-12],[5,-12],[-1,-22],[3,-10],[8,-8],[28,-18],[9,-11],[15,-13],[13,-6],[23,-2],[14,-4],[25,-13],[28,-9],[11,-8],[3,-6],[6,-19],[8,-16],[17,-14],[7,-16],[16,-20],[14,-11],[21,-7],[32,-18],[10,-12],[19,-7],[20,1],[10,2],[14,-2],[9,-5],[13,-14],[21,-9],[12,-9],[8,-10],[9,-30],[24,-24],[26,-14],[4,-10],[-3,-9],[-29,-12],[-25,-16],[-11,-10],[-26,-29],[-20,-3],[-9,-9],[-7,-15]],[[16560,3600],[-10,-5],[-17,-1],[-9,3],[-5,-8],[10,-17],[1,-9],[-4,-25],[-9,-17],[-25,-30],[-21,-18],[-7,-10],[-3,-19],[5,-20],[-1,-14],[-8,-8],[-8,-29],[0,-9],[-5,-3],[6,-12],[-12,-14],[-6,-12],[3,-7],[-7,-13],[10,-5],[-6,-10],[-5,4],[-1,-19],[-8,3],[-3,-6],[-10,1],[-7,-19],[-15,4],[-2,-6],[-15,-7],[2,8],[-15,1],[0,-16],[-19,-3],[-3,10],[-6,-6],[-4,-10],[-13,2],[-17,6],[0,-9],[-12,-11],[16,-6],[14,-10],[-16,-4],[-4,-5],[9,-10],[-3,-4],[5,-13],[-16,1],[-5,-3],[-6,-16],[-11,14],[-8,-3],[4,-9],[-2,-9],[-7,4],[-14,-2],[9,-15],[-1,-5],[-7,-8],[-3,-6],[2,-11],[-2,-11],[-14,2],[1,-8],[-12,-4],[-12,11],[0,-16],[-10,-12],[-11,5],[-13,-14],[0,-12],[-12,5],[-4,-4],[3,-11],[-12,5],[-4,-9],[6,-2],[-8,-10],[5,-9],[-5,-3],[-14,0],[-6,-27],[2,-12],[-7,0],[-1,8],[-15,-5],[-3,-9],[-7,-7],[15,-15],[-6,-12],[2,-6],[-18,-3],[2,-13],[15,-7],[10,0],[1,-8],[-17,-6],[9,-14],[-2,-8],[-7,-8],[-17,3],[0,-8],[-6,-3],[-6,15],[-14,-10],[7,-13],[-5,-12],[-4,1],[-11,-4],[6,-10],[-16,-3],[0,-9],[-5,-4],[-5,-19],[-6,-3],[-16,8],[-14,-5],[0,-14],[-7,-10],[-10,1],[4,10],[-14,-2],[-10,-5],[11,-13],[-1,-5],[-15,-2],[1,-9],[9,-3],[-2,-10],[-5,-3],[-13,6],[-12,-2],[-4,11],[-8,-1],[-9,6],[-7,-7],[-3,-21],[2,-12],[7,-11],[-7,-15],[4,-9],[-14,-22],[-7,-6],[-2,-23],[-9,-2],[-4,-9],[-7,-8],[-6,-9],[-1,-12],[-5,-8],[-24,-13],[-10,-10],[-8,-15],[-28,-13],[-2,-12],[-12,-13],[-6,-2],[-2,-9],[-21,-4],[-14,-4],[-3,-9],[-13,-9],[-21,-9],[-16,2],[-8,-6],[-9,-2],[-13,-8],[-33,-10],[-24,-1],[-27,-6],[-17,-13],[-13,-3],[-20,-8],[-15,-8],[-23,-4],[-23,-11],[-22,-7],[-6,-7],[-15,-9],[-4,-13],[-17,1],[-2,-6],[-9,-16],[-18,-14],[-7,-11],[-15,-20],[-1,-25],[-15,-19],[-5,-13],[-8,-5],[-3,-8],[-13,-6],[-11,-24],[-4,-16],[-7,-12],[-1,-8],[-9,-21],[5,-42],[3,-11],[-3,-8],[5,-17],[-2,-8],[6,-8],[-4,-9],[0,-18],[4,-28],[-2,-13],[-8,-14],[-9,-5],[-12,-1],[-6,-8],[-6,-28],[1,-12],[-3,-10],[-8,0],[-8,-11],[-34,-5],[-22,-5],[-6,-6],[-19,-13],[-15,-2],[-19,1],[-32,-2],[-30,-13],[-125,-5],[-20,-2],[-44,-2],[-81,4],[-81,-6],[-39,-1],[-42,-6],[-123,-7],[-39,-2],[-44,2],[-20,-2],[-38,-2],[-18,-3],[-46,-3],[-41,-2],[-41,-2],[-42,-2],[-41,0],[-48,-3],[-104,715]],[[13930,2467],[7,4],[7,19],[14,12],[11,37],[2,13],[7,10],[0,25],[-4,13],[-8,12],[-7,18],[4,15],[0,18],[-12,34],[-3,20],[-2,29],[-8,11],[-16,5],[-12,13],[-13,21],[-10,10],[-7,12],[-14,3],[-10,17],[-13,21],[-9,22],[-14,13],[-4,47],[-16,17],[0,22],[-17,3],[-32,112],[-1,55],[-5,71]],[[13745,3221],[-10,56]],[[12525,1615],[-2,9],[-10,69],[6,48],[10,117],[12,98],[-5,59],[-2,77],[17,113],[20,97],[-8,22],[-1,33],[-3,34],[-3,22],[-1,22],[4,25],[6,25],[21,55],[12,18],[27,23],[16,35],[23,20],[32,51],[28,54],[29,67],[22,94],[12,57],[7,52],[29,68],[52,20],[70,29],[70,36],[32,31],[-20,32],[-22,-8],[17,37],[20,35],[13,19],[24,49],[27,46],[16,38],[63,105],[25,56],[27,49],[9,27],[7,36],[-3,29],[-10,41],[-2,47],[4,41],[8,20],[19,21],[27,23],[36,22],[8,26],[9,46],[-1,44],[5,38],[10,17],[25,25],[31,25],[30,19]],[[13449,4200],[1,-1]],[[13717,3326],[18,-49],[10,-56]],[[13930,2467],[104,-714],[-33,-3],[-531,-26],[-68,-32],[-80,-51],[-127,-78],[-43,-26],[-562,71],[-27,2],[-21,7],[-17,-2]],[[13360,4561],[3,-89]],[[13444,4212],[5,-12]],[[12525,1615],[-9,-6],[-12,-15],[-5,-10],[-15,-1],[-10,9],[-11,18],[-12,9],[-10,3],[-20,1],[-19,5],[-13,-1],[-11,-3],[-12,-9],[-12,-12],[-1,-17],[3,-12],[10,-13],[-4,-11],[-9,-7],[-3,-10],[-18,-25],[-5,-2],[-19,8],[-18,-2],[-16,-6],[-9,-16],[-15,-15],[-26,-15],[-8,-2],[-16,21],[-11,3],[-23,-2],[-24,-14],[-8,-11],[-13,-30],[-6,-5],[-22,-7],[-2,4],[-5,23],[-7,4],[-10,11],[-17,7],[-7,-2],[-15,-13],[-26,-6],[-1,-5],[11,-14],[-1,-10],[-12,-21],[-1,-14],[6,-12],[3,-13],[-1,-14],[-10,3],[-16,14],[-15,2],[-7,-10],[0,-20],[-14,-28],[-5,-9],[-15,-6],[-10,2],[-12,12],[-10,18],[-6,5],[-15,3],[-12,16],[-17,6],[-7,19],[-9,7],[-20,7],[-13,-1],[-7,-6],[-7,-32],[-12,-6],[-18,8],[-9,0],[-9,-7],[-1,-4],[17,-15],[1,-9],[-8,-17],[-11,-7],[-20,-2],[-10,3],[-2,9],[8,19],[-5,9],[-8,2],[-32,-15],[-13,-11],[1,-8],[19,-12],[1,-7],[-9,-7],[-8,0],[-21,20],[-10,5],[-13,-5],[4,-24],[0,-16],[2,-10],[0,-16],[-5,-5],[-8,-1],[-10,7],[-16,24],[-6,6],[-7,-2],[0,-19],[-6,-7],[-11,-5],[-10,0],[-18,16],[-18,6],[-16,-12],[-13,-18],[-10,-10],[-9,-3],[-18,9],[-13,-5],[-5,-7],[0,-30],[-3,-6],[-24,-12],[-11,1],[-23,12],[-19,6],[-18,0],[-11,-6],[1,-30],[2,-12],[-3,-9],[-8,-8],[-9,-3],[-39,4],[-2,-13],[-8,-15],[1,-15],[-13,5],[-9,-8],[-4,-18],[-20,2]],[[11196,1036],[-297,632]],[[10899,1668],[-195,408],[10,7]],[[10714,2083],[14,7]],[[10728,2090],[16,9],[18,9],[25,-2],[58,19],[20,3],[17,0],[33,-3],[43,8],[12,14],[14,11],[7,1],[9,8],[6,8],[13,11],[17,10],[9,13],[4,13],[2,15],[10,14],[4,16],[4,8],[24,6],[8,10],[8,4],[6,13],[11,8],[-2,16],[-8,10],[0,17],[10,8],[25,7],[5,19],[9,18],[12,9],[8,13],[2,25],[10,13],[-4,15],[19,16],[12,1],[14,26]],[[11238,2529],[53,42],[68,77],[45,104],[46,119],[56,151],[35,102],[31,79],[112,109],[109,64],[54,71],[36,77]],[[11883,3524],[110,49],[123,87],[78,81],[83,95],[69,103],[73,89],[109,22],[85,48],[74,50],[69,84],[117,89],[85,26],[64,73],[122,28],[110,59],[105,63],[1,-9]],[[11883,3524],[-18,125],[-61,134],[37,78],[91,52],[-62,77],[-97,38],[-62,93],[-78,43],[-55,-127]],[[12278,4928],[12,-2],[37,11],[25,5],[33,14],[19,15],[31,44],[19,36],[24,36],[15,21],[16,27],[23,42],[16,32],[18,41],[25,65],[10,31],[15,34],[11,37],[44,64],[38,46],[12,11],[29,13],[28,9],[16,2]],[[12794,5562],[22,-47]],[[11238,2529],[-426,677],[-34,55],[-254,300]],[[11067,5843],[-25,272]],[[11042,6115],[97,77],[1,18],[-14,10],[-5,9],[-15,9],[-3,7],[0,14],[-3,13],[-18,15],[-5,10],[-8,3],[-17,0],[-8,4],[-1,16],[-9,-10],[-3,6],[6,16],[-3,3],[-10,-2],[-16,6],[5,17],[-6,13],[0,14],[-6,11],[-9,11],[-10,15],[0,5],[124,62],[10,4],[11,9],[23,12],[27,30],[12,-13],[7,-4],[11,11],[19,2],[4,-9],[8,-6],[15,10],[9,-3],[16,-15],[24,-7],[19,-11],[22,8],[25,-6],[32,34],[9,-10],[8,8],[16,8],[0,10],[34,15],[16,20],[6,-3],[21,2],[3,10],[11,1],[14,7],[6,-9],[21,3],[4,-11],[15,0],[16,-11],[14,2],[8,6],[8,-2],[11,15],[14,9],[7,13],[21,-7],[7,5],[11,17],[10,-1],[21,13],[15,-2],[13,4],[19,12],[26,-7],[15,2],[15,-1],[13,-6],[2,-20],[10,-28],[5,-8],[0,-13],[10,-23],[5,-6],[22,-4],[3,-7],[20,3],[10,0],[27,-3],[22,-1],[12,-10],[8,-18],[6,-24],[11,-18],[5,-6]],[[12593,5990],[201,-428]],[[8803,3076],[-87,0],[-94,-20],[-91,-44],[-78,-33],[-72,-51],[-87,-47],[12,-132],[8,-168],[17,-119],[36,-124],[36,-85],[25,-136],[-41,-135],[-51,-154],[14,-159],[55,-129],[45,-139],[21,-142],[29,-121],[16,-141],[10,-112],[17,-80],[28,-123],[21,14]],[[8592,696],[-15,-14],[-5,-7],[-15,5],[-9,-1],[-16,-9],[-10,0],[-18,9],[-12,-7],[-4,-12],[-11,5],[-44,-6],[-29,-16],[-15,-11],[-12,-3],[-15,2],[-8,6],[-13,-4],[-22,-23],[-2,-6],[5,-11],[-5,-7],[-9,-2],[-10,-11],[-21,-8],[-6,-8],[-19,-2],[-9,-6],[-6,6],[-8,0],[-12,-11],[-6,-13],[0,-17],[-6,-4],[-16,0],[-17,-5],[-19,-12],[-15,1],[-19,-2],[-10,9],[-15,7],[-11,-1],[-6,3],[-9,-3],[-8,12],[-2,7],[-20,1],[-20,-4],[-13,-6],[-4,-7],[-8,-2],[-8,-8],[-8,-20],[-13,-8],[-6,-9],[-11,-9],[-14,2],[-7,-2],[-13,7],[-11,1],[-22,-5],[-12,3],[-6,-10],[-8,-1],[-3,-10],[-7,-3],[-12,11],[-11,-7],[-12,10],[-10,2],[-13,-6],[-5,8],[-7,-1],[-8,-7],[-22,2],[-7,-7],[-9,-4],[-19,2],[-16,-5],[-31,-15],[-17,-1],[-5,-6],[-3,-12],[-19,1],[-3,-4],[-20,-15],[-9,-13],[-5,-16],[1,-10],[-2,-15],[-5,-8],[4,-16],[-6,-10],[5,-20],[-7,-11],[-10,0],[-10,-5],[-2,4],[-13,1],[-8,-16],[-18,-5],[6,-6],[-7,-7],[5,-6],[-11,-8],[-6,-13],[-18,-8],[-7,0],[-34,-26],[-4,-14],[-7,-3],[-18,-4],[-6,5],[-9,-7],[-5,-16],[-9,6],[-28,-9],[-18,1],[-21,-6],[-13,-1],[-9,3],[-16,-2],[-8,-5],[-14,0],[-18,-5],[-8,-14],[-9,-3],[-8,-7],[-13,-4],[-8,-6],[-6,1],[-22,-14],[-29,-2],[-16,-5],[-18,-10],[-19,-2],[-11,-4],[-17,-14],[-5,3],[-45,3],[-17,-4],[-8,-3],[-13,-17],[-6,-1],[-13,3],[-14,-1],[-25,2],[-7,-8],[-12,-4],[-8,16],[-4,4],[-10,17],[-14,9],[-9,0],[-9,10],[-7,0],[-9,9],[-11,1],[-7,-4],[-19,5],[-16,-19],[-6,0],[-4,14],[-19,2],[-11,11],[0,7],[6,4],[-8,14],[-15,0],[-8,3],[-17,20],[-2,13],[-13,16],[-6,22],[-5,6],[-11,20],[6,4],[0,18],[-15,2],[-11,0],[-498,-18],[-126,41],[-10,7],[18,13],[18,5],[1,17],[7,9],[8,15],[13,-3],[8,6],[8,13],[22,18],[7,3],[6,17],[18,17],[8,4],[10,-1],[6,5],[1,14],[10,13],[16,4],[18,34],[-1,5],[-18,19],[4,32],[15,3],[17,25],[6,4],[5,12],[0,25],[7,5],[6,9],[-5,18],[0,18],[-9,1],[-6,10],[4,5],[12,2],[4,13],[11,7],[4,7],[-2,8],[5,14],[6,3],[2,9],[1,16],[6,18],[-13,7],[0,14],[3,8],[-6,26],[3,30],[5,6],[-14,10],[8,36],[-1,14],[-11,7],[-1,7],[6,9],[7,23],[13,10],[-13,42],[-236,57],[-8,4],[-4,8],[-149,255],[-126,362],[-49,134],[7,130],[-99,215],[-268,590],[-102,219]],[[5219,2968],[25,16],[32,2],[36,17],[74,13]],[[5386,3016],[0,1]],[[5386,3017],[33,-17],[14,-6],[15,-11],[17,-14],[9,-14],[10,-8],[29,-4],[10,-3],[20,-11],[19,-18],[6,-12],[10,-11],[1,-12],[7,-14],[11,-9],[15,-7],[24,-1],[8,-7],[15,-24],[29,-11],[9,-9],[4,-12],[10,-9],[11,-5],[18,0],[11,-2],[9,-8],[17,-2],[10,1],[10,-11],[15,-10],[19,-8],[28,1],[2,13],[27,12],[4,-6],[9,-1],[9,7],[11,-8],[13,-1],[13,4],[13,-16],[6,-36],[5,-24],[12,-1],[10,5],[10,2],[19,0],[3,-8],[2,-14],[5,-9],[21,-22],[9,-18],[7,-18],[10,-20],[23,-13],[12,-14],[13,-1],[13,-5],[8,-13],[6,-3],[13,-1],[14,8],[15,-1],[1,-11],[-11,-21],[-5,-15],[-10,-13],[1,-10],[12,-8],[31,-7],[20,-16],[20,-4],[17,9],[10,0],[5,-7],[7,-15],[7,-8],[14,0],[7,16],[4,31],[3,9],[9,9],[17,7],[14,13],[16,1],[10,-9],[11,0],[10,27],[8,-5],[10,-11],[27,4],[28,-6]],[[8460,3594],[9,-3]],[[9338,1801],[77,-73],[50,-68],[99,-91],[117,-80],[122,-49],[100,2],[92,17],[117,45],[117,21],[107,23],[96,8],[100,-11],[105,6],[270,19],[38,-1]],[[10945,1569],[251,-533]],[[11196,1036],[-5,-7],[2,-12],[5,-12],[1,-16],[3,-14],[-2,-34],[-6,-11],[-18,-14],[-15,-1],[-21,9],[-6,4],[-4,20],[-7,16],[-9,9],[-13,6],[-13,-5],[-1,-23],[-10,-15],[-8,-7],[-18,-12],[-6,-10],[15,-24],[1,-12],[-4,-4],[-18,-3],[-10,-26],[-12,-7],[-12,4],[-22,0],[-13,-2],[-19,-23],[-5,0],[-7,11],[-16,-2],[-7,-4],[-6,-17],[-6,-10],[-2,-16],[13,-20],[-4,-16],[-17,-4],[-7,-6],[-2,-18],[5,-11],[1,-13],[-13,-4],[-13,4],[-8,-1],[-14,-12],[-44,1],[-13,4],[-1,11],[-3,10],[-12,16],[-6,12],[-2,15],[-5,8],[-24,-2],[-10,1],[-6,4],[-8,15],[-8,4],[-18,-4],[-7,-5],[0,-20],[-11,-8],[5,-8],[8,-3],[-1,-21],[18,-23],[2,-8],[-6,-6],[-15,-3],[-18,1],[-15,-2],[-13,-11],[-13,-14],[-15,-7],[-27,19],[-10,2],[-16,-1],[-9,-14],[-2,-15],[7,-24],[-10,-9],[-30,-4],[-9,3],[-23,0],[-25,-8],[-7,-1],[-16,10],[-16,5],[-6,-1],[-14,-8],[-9,3],[-9,7],[-14,5],[-7,-6],[-4,-18],[-5,-6],[-18,-2],[-10,3],[-15,26],[-17,10],[-5,0],[-7,-11],[-17,-4],[-5,-5],[-8,-19],[-12,-7],[-20,-4],[-12,-11],[-1,-13],[6,-17],[-1,-10],[-5,-4],[-16,-1],[-12,12],[-16,5],[-6,7],[-20,10],[-13,0],[-7,-14],[2,-16],[26,-19],[2,-5],[-3,-15],[-5,-8],[-6,-2],[-8,-9],[-4,-14],[-15,-17],[-2,-12],[9,-5],[32,-2],[4,-2],[7,-18],[3,-10],[-18,-24],[-18,-13],[-8,0],[-25,12],[1,11],[10,1],[-5,10],[-5,2],[-11,-2],[-13,2],[-12,-5],[-18,-2],[-15,-14],[-1,-14],[2,-13],[-4,-12],[-10,-4],[-12,-10],[-18,7],[-14,-3],[-9,-12],[0,-9],[-7,-2],[-10,9],[-17,4],[-11,-4],[-15,5],[-12,-5],[-10,1],[-5,6],[-7,30],[-8,17],[-5,6],[-24,14],[-7,10],[-5,13],[8,23],[1,21],[-1,8],[-10,15],[-16,14],[-11,17],[-9,17],[-5,7],[-24,11],[-15,18],[-6,5],[-33,12],[-8,17],[-13,13],[-18,4],[-10,7],[-23,46],[-25,-3],[-26,3],[-31,8],[-15,2],[-10,-1],[-12,-8],[-12,9],[-9,9],[-1,9],[-12,19],[-5,3],[-23,5],[-6,6],[-2,21],[-1,19],[-4,14],[1,23],[3,13],[-1,19],[-6,21],[3,16],[4,9],[0,9],[12,24],[-2,10],[-8,17],[-20,10],[-21,19],[-2,6],[-19,10],[-14,2],[-14,6],[-13,1],[-13,13],[-6,0],[-9,-10],[-11,-3],[-16,-1],[-16,11],[-12,13],[-15,6],[-4,6],[5,15],[-8,32],[-5,15],[1,18],[-2,9],[14,6],[-3,13],[-15,2],[-1,19],[-9,0],[0,18],[-4,9],[1,7],[12,11],[0,8],[-11,9],[-7,20],[2,7],[-2,10],[4,9],[-5,10],[3,6],[14,8],[-2,7],[8,7],[1,9],[9,1],[1,8],[-7,5],[0,8],[12,18],[-3,18],[-8,-11],[-13,-8],[-16,-20],[-8,-1],[-14,5],[-6,-2],[-15,-11],[-15,-1],[-13,4],[-8,-3],[-2,-8],[11,-13],[0,-10],[-12,-11],[-29,7],[-13,-4],[-12,-19],[-27,-13],[-8,-1],[-26,4],[-13,-8],[-4,-8],[7,-12],[1,-12],[-2,-11],[-13,-15],[-5,-17],[-7,-11],[-25,-12],[-9,-10],[-2,-12],[6,-18],[-9,-20],[-8,-4],[-21,-1],[-10,-6],[-31,-9],[-26,-1],[-14,5],[4,10],[6,4],[0,16],[-9,16],[-8,3],[-20,1],[-6,4],[-10,10],[-8,-10],[-1,-15],[-8,-9],[-3,-14],[-13,-13],[-6,-11],[-2,-12],[-27,-14],[-10,-10],[-1,-11],[25,-30],[11,-26],[2,-12],[-2,-7],[-24,-12],[-5,-11],[14,-24],[6,-17],[20,-7],[7,0],[0,-10],[-4,-10],[-10,-7],[-7,-11],[-17,-14],[-6,-9],[0,-7],[-19,-10],[6,-10],[-2,-6],[-9,1],[-9,-25],[-12,0],[-11,5],[-5,-8],[0,-15],[-6,-8],[-10,-1],[-17,2]],[[10719,2086],[-5,-3]],[[10899,1668],[46,-99]],[[9869,2926],[87,23],[80,-28],[167,-8],[127,23],[25,-84],[-7,-123],[5,-94],[39,-118],[84,-128],[62,-110],[57,-97],[70,-62],[54,-34]],[[9976,3412],[107,51],[133,27],[111,28],[113,47],[96,13]],[[10536,3578],[-12,-17]],[[10728,2090],[-9,-4]],[[8855,4893],[-7,16]],[[8848,4909],[-11,19],[-3,22],[-4,11],[-5,6],[-7,1],[-11,7],[-1,18],[-2,10],[-29,27]],[[9240,5108],[119,-34],[20,-12],[-6,-11],[-6,-14],[6,-29],[15,-15],[12,-6],[10,1],[30,1],[42,-30],[217,-86],[629,-47],[109,21],[342,59]],[[10803,3973],[-267,-395]],[[6214,4757],[48,-60],[76,-95],[132,-116],[96,-108],[51,-79],[97,-58],[82,-97],[30,-113]],[[5386,3017],[-28,121]],[[5358,3138],[15,6],[3,13],[-4,12],[-7,5],[7,9],[5,18],[13,114],[-12,32],[-13,25],[-5,15],[5,13],[8,6],[36,12],[22,5],[38,102],[0,149],[54,67],[6,18],[2,12],[3,7],[15,5],[15,-4],[24,16],[20,24],[23,33],[16,24],[1,9],[9,5],[9,15],[5,19],[-25,11],[-6,8],[-4,11],[1,12],[4,18],[7,8],[15,15],[8,4],[-6,59],[3,59],[9,51],[0,68],[-2,28],[20,82],[10,61],[74,219],[0,65],[-4,58],[127,70]],[[5902,4831],[232,-55],[43,-12],[19,-3],[17,-4]],[[6213,4757],[1,0]],[[7757,4984],[1,-121],[23,-133],[-18,-83]],[[6214,4757],[5,3]],[[6219,4760],[10,-1],[15,5],[11,-7],[18,-16],[13,-18],[6,-2],[13,3],[186,100],[350,-5],[189,-37],[6,8],[1,8],[8,9],[13,11],[25,11],[16,11],[14,1],[4,11],[37,-1]],[[7154,4851],[6,1],[16,-8],[45,-27],[29,12],[6,-2],[18,4],[27,11],[12,6],[11,-2],[-2,10],[17,32],[7,4],[5,9]],[[7351,4901],[89,114]],[[7440,5015],[8,11],[5,18],[17,15],[200,-2]],[[7670,5057],[87,-73]],[[7154,4851],[-286,540],[-252,144],[-576,92]],[[6040,5627],[15,34],[15,18],[13,19],[9,5],[16,29],[10,8],[13,31],[3,12],[7,3],[11,26],[21,14],[12,-6],[11,-11],[16,17],[5,7],[1,9],[19,41],[35,40],[278,285],[6,12],[5,46],[31,86],[2,26],[13,32],[15,30],[11,16],[39,28],[10,20],[16,118],[11,30]],[[6709,6652],[163,211]],[[6872,6863],[15,-9],[17,-2]],[[6904,6852],[40,-2],[33,-43],[62,36],[33,-4],[44,-29],[12,-74],[90,-65],[54,-5],[84,23]],[[7356,6689],[20,19]],[[8130,6255],[-49,-36],[-36,-37],[-87,-64],[-56,-75],[-86,-111],[-47,-48],[-66,-65],[-79,-49],[-83,-47],[-27,-21],[-32,-19],[-31,-4],[-28,-15],[-16,-15],[-26,-34],[-22,-23],[-18,-32],[-31,-22],[-1,-28],[-12,-38],[-11,-41],[0,-47],[-7,-26],[7,-27],[33,-14],[16,-23],[13,-24],[17,-39],[3,-49],[-3,-17],[-8,-26],[-8,-99],[47,-81]],[[7396,4959],[-45,-58]],[[8587,5457],[-9,-14],[-3,-20],[-20,-23],[-22,-22],[-20,-16],[-26,-17],[-9,-8],[-14,-5],[-25,-7],[-13,-6],[-16,-3],[-16,-9],[-16,-4],[-35,-14],[-9,-9],[-12,-17],[-14,-16],[-6,-11],[-24,-21],[-11,-2],[-16,-9],[-3,-11],[-9,-8],[-2,-7],[-10,-9],[-23,-11],[-26,-21],[-32,-26],[-8,-9],[-44,-40],[-9,-6],[-18,-26],[-15,-43],[-33,-14],[-19,-5],[-38,-15],[-114,-47]],[[7848,4906],[-178,151]],[[7440,5015],[-44,-56]],[[10320,7568],[100,-1]],[[10420,7567],[105,1],[222,-59],[12,5],[7,-7],[11,-5],[12,-1],[7,-15],[7,-7],[8,-1],[15,17],[2,8],[-3,9],[9,15],[13,1],[11,5],[6,-9],[18,-11],[12,-13],[13,-11],[19,-9],[5,-12],[7,-35],[7,-24],[4,-8],[5,-17],[1,-18],[10,-14],[30,-14],[7,-2],[6,-6],[28,-18],[11,3],[20,-7],[4,11],[19,-4],[5,-5],[3,-13],[18,-34],[5,-7],[23,-4],[18,-5],[14,-13],[20,-1],[15,9],[11,3],[7,-2],[25,8],[10,-1],[21,-6],[40,-16],[19,-6],[22,-11],[12,-1],[18,-6],[17,-2],[26,-5],[27,7],[17,0],[18,-5],[8,1],[12,-4],[29,-16],[267,-158],[190,-177],[122,-119],[36,-3]],[[11042,6115],[25,-272]],[[5358,3138],[28,-122]],[[5219,2968],[-35,78],[-46,97],[-25,56],[-8,15],[-5,5],[-18,7],[-21,12],[-17,13],[-21,44],[-6,28],[-11,25],[-8,14],[-23,30],[-5,33],[-6,68],[-6,5],[-19,11],[-24,17],[-42,38],[-32,39],[-2,6],[2,25],[-3,20],[-13,8],[-36,15],[-29,14],[-45,15],[-18,15],[-14,6],[-11,0],[-21,-2],[-13,-4],[-9,-6],[-12,1],[-9,4],[-22,21],[-15,4],[-50,3],[-29,-5],[-18,2],[-3,10],[3,31],[6,13],[1,9],[10,19],[3,33],[-2,6],[-18,24],[-18,17],[-11,7],[-13,4],[-17,2],[-21,9],[-19,24],[-11,4],[-16,-2],[-15,-9],[-37,-1],[-40,28],[4,8],[25,19],[9,8],[4,10],[-13,14],[-28,16],[3,12],[-6,4],[-10,0],[9,16],[-17,10],[-4,29],[-5,7],[-16,4],[-10,6],[-13,2],[-17,12],[-11,-10],[-5,4],[-2,7],[-11,7],[-9,-8],[-11,-14],[-7,0],[-8,9],[-6,2],[-11,-4]],[[4090,4143],[-4,61],[0,55],[-5,62],[-9,35],[-2,20],[-2,39],[-8,56],[-12,40],[-24,55],[-50,86],[-29,43],[-41,42],[-31,44],[-27,31],[-25,34],[-22,22],[-28,46],[-22,16],[-31,21],[39,31],[46,31],[47,27],[56,25],[56,17],[55,14],[45,14],[68,10],[88,40],[55,33],[21,9],[28,-1],[44,23],[34,26],[32,35],[41,42],[19,23],[3,50],[36,92],[34,80],[16,84],[29,49],[54,23],[83,44],[60,-12],[73,21],[35,18],[67,21]],[[4982,5820],[3,-8]],[[4985,5812],[606,-363],[195,-89],[50,-23],[2,-6]],[[5838,5331],[3,-8],[10,-6],[-10,-18],[13,-14],[7,-12],[0,-15],[-2,-4],[-1,-15],[5,-15],[0,-10],[7,-10],[4,-25],[-6,-11],[2,-19],[7,-17],[1,-17],[7,-8],[5,-14],[4,-6],[-11,-13],[-3,-8],[4,-18],[-6,-8],[-3,-15],[-3,-40],[6,-10],[3,-27],[-6,-38],[-1,-19],[4,-9],[12,-3],[7,-17],[5,-31]],[[2289,5843],[10,4],[206,47],[88,52],[129,52],[157,-40],[146,-28],[96,-24],[60,-77],[91,-41],[100,16],[82,106],[17,117],[52,82],[127,58],[50,118],[55,106],[32,103],[-10,127],[128,134]],[[3905,6755],[376,-1],[106,60],[28,38],[79,57],[185,-116],[125,-117],[-52,-77],[105,-102]],[[4857,6497],[61,-95]],[[4918,6402],[-3,-195],[-30,-176]],[[4885,6031],[97,-211]],[[4090,4143],[-3,-8],[1,-12],[-4,-4],[-10,8],[-7,0],[-23,-6],[-743,556],[-259,169],[-27,16],[-5,13],[-8,36],[-15,30],[-23,32],[-14,35],[-3,12],[-8,10],[-38,21],[-37,19],[-21,5],[-7,10],[-12,12],[-21,14],[-26,12],[-5,5],[-14,20],[-16,22],[-22,10],[-5,14],[-8,11],[-30,26],[-22,8],[-10,2],[-30,27],[7,4],[5,10],[-10,14],[-10,3],[-5,10],[2,17],[7,12],[7,5],[4,11],[-5,9],[4,7],[21,4],[2,12],[-3,15],[8,1],[8,8],[6,32],[15,35],[5,25],[-10,60],[-2,8],[-10,11],[-19,8],[-70,26],[-11,8],[-3,7],[-13,45],[-4,10],[-30,43],[-14,24],[-11,22],[-10,24],[-10,3],[-9,-4],[-50,-19],[-10,-3],[-6,-6],[-19,-6],[-18,4],[-22,19],[-30,37],[-13,20]],[[2289,5843],[-29,38],[-17,28],[-3,23],[0,21],[-62,55],[-9,20],[-3,11],[-8,-11],[-10,-2],[-13,0],[-10,5],[-7,10],[-1,17],[-10,16],[-12,4],[-2,9],[2,9],[-7,7],[-7,21],[-12,15],[-18,11],[-26,23],[-12,20],[-18,12],[-21,-2],[-29,2],[-25,14],[-34,26],[-9,9],[-8,19],[-3,19],[-4,12]],[[1862,6304],[26,11],[63,-38],[35,-17],[33,-2],[2,27],[4,22],[-8,28],[-13,38],[34,-13],[37,2],[68,-6],[31,2],[24,17],[13,53],[1,49],[10,38],[31,38],[46,21],[35,19],[64,21],[71,16],[76,3],[55,6],[43,0],[65,-4],[46,7],[85,27],[37,0],[90,40],[56,29],[39,24],[43,15],[15,22]],[[3119,6799],[69,13],[19,3],[38,10],[37,4],[35,12],[31,4],[47,33],[56,42],[37,48],[39,25],[55,67],[33,29],[82,55],[37,22],[159,9]],[[3893,7175],[10,-9],[2,-18],[1,-20],[7,-14],[10,-64],[9,-20],[-4,-22],[-6,-10],[-1,-17],[-4,-5],[-1,-22],[7,-17],[-10,-23],[0,-14],[-9,-6],[-6,-8],[8,-31],[7,-15],[5,-14],[-1,-11],[-5,-9],[5,-14],[-10,-16],[-2,-21]],[[4872,6473],[25,16],[59,95],[15,166],[31,79],[63,56],[102,-1],[114,32],[78,29],[96,24],[105,33],[135,23],[108,9],[141,22],[146,18],[119,-24],[131,10],[162,25],[136,59],[74,67],[66,54]],[[6778,7265],[52,-31],[38,-33],[-22,-95],[-15,-92],[10,-74],[20,-61],[11,-16]],[[6872,6863],[-163,-211]],[[6040,5627],[-4,0]],[[6036,5627],[-6,-9]],[[6030,5618],[-1,-11],[-9,0],[0,-7],[-12,-2],[-6,-27],[-14,-11],[-7,0],[-13,-26],[-7,-4],[0,-10],[-15,-19],[-6,-26],[-1,-21],[-5,-21],[-10,1],[-5,4],[-4,-12],[1,-11],[-6,0],[-8,-18],[-7,-10],[-10,-30],[-7,-7],[-14,2],[-6,-10],[0,-7],[-9,-5],[-11,1]],[[4985,5812],[-100,219]],[[4918,6402],[-46,71]],[[10420,7567],[-137,1]],[[8177,8324],[-9,-1],[-7,13],[-9,3],[-12,-9],[-20,-9],[-15,7],[-6,12],[-16,6],[4,19],[0,20],[-10,3],[-1,-13],[-11,0],[-1,16],[-9,9],[-1,20],[5,6],[11,-7],[2,7],[-6,11],[-3,21],[2,17],[-8,1],[2,20],[7,8],[-6,7],[5,12],[9,7],[-11,12],[-5,-11],[-7,1],[-1,14],[-6,3],[-11,-1],[-5,8],[-8,4],[0,-15],[-18,10],[-3,11],[4,16],[-9,2],[-8,7],[-5,-4],[-9,6],[-9,-2],[-4,7],[-8,1],[0,13],[-10,-2],[-5,6],[9,3],[0,6],[-5,7],[-7,14],[-7,-2],[-10,14],[0,7],[-26,-2],[-27,473],[110,810],[-18,10],[-26,8],[-13,9],[-20,13],[-33,15]],[[7863,10001],[-18,13]],[[7845,10014],[-19,11],[-48,-6],[-33,-6],[-27,-7],[-27,-10],[-20,-4],[-16,-8],[-38,2]],[[7617,9986],[-7,5]],[[5728,11326],[-12,10],[-444,1],[-436,-364]],[[4836,10973],[1,12],[8,11],[-5,17],[-11,6],[-13,10],[-4,7],[-6,19],[-1,13],[7,7],[-3,9],[-2,23],[3,14],[-3,12],[1,13],[5,14],[-3,6],[3,18],[-4,14],[-8,17],[-1,18],[-4,6],[-22,9],[-8,8],[-9,16],[-13,13],[-18,42],[-10,13],[0,10],[-6,19],[-10,24],[-3,23],[-6,9],[4,12],[14,8],[5,9],[0,18],[-2,16],[-11,21],[1,17],[-5,16],[-18,11],[-12,10],[-4,10],[5,7],[8,2],[4,7],[5,16],[0,16],[4,7],[12,13],[6,28],[18,9],[7,7],[6,20],[-1,7],[-11,16],[-6,3],[-25,17],[-25,12],[-5,4],[0,11],[10,17],[10,11],[37,28],[-2,23],[-6,17],[-7,29],[-17,26],[2,8],[11,10],[-8,27],[6,12],[18,5],[6,18],[1,23],[3,8],[14,2],[1,7],[-10,15],[1,9],[16,5],[16,13],[21,53],[9,5],[17,13],[-1,7],[-11,16],[-1,5],[6,6],[25,-1],[3,6],[-2,31],[3,5],[26,13],[23,7],[20,9],[4,10],[-4,18],[4,18],[14,15],[3,7],[2,21],[7,19],[-3,7],[1,15],[3,9],[8,11],[-2,5],[-11,6],[-17,13],[-2,6],[-15,11],[-8,4],[-13,2],[-54,20],[-6,5],[-2,8],[-2,21],[1,17],[3,30],[-2,7],[-10,12],[-26,19],[-5,6],[1,22],[-3,13],[-6,7],[-14,11],[-4,5],[3,15],[12,9],[6,16],[-2,12],[-21,24],[-4,9],[4,28],[0,22],[-24,40],[-14,29],[1,22],[11,11],[10,20],[12,14],[16,4],[14,-2],[16,-7],[13,-2],[20,-8],[6,7],[-11,25],[-5,15],[-9,10],[-18,15],[-10,6],[-16,15],[-3,16],[7,13],[12,11],[16,7],[16,6],[28,4],[24,7],[10,5],[8,20],[-3,20],[-6,9],[-15,6],[-11,6],[-18,17],[-15,18],[-5,9],[-1,29],[3,24],[-2,15],[-5,10],[1,17],[-24,16],[-17,10],[-6,12],[-4,0],[-1,-17],[-12,-12],[-17,-21],[-8,-2],[-8,1],[-19,12],[-19,32],[-6,21],[0,5],[6,21],[0,11],[-14,22],[-13,32],[-5,16],[2,28],[7,10],[31,16],[23,18],[4,5],[8,23],[-1,13],[-23,39],[-17,23],[-8,14],[0,7],[5,16],[9,11],[24,17],[6,1],[20,-8],[17,-11],[12,5],[11,11],[8,15],[6,28],[34,4],[64,18],[37,18],[7,6]],[[4917,13767],[6,-77],[86,-109],[130,-90],[115,-154],[85,-133],[83,-127],[106,-60],[100,-87],[95,-188],[62,-202],[-139,-347],[-38,-265],[61,-104],[66,-170]],[[8210,14061],[415,363],[173,237],[212,223],[144,60],[98,0],[145,21],[88,-24],[74,3],[266,9],[173,9],[110,73],[103,15],[142,18],[115,39],[215,111],[183,82],[144,117]],[[11010,15417],[75,-89]],[[11085,15328],[9,0],[16,-12],[15,-1],[18,3],[9,-3],[10,1],[6,5],[14,2],[13,-10],[11,0],[4,-18],[9,-4],[-10,-7],[3,-9],[5,-4],[-20,-7],[-9,-8],[-4,-10],[5,-14],[13,-21],[13,-25],[7,-19],[3,-34],[-5,-31],[-7,-18],[-2,-14],[8,-21],[1,-8],[-10,-11],[-2,-9],[5,-6],[-3,-16],[0,-55],[3,-8],[7,-5],[7,-10],[2,-14],[4,-8],[2,-15],[0,-24],[2,-12],[15,-3],[8,-14],[0,-23],[9,2],[10,-2],[3,-14],[6,-5],[18,2],[9,-12],[-1,-17],[3,-8],[17,-8],[16,-4],[12,-24],[23,2],[9,-5],[7,-12],[15,3],[3,-11],[6,-5],[7,0],[15,-19],[-2,-19],[8,-6],[7,-15],[15,-9],[11,-17],[7,-7],[8,-2],[2,-12],[4,-3],[13,7],[7,-16],[4,-6],[3,-17],[11,-11],[9,-45],[-5,-9],[-14,-17],[0,-12],[-4,-8],[7,-17],[1,-22],[4,-10],[7,-5],[2,-11],[13,-13],[9,-24],[-3,-21],[9,-9],[25,0],[9,-3],[4,-12],[10,-12],[10,-1],[14,-7],[19,11],[18,0],[15,7],[13,3],[14,-3],[24,-1],[17,9],[20,6],[27,-2],[13,-8],[24,-18],[15,-6],[12,-8],[6,-12],[7,-24],[4,-18],[10,-18],[13,-2],[11,-5],[6,-7],[9,-3],[9,19],[21,-15],[20,20],[11,-4],[4,55],[16,54],[30,70],[87,81]],[[12147,14461],[23,-20],[18,-19],[19,-46],[-14,-132],[-18,-70],[-20,-14],[-29,-15],[-20,-58],[-58,-27],[-12,-33],[27,-58],[-78,-216],[-47,-113]],[[9509,13202],[-358,376]],[[9151,13578],[-646,14],[-295,469]],[[10902,15543],[108,-126]],[[8210,14061],[-62,17],[-14,-4],[-46,-8],[-27,-9],[-33,-7],[-33,36],[-301,131],[-259,-26],[-120,24],[-272,9]],[[7043,14224],[359,526],[209,143],[124,150],[204,317],[106,247]],[[8045,15607],[-91,160],[-60,142],[7,157],[85,232],[-94,202],[-110,133],[6,218]],[[7788,16851],[210,-25],[106,51],[136,-12],[295,45],[189,-21],[126,-30],[75,63],[159,46]],[[9084,16968],[634,60]],[[9718,17028],[74,63],[245,-71],[88,65],[286,84],[80,61],[115,-61],[113,-11],[76,-44],[22,31]],[[10817,17145],[-141,-198],[-240,-191],[-25,-190],[-91,-206],[148,-110],[7,-29],[12,-30],[1,-49],[-1,-14],[19,-33],[7,-24],[13,-29],[12,-13],[9,-13],[6,-13],[24,-28],[17,-7],[47,-16],[35,-6],[16,-4],[33,-3],[7,-4],[49,-249],[82,-108],[39,-35]],[[15115,11955],[-37,169],[-98,453],[-151,329],[-53,166],[-94,307],[242,94],[274,180],[118,281],[-53,169],[-171,166],[-180,8],[-148,31],[51,271],[-139,435],[-218,361],[-112,229],[-70,153]],[[14276,15757],[384,215]],[[14660,15972],[1686,-47],[0,-104],[281,13]],[[16627,15834],[-39,-399],[32,-385],[51,-293],[82,-238],[100,-284],[3,-265],[-100,-160],[-253,-259],[-278,-256],[-153,-296],[-39,-187]],[[16033,12812],[-82,-648]],[[16033,11723],[-220,68],[-6,2],[-252,78],[-440,84]],[[15115,11955],[-227,133]],[[12147,14461],[125,46],[2,82],[7,10],[13,30],[15,26],[9,9],[23,20],[31,17],[547,438],[455,39]],[[13374,15178],[32,0]],[[13406,15178],[137,167],[286,160],[67,-80],[66,41],[-8,109]],[[13954,15575],[322,182]],[[18211,9520],[-49,-214]],[[18162,9306],[-264,-79],[-15,3],[-15,-13],[-8,-3],[-26,22],[-1,25],[-3,10],[-11,12],[-8,-1],[-10,-7],[-14,-4],[-11,-1],[-13,-9],[-16,0],[-12,-13],[-2,-33],[-2,-6],[-16,0],[-3,16],[3,18],[11,19],[0,9],[-7,11],[-9,2],[-11,-4],[-8,-6],[-10,-15],[-8,-21],[-8,-10],[-14,-2],[-16,7],[0,9],[6,7],[12,11],[10,12],[-1,10],[-5,3],[-35,6],[-7,0],[-6,-9],[-4,-19],[-9,-11],[-14,-3],[-17,3],[-13,0],[-21,5],[-10,-1],[-16,-8],[-6,-13],[-2,-11],[-6,-11],[-21,-14],[-7,1],[-15,21],[-10,-2],[-9,-12],[-16,-17],[-11,-10],[-13,-2],[-11,-5],[-12,-15],[-3,-11],[0,-20],[-13,-15],[-12,-5],[-9,3],[-12,0],[-6,-5],[-6,-13],[14,-10],[3,-14],[12,-13],[6,-18],[0,-15],[-21,12],[-19,-12],[-6,-1],[-16,8],[-19,3],[-7,-3],[-9,-11],[-5,-13],[11,-17],[17,-10],[16,-15],[5,-29],[6,-6],[5,-13],[-11,-4],[-6,7],[-9,1],[-11,-10],[-10,-3],[-1,15],[-3,7],[-31,7],[-8,-9],[-10,-28],[0,-10],[5,-10],[2,-16],[11,-26],[5,-20],[-2,-10],[-13,-6],[-6,4],[6,7],[-9,15],[-9,2],[-9,-6],[-9,3],[-13,-9],[-5,6],[5,9],[-16,1],[-20,-6],[-3,-4],[6,-10],[-4,-19],[-1,-15],[4,-9],[7,-5],[17,6],[5,-6],[17,1],[12,-13],[4,-14],[-3,-14],[0,-11],[4,-11],[-1,-8],[-8,-6],[-20,-2],[-17,-4],[-14,-11],[12,-7],[3,-14],[24,13],[28,9],[15,0],[3,-14],[-11,-5],[-8,-8],[-9,-2],[-10,-12],[-10,-7],[-9,2],[-17,12],[-24,11],[-9,1],[-5,-8],[-3,-14],[10,-8],[17,-1],[12,-4],[8,-21],[-7,-4],[-6,-14],[-17,-3],[-24,-2],[-21,-7],[-17,-7],[-15,-10],[-13,-11],[-6,-11],[-2,-17],[-7,-8],[-5,-13],[6,-16],[0,-9],[-5,-10],[-9,-5],[-8,6],[-11,4],[-11,-18],[-10,-9],[-3,-14],[6,-9],[10,-4],[8,-10],[-16,-16],[-27,-4],[-15,3],[-4,9],[-13,7],[-9,17],[-7,0],[-5,-11],[-1,-17],[-4,-7],[-9,2],[-14,-3],[-7,-7],[-16,-3],[-8,-5],[-3,-13],[-7,-8],[0,-28],[-20,-43],[4,-16],[-3,-35],[2,-20],[8,-19],[-1,-3],[-13,-3],[-13,-7],[-8,2],[-21,19],[-3,8],[-16,3],[-11,-2],[-8,-6],[-4,-12],[-9,-5],[-5,-17],[-13,-12],[-4,-10],[-7,-4],[-15,15],[-1,8],[12,0],[-2,22],[-8,12],[-10,-3],[-8,-7],[-15,0],[-9,-4],[-4,-21],[-14,-13],[-8,-17],[5,-25],[-2,-17],[-5,-8],[-11,-11],[4,-15],[-12,-14],[12,-9],[-16,-23],[4,-13],[-3,-10],[-9,-1],[-11,-7],[-2,-6],[10,-16],[-1,-9],[-5,-7],[-1,-7],[11,-17],[-12,0],[-6,-6],[-8,15],[-11,9],[-14,2],[-10,-6],[-22,-27],[-19,-15],[-6,-11],[3,-17],[-18,-7],[-10,-9],[-4,-13],[5,-17],[-18,-20],[-1,-7],[-6,-3],[-8,-11],[-1,-20],[17,-22],[0,-5],[-70,1],[-510,-5],[-175,3],[-73,-334],[-12,-4],[-19,5],[-8,0],[-11,-5],[-10,-2],[-11,6],[-20,-1],[-6,-10],[-9,-5],[-10,5],[-8,0],[-17,-7],[-9,2],[-6,-4],[0,-8],[-7,0],[-7,17],[-8,9],[-7,2],[-28,4],[-9,2],[-20,31],[-15,16],[-32,10],[-10,16],[-12,0],[-20,-3],[-23,1]],[[13637,8783],[2,10]],[[13413,18195],[67,-238],[36,-208],[-26,-350],[2,-205],[12,-239],[-80,-334],[-153,-266],[-68,-289],[-12,-302],[83,-298],[71,-184],[46,-104]],[[13391,15178],[-17,0]],[[11085,15328],[-183,215]],[[10817,17145],[226,333]],[[11043,17478],[-16,549]],[[11027,18027],[84,17],[404,139],[234,72],[245,-51],[233,-72],[427,75],[620,3],[139,-15]],[[14660,15972],[-706,-397]],[[13406,15178],[-15,0]],[[13413,18195],[162,145],[85,12],[54,24],[144,45],[157,-178],[85,-90],[124,15],[151,-64],[192,10],[180,-85],[295,-72],[209,-121],[381,-82]],[[15632,17754],[-130,-102],[-35,-164],[76,-192],[145,-74],[209,-108],[139,-14],[156,12],[124,9]],[[16316,17121],[98,-57]],[[16414,17064],[3,-34],[12,-150],[74,-136],[46,-123],[33,-136],[93,-94],[5,-114],[-53,-443]],[[16414,17064],[89,73],[170,54],[172,63],[183,151],[150,96],[50,142],[6,181],[121,217],[118,187],[95,57],[71,28],[-10,208],[-5,196]],[[17624,18717],[97,69],[165,81],[163,82],[-62,126],[106,124],[74,30],[150,-36],[137,46],[70,24],[212,81],[242,136],[204,144],[109,109],[15,26]],[[19306,19759],[666,-336]],[[20091,18502],[2,-408]],[[19211,16695],[-203,19],[-393,136],[-201,-107],[-11,1],[42,-37],[-92,-55],[-36,55],[-22,29],[-310,24],[-61,-15],[-125,-288],[-168,-51],[-45,-133],[-25,-85],[-31,-21],[-48,18],[-50,38],[-30,10],[-19,-4],[-15,-18],[2,-17],[18,-36],[4,-23],[12,-44],[-353,-176],[-66,-73],[-48,-18],[-42,-23],[-36,4],[-8,9],[-224,20]],[[16414,17064],[-98,57]],[[15632,17754],[236,278]],[[15868,18032],[257,-85],[147,-21],[112,31],[121,-70],[54,109],[26,115],[71,96],[47,93],[38,164],[44,162],[4,163],[18,151],[5,135],[186,-23],[201,-73],[186,-112],[165,-93],[74,-57]],[[15868,18032],[148,386],[38,371],[72,456],[28,180],[91,540],[48,456],[516,561],[611,666],[83,121],[3,6],[242,354],[276,630],[340,651],[256,651],[404,1050],[15,71]],[[19039,25182],[27,-7]],[[19066,25175],[77,-15],[87,-13],[48,-6]],[[19270,19778],[36,-19]],[[11027,18027],[-6,167]],[[11021,18194],[116,699]],[[11137,18893],[945,285],[186,841],[1159,4258]],[[13427,24277],[126,-81],[149,-87],[58,-36],[108,-53],[47,-18],[134,-48],[157,-46],[133,-35],[98,-16],[76,-10],[111,-13],[81,-10],[50,4],[139,3],[99,6],[162,26],[88,19],[131,34],[118,33],[50,21],[47,11],[77,35],[95,37],[81,45],[66,41],[63,33],[63,45],[84,57],[36,28],[17,16],[27,21],[82,47],[31,21],[15,0],[248,108],[158,81],[39,22],[129,71],[163,96],[153,99],[152,104],[115,88],[125,101],[167,142],[107,103],[26,24],[10,4]],[[17918,25450],[47,-12],[46,-11],[77,-21],[75,-14],[75,-11],[77,-9],[53,-4],[43,0],[55,-22],[32,-11],[108,-38],[84,-28],[54,-11],[76,-19],[80,-29],[108,-20]],[[19008,25190],[31,-8]],[[26366,21544],[-43,-140],[-29,-84],[6,-6],[13,-6],[15,2],[8,18],[7,-4],[72,-45],[73,-42],[-16,-151],[-8,-83],[9,-96],[41,-57],[14,-76],[-48,-35],[-17,-6],[-25,-18],[-6,-62],[132,-154],[11,0],[20,19],[44,-1],[124,-20],[66,-9],[-17,-23],[-5,-22],[-12,-25],[94,-77],[-109,-170],[-25,-35],[-131,-46],[-82,-75],[-99,-90],[-115,12],[-87,-97],[-112,-27],[-77,-93],[-128,-59],[-101,-56],[-48,-83],[-144,-150]],[[23563,20182],[-51,14]],[[23512,20196],[-10,330],[32,242],[101,331],[88,347],[-17,223],[-24,130],[-74,139]],[[23608,21938],[80,177],[168,100],[162,117],[133,94],[95,63],[121,82],[150,96],[434,67]],[[24951,22734],[289,-18],[168,-214],[136,-200],[95,-132],[239,-293],[324,-229],[164,-104]],[[24951,22734],[376,609],[316,261],[237,242],[386,233],[263,144],[395,26],[246,162],[369,63],[128,52]],[[27667,24526],[10,-10],[198,-199]],[[27875,24317],[25,-25]],[[27900,24292],[-9,-15],[-1,-18],[14,-35],[14,-21],[15,-19],[43,-30],[17,-18],[16,-8],[17,-12],[13,-13],[37,-43],[24,-28],[11,-22],[2,-11],[1,-16],[-9,-29],[-11,-21],[-1,-11],[2,-18],[11,-35],[2,-13],[1,-27],[-4,-33],[4,-11],[22,-28],[9,-22],[-1,-15],[-4,-15],[-9,-12],[-12,-11],[-18,-23],[-3,-17],[1,-39],[-3,-10],[-11,-13],[-2,-8],[25,-27],[20,-14],[7,-7],[9,-15],[1,-13],[-3,-15],[-9,-10],[-17,-9],[-25,-9],[-10,-11],[-4,-16],[-1,-26],[-4,-11],[-12,-16],[-18,-15],[-18,-23],[-15,-10],[-20,-4],[-43,-19],[-7,-5],[-4,-9],[0,-21],[-4,-10],[-12,-15],[-1,-10],[6,-14],[11,-19],[9,-20],[8,-31],[2,-15],[-6,-32],[-17,-20],[-23,-13],[-21,2],[-15,-2],[-14,1],[-39,1],[-28,-6],[-14,-5],[-36,-23],[-10,-12],[2,-10],[-1,-14],[-10,-29],[-14,-19],[-15,-15],[-18,-10],[-13,-5],[-31,-15],[-10,-3],[-33,-12],[1,-10],[-5,-5],[-2,-13],[-6,-9],[-20,-9],[-15,-18],[-4,-1],[-13,-16],[-7,-13],[-13,-12],[-11,-15],[-4,-9],[-12,-6],[-7,1],[-11,-5],[-8,-15],[-2,-13],[-9,-7],[-21,-8],[-17,-10],[-5,-9],[3,-13],[-1,-7],[-8,-25],[-2,-9],[12,-30],[-1,-16],[5,-14],[9,-10],[-1,-12],[2,-8],[-4,-9],[0,-13],[22,-15],[-5,-11],[-11,-1],[-21,-10],[-6,-1],[-17,-8],[-16,3],[-32,2],[-43,-9],[-27,-11],[-14,-14],[-19,-10],[-12,-12],[-21,-11],[-12,-23],[-20,-13],[-12,-16],[-2,-20],[1,-6],[138,-374],[15,-92],[-391,-138],[-326,-64],[-29,-6],[-62,-61],[-103,-11],[-15,-48]],[[23608,21938],[-91,66],[-139,142],[-204,142]],[[23174,22288],[-239,126],[-248,39],[-221,78],[-224,7]],[[24249,25471],[245,24],[295,82],[217,60],[7,2],[110,63]],[[25123,25702],[56,32]],[[25179,25734],[204,-38],[151,-57],[178,-41],[183,-53],[95,-34],[138,-48],[125,-220],[261,-53],[490,-206],[227,-106],[163,-131],[145,-129],[93,-57]],[[27632,24561],[35,-35]],[[22390,20032],[82,159],[35,163],[-17,226],[6,154],[35,181],[124,287],[139,220],[62,117],[106,193],[44,163],[104,202],[64,191]],[[23512,20196],[-29,8]],[[23201,19807],[-56,-58]],[[20796,21145],[-13,3]],[[8201,19439],[-121,-225],[-82,-151],[-266,-319],[-78,-132],[-112,-187],[0,-1]],[[7542,18424],[-267,-318]],[[7275,18106],[0,8],[-42,147],[-82,142],[-47,205],[21,133],[17,44],[15,30],[-1,109],[119,16],[-129,176],[-196,-1],[-216,80],[-87,12],[-57,-88],[-92,69],[22,115],[-68,60]],[[6452,19363],[-19,448]],[[6433,19811],[1038,841]],[[7471,20652],[56,-117],[61,-100],[114,-144],[207,-236],[144,-174],[124,-247],[21,-195],[3,0]],[[9401,16998],[-317,-30]],[[7788,16851],[-324,38]],[[7464,16889],[-21,220],[-179,171],[9,21],[-28,34]],[[7245,17335],[-13,-6]],[[7232,17329],[10,18],[-8,9],[18,30],[0,86],[-15,28],[-15,26],[-12,29],[-10,22],[-3,29],[17,29],[22,23],[3,37],[-5,50],[9,62],[-5,63],[-7,48],[-12,65],[13,50],[43,73]],[[7542,18424],[94,-57],[122,-22],[200,-108],[163,-215],[347,-204],[163,-65],[174,-48],[190,-44],[274,-129],[105,-333],[32,-135],[-5,-66]],[[8201,19439],[772,-21],[435,-71],[444,-31],[112,-12],[478,-50],[537,-318],[147,-111]],[[11126,18825],[-105,-631]],[[11021,18194],[22,-716]],[[9718,17028],[-317,-30]],[[5760,19045],[299,148],[106,118],[145,93],[140,26]],[[6450,19430],[2,-67]],[[7232,17329],[-44,-19]],[[7188,17310],[-53,2],[-83,-14],[-275,38],[-38,-14],[-4,19],[-49,17],[-72,34],[-496,203]],[[6118,17595],[3,11],[-64,195],[-91,13],[-10,65],[-85,183],[-9,27],[-51,77],[127,111],[52,47],[-44,135],[113,44],[-31,91],[-59,77],[-143,43],[-3,69],[8,47],[25,46],[-11,38],[-39,55],[-46,76]],[[7807,21406],[-31,-69]],[[7776,21337],[-274,-659]],[[7502,20678],[-1069,-867]],[[6433,19811],[17,-381]],[[5760,19045],[-48,-9],[-40,-43],[-7,-33],[-79,15],[-76,-30],[2,-50],[-23,-14],[-52,83],[-55,93],[-267,212],[159,282],[-189,108],[-86,-88],[-88,-70],[-88,-54],[-100,-70],[-52,-56],[-227,-293],[-229,-67],[-10,-132],[-25,3],[-18,-32],[-90,-4],[-78,-76],[-93,-12]],[[3901,18708],[-49,-62],[-44,74],[-1,0],[-49,85],[-19,-11],[-61,152],[-25,48],[-19,36],[-159,-39],[-70,112],[-82,-30],[-42,59],[180,135],[-57,56],[-67,-52]],[[3337,19271],[-71,60]],[[3247,19640],[-72,89]],[[6107,17556],[-166,94],[-168,86],[-48,65],[-15,59],[-32,70],[-116,-5],[-79,59],[-221,-6],[-22,44],[-89,37],[-79,108],[-84,54],[-205,-11],[-95,11],[-308,15]],[[4380,18236],[-28,161]],[[4352,18397],[-101,118],[-88,51],[-75,35]],[[4088,18601],[-55,26],[-125,44],[-7,37]],[[6118,17595],[-11,-39]],[[6107,17556],[-27,-95]],[[6080,17461],[-71,-21],[-32,2],[-41,8],[-30,-10],[-10,-14],[10,-49],[39,-33],[25,-42],[18,-31],[32,-24],[24,-12],[-8,-36],[-23,-18],[-42,-26],[-72,0],[-37,-12],[-7,-36],[9,-94],[-8,-48],[0,-31],[10,-22],[33,-32],[-7,-48],[-13,-26],[10,-17],[12,-8],[5,-23],[0,-37],[7,-38],[35,-59],[-2,-23],[2,-34],[0,-34],[-6,-39],[-15,-21],[-49,-46],[-31,0],[-35,-8],[-13,-36],[-17,-35],[-23,-10],[-44,-17],[-50,21],[-24,18],[-20,12],[-38,14],[-31,5],[-32,10],[-27,14],[-56,-5],[-29,-4],[-29,-5],[-31,-11],[-26,2],[-22,12],[-20,17],[-19,34],[-23,24],[-27,45],[-19,46],[-42,25],[-34,16],[-40,8],[-30,37],[-43,41],[-40,35],[-34,3],[-13,-5],[-10,20],[3,32],[-5,14],[4,36],[-10,4],[-16,-2],[-8,2],[-11,7],[-6,8],[-11,6],[-13,3],[-7,-3],[-19,-2],[-16,-7],[-22,-3],[-7,-27],[-20,0],[0,19],[8,24],[-18,10],[-19,-2],[-26,-4],[-9,3],[-10,14],[-8,-3],[-16,9],[-10,16],[-15,-3],[-21,-15],[-31,-7],[-36,1],[-20,20],[-39,-3],[-49,-13],[-49,-33]],[[4374,16851],[-35,-20]],[[4339,16831],[-1,20],[-6,287],[141,184],[28,12],[-5,141],[24,46],[33,58],[-151,198],[-35,233],[13,43],[-49,86]],[[4331,18139],[49,97]],[[1393,17612],[762,173],[137,-6],[116,227],[78,0],[16,134],[490,11],[5,177],[126,43],[238,38],[510,16],[32,65],[79,59],[106,52]],[[4352,18397],[28,-161],[-49,-97]],[[4339,16831],[-28,-16]],[[4311,16815],[-55,-58]],[[4256,16757],[-795,0]],[[3461,16757],[-23,-216],[-292,0]],[[3146,16541],[6,18],[-2,7],[-7,31],[-15,41],[1,20],[18,7],[-20,29],[-214,309],[-1102,-5],[-418,614]],[[3298,19304],[39,-33]],[[1393,17612],[-104,152],[-615,888]],[[17827,37869],[-1161,-4063]],[[16666,33806],[-645,44]],[[9258,34310],[2261,4548]],[[11519,38858],[179,647],[-9,73]],[[11689,39578],[81,-39]],[[11770,39539],[108,68],[286,-204],[-43,-195],[-198,-173],[215,-379],[98,-207],[108,-239],[179,-103],[107,-204],[144,-170],[215,-239],[107,34],[251,307],[0,171],[-71,204],[-131,1038],[-40,108],[-81,217],[-143,0],[-16,567],[364,426],[118,98],[251,341],[215,102],[425,123],[292,-20],[121,98],[99,80]],[[14750,41388],[165,0],[189,197],[126,134],[181,190],[215,205],[87,800],[-37,5],[82,253],[215,284],[116,0],[215,347],[250,81]],[[16554,43884],[3754,-1875],[939,-493],[1013,-508]],[[22260,41008],[-1529,-3139],[-2904,0]],[[17918,25450],[-2489,1299],[-1714,315],[-688,-230],[-1164,519]],[[11863,27353],[1062,995]],[[18695,31868],[2093,40]],[[20788,31908],[90,-254]],[[20878,31654],[-243,-2850],[-108,-513]],[[20527,28291],[-72,-339],[502,-1357],[655,-1440],[-104,2],[-84,-73],[-107,-77],[-175,-98],[-138,-144],[-14,8]],[[19066,25175],[-58,15]],[[20527,28291],[108,513]],[[20635,28804],[1159,0]],[[21794,28804],[2099,-3316],[-242,10]],[[14750,41388],[-964,573],[-1138,417],[-1263,458],[-1076,213]],[[10309,43049],[-158,360],[0,1023],[15,2294],[0,54],[-7,223]],[[10159,47003],[3471,-1691],[410,-187],[1474,-721],[1040,-520]],[[6322,40766],[2198,104],[1332,223]],[[9852,41093],[632,-575],[686,-628],[559,-329],[-1,-2]],[[11728,39559],[-39,19]],[[11519,38858],[-5440,-10940]],[[6079,27918],[92,3337],[0,7],[30,570],[60,2133],[7,260],[85,665],[294,2151],[93,666],[718,1220],[-204,135],[-322,307],[-144,307],[-358,306],[-144,137],[-107,204],[-36,171],[179,272]],[[7847,10014],[16,-13]],[[7935,7237],[-579,-548]],[[6904,6852],[-17,2],[-15,9]],[[6778,7265],[-68,61],[-65,57],[-73,93],[-78,102],[-43,84]],[[6451,7662],[81,21],[18,7],[0,8],[-18,14],[-13,15],[-14,19],[-8,6],[-24,11],[-15,13],[-30,12],[-7,9],[-16,11],[-10,4],[-20,1],[-17,9],[-12,21],[-13,7],[-8,1],[-28,-7],[-15,6],[-6,8],[-2,17],[-6,16],[-13,11],[-22,11],[-12,2],[-15,-5],[-18,1],[-14,13],[-4,17],[-9,11],[-17,7],[-12,1],[-24,9],[-9,8],[-6,24],[-13,11],[-11,-1],[-9,-6],[-9,-11],[-18,-7],[-4,1],[-4,16],[0,15],[-4,16],[-9,8],[-16,17],[-13,19],[-4,3],[-17,-4],[-4,5],[-13,3],[-8,24],[-21,30],[-11,17],[-17,18],[-6,18],[-16,31],[-6,29],[-10,21],[-12,15],[-12,18],[-24,15],[-22,6],[-13,16],[-13,12],[-25,17],[-5,10],[2,19],[-2,10],[-11,23],[-23,21],[-22,19],[-15,7],[-25,17],[-17,16],[-20,22],[-21,35],[-16,15],[-2,5],[-17,15],[-20,9],[-20,11],[-21,6],[-9,-2],[-16,0],[-18,9],[-1,17],[8,25],[0,7],[-14,15],[-18,9],[-14,15],[-4,24],[-5,13],[-8,12],[-9,10],[-11,36],[-6,30],[-2,25],[-3,24],[-8,28],[-17,29],[-20,36],[-13,15],[-10,1],[-9,4],[-16,22],[-6,13],[-6,28],[-8,29],[-8,17],[-14,20],[-40,40],[-22,19],[-13,8],[-8,8],[-13,6],[-16,9],[-17,8],[-15,-1],[-28,13],[-15,16],[-23,14],[-30,25],[-10,12],[-7,13],[-4,11],[-2,21],[0,37],[-1,19],[-4,20],[-1,22],[2,25],[9,18],[17,22],[7,12],[4,20],[7,18],[-2,21],[-12,49],[-8,23],[-12,18],[-9,12],[-16,39],[-14,58],[-6,18],[-3,18],[-6,13],[-7,11],[-15,15],[-14,10],[-7,9]],[[4855,9893],[57,88],[57,117],[89,106],[135,38],[101,21],[127,-44],[41,-128],[89,-109],[69,-98],[115,-34],[72,125],[77,47],[112,-65],[111,-7],[104,2],[114,0],[132,-27],[98,-76],[38,-100],[42,-146],[34,-163],[130,-61],[142,-22],[105,-56],[93,-64],[108,5],[114,22],[58,91],[59,143],[82,112],[100,99],[107,112],[71,173],[9,20]],[[11137,18893],[-11,-68]],[[7471,20652],[31,26]],[[7776,21337],[647,1462]],[[10923,25909],[1868,-831],[3,-21],[47,-90],[35,-54],[35,-58],[43,-66],[39,-63],[44,-54],[39,-54],[42,-47],[48,-62],[93,-86],[36,-38],[39,-35],[47,-31],[46,-42]],[[5090,14269],[-121,-34],[-11,2],[-68,18],[-137,-17],[-36,-11],[12,-12],[-3,-12],[12,-6],[5,-13],[1,-9],[-52,15]],[[4692,14190],[-6,9],[-58,59],[-1,-22],[-6,-10],[-39,44],[-16,28],[16,22],[-3,6],[-30,15],[-16,6],[-38,23],[70,23],[117,39],[21,1]],[[4703,14433],[15,1]],[[4718,14434],[42,4]],[[4760,14438],[67,3],[16,-9],[21,-8],[33,-17],[6,-11],[8,-8],[16,-3]],[[4927,14385],[25,-11],[19,-20],[10,-7]],[[4981,14347],[32,-19],[17,-15],[45,-24],[15,-20]],[[18162,9306],[-150,-658]],[[18171,7555],[845,-2631]],[[19016,4924],[5,-17]],[[19021,4907],[-14,17],[-8,6],[-12,-1],[-20,-14],[-4,-9],[-16,-19],[-18,-5],[-23,24],[-14,4],[-14,-5],[-17,-14],[-15,-18],[-8,-2],[-9,-16],[-15,-6],[-16,0],[-4,10],[-13,10],[0,25],[-15,3],[-9,-5],[-17,-19],[-11,-5],[-9,2],[-9,-1],[-7,-7],[-9,-3],[-25,0],[-12,4],[-5,13],[-16,0],[-25,6],[-13,0],[-18,-20],[-4,-11],[-21,1],[-13,4],[-14,-11],[-9,0],[-13,-7],[-11,-2],[-12,5],[-6,6],[-15,-2],[-22,-10],[-8,-19],[-14,-7],[-9,-10],[-14,3],[-15,-1],[-12,-11],[-13,-15],[-10,2],[-2,10],[6,11],[-9,5],[-9,-3],[-6,-14],[-8,2],[-6,10],[-9,-5],[9,-16],[-19,-3],[-20,1],[-12,3],[-4,15],[-11,-3],[-4,-14],[-12,-10],[-10,1],[-7,-8],[-11,2],[-10,-4],[-37,4],[-20,11],[-13,2],[-7,-9],[-4,-10],[-15,1],[-11,-2],[-11,5],[-2,13],[3,11],[-23,1],[-13,3],[-2,12],[-15,-2],[-26,-7],[-32,-7],[-9,4],[-10,-3],[-3,7],[-8,-6],[-8,-31],[-18,-12],[-10,5],[-11,1],[-9,6],[-4,13],[-8,2],[-7,-6],[-4,-11],[-7,-9],[-14,3],[-13,10],[-4,22],[-11,4],[-10,-7],[-11,-17],[4,-10],[-8,-5],[-11,8],[-8,9],[-4,-7],[-2,-11],[-6,-12],[-10,-4],[-9,7],[-12,-2],[-6,-10],[-18,-13],[-9,4],[-11,9],[-19,-2],[-21,4],[14,20],[1,9],[-7,11],[-11,6],[-10,1],[-6,-6],[-2,-11],[-8,-3],[-13,3],[-21,-5],[-8,8],[-15,-2],[1,11],[4,11],[-11,-1],[-8,-6],[-10,-5],[-19,13],[-11,-4],[-7,-7],[-8,-26],[-12,-3],[-13,8],[-10,10],[-14,3],[-10,9],[-10,1],[-16,11],[-10,-2],[-11,-21],[-10,-8],[4,-9],[-1,-8],[-16,7],[-13,2],[-8,9],[-17,6],[-14,-11],[-27,-7],[-32,-10],[-31,-5],[-11,1],[-27,7],[-30,4],[-21,6],[-17,1],[-8,6],[-3,23],[-6,14],[-11,1],[-23,-9],[-26,7],[-36,2],[-17,-1],[-23,3],[-24,-1],[-8,-4],[-24,-8],[-22,-4],[-20,-6],[-17,-8],[-9,-13],[-11,-8],[-15,-3],[-24,0],[-21,-9],[-49,3],[-26,-5],[-20,-5],[-18,-3],[-22,2],[-26,5],[-9,4],[-7,22],[-12,5],[-22,-9],[-8,-6],[-3,-31],[-7,-4],[-21,9],[-9,-17],[5,-9],[-11,-1],[-12,6],[-17,-1],[-4,-13],[-13,5],[-10,0],[-17,8],[-7,-5],[-20,-3],[-10,-10]],[[14224,6294],[19,15]],[[3119,6799],[-22,23],[-87,69],[-62,20],[-79,48],[-46,34],[-50,11],[-89,-4],[-56,-17],[-53,-4],[-50,-1],[-44,45],[-23,54],[-49,59],[-89,67],[-74,59],[-62,24],[-46,9],[-101,15],[-14,6]],[[2023,7316],[54,112],[86,262],[2,21],[831,-2],[84,-18],[514,-110],[337,-69]],[[3931,7512],[-13,-22]],[[3918,7490],[-30,-26],[-62,-66],[23,-2],[9,-11],[1,-15],[-2,-17],[17,-2],[8,-7],[3,-10],[-10,-12],[8,-7],[-1,-12],[3,-8],[13,-4],[13,-11],[-5,-35],[2,-14],[-1,-30],[-3,-16],[-11,-10]],[[7188,17310],[57,25]],[[7464,16889],[324,-38]],[[8045,15607],[-153,-6],[-216,-23],[-174,-16],[-156,-60],[-263,-18],[-133,-27],[-130,-49],[-185,19],[-236,-28],[-134,51],[-170,7],[-175,6],[-195,-34],[-197,58],[-242,30],[-224,154],[-234,253],[-303,260],[-304,5],[-346,-43],[-210,108],[-22,118],[-27,385]],[[3616,16757],[640,0]],[[4311,16815],[63,36]],[[6080,17461],[38,134]],[[8848,4909],[7,-16]],[[7757,4984],[91,-78]],[[1862,6304],[-8,23],[-10,19],[-10,11],[-10,3],[-19,1],[-18,10],[-13,20],[-9,7],[-5,8],[-33,34],[-30,46],[-15,11],[-3,21],[-3,16],[-15,6],[-45,21],[-35,2],[-5,3],[-14,3],[-73,63],[5,29],[136,234],[17,19],[138,124],[61,50],[43,36],[59,46],[8,8],[18,37],[49,101]],[[4872,6473],[-15,24]],[[3918,7490],[13,22]],[[3931,7512],[457,150],[116,-43],[25,-4],[87,0],[7,-2],[16,-15],[53,-43],[12,1],[114,48],[10,4],[5,7],[5,22],[4,23],[7,10],[7,4],[22,5],[19,7],[62,13],[78,-24],[15,0],[50,19],[34,-6],[7,-7],[7,-11],[89,12],[355,-91],[146,-80],[312,52],[396,98],[3,1]],[[9151,13578],[345,-362]],[[4917,13767],[26,9],[35,20],[11,23],[10,7],[134,85],[-3,22],[-7,3],[-5,8],[2,10],[-1,17],[-5,7],[-10,10],[-5,11],[12,11],[2,7],[-5,10],[-12,7],[-10,0],[-4,5],[0,10],[-12,23],[0,8],[-8,13],[-9,9],[-2,12],[4,10],[20,28]],[[5075,14152],[2,9],[-7,12],[-27,1],[-6,14],[-12,10],[1,13]],[[5026,14211],[7,10]],[[5033,14221],[23,12]],[[5056,14233],[20,12],[14,24]],[[5090,14269],[-15,20],[-45,24],[-17,15],[-32,19]],[[4981,14347],[-10,7],[-19,20],[-25,11]],[[4927,14385],[-16,3],[-8,8],[-6,11],[-33,17],[-21,8],[-15,9]],[[4828,14441],[17,16],[560,269],[68,13],[314,163],[263,-225],[363,14],[154,-94],[55,-103],[-29,-102],[62,-74],[50,59],[50,0],[39,-90],[4,150],[106,44],[139,-257]],[[4828,14441],[-68,-3]],[[4760,14438],[-42,-4]],[[4703,14433],[-21,-1],[-117,-39],[-186,-61]],[[4379,14332],[-112,-15],[-17,-13]],[[4250,14304],[-3,10],[-7,9],[-19,10],[-15,14],[-4,6],[0,13],[7,17],[13,15],[8,19],[-2,25],[-5,12],[-7,7],[-14,29],[0,10],[12,24],[20,24],[2,22],[-2,15],[-10,31],[-11,14],[-3,10],[0,17],[2,20],[16,29],[8,20],[3,11],[-2,20],[-8,18],[-3,20],[1,19],[15,37],[6,28],[-2,28],[-17,42],[-16,28],[-26,38],[-14,20],[-11,18],[-4,13],[0,22],[5,25],[-9,29],[-14,11],[-19,0],[-9,-10],[-5,-19],[-3,-6],[-15,-4],[-15,7],[-13,19],[-2,8],[1,18],[2,12],[5,8],[14,13],[16,11],[4,4],[1,22],[-3,19],[-17,50],[-3,46],[1,24],[6,47],[0,15],[-25,42],[-9,23],[-3,19],[-1,24],[-12,58],[-15,53],[-8,5],[-14,4],[-39,-2],[-47,0],[-37,-15],[-12,2],[-24,12],[-18,19],[-4,14],[-4,30],[-1,25],[-5,21],[-10,20],[-9,13],[-10,8],[-19,2],[-12,-4],[-9,-7],[-8,-33],[-8,-19],[-14,-8],[-18,-8],[-18,-1],[-12,9],[-12,30],[-1,19],[7,13],[10,13],[15,15],[14,21],[5,22],[0,10],[-7,20],[-11,11],[-11,7],[-16,5],[-28,3],[-18,-3],[-34,-19],[-13,-3],[-9,1],[-40,16],[-14,7],[-10,8],[-10,14],[-16,12],[-16,9],[-16,5],[-35,1],[-6,9],[10,17],[4,15],[5,31],[-8,17],[-8,1],[-9,-4],[-26,-38],[-14,-19],[-16,-10],[-14,-2],[-14,6],[-12,10],[-8,16],[-3,18],[-11,40],[-12,11],[-13,0],[-13,-12],[-9,-2],[-11,2],[-17,24],[-8,30],[0,10],[9,26],[8,10],[8,16],[16,20],[7,15],[4,23],[-3,27],[-8,23],[-16,31],[-10,8],[-20,10],[-24,13],[-14,6],[-9,9],[-12,21],[-6,23],[3,16],[16,23],[6,7],[8,32],[-8,3],[0,9],[9,20]],[[3461,16757],[155,0]],[[16485,12803],[-452,9]],[[19016,4924],[-792,2464]],[[23397,12631],[1293,243]],[[26240,10593],[-4,3],[-27,-2],[-24,6],[3,-8],[-9,-5],[-5,-14],[0,-9],[-6,-10],[-7,-4],[-40,1],[-6,-5],[-18,-5],[-15,-7],[-7,-12],[-26,-22],[-14,-14],[-14,-9],[-23,4],[-40,21],[-20,3],[-7,-10],[-9,-1],[-12,-15],[-14,-1],[-5,17],[-9,-3],[0,-11],[-10,7],[-5,-15],[-13,-9],[-8,12],[-10,9],[-24,0],[-2,-9],[-7,-7],[-3,8],[-10,-5],[-9,4],[-9,-4],[-11,-1],[-3,-10],[-10,10],[-9,-10],[-8,5],[-5,-14],[-12,-1],[-1,-17],[-21,-6],[-41,-3],[-10,10],[8,3],[6,14],[-9,-2],[-9,10],[-12,-4],[-2,-11],[-6,3],[4,19],[-7,7],[4,7],[-7,3],[-9,0],[-9,-8],[-10,12],[3,12],[-10,-5],[1,-7],[-6,-3],[-7,14],[7,12],[-7,3],[-11,-6],[2,11],[-18,-3],[3,7],[-8,3],[-4,-10],[-7,5],[-5,9],[-12,-2],[7,-10],[-7,-8],[-14,3],[-7,-12],[-4,-1],[-7,10],[-9,-3],[-3,-7],[-9,-2],[4,-13],[-9,-2],[-11,5],[-6,-6],[-4,11],[-8,-13],[-10,0],[-6,4],[-6,-7],[3,-13],[-6,-3],[-17,2],[-7,-6],[-3,8],[-12,6],[-1,6],[-8,12],[4,7],[-19,7],[-3,8],[3,9],[-12,7],[-5,-4],[-8,6],[-7,-4],[-13,1],[-9,-4],[-10,-14],[-14,4],[-20,-2],[-5,-4],[-10,1],[3,-9],[-3,-7],[-15,-4],[7,-15],[-13,-12],[-6,-2],[6,-17],[-5,-3],[-11,2],[-13,-10],[-19,1],[-3,8],[-11,-4],[-10,0],[-1,-15],[-17,-19],[-16,-21],[-4,7],[-9,2],[-2,9],[-6,10],[-18,-19],[0,-6],[7,-7],[-13,-2],[-10,6],[-12,0],[-15,-9],[-12,0],[-11,7],[-31,-1],[-15,11],[-5,-9],[3,-6],[-9,-4],[7,-7],[3,-12],[-6,-8],[8,-5],[-8,-10],[-18,0],[-14,-16],[-2,-8],[-10,-3],[-25,6],[-12,13],[-4,-8],[-9,-10],[-7,-12],[10,-12],[-8,-11],[-8,-5],[-17,-5],[-15,-15],[-15,0],[-13,-3],[-10,16],[-14,7],[-10,-1],[-12,9],[-14,4],[-10,-8],[3,-4],[1,-20],[-15,-11],[-5,9],[-18,0],[-20,-20],[3,-7],[-17,-11],[-3,-8],[3,-13],[-9,-7],[8,-9],[-5,-8],[3,-7],[-4,-8],[-6,12],[-11,-5],[-10,-20],[-8,-2],[-9,-11],[-3,2],[-27,-3],[-2,-8],[2,-24],[-1,-11],[8,-13],[8,-8],[4,-9],[0,-22],[-11,-2],[0,-9],[-17,2],[-3,-13],[8,-9],[1,-8],[-11,-4],[0,-6],[7,-4],[-4,-12],[14,-8],[-9,-12],[14,-11],[-3,-6],[7,-12],[-5,-5],[2,-11],[-7,0],[-9,-13],[5,-10],[-5,-3],[0,-11],[-8,-7],[0,-5],[10,-9],[12,-25],[-4,-1],[1,-12],[-3,-14],[-7,-6],[7,-12],[-9,-11],[7,-11],[-9,-12],[-3,-11],[2,-5],[-8,-12],[-19,-19],[-8,3],[-15,-6],[2,-10],[-6,-9],[-7,-2],[-8,6],[-3,-10],[-12,0],[-4,-8],[-6,-3],[-8,5],[-2,12],[10,10],[-5,5],[-16,4],[-4,8],[3,6],[-12,5],[-14,-2],[-10,-15],[-3,-17],[8,-16],[0,-7],[-9,-8],[-1,-11],[-4,-15],[3,-7],[1,-14],[6,-16],[-3,-13],[2,-8],[-1,-12],[-14,-8],[-9,-16],[7,-4],[1,-14],[-3,-15],[5,-11],[-8,-5],[10,-6],[-2,-7],[5,-8],[-1,-4],[10,-6],[5,-16],[-9,-4],[-2,-19],[-5,-16],[-7,0],[1,-10],[7,-15],[6,-2],[0,-8],[-7,-3],[-3,-12],[2,-14],[-5,-1],[-4,13],[-8,-6],[-16,-2],[3,-9],[-3,-11],[8,-2],[4,-13],[-14,-2],[3,-6],[-4,-14],[-7,-3],[5,-11],[-1,-10],[6,-11],[-5,-8],[3,-17],[13,-5],[8,-17],[11,-10],[14,-6],[1,-12],[15,-13],[25,-4],[3,-11],[12,0],[-2,-18],[-5,0],[4,-23],[10,-4],[8,2],[6,-5],[4,-12],[-2,-11],[-6,-3],[0,-7],[-6,-14],[-9,-11],[0,-10],[4,-5],[7,3],[13,-10],[2,5],[22,-1],[19,-3],[5,-7],[-9,-18],[-7,-1],[-12,-13],[-11,-18],[-6,-6],[-23,-11],[-8,-8],[-4,-10],[6,-10],[-8,0],[-12,-5],[-9,3],[-2,-11],[-8,-5],[6,-12],[-8,-6],[-3,-10],[3,-10],[10,-2],[3,-9],[-12,-6],[8,-12],[-5,-3],[-1,-12],[-9,-10],[-9,-1],[-11,8],[-2,11],[-10,-9],[-1,-14],[2,-27],[12,-16],[17,-13],[9,-9],[0,-17],[-3,-6],[13,-4],[-1,-6],[-20,-22],[-13,-21],[-8,-2],[-4,-8],[-10,-6],[-2,-6],[-16,-3],[-5,-14],[8,-8],[-8,-9],[-9,-16],[-17,-5],[-9,4],[-8,8],[-11,-10],[-10,3],[-16,-7],[-6,14],[-9,-5],[-7,5],[-9,-20],[-7,-1],[8,-12],[11,-12],[5,-11],[-8,-13],[-9,2],[-15,-4],[-7,-5],[-19,-6],[-2,-7],[7,-11],[8,4],[14,-2],[8,-21],[6,-1],[8,-12],[-3,-8],[-7,-3],[-16,-2],[-12,-4],[-30,-4],[-9,-3],[-14,17],[-9,-12],[-3,-9],[-6,8],[-11,-2],[-1,-9],[5,-7],[-9,-4],[-15,3],[-16,15],[-14,-3],[-12,-10],[0,-14],[-10,-3],[-5,-7],[-10,-4],[-8,-9],[-7,2],[-17,-13],[-11,-2],[-14,-6],[-3,9],[-20,15],[-27,-9],[-8,1],[-9,-6],[-5,3],[-9,-10],[-6,0],[-13,12],[-9,16],[-11,10],[0,12],[-11,10],[-11,-8],[-10,-5],[-2,-9],[-21,-4],[-8,-7],[-13,-5],[-12,-15],[-13,-22],[-1,-7],[4,-12],[-5,-10],[-6,-4],[-10,-11],[-14,-1],[-7,-8],[-17,0],[-11,13],[-3,-12],[1,-23],[-6,-19],[10,-23],[-4,-12],[-4,-4],[-13,11],[-9,-5],[-9,1],[-2,9],[-9,-6],[-7,-15],[-10,-10],[-9,-3],[5,-8],[-2,-10],[10,-2],[4,-5],[-17,-25],[0,-8],[-9,-13],[-19,-13],[-14,-3],[-16,1],[-9,-5],[4,-6],[0,-10],[7,-4],[10,-13],[-2,-4],[8,-8],[-2,-15],[-8,-13],[-2,-11],[5,-11],[8,-1],[-3,-13],[-8,-3],[-9,5],[-13,-10],[-12,-5],[-5,-7],[-5,-25],[15,-18],[3,-13],[-8,-18],[-13,-16],[-12,5],[-10,-2],[-9,5],[-15,-1],[-8,-7],[-10,-16],[-21,-27],[-6,-20],[3,-13],[13,-24],[-13,-3],[-9,-9],[-10,-3],[-9,-21],[-1,-32],[-1,-9],[-8,-9],[-13,-3],[-4,-10],[-24,-3],[-9,2],[-4,-15],[-10,-5],[-8,4],[-1,14],[-13,5],[-10,-11],[2,-14],[-4,-20],[-5,-19],[-10,-15],[-7,-1],[-26,2],[-10,3],[-13,14],[4,13],[-7,3],[-22,-14],[-9,2],[-12,18],[1,14],[17,5],[-3,5],[-10,4],[-8,-5],[-17,7],[-15,-3],[2,-14],[-3,-11],[-12,-17],[-9,-6],[-5,8],[-12,3],[-8,8],[-10,0],[-9,17],[10,9],[-13,8],[-8,-3],[-18,9],[-17,4],[0,11],[-6,13],[-8,1],[-10,-3],[-16,-9],[-9,-11],[-3,-7],[-1,-15],[4,-12],[6,-6],[-4,-8],[-10,-1],[-14,-11],[-2,-12],[-19,-17],[-19,-13],[-11,3],[-4,-3],[-20,1],[-6,-8],[-10,-4],[3,-26],[0,-11],[-4,-8],[-8,-10],[-8,12],[-8,-2],[1,-9],[-8,-13],[-2,-22],[-3,-6],[3,-10],[6,0],[6,-12],[9,-6],[-4,-11],[-11,-5],[3,-7],[-6,-9],[-13,-7],[-9,-1],[0,-7],[-7,-5],[-8,7],[-14,-18],[-2,12],[-6,1],[-16,-5],[-3,4],[-9,-36],[-20,1],[-8,-4],[-4,-6],[-14,-6],[-9,0],[-1,-11],[-10,-10],[-10,-15],[-21,-7],[-3,-7],[2,-12],[-14,-20],[-10,-11],[-15,-13],[-17,-6],[-4,-10],[0,-16],[10,-4],[3,-9],[-15,-11],[-15,-2],[-5,-11],[5,-15],[8,-8],[2,-10],[11,-16],[0,-11],[-5,-3],[-7,4],[-6,-13],[-12,-8],[-9,-16],[-23,-12],[-31,-8],[-10,-6],[-8,3],[-14,-8],[-3,-10],[-27,-31],[-8,-2],[-28,12],[-17,6],[-7,17],[10,5],[-7,16],[-9,0],[-6,-4],[-31,-10],[-14,-9],[-16,-18],[-3,-18],[7,-18],[11,4],[6,-4],[15,5],[6,-8],[-11,-5],[-2,-8],[13,0],[10,-17],[3,-18],[-9,-7],[-10,8],[-6,-14],[-8,-8],[-1,-8],[-14,0],[-19,-3],[-10,1],[-14,11],[-16,17],[-6,8],[-3,11],[-1,21],[-14,6],[-6,6],[-15,-4],[-18,1],[-9,-9],[-8,-5],[0,-9],[25,-32],[15,-15],[6,-13],[8,-27],[9,-7],[20,-8],[10,-17],[-1,-10],[-4,-8],[-8,-2],[-9,3],[-24,13],[-16,2],[-14,-6],[-7,-21],[1,-5],[13,-11],[25,-3],[13,0],[11,-7],[3,-8],[-4,-10],[-12,-9],[-20,-2],[-18,4],[-3,-7],[4,-11],[9,-10],[15,-7],[18,-2],[12,4],[4,-1],[1,-14],[-17,-12],[-17,0],[-22,12],[-19,20],[-8,-4],[8,-15],[1,-18],[18,-1],[7,-2],[16,-14],[5,-12],[-4,-12],[-12,-13],[-11,-2],[-14,0],[-25,6],[-11,7],[-11,-2],[-3,-12],[11,-13],[15,-5],[12,0],[13,3],[25,0],[4,-2],[3,-18],[-2,-7],[-20,-24],[-3,-12],[-11,-7],[-29,13],[-24,12],[-22,0],[-8,-2],[-9,-8],[-3,-19],[0,-15],[17,-42],[3,-5],[-6,-23],[2,-19],[0,-17],[-2,-15],[-8,-19],[-9,-1],[-11,5],[-11,18],[-12,13],[-8,3],[-12,-1],[-8,-6],[-4,-12],[3,-28],[0,-12],[-6,-15],[-11,-6],[-23,1],[-4,-5],[3,-14],[22,-8],[-1,-11],[1,-30],[-4,-15],[-3,-5],[-11,-1],[-7,4],[-15,19],[-6,16],[0,10],[-5,3],[-10,-10],[-4,-8],[-6,-22],[-4,-7],[-13,-2],[-26,18],[-10,-1],[-5,-8],[-5,-33],[-5,-10],[-10,-11],[-13,-5],[-7,-8],[-1,-8],[17,-43],[-26,-7],[-24,7],[-15,7],[-14,-3],[-20,-23],[-16,-30],[-9,-20],[-2,-12],[4,-11],[10,-13],[-10,-6],[2,-13],[-3,-36],[-22,-6],[-1,7],[-12,18],[-10,6],[-20,4],[-9,12],[5,9],[-21,-6],[-7,-7],[0,-8],[-7,-5],[-7,5],[-7,-2],[-5,-9],[2,-5],[9,-5],[0,-7],[-6,-5],[-7,6],[-21,5],[4,-14],[-4,-2],[-24,12],[-13,-6],[2,-25],[10,-10],[0,-21],[-6,-5],[-7,-1],[-6,-6],[6,-6],[0,-9],[-5,-3],[-6,6],[-21,-7],[-4,6],[-9,0],[-2,-9],[-10,3],[-9,8],[-8,2],[-12,-15],[-18,1],[-4,12],[-8,2],[-10,-8],[-10,10],[-5,10],[-13,-2],[-6,-20],[-10,2],[-8,-8],[3,-10],[-10,-10],[-5,2],[3,15],[-6,1],[7,11],[-7,1],[-7,-7],[-8,-2],[-14,1],[-10,12],[-11,1],[-21,-10],[-13,7],[-21,-21],[-5,-8],[-5,-27],[-7,-10],[-12,-6],[-1,-12],[11,-12],[0,-5],[-11,-5],[-5,-9],[2,-11],[-5,-10],[0,-10],[10,-15],[11,-3],[-18,-10],[1,-9],[-9,-10],[-9,-5],[9,-9],[10,0],[-4,-8],[7,-5],[-3,-9],[-6,-6],[7,-6],[0,-5],[7,-5],[-15,-10],[-8,-9],[-6,-2],[-32,9],[-18,8],[-10,-1],[-4,-8],[-9,-1],[-7,9],[-6,-2],[-5,-7],[-11,11],[-14,1],[-11,-3],[-5,-5],[-10,-3],[-3,10],[1,16],[-10,17],[-6,12],[-19,7],[-4,11],[-22,-17],[-7,-6],[-9,6],[-9,-5],[5,-13],[-18,0],[-14,11],[-18,2],[-7,6],[-1,14],[-5,6],[-5,-4],[-1,-11],[-7,-4],[7,-7],[-6,-6],[-7,4],[-3,7],[-12,-2],[-4,9],[-11,3],[-12,-21],[-10,-4],[-2,-23],[8,-9],[6,-16],[-10,-6],[1,-26],[-4,-4],[-14,-4],[-12,7],[-7,7],[-6,-3],[-5,-9],[-5,2],[-6,12],[-8,-10],[7,-9],[-9,-3],[-10,9],[-13,-17],[-8,6],[-2,-23],[12,-17],[0,-9],[12,-26],[7,-3],[1,-6],[13,-13],[0,-10],[5,-20],[11,-5],[2,-6],[-7,-12],[2,-10],[17,-7],[-4,-18],[3,-9],[10,-9],[-2,-12],[-5,-3],[-12,4],[-19,1],[-13,4],[-11,-3],[-13,11],[-20,-11],[-5,-14],[-21,-28],[-5,-4],[-29,10],[-7,-9],[3,-10],[0,-9],[-10,-14],[6,-18],[-12,-8],[0,-15],[-10,-7],[1,-12],[-5,-21],[-8,-13],[5,-8],[-6,-9],[-20,-16],[-3,-7],[0,-14],[-8,-1],[-9,5],[-8,-3],[-15,-11],[-15,2],[-2,10],[-5,8],[-20,1],[-14,-9],[-14,1],[-26,-6],[4,16],[-9,-3],[-6,-8],[-15,-9],[-7,-1],[-4,-12],[-10,-17],[-7,1],[-31,-6],[9,-7],[-8,-7],[0,-10],[-5,-22],[-12,-6],[-9,-7],[-29,8],[-12,-3],[-13,10],[-11,-1],[3,12],[-8,12],[-14,6],[-12,-4],[-3,-13],[-4,-9],[-8,-3],[-19,1],[-12,-1],[-10,-10],[-14,-3],[-14,9],[-4,14],[-5,5],[-12,-2],[-25,-15],[-13,2],[-21,-2],[-14,6],[-17,1],[-5,6],[-17,5],[-5,-1],[-7,6],[-17,11],[-1,4],[10,17],[-7,5],[-12,0],[1,12],[-12,10],[-6,-2],[-9,-8],[-12,-1],[-12,9],[-12,5],[-10,11],[-5,9],[-7,4],[-11,1],[-13,-14],[-19,-7],[-5,-6],[4,-22],[-10,-7],[-9,-9],[-11,7],[-17,-1],[-9,-8],[-4,4],[2,13],[-16,0],[-16,-11],[-8,11],[-9,1],[-8,-12],[-11,2],[-5,-4],[-15,3],[-16,1],[-5,-4],[-11,-1],[-10,4],[-4,-4],[-1,-11],[-10,-1],[1,10],[-5,3],[2,9],[7,7],[-3,9],[-13,6],[-10,-8],[-6,3],[-13,-4],[-15,10],[-2,24],[-5,3],[-17,6],[-7,4],[-16,-5],[-11,1],[-5,-5],[3,-11],[13,-6],[2,-13],[0,-20],[-5,-3],[-19,-7],[-7,-12],[-10,-3],[-13,2],[-30,16],[-10,9],[-8,12],[-11,6],[-10,-8],[-13,7],[-16,-7],[-4,-11],[6,-13],[-2,-7],[-8,-5],[-12,-3],[-6,-5],[-6,-12],[-5,-2],[-7,9],[0,9],[-9,7],[-33,-13],[-6,-7],[1,-26],[-2,-10],[10,-6],[18,1],[1,-10],[-6,-12],[-12,0],[-20,-10],[-5,3],[-5,12],[6,12],[-2,5],[-19,16],[-9,2],[-10,-2],[-9,-11],[-10,-5],[-7,-8],[-10,-5],[11,-28],[-5,1],[-5,-11],[-9,-7],[-8,-2],[-2,-9],[-11,-3],[-6,-9],[-10,-1],[-22,-8],[-20,1],[-27,8],[-12,7],[-8,7],[-18,-1],[-2,-12],[-10,-24],[7,-8],[10,-3],[11,-6],[-1,-12],[-6,-8],[-10,-3],[-14,2],[-11,-7],[-10,2],[-7,8],[-4,12]],[[7602,9995],[15,-9]],[[7845,10014],[2,0]],[[4855,9893],[-5,7],[-27,40],[-15,25],[-4,11],[-2,22],[-15,30],[-23,27],[-8,13],[-10,23],[-10,24],[-8,32],[-9,40],[10,50],[3,25],[10,19],[26,18],[12,11],[6,13],[6,16],[3,24],[-1,20],[-16,74],[-9,43],[-6,23],[-9,24],[-14,43],[-26,35],[-15,18],[-2,10],[2,13],[-2,23],[-6,9],[-32,24],[-5,21],[4,8],[13,9],[2,12],[-2,9],[-11,10],[31,17],[39,-4],[9,4],[18,16],[10,6],[13,1],[11,-2],[6,8],[7,16],[5,9],[-2,12],[-3,30],[-4,11],[5,10],[13,8],[5,12],[-3,14],[2,4],[14,10]],[[27875,24317],[-243,244]],[[25179,25734],[-133,177],[-140,313],[-29,182],[983,-280],[1046,-351],[845,-284],[771,-537],[2,-9],[-59,-16],[-16,-3],[-45,-25],[-10,-27],[-8,-31],[-14,-29],[-51,-28],[-46,-32],[-25,-20],[-14,-60],[-85,-39],[-16,-15],[-9,-3],[-9,-14],[-8,-22],[-3,-5],[-28,-8],[-3,-9],[-23,-16],[-17,1],[-21,-4],[-31,-12],[-14,-11],[-6,-7],[-14,-25],[-6,-5],[-9,-16],[-10,-7],[-10,-12],[-6,-13],[2,-18],[4,-17],[-2,-29],[8,-18],[-1,-20],[-10,-13],[-9,-25]],[[4556,14104],[-23,3],[-12,-2],[-15,-14],[-5,-13],[-6,-24],[-6,-17],[-11,-8],[-17,-2],[-14,6],[-3,-2],[-30,5],[-17,7],[-29,29],[-25,23],[-28,13],[-27,24],[-18,28],[-22,30],[-21,18],[-16,3],[-18,13],[-8,10],[0,17],[3,8],[7,4],[15,5],[21,11],[15,13],[4,12]],[[4379,14332],[116,38],[38,-23],[16,-6],[30,-15],[3,-6],[-16,-22],[16,-28],[39,-44]],[[4621,14226],[-14,-10],[-9,-39],[-6,-10],[-37,-37],[1,-26]],[[4621,14226],[6,10],[1,22],[62,-63],[10,-18],[-32,-31],[-2,-5],[1,-64],[-6,-6],[-25,3],[-10,8],[-6,-7],[-38,21],[-13,6],[-13,2]],[[4671,14071],[-4,6],[-1,64],[2,5],[32,31]],[[4700,14177],[8,-14],[11,-13]],[[4719,14150],[-4,-4],[-8,-25],[-5,-10],[-10,-7],[-7,-9],[1,-10],[-5,-11]],[[4681,14074],[-1,-3]],[[4680,14071],[-9,0]],[[4680,14071],[21,-6]],[[4701,14065],[12,-18],[-2,-7],[2,-13],[-8,2],[-4,-15],[-12,-18]],[[4689,13996],[-14,-2]],[[4675,13994],[-15,9],[-5,6],[-1,16],[-16,25],[-17,13]],[[4621,14063],[-3,6],[8,13],[10,-8],[8,-2],[27,-1]],[[4763,14009],[-10,2],[-18,-6],[-24,0],[-23,-11]],[[4688,13994],[1,2]],[[4701,14065],[49,0],[14,-3]],[[4764,14062],[-1,-53]],[[4680,14071],[1,3]],[[4719,14150],[41,-43],[4,-10]],[[4764,14097],[0,-35]],[[5075,14152],[-20,-28],[-4,-10],[2,-12],[9,-9],[8,-13],[0,-8],[12,-23],[0,-10],[4,-5],[10,0],[12,-7],[5,-10],[-2,-7],[-12,-11],[5,-11],[10,-10],[5,-7],[1,-17],[-2,-10],[5,-8],[7,-3],[3,-22],[-134,-85],[-5,-4],[-16,39],[-6,6],[-4,11],[1,11],[-5,14],[-13,26],[-13,21],[-11,8],[-27,12],[-28,10],[-14,0],[-10,5],[-11,14],[-63,6],[-11,4],[2,82],[-1,6],[35,0],[44,-12],[1,20],[-5,14],[30,-1],[77,10],[19,8],[23,5],[55,33],[27,-1],[7,-12],[-2,-9]],[[5090,14269],[-14,-24],[-20,-12]],[[5056,14233],[-23,-12]],[[5033,14221],[-7,-10]],[[5026,14211],[-1,-13],[12,-10],[6,-14],[-55,-33],[-23,-5],[-19,-8],[-77,-10],[-30,1],[5,-14],[-1,-20],[-44,12],[-35,0]],[[4700,14177],[-8,13]],[[20635,28804],[243,2850]],[[23117,31617],[590,-1141],[1011,-925],[-315,-539],[-2609,-208]],[[25283,28384],[-880,628]],[[24403,29012],[315,539],[-1011,925],[-590,1141],[948,1141],[169,775],[1980,37],[17,-1849],[-18,-2952]],[[26213,28769],[-25,24],[-196,-176],[-273,-30],[-285,-114]],[[25434,28473],[-151,-89]],[[25283,28384],[-264,-153]],[[25019,28231],[-409,-629],[42,-64],[57,-335],[93,-319]],[[24802,26884],[104,-660],[140,-313],[133,-177]],[[25123,25702],[-110,-63],[-7,-2],[-217,-60],[-295,-82],[-245,-24]],[[24249,25471],[-349,17],[-7,0],[-2099,3316],[2609,208]],[[31077,26645],[-3473,-22]],[[27604,26623],[-168,193],[-43,625],[144,1106]],[[27537,28547],[2216,78],[1324,22],[0,-2002]],[[25659,26183],[386,193],[1559,247]],[[31077,26645],[0,-1692],[0,-48],[-11,0],[-48,5],[-65,48],[-129,-5],[-21,23],[-16,6],[-49,-6],[-83,48],[-70,16],[-22,4],[-24,18],[-30,12],[-40,4],[-44,-11],[-29,-1],[-39,-10],[-84,-1],[-131,24],[-89,5],[-87,1],[-116,-23],[-136,-16],[-36,-28],[-112,-18],[-13,-16],[-35,-26],[-70,-33],[-76,-21],[-57,-20],[-44,7],[-47,-16],[-71,-28],[-57,1],[-45,12],[-55,30],[-99,6],[-39,-8],[-59,26],[-58,19],[-62,-13],[-85,14],[-7,3],[-44,13],[-19,-5],[-2,9],[-771,537],[-845,284],[-1046,351],[-201,57]],[[25659,26183],[-782,223],[-75,478]],[[25019,28231],[415,242]],[[26213,28769],[0,89],[275,-255],[822,-64],[227,8]],[[10923,25909],[-403,187]],[[10520,26096],[1343,1257]],[[6322,40766],[-430,682],[-287,409],[-537,546],[0,1602],[-108,477],[-107,273],[-377,2149],[31,15],[1941,903],[225,90],[373,172],[14,16],[404,172],[2412,-1131],[283,-138]],[[10309,43049],[-703,-843],[35,-36],[211,-1077]],[[11770,39539],[-42,20]],[[20714,31907],[-2019,-39]],[[18687,31872],[-1144,1233],[-188,202]],[[16887,33792],[-221,14]],[[17827,37869],[2904,0],[-1183,-2493]],[[6219,4760],[-6,-3]],[[6030,5618],[6,9]],[[4763,14009],[11,-4],[63,-6],[11,-14],[10,-5],[14,0],[28,-10],[27,-12],[11,-8],[13,-21],[13,-26],[5,-14],[-1,-11],[4,-11],[6,-6],[16,-39],[-5,-3],[-11,-23],[-35,-20],[-26,-9],[-7,-6],[-37,-18],[-64,-18],[-33,-4],[-5,20],[1,6],[-7,4],[-19,1],[-16,-3],[-16,2],[-11,5],[-15,9],[-19,19],[-7,18],[-7,12],[-20,20],[-1,5],[8,7],[13,4],[8,-1],[14,-7],[5,2],[7,8],[2,21],[6,13],[-1,14],[-7,24],[-8,18],[-10,13],[-25,8],[-13,7],[-5,11],[-3,15],[2,27],[4,22],[-6,7],[-4,11]],[[4675,13994],[13,0]]],"transform":{"scale":[0.0003388777874312192,0.0003315941125290024],"translate":[13.468701,7.443658000000001]},"objects":{"adm-2":{"type":"GeometryCollection","geometries":[{"arcs":[[0,1,2,3,4,5,6,7,8,9]],"type":"Polygon","properties":{"ID_PRO":"15","NOMPRO":"Salamat","SUPERFICIE":68919.3225207,"ID_DEP":"DEP_","NOM_DEP":"Bahr Azoum","Chef_dep":"Am Timan","ADM2_CODE":"DEP_0","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[10,11,-4,12,13,14,15,16]],"type":"Polygon","properties":{"ID_PRO":"21","NOMPRO":"Sila","SUPERFICIE":28194.0701544,"ID_DEP":"DEP_","NOM_DEP":"Kimiti","Chef_dep":"Goz Beida","ADM2_CODE":"DEP_1","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[17,18,19,20,21,22,23,24,25]],"type":"Polygon","properties":{"ID_PRO":"04","NOMPRO":"Guéra","SUPERFICIE":65612.7742169,"ID_DEP":"DEP_","NOM_DEP":"Garada","Chef_dep":"Melfi","ADM2_CODE":"DEP_2","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[26,27,28,29,30,31,32,33]],"type":"Polygon","properties":{"ID_PRO":"06","NOMPRO":"Kanem","SUPERFICIE":71602.0040619,"ID_DEP":"DEP_","NOM_DEP":"Nord-Kanem","Chef_dep":"Nokou","ADM2_CODE":"DEP_3","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[34,35,-29,36,37,38]],"type":"Polygon","properties":{"ID_PRO":"07","NOMPRO":"Lac","SUPERFICIE":0,"ID_DEP":"DEP_","NOM_DEP":"Fouli","Chef_dep":"Liwa","ADM2_CODE":"DEP_4","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[39]],"type":"Polygon","properties":{"ID_PRO":"23","NOMPRO":"Ennedi Est","SUPERFICIE":87356.60164,"ID_DEP":"DEP_","NOM_DEP":"Mourdi","Chef_dep":"Djona","ADM2_CODE":"DEP_5","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[40,41,42,43,44,45]],"type":"Polygon","properties":{"ID_PRO":"20","NOMPRO":"Ennedi Ouest","SUPERFICIE":121835.764485,"ID_DEP":"DEP_","NOM_DEP":"Lac-Ounianga","Chef_dep":"Ounianga-Kebir","ADM2_CODE":"DEP_6","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[46,47,-31,48,49,50,51,52,53]],"type":"Polygon","properties":{"ID_PRO":"02","NOMPRO":"Borkou","SUPERFICIE":236103.17068,"ID_DEP":"DEP_","NOM_DEP":"Borkou Yala","Chef_dep":"Kirdimi","ADM2_CODE":"DEP_7","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[54,55,56,57,-24,58,-22,59,60,61]],"type":"Polygon","properties":{"ID_PRO":"03","NOMPRO":"Chari Baguirmi","SUPERFICIE":41468.6821228,"ID_DEP":"DEP_","NOM_DEP":"Baguirmi","Chef_dep":"Massenya","ADM2_CODE":"DEP_8","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[62,63,64,65,66,67,68]],"type":"Polygon","properties":{"ID_PRO":"09","NOMPRO":"Logone Oriental","SUPERFICIE":22950.6370242,"ID_DEP":"DEP_","NOM_DEP":"La Nya","Chef_dep":"Bébédjia","ADM2_CODE":"DEP_9","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-67,69,70,71,72,73]],"type":"Polygon","properties":{"ID_PRO":"08","NOMPRO":"Logone Occidental","SUPERFICIE":9007.26100196,"ID_DEP":"DEP_","NOM_DEP":"Lac Wey","Chef_dep":"Moundou","ADM2_CODE":"DEP_10","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[74,75,76,77,78,79,80,81,82]],"type":"Polygon","properties":{"ID_PRO":"16","NOMPRO":"Tandjilé","SUPERFICIE":17468.5873898,"ID_DEP":"DEP_","NOM_DEP":"Tandjilé Est","Chef_dep":"Laï","ADM2_CODE":"DEP_11","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[83,84,85,86,87,88,89,90,91,92,93,94,95]],"type":"Polygon","properties":{"ID_PRO":"14","NOMPRO":"Ouaddaï","SUPERFICIE":40088.7322512,"ID_DEP":"DEP_","NOM_DEP":"Ouara","Chef_dep":"Abéché","ADM2_CODE":"DEP_12","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[96,97,-92,98,99,100,101,102]],"type":"Polygon","properties":{"ID_PRO":"17","NOMPRO":"Wadi Fira","SUPERFICIE":52750.5724915,"ID_DEP":"DEP_","NOM_DEP":"Al-Biher","Chef_dep":"Arada","ADM2_CODE":"DEP_13","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[103,104,105,106,107,108]],"type":"Polygon","properties":{"ID_PRO":"10","NOMPRO":"Mandoul","SUPERFICIE":17773.6202417,"ID_DEP":"DEP_","NOM_DEP":"Taralnass","Chef_dep":"Mouroumgoulaye","ADM2_CODE":"DEP_14","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[109,-13,-3,110,111,112,113,114,-86]],"type":"Polygon","properties":{"ID_PRO":"14","NOMPRO":"Ouaddaï","SUPERFICIE":40088.7322512,"ID_DEP":"DEP_","NOM_DEP":"Djourf Al Ahmar","Chef_dep":"Am Dam","ADM2_CODE":"DEP_15","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-115,115,116,-87]],"type":"Polygon","properties":{"ID_PRO":"14","NOMPRO":"Ouaddaï","SUPERFICIE":40088.7322512,"ID_DEP":"DEP_","NOM_DEP":"Abougoudam","Chef_dep":"Abougoudam","ADM2_CODE":"DEP_16","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-84,117,118,119,120,121,122,123,-15,124]],"type":"Polygon","properties":{"ID_PRO":"14","NOMPRO":"Ouaddaï","SUPERFICIE":40088.7322512,"ID_DEP":"DEP_","NOM_DEP":"Assoungha","Chef_dep":"Adré","ADM2_CODE":"DEP_17","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-14,-110,-85,-125]],"type":"Polygon","properties":{"ID_PRO":"21","NOMPRO":"Sila","SUPERFICIE":28194.0701544,"ID_DEP":"DEP_","NOM_DEP":"Abdi","Chef_dep":"Abdi","ADM2_CODE":"DEP_18","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[125,126,-17,127,-123,128]],"type":"Polygon","properties":{"ID_PRO":"21","NOMPRO":"Sila","SUPERFICIE":28194.0701544,"ID_DEP":"DEP_","NOM_DEP":"Adé","Chef_dep":"Adé","ADM2_CODE":"DEP_19","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[129,-126,130,131]],"type":"Polygon","properties":{"ID_PRO":"21","NOMPRO":"Sila","SUPERFICIE":28194.0701544,"ID_DEP":"DEP_","NOM_DEP":"Tissi","Chef_dep":"Tissi","ADM2_CODE":"DEP_20","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-127,-130,132,133,-11]],"type":"Polygon","properties":{"ID_PRO":"21","NOMPRO":"Sila","SUPERFICIE":28194.0701544,"ID_DEP":"DEP_","NOM_DEP":"Koukou-Angarana","Chef_dep":"Koukou-Angarana","ADM2_CODE":"DEP_21","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-1,134,135,136,137,-112,138]],"type":"Polygon","properties":{"ID_PRO":"15","NOMPRO":"Salamat","SUPERFICIE":68919.3225207,"ID_DEP":"DEP_","NOM_DEP":"Aboudeia","Chef_dep":"Aboudeia","ADM2_CODE":"DEP_22","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[139,140,141,142,143,144,145,146,147,-20]],"type":"Polygon","properties":{"ID_PRO":"13","NOMPRO":"Moyen-Chari","SUPERFICIE":40065.1290159,"ID_DEP":"DEP_","NOM_DEP":"Korbol","Chef_dep":"Korbol","ADM2_CODE":"DEP_23","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[148,149,150,151,152,153,154,155,-144,156,157,158]],"type":"Polygon","properties":{"ID_PRO":"13","NOMPRO":"Moyen-Chari","SUPERFICIE":40065.1290159,"ID_DEP":"DEP_","NOM_DEP":"Bahr Koh","Chef_dep":"Sarh","ADM2_CODE":"DEP_24","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[159,160,161,-149]],"type":"Polygon","properties":{"ID_PRO":"13","NOMPRO":"Moyen-Chari","SUPERFICIE":40065.1290159,"ID_DEP":"DEP_","NOM_DEP":"Grande Sido","Chef_dep":"Maro","ADM2_CODE":"DEP_25","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[162,163,-151,164,-161,165]],"type":"Polygon","properties":{"ID_PRO":"10","NOMPRO":"Mandoul","SUPERFICIE":17773.6202417,"ID_DEP":"DEP_","NOM_DEP":"La Moula","Chef_dep":"Dembo","ADM2_CODE":"DEP_26","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[166,-153,167,-163,168,169,170,171,172,173,174]],"type":"Polygon","properties":{"ID_PRO":"10","NOMPRO":"Mandoul","SUPERFICIE":17773.6202417,"ID_DEP":"DEP_","NOM_DEP":"Bahr Sara","Chef_dep":"Moissala","ADM2_CODE":"DEP_27","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[175,-104,176,177,-155,-175]],"type":"Polygon","properties":{"ID_PRO":"10","NOMPRO":"Mandoul","SUPERFICIE":17773.6202417,"ID_DEP":"DEP_","NOM_DEP":"Mandoul Oriental","Chef_dep":"Koumra","ADM2_CODE":"DEP_28","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-105,-176,-174,178]],"type":"Polygon","properties":{"ID_PRO":"10","NOMPRO":"Mandoul","SUPERFICIE":17773.6202417,"ID_DEP":"DEP_","NOM_DEP":"Mandoul Occidental","Chef_dep":"Bédjondo","ADM2_CODE":"DEP_29","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-109,179,180,-146,181,-177]],"type":"Polygon","properties":{"ID_PRO":"10","NOMPRO":"Mandoul","SUPERFICIE":17773.6202417,"ID_DEP":"DEP_","NOM_DEP":"Goundi","Chef_dep":"Goundi","ADM2_CODE":"DEP_30","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-66,182,183,184,185,186,-71,187]],"type":"Polygon","properties":{"ID_PRO":"09","NOMPRO":"Logone Oriental","SUPERFICIE":22950.6370242,"ID_DEP":"DEP_","NOM_DEP":"Monts de Lam","Chef_dep":"Baïbokoum","ADM2_CODE":"DEP_31","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-65,188,189,190,-183]],"type":"Polygon","properties":{"ID_PRO":"09","NOMPRO":"Logone Oriental","SUPERFICIE":22950.6370242,"ID_DEP":"DEP_","NOM_DEP":"La Nya Pendé","Chef_dep":"Goré","ADM2_CODE":"DEP_32","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[191,-171,192,-189,-64,193]],"type":"Polygon","properties":{"ID_PRO":"09","NOMPRO":"Logone Oriental","SUPERFICIE":22950.6370242,"ID_DEP":"DEP_","NOM_DEP":"Kouh Ouest","Chef_dep":"Beboto","ADM2_CODE":"DEP_33","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-63,194,195,-179,-173,196,-194]],"type":"Polygon","properties":{"ID_PRO":"09","NOMPRO":"Logone Oriental","SUPERFICIE":22950.6370242,"ID_DEP":"DEP_","NOM_DEP":"Kouh Est","Chef_dep":"Bodo","ADM2_CODE":"DEP_34","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-69,197,198,-77,199,-107,200,-195]],"type":"Polygon","properties":{"ID_PRO":"09","NOMPRO":"Logone Oriental","SUPERFICIE":22950.6370242,"ID_DEP":"DEP_","NOM_DEP":"La Pendé","Chef_dep":"Doba","ADM2_CODE":"DEP_35","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[201,-72,-187,202,203,204,205]],"type":"Polygon","properties":{"ID_PRO":"08","NOMPRO":"Logone Occidental","SUPERFICIE":9007.26100196,"ID_DEP":"DEP_","NOM_DEP":"Dodjé","Chef_dep":"Beinamar","ADM2_CODE":"DEP_36","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[206,-73,-202,207,208,209,210,211,212]],"type":"Polygon","properties":{"ID_PRO":"08","NOMPRO":"Logone Occidental","SUPERFICIE":9007.26100196,"ID_DEP":"DEP_","NOM_DEP":"Gueni","Chef_dep":"Krim Krim","ADM2_CODE":"DEP_37","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[213,214,215,216,217,218,-80,219,220,-210]],"type":"Polygon","properties":{"ID_PRO":"16","NOMPRO":"Tandjilé","SUPERFICIE":17468.5873898,"ID_DEP":"DEP_","NOM_DEP":"Tandjilé Ouest","Chef_dep":"Kélo","ADM2_CODE":"DEP_38","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[221,222,-212,223,-220,-79]],"type":"Polygon","properties":{"ID_PRO":"16","NOMPRO":"Tandjilé","SUPERFICIE":17468.5873898,"ID_DEP":"DEP_","NOM_DEP":"Tandjilé Centre","Chef_dep":"Béré","ADM2_CODE":"DEP_39","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-76,224,225,-147,-181,226,-108,-200]],"type":"Polygon","properties":{"ID_PRO":"16","NOMPRO":"Tandjilé","SUPERFICIE":17468.5873898,"ID_DEP":"DEP_","NOM_DEP":"Manga","Chef_dep":"Dono-Manga","ADM2_CODE":"DEP_40","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-204,227,-185,228,229,230,231,232]],"type":"Polygon","properties":{"ID_PRO":"12","NOMPRO":"Mayo-Kebbi Ouest","SUPERFICIE":13515.8316556,"ID_DEP":"DEP_","NOM_DEP":"Gagal","Chef_dep":"Gagal","ADM2_CODE":"DEP_41","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[233,234,235,236,237,-230,238]],"type":"Polygon","properties":{"ID_PRO":"12","NOMPRO":"Mayo-Kebbi Ouest","SUPERFICIE":13515.8316556,"ID_DEP":"DEP_","NOM_DEP":"Mayo Dallah","Chef_dep":"Pala","ADM2_CODE":"DEP_42","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-234,239,240,241,242]],"type":"Polygon","properties":{"ID_PRO":"12","NOMPRO":"Mayo-Kebbi Ouest","SUPERFICIE":13515.8316556,"ID_DEP":"DEP_","NOM_DEP":"El Ouaya","Chef_dep":"Lagon","ADM2_CODE":"DEP_43","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[243,244,245,-215,246,247,248,-232,249,-237,250]],"type":"Polygon","properties":{"ID_PRO":"11","NOMPRO":"Mayo-Kebbi Est","SUPERFICIE":17849.3901655,"ID_DEP":"DEP_","NOM_DEP":"La Kabbia","Chef_dep":"Gounou Gaya","ADM2_CODE":"DEP_44","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-148,-226,251,-83,252,253,254,255,-60,-21]],"type":"Polygon","properties":{"ID_PRO":"03","NOMPRO":"Chari Baguirmi","SUPERFICIE":41468.6821228,"ID_DEP":"DEP_","NOM_DEP":"Loug Chari","Chef_dep":"Bousso","ADM2_CODE":"DEP_45","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-55,256,257,258]],"type":"Polygon","properties":{"ID_PRO":"03","NOMPRO":"Chari Baguirmi","SUPERFICIE":41468.6821228,"ID_DEP":"DEP_","NOM_DEP":"Chari","Chef_dep":"Mandelia","ADM2_CODE":"DEP_46","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[259,260,261,262,-25,-58,263,264]],"type":"Polygon","properties":{"ID_PRO":"05","NOMPRO":"Hadjer Lamis","SUPERFICIE":32658.1486193,"ID_DEP":"DEP_","NOM_DEP":"Dababa","Chef_dep":"Bokoro","ADM2_CODE":"DEP_47","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[265,-260,266,267,268,269,270,271,272]],"type":"Polygon","properties":{"ID_PRO":"05","NOMPRO":"Hadjer Lamis","SUPERFICIE":32658.1486193,"ID_DEP":"DEP_","NOM_DEP":"Ngoura","Chef_dep":"Ngoura","ADM2_CODE":"DEP_48","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[273,274,275,276,277,-136,278]],"type":"Polygon","properties":{"ID_PRO":"04","NOMPRO":"Guéra","SUPERFICIE":65612.7742169,"ID_DEP":"DEP_","NOM_DEP":"Guera","Chef_dep":"Mongo","ADM2_CODE":"DEP_49","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[279,-26,-263,280,281,282,283,-274]],"type":"Polygon","properties":{"ID_PRO":"04","NOMPRO":"Guéra","SUPERFICIE":65612.7742169,"ID_DEP":"DEP_","NOM_DEP":"Abtouyour","Chef_dep":"Bitkine","ADM2_CODE":"DEP_50","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-18,-280,-279,-135,-10,284,285,-141,286]],"type":"Polygon","properties":{"ID_PRO":"04","NOMPRO":"Guéra","SUPERFICIE":65612.7742169,"ID_DEP":"DEP_","NOM_DEP":"Bahr Signaka","Chef_dep":"Chinguil","ADM2_CODE":"DEP_51","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[287,288,-281,-262,289,-273,290,291,292]],"type":"Polygon","properties":{"ID_PRO":"01","NOMPRO":"Batha","SUPERFICIE":89314.3288635,"ID_DEP":"DEP_","NOM_DEP":"Fitri","Chef_dep":"Yao","ADM2_CODE":"DEP_52","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-276,293,-283,294,-288,295,296,297,298]],"type":"Polygon","properties":{"ID_PRO":"01","NOMPRO":"Batha","SUPERFICIE":89314.3288635,"ID_DEP":"DEP_","NOM_DEP":"Batha Ouest","Chef_dep":"Ati","ADM2_CODE":"DEP_53","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[299,300,301,-89,302,-116,-114,303,-299]],"type":"Polygon","properties":{"ID_PRO":"01","NOMPRO":"Batha","SUPERFICIE":89314.3288635,"ID_DEP":"DEP_","NOM_DEP":"Batha Est","Chef_dep":"Oum Hadjer","ADM2_CODE":"DEP_54","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-300,304,-297,305,306]],"type":"Polygon","properties":{"ID_PRO":"01","NOMPRO":"Batha","SUPERFICIE":89314.3288635,"ID_DEP":"DEP_","NOM_DEP":"Assinet","Chef_dep":"Assinet","ADM2_CODE":"DEP_55","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[307,308,309,-99,-91,310,-301,-307]],"type":"Polygon","properties":{"ID_PRO":"01","NOMPRO":"Batha","SUPERFICIE":89314.3288635,"ID_DEP":"DEP_","NOM_DEP":"Haraze","Chef_dep":"Haraze","ADM2_CODE":"DEP_56","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-308,-306,-296,-293,311,312,313,314,315,316]],"type":"Polygon","properties":{"ID_PRO":"01","NOMPRO":"Batha","SUPERFICIE":89314.3288635,"ID_DEP":"DEP_","NOM_DEP":"Ouadi Rimé","Chef_dep":"Djedda","ADM2_CODE":"DEP_57","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[317,-121,318,319,320,321]],"type":"Polygon","properties":{"ID_PRO":"17","NOMPRO":"Wadi Fira","SUPERFICIE":52750.5724915,"ID_DEP":"DEP_","NOM_DEP":"Dar Tama","Chef_dep":"Guéréda","ADM2_CODE":"DEP_58","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-322,322,323,324,325]],"type":"Polygon","properties":{"ID_PRO":"17","NOMPRO":"Wadi Fira","SUPERFICIE":52750.5724915,"ID_DEP":"DEP_","NOM_DEP":"Iriba","Chef_dep":"Iriba","ADM2_CODE":"DEP_59","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[326,327,-103,328,329,330,331,-323,-321]],"type":"Polygon","properties":{"ID_PRO":"17","NOMPRO":"Wadi Fira","SUPERFICIE":52750.5724915,"ID_DEP":"DEP_","NOM_DEP":"Megri","Chef_dep":"Matadjana","ADM2_CODE":"DEP_60","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[332,-327,-320,333,-119,334,-95]],"type":"Polygon","properties":{"ID_PRO":"17","NOMPRO":"Wadi Fira","SUPERFICIE":52750.5724915,"ID_DEP":"DEP_","NOM_DEP":"Dar-Alfawakih","Chef_dep":"Am-Zoer","ADM2_CODE":"DEP_61","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-97,-328,-333,-94,335]],"type":"Polygon","properties":{"ID_PRO":"17","NOMPRO":"Wadi Fira","SUPERFICIE":52750.5724915,"ID_DEP":"DEP_","NOM_DEP":"Biltine","Chef_dep":"Biltine","ADM2_CODE":"DEP_62","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[336,337,338,339,340,341]],"type":"Polygon","properties":{"ID_PRO":"19","NOMPRO":"Barh El Gazal","SUPERFICIE":49991.85913129999,"ID_DEP":"DEP_","NOM_DEP":"Kleta","Chef_dep":"Michémiré","ADM2_CODE":"DEP_63","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[342,-270,343,344,345,346,-338,347]],"type":"Polygon","properties":{"ID_PRO":"19","NOMPRO":"Barh El Gazal","SUPERFICIE":49991.85913129999,"ID_DEP":"DEP_","NOM_DEP":"Barh El Gazel Ouest","Chef_dep":"Chedra","ADM2_CODE":"DEP_64","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-348,-337,348,349,350,-291,-272,351]],"type":"Polygon","properties":{"ID_PRO":"19","NOMPRO":"Barh El Gazal","SUPERFICIE":49991.85913129999,"ID_DEP":"DEP_","NOM_DEP":"Barh El Gazel Sud","Chef_dep":"Moussoro","ADM2_CODE":"DEP_65","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[352,353,-339,-347,354,355,356]],"type":"Polygon","properties":{"ID_PRO":"06","NOMPRO":"Kanem","SUPERFICIE":71602.0040619,"ID_DEP":"DEP_","NOM_DEP":"Sud-Kanem","Chef_dep":"Mondo","ADM2_CODE":"DEP_66","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[357,358,359,360,-353,361,362,363,-38,364,-27]],"type":"Polygon","properties":{"ID_PRO":"06","NOMPRO":"Kanem","SUPERFICIE":71602.0040619,"ID_DEP":"DEP_","NOM_DEP":"Kanem","Chef_dep":"Mao","ADM2_CODE":"DEP_67","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[365,366,367,368,-362,-357,369]],"type":"Polygon","properties":{"ID_PRO":"07","NOMPRO":"Lac","SUPERFICIE":0,"ID_DEP":"DEP_","NOM_DEP":"Wayi","Chef_dep":"Ngouri","ADM2_CODE":"DEP_68","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[370,371,372,373,374,-366]],"type":"Polygon","properties":{"ID_PRO":"07","NOMPRO":"Lac","SUPERFICIE":0,"ID_DEP":"DEP_","NOM_DEP":"Kouloudia","Chef_dep":"Kouloudia","ADM2_CODE":"DEP_69","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[375,-368,376,-374,377,378,379,380,381]],"type":"Polygon","properties":{"ID_PRO":"07","NOMPRO":"Lac","SUPERFICIE":0,"ID_DEP":"DEP_","NOM_DEP":"Mamdi","Chef_dep":"Bol","ADM2_CODE":"DEP_70","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-35,382,-363,-369,-376,383]],"type":"Polygon","properties":{"ID_PRO":"07","NOMPRO":"Lac","SUPERFICIE":0,"ID_DEP":"DEP_","NOM_DEP":"Kaya","Chef_dep":"Baga-Sola","ADM2_CODE":"DEP_71","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[384,385,-50,386,387,388,389,390,391,392]],"type":"Polygon","properties":{"ID_PRO":"02","NOMPRO":"Borkou","SUPERFICIE":236103.17068,"ID_DEP":"DEP_","NOM_DEP":"Emi-Koussi","Chef_dep":"Yebibou","ADM2_CODE":"DEP_72","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[393,394,-47,395,396,397,398,-100,-310,399,-316]],"type":"Polygon","properties":{"ID_PRO":"02","NOMPRO":"Borkou","SUPERFICIE":236103.17068,"ID_DEP":"DEP_","NOM_DEP":"Borkou","Chef_dep":"Faya","ADM2_CODE":"DEP_73","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-101,-399,400,401,402]],"type":"Polygon","properties":{"ID_PRO":"20","NOMPRO":"Ennedi Ouest","SUPERFICIE":121835.764485,"ID_DEP":"DEP_","NOM_DEP":"Mourtcha","Chef_dep":"Kalaït","ADM2_CODE":"DEP_74","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[403,404,405,-391]],"type":"Polygon","properties":{"ID_PRO":"22","NOMPRO":"Tibesti","SUPERFICIE":40233.212889,"ID_DEP":"DEP_","NOM_DEP":"Aouzou","Chef_dep":"Aouzou","ADM2_CODE":"DEP_75","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[406,407,408,-388,409,410]],"type":"Polygon","properties":{"ID_PRO":"22","NOMPRO":"Tibesti","SUPERFICIE":130346.152811,"ID_DEP":"DEP_","NOM_DEP":"Zouar","Chef_dep":"Zouar","ADM2_CODE":"DEP_76","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[411,-253,-82,412,-218,413,-245,414,415,416]],"type":"Polygon","properties":{"ID_PRO":"11","NOMPRO":"Mayo-Kebbi Est","SUPERFICIE":17849.3901655,"ID_DEP":"DEP_","NOM_DEP":"Mayo Boneye","Chef_dep":"Bongor","ADM2_CODE":"DEP_77","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-314,417,-349,-342,418,-359,419,-33,420]],"type":"Polygon","properties":{"ID_PRO":"19","NOMPRO":"Barh El Gazal","SUPERFICIE":49991.85913129999,"ID_DEP":"DEP_","NOM_DEP":"Barh El Gazel Nord","Chef_dep":"Salal","ADM2_CODE":"DEP_78","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[421,422,423,424,425,426,427]],"type":"Polygon","properties":{"ID_PRO":"18","NOMPRO":"N'Djaména","SUPERFICIE":523.6829212822,"ID_DEP":"DEP_","NOM_DEP":"10ème Arrondissement","Chef_dep":null,"ADM2_CODE":"DEP_79","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[428,-8,429,430,431,-158,432,-142,-286]],"type":"Polygon","properties":{"ID_PRO":"13","NOMPRO":"Moyen-Chari","SUPERFICIE":40065.1290159,"ID_DEP":"DEP_","NOM_DEP":"Lac Iro","Chef_dep":"Kyabé","ADM2_CODE":"DEP_80","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[433,434,435,436,-242]],"type":"Polygon","properties":{"ID_PRO":"12","NOMPRO":"Mayo-Kebbi Ouest","SUPERFICIE":13515.8316556,"ID_DEP":"DEP_","NOM_DEP":"Mayo Binder","Chef_dep":"Binder","ADM2_CODE":"DEP_81","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-356,437,-345,438,-269,439,440,-379,441,-372,442]],"type":"Polygon","properties":{"ID_PRO":"05","NOMPRO":"Hadjer Lamis","SUPERFICIE":32658.1486193,"ID_DEP":"DEP_","NOM_DEP":"Dagana","Chef_dep":"Massakory","ADM2_CODE":"DEP_82","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-199,443,-68,-74,-207,444,-222,-78]],"type":"Polygon","properties":{"ID_PRO":"08","NOMPRO":"Logone Occidental","SUPERFICIE":9007.26100196,"ID_DEP":"DEP_","NOM_DEP":"Ngourkosso","Chef_dep":"Benoye","ADM2_CODE":"DEP_83","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-241,445,-434]],"type":"Polygon","properties":{"ID_PRO":"12","NOMPRO":"Mayo-Kebbi Ouest","SUPERFICIE":13515.8316556,"ID_DEP":"DEP_","NOM_DEP":"Lac Léré","Chef_dep":"Léré","ADM2_CODE":"DEP_84","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-415,-244,446,-235,-243,-437,447,448]],"type":"Polygon","properties":{"ID_PRO":"11","NOMPRO":"Mayo-Kebbi Est","SUPERFICIE":17849.3901655,"ID_DEP":"DEP_","NOM_DEP":"Mont Illi","Chef_dep":"Fianga","ADM2_CODE":"DEP_85","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-267,-265,449,-56,-259,450,451,452,453,454,455,456,457,458]],"type":"Polygon","properties":{"ID_PRO":"03","NOMPRO":"Chari Baguirmi","SUPERFICIE":41468.6821228,"ID_DEP":"DEP_","NOM_DEP":"Dourbali","Chef_dep":"Dourbali","ADM2_CODE":"DEP_86","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-268,-459,459,460,-424,461,462,463,-381,464,-440]],"type":"Polygon","properties":{"ID_PRO":"05","NOMPRO":"Hadjer Lamis","SUPERFICIE":32658.1486193,"ID_DEP":"DEP_","NOM_DEP":"Haraze Al Biar","Chef_dep":"Massaguet","ADM2_CODE":"DEP_87","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-113,-138,465,-277,-304]],"type":"Polygon","properties":{"ID_PRO":"04","NOMPRO":"Guéra","SUPERFICIE":65612.7742169,"ID_DEP":"DEP_","NOM_DEP":"Mangalmé","Chef_dep":"Mangalmé","ADM2_CODE":"DEP_88","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-431,466,-6,467,-133,-132,468]],"type":"Polygon","properties":{"ID_PRO":"15","NOMPRO":"Salamat","SUPERFICIE":68919.3225207,"ID_DEP":"DEP_","NOM_DEP":"Haraze Mangueigne","Chef_dep":"Haraze Mangueigne","ADM2_CODE":"DEP_89","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-257,-62,469,-255,470,-417,471]],"type":"Polygon","properties":{"ID_PRO":"11","NOMPRO":"Mayo-Kebbi Est","SUPERFICIE":17849.3901655,"ID_DEP":"DEP_","NOM_DEP":"Mayo Lemié","Chef_dep":"Guelendeng","ADM2_CODE":"DEP_90","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-325,472,-331,473]],"type":"Polygon","properties":{"ID_PRO":"23","NOMPRO":"Ennedi Est","SUPERFICIE":87356.60164,"ID_DEP":"DEP_","NOM_DEP":"Wadi Hawar","Chef_dep":"Bahaï","ADM2_CODE":"DEP_91","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[474,-463,475,476]],"type":"Polygon","properties":{"ID_PRO":"18","NOMPRO":"N'Djaména","SUPERFICIE":523.6829212822,"ID_DEP":"DEP_","NOM_DEP":"1er Arrondissement","Chef_dep":null,"ADM2_CODE":"DEP_92","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-477,477]],"type":"Polygon","properties":{"ID_PRO":"18","NOMPRO":"N'Djaména","SUPERFICIE":523.6829212822,"ID_DEP":"DEP_","NOM_DEP":"2ème Arrondissement","Chef_dep":null,"ADM2_CODE":"DEP_93","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[478,479,480,481,482]],"type":"Polygon","properties":{"ID_PRO":"18","NOMPRO":"N'Djaména","SUPERFICIE":523.6829212822,"ID_DEP":"DEP_","NOM_DEP":"4ème Arrondissement","Chef_dep":null,"ADM2_CODE":"DEP_94","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[483,484,485,486,487,-483]],"type":"Polygon","properties":{"ID_PRO":"18","NOMPRO":"N'Djaména","SUPERFICIE":523.6829212822,"ID_DEP":"DEP_","NOM_DEP":"3ème Arrondissement","Chef_dep":null,"ADM2_CODE":"DEP_95","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[488,489,-485,490,491]],"type":"Polygon","properties":{"ID_PRO":"18","NOMPRO":"N'Djaména","SUPERFICIE":523.6829212822,"ID_DEP":"DEP_","NOM_DEP":"6ème Arrondissement","Chef_dep":null,"ADM2_CODE":"DEP_96","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-491,-484,492,-481,493,494]],"type":"Polygon","properties":{"ID_PRO":"18","NOMPRO":"N'Djaména","SUPERFICIE":523.6829212822,"ID_DEP":"DEP_","NOM_DEP":"5ème Arrondissement","Chef_dep":null,"ADM2_CODE":"DEP_97","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[495]],"type":"Polygon","properties":{"ID_PRO":"18","NOMPRO":"N'Djaména","SUPERFICIE":523.6829212822,"ID_DEP":"DEP_","NOM_DEP":"7ème Arrondissement","Chef_dep":null,"ADM2_CODE":"DEP_98","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-422,496,497,498,499,-494,-480,500]],"type":"Polygon","properties":{"ID_PRO":"18","NOMPRO":"N'Djaména","SUPERFICIE":523.6829212822,"ID_DEP":"DEP_","NOM_DEP":"8ème Arrodissement","Chef_dep":null,"ADM2_CODE":"DEP_99","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-402,501,-397,-45,502]],"type":"Polygon","properties":{"ID_PRO":"20","NOMPRO":"Ennedi Ouest","SUPERFICIE":121835.764485,"ID_DEP":"DEP_","NOM_DEP":"Fada","Chef_dep":"Fada","ADM2_CODE":"DEP_100","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[503,504,505,506]],"type":"Polygon","properties":{"ID_PRO":"20","NOMPRO":"Ennedi Ouest","SUPERFICIE":121835.764485,"ID_DEP":"DEP_","NOM_DEP":"Tébi","Chef_dep":"Tébi","ADM2_CODE":"DEP_101","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[507,508,509,-330,510,511,-504]],"type":"Polygon","properties":{"ID_PRO":"20","NOMPRO":"Ennedi Ouest","SUPERFICIE":121835.764485,"ID_DEP":"DEP_","NOM_DEP":"Torbol","Chef_dep":"Torbol","ADM2_CODE":"DEP_102","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[512,513,514]],"type":"Polygon","properties":{"ID_PRO":"23","NOMPRO":"Ennedi Est","SUPERFICIE":87356.60164,"ID_DEP":"DEP_","NOM_DEP":"Bao","Chef_dep":"Bao","ADM2_CODE":"DEP_103","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[515,-513,516]],"type":"Polygon","properties":{"ID_PRO":"23","NOMPRO":"Ennedi Est","SUPERFICIE":87356.60164,"ID_DEP":"DEP_","NOM_DEP":"Amdjarass","Chef_dep":"Amdjarass","ADM2_CODE":"DEP_104","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-516,517,-509,518,-506,519,-514]],"type":"Polygon","properties":{"ID_PRO":"23","NOMPRO":"Ennedi Est","SUPERFICIE":87356.60164,"ID_DEP":"DEP_","NOM_DEP":"Itou","Chef_dep":"Itou","ADM2_CODE":"DEP_105","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-315,-421,520,521,-394]],"type":"Polygon","properties":{"ID_PRO":"02","NOMPRO":"Borkou","SUPERFICIE":236103.17068,"ID_DEP":"DEP_","NOM_DEP":"Kouba","Chef_dep":"Kouba","ADM2_CODE":"DEP_106","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-407,522,-405,523]],"type":"Polygon","properties":{"ID_PRO":"22","NOMPRO":"Tibesti","SUPERFICIE":130346.152811,"ID_DEP":"DEP_","NOM_DEP":"Wour","Chef_dep":"Wour","ADM2_CODE":"DEP_107","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-390,524,-408,-524,-404]],"type":"Polygon","properties":{"ID_PRO":"22","NOMPRO":"Tibesti","SUPERFICIE":40233.212889,"ID_DEP":"DEP_","NOM_DEP":"Bardaï","Chef_dep":"Bardaï","ADM2_CODE":"DEP_108","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[525,-54,526,-52,527,-385,528,-41]],"type":"Polygon","properties":{"ID_PRO":"20","NOMPRO":"Ennedi Ouest","SUPERFICIE":121835.764485,"ID_DEP":"DEP_","NOM_DEP":"Gouro","Chef_dep":"Gouro","ADM2_CODE":"DEP_109","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-214,-209,529,-205,-233,-249,530,-247]],"type":"Polygon","properties":{"ID_PRO":"16","NOMPRO":"Tandjilé","SUPERFICIE":17468.5873898,"ID_DEP":"DEP_","NOM_DEP":"Nanbagué","Chef_dep":"Dafra","ADM2_CODE":"DEP_110","Prop_ens":0,"Prop_18ans":0}},{"arcs":[[-489,531,-487,532]],"type":"Polygon","properties":{"ID_PRO":"18","NOMPRO":"N'Djaména","SUPERFICIE":523.6829212822,"ID_DEP":"DEP_","NOM_DEP":"9ème Arrondissement","Chef_dep":null,"ADM2_CODE":"DEP_111","Prop_ens":0,"Prop_18ans":0}}]}}} \ No newline at end of file diff --git a/amp/pom.xml b/amp/pom.xml index 41c49082070..0febbd59a41 100644 --- a/amp/pom.xml +++ b/amp/pom.xml @@ -516,7 +516,6 @@ org.hamcrest hamcrest-core 1.3 - test org.unitils From faf9ee70a4e212726b22a1b060dd976eac24103d Mon Sep 17 00:00:00 2001 From: Octavian Ciubotaru Date: Fri, 30 Sep 2022 09:31:00 +0300 Subject: [PATCH 004/135] AMP-30342: New admin boundaries for Chad --- amp/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/amp/Dockerfile b/amp/Dockerfile index f68bb4747e3..6d352b8e83d 100644 --- a/amp/Dockerfile +++ b/amp/Dockerfile @@ -52,6 +52,10 @@ ENV CHROME_NO_SANDBOX 1 COPY docker/wait-for-it.sh docker/setenv.sh bin/ COPY docker/server.xml docker/tomcat-users.xml conf/ +RUN rm -fr /usr/local/tomcat/webapps/ROOT + +ENV AMP_REGISTRY_PRIVATE_KEY $AMP_REGISTRY_PRIVATE_KEY + ARG AMP_PULL_REQUEST ARG AMP_BRANCH ARG AMP_REGISTRY_PRIVATE_KEY @@ -59,7 +63,4 @@ ARG AMP_REGISTRY_PRIVATE_KEY LABEL "pull-request"=$AMP_PULL_REQUEST LABEL "branch"=$AMP_BRANCH -ENV AMP_REGISTRY_PRIVATE_KEY $AMP_REGISTRY_PRIVATE_KEY - -RUN rm -fr /usr/local/tomcat/webapps/ROOT COPY --from=compile /tmp/amp/exploded /usr/local/tomcat/webapps/ROOT/ From cc39037d0b33028568b798aa0645a25bd44258e6 Mon Sep 17 00:00:00 2001 From: Octavian Ciubotaru Date: Fri, 30 Sep 2022 09:39:22 +0300 Subject: [PATCH 005/135] AMP-30342: Docker layers optimization --- amp/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/amp/Dockerfile b/amp/Dockerfile index 6d352b8e83d..ac8255537f2 100644 --- a/amp/Dockerfile +++ b/amp/Dockerfile @@ -54,6 +54,8 @@ COPY docker/server.xml docker/tomcat-users.xml conf/ RUN rm -fr /usr/local/tomcat/webapps/ROOT +COPY --from=compile /tmp/amp/exploded/WEB-INF/lib /usr/local/tomcat/webapps/ROOT/WEB-INF/lib + ENV AMP_REGISTRY_PRIVATE_KEY $AMP_REGISTRY_PRIVATE_KEY ARG AMP_PULL_REQUEST From 03831e54ee27ef3515e33d5c5804838b836c39a9 Mon Sep 17 00:00:00 2001 From: Octavian Ciubotaru Date: Thu, 27 Oct 2022 12:00:49 +0300 Subject: [PATCH 006/135] AMP-30350: Activities coming from IATI Importer don't specify the workspace --- .../activity/ActivityInterchangeUtils.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java index 908d86af50e..c89a78c822a 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java @@ -16,6 +16,7 @@ import org.digijava.kernel.ampapi.endpoints.errors.ApiErrorResponseService; import org.digijava.kernel.ampapi.endpoints.errors.ApiRuntimeException; import org.digijava.kernel.ampapi.endpoints.errors.GenericErrors; +import org.digijava.kernel.ampapi.filters.AmpClientModeHolder; import org.digijava.kernel.exception.DgException; import org.digijava.kernel.persistence.PersistenceManager; import org.digijava.kernel.request.TLSUtils; @@ -74,9 +75,8 @@ public static JsonApiResponse importActivity(Map importActivity(Map newJson) { + if (AmpClientModeHolder.isOfflineClient()) { + Workspace team = TeamUtil.getWorkspace(Long.parseLong(newJson.get("team").toString())); + return team.getFmTemplate() != null ? team.getFmTemplate().getId() : null; + } + return null; + } + /** * Validates fields filter * @param filterJson From d77cbc14c5a22ac59fcf8147a60365852b8850bc Mon Sep 17 00:00:00 2001 From: Octavian Ciubotaru Date: Fri, 4 Nov 2022 10:40:05 +0200 Subject: [PATCH 007/135] AMP-30364: Do not lock lucene indexes in case of failure --- .../digijava/module/aim/util/LuceneUtil.java | 67 ++++++++++--------- 1 file changed, 35 insertions(+), 32 deletions(-) diff --git a/amp/WEB-INF/src/org/digijava/module/aim/util/LuceneUtil.java b/amp/WEB-INF/src/org/digijava/module/aim/util/LuceneUtil.java index e575f104b38..3f81ae64916 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/util/LuceneUtil.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/util/LuceneUtil.java @@ -901,6 +901,9 @@ public static Document activityToLuceneDocument(ActivityLuceneDocument actLucene if (!valueTranslationsList.isEmpty()) { for (AmpContentTranslation translation : valueTranslationsList) { + if (translation.getTranslation() == null) { + continue; + } // Added try/catch because Field can throw an exception if any of the parameters is wrong and that would break the process. try { if ("name".equals(field)){ @@ -1041,41 +1044,41 @@ public static void addUpdateActivity(String rootRealPath, boolean update, Site s IndexWriterConfig indexWriterConfig = new IndexWriterConfig(Version.LUCENE_36, LuceneUtil.ANALYZER); indexWriterConfig.setWriteLockTimeout(LOCK_OBTAIN_WAIT_FOREVER); Directory directory = FSDirectory.open(new File(rootRealPath + ACTIVITY_INDEX_DIRECTORY)); - IndexWriter indexWriter = new IndexWriter(directory, indexWriterConfig); + try (IndexWriter indexWriter = new IndexWriter(directory, indexWriterConfig)) { - ArrayList componentsCode = new ArrayList(); - if(newActivity.getComponents() != null && Hibernate.isInitialized(newActivity.getComponents())){ - for (AmpComponent c : newActivity.getComponents()) { - componentsCode.add(c.getCode()); + ArrayList componentsCode = new ArrayList(); + if (newActivity.getComponents() != null && Hibernate.isInitialized(newActivity.getComponents())) { + for (AmpComponent c : newActivity.getComponents()) { + componentsCode.add(c.getCode()); + } } - } - - String language = navigationLanguage.getLanguage(); - - ActivityLuceneDocument actLuceneDoc = new ActivityLuceneDocument(); - actLuceneDoc.setAmpActivityId(String.valueOf(newActivity.getAmpActivityId())); - actLuceneDoc.setProjectId(projectid); - actLuceneDoc.setName(String.valueOf(newActivity.getName())); - actLuceneDoc.setDescription(DbUtil.getEditorBody(site, newActivity.getDescription(), language)); - actLuceneDoc.setObjective(DbUtil.getEditorBody(site, newActivity.getObjective(), language)); - actLuceneDoc.setPurpose(DbUtil.getEditorBody(site, newActivity.getPurpose(), language)); - actLuceneDoc.setResults(DbUtil.getEditorBody(site, newActivity.getResults(), language)); - actLuceneDoc.setContactName(DbUtil.getEditorBody(site, newActivity.getContactName(), language)); - actLuceneDoc.setCrisNumber(newActivity.getCrisNumber()); - actLuceneDoc.setBudgetCodeProjectId(newActivity.getBudgetCodeProjectID()); - actLuceneDoc.setBudgetCodes(LuceneUtil.getBudgetCodesForActivity(newActivity)); - actLuceneDoc.setComponentCodes(componentsCode); - actLuceneDoc.setTranslations(translations); - - Document doc = activityToLuceneDocument(actLuceneDoc); - if (doc != null) { - try { - indexWriter.addDocument(doc); - indexWriter.optimize(); - indexWriter.close(); - } catch (Exception e) { - e.printStackTrace(); + String language = navigationLanguage.getLanguage(); + + ActivityLuceneDocument actLuceneDoc = new ActivityLuceneDocument(); + actLuceneDoc.setAmpActivityId(String.valueOf(newActivity.getAmpActivityId())); + actLuceneDoc.setProjectId(projectid); + actLuceneDoc.setName(String.valueOf(newActivity.getName())); + actLuceneDoc.setDescription(DbUtil.getEditorBody(site, newActivity.getDescription(), language)); + actLuceneDoc.setObjective(DbUtil.getEditorBody(site, newActivity.getObjective(), language)); + actLuceneDoc.setPurpose(DbUtil.getEditorBody(site, newActivity.getPurpose(), language)); + actLuceneDoc.setResults(DbUtil.getEditorBody(site, newActivity.getResults(), language)); + actLuceneDoc.setContactName(DbUtil.getEditorBody(site, newActivity.getContactName(), language)); + actLuceneDoc.setCrisNumber(newActivity.getCrisNumber()); + actLuceneDoc.setBudgetCodeProjectId(newActivity.getBudgetCodeProjectID()); + actLuceneDoc.setBudgetCodes(LuceneUtil.getBudgetCodesForActivity(newActivity)); + actLuceneDoc.setComponentCodes(componentsCode); + actLuceneDoc.setTranslations(translations); + + Document doc = activityToLuceneDocument(actLuceneDoc); + + if (doc != null) { + try { + indexWriter.addDocument(doc); + indexWriter.optimize(); + } catch (Exception e) { + e.printStackTrace(); + } } } } catch (Exception e) { From 06d9a9389715892e4ad14b1bca18016ba9f17987 Mon Sep 17 00:00:00 2001 From: Julian de Anquin Date: Tue, 8 Nov 2022 08:56:33 -0300 Subject: [PATCH 008/135] AMP-30365 adjust development version --- amp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amp/pom.xml b/amp/pom.xml index 0b7e4424b14..fd6cde441b5 100644 --- a/amp/pom.xml +++ b/amp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.devgateway amp - 3.5.5 + 3.5.5.1-SNAPSHOT war Aid Management Platform From 65e32ae2a608da05440edacba2640cae8fbaf27b Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Thu, 10 Nov 2022 10:15:30 +0300 Subject: [PATCH 009/135] AMP-30368 added measure constants in GisConstants.java --- .../org/digijava/kernel/ampapi/endpoints/util/GisConstants.java | 1 + 1 file changed, 1 insertion(+) diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/util/GisConstants.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/util/GisConstants.java index dc1d838bca6..d2a0537d931 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/util/GisConstants.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/util/GisConstants.java @@ -53,6 +53,7 @@ public class GisConstants { add(MeasureConstants.BILATERAL_SSC_DISBURSEMENTS); add(MeasureConstants.TRIANGULAR_SSC_COMMITMENTS); add(MeasureConstants.TRIANGULAR_SSC_DISBURSEMENTS); + add(MeasureConstants.MTEF); }}; public static final Map ADM_TO_IMPL_CATEGORY_VALUE = new HashMap() {{ From 323d1c409fcf2f277e4416a4d404e53e2dcd190a Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Fri, 11 Nov 2022 20:21:39 +0300 Subject: [PATCH 010/135] AMP-30368 remove mtef in FUNDING_TYPES, added Pipeline and projection MTEF in GisConstants.java --- .../digijava/kernel/ampapi/endpoints/util/GisConstants.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/util/GisConstants.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/util/GisConstants.java index d2a0537d931..76eaf95e528 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/util/GisConstants.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/util/GisConstants.java @@ -53,7 +53,8 @@ public class GisConstants { add(MeasureConstants.BILATERAL_SSC_DISBURSEMENTS); add(MeasureConstants.TRIANGULAR_SSC_COMMITMENTS); add(MeasureConstants.TRIANGULAR_SSC_DISBURSEMENTS); - add(MeasureConstants.MTEF); + add(MeasureConstants.PROJECTION_MTEF_PROJECTIONS); + add(MeasureConstants.PIPELINE_MTEF_PROJECTIONS); }}; public static final Map ADM_TO_IMPL_CATEGORY_VALUE = new HashMap() {{ From 4e278037b51bc42d95b4e1ccc71dcc46e7c018e0 Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Thu, 17 Nov 2022 18:09:15 +0300 Subject: [PATCH 011/135] AMP-30363 updated patch under 3.5.05.01 to remove IATI under the tools menu for admin --- ...IATI-tool-by-updating-amp-visibility-rule.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 amp/xmlpatches/3.5.05.1/AMP-30363-remove-IATI-tool-by-updating-amp-visibility-rule.xml diff --git a/amp/xmlpatches/3.5.05.1/AMP-30363-remove-IATI-tool-by-updating-amp-visibility-rule.xml b/amp/xmlpatches/3.5.05.1/AMP-30363-remove-IATI-tool-by-updating-amp-visibility-rule.xml new file mode 100644 index 00000000000..94dedde630c --- /dev/null +++ b/amp/xmlpatches/3.5.05.1/AMP-30363-remove-IATI-tool-by-updating-amp-visibility-rule.xml @@ -0,0 +1,16 @@ + + + AMP-30363 + remove iati importer url + timothymugo + + + + \ No newline at end of file From f15521794ff3cf4b88ef56f57846b09b8acec505 Mon Sep 17 00:00:00 2001 From: Octavian Ciubotaru Date: Fri, 18 Nov 2022 09:09:44 +0200 Subject: [PATCH 012/135] AMP-30403: Fixed docker build --- amp/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amp/Dockerfile b/amp/Dockerfile index 5850c2d6d45..35893d8151d 100644 --- a/amp/Dockerfile +++ b/amp/Dockerfile @@ -112,7 +112,7 @@ COPY --from=compile-amp-settings /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp- COPY --from=compile-gis-layers-manager /tmp/amp/TEMPLATE/ampTemplate/node_modules/gis-layers-manager/dist TEMPLATE/ampTemplate/node_modules/gis-layers-manager/dist COPY --from=compile-gis-module /tmp/amp/TEMPLATE/ampTemplate/gisModule/dist TEMPLATE/ampTemplate/gisModule/dist COPY --from=compile-dashboard /tmp/amp/TEMPLATE/ampTemplate/dashboard/build TEMPLATE/ampTemplate/dashboard/build -COPY --from=compile-reamp /tmp/amp/TEMPLATE/reamp/modules TEMPLATE/reamp/modules +COPY --from=compile-reamp /tmp/amp/TEMPLATE/reamp TEMPLATE/reamp COPY --from=compile-reampv2 /tmp/amp/TEMPLATE/reampv2/build TEMPLATE/reampv2/build ARG BUILD_SOURCE RUN --mount=type=cache,target=/root/.m2 \ From e4f6af3522eeed4e88662bfc24afd7826ee7ee6b Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Fri, 18 Nov 2022 20:23:47 +0300 Subject: [PATCH 013/135] AMP-30380 Redesigned the change password form added userIdEnabled in the ChangePassword form --- amp/TEMPLATE/ampTemplate/css_2/amp.css | 25 ++-- amp/WEB-INF/src/ehcache.xml | 2 +- .../module/aim/action/ChangePassword.java | 3 +- .../module/aim/action/ShowChangePassword.java | 14 ++ .../module/aim/form/ChangePasswordForm.java | 9 ++ amp/deployConfigs/selected.properties | 2 +- amp/repository/aim/view/changePassword.jsp | 141 +++++++++++++----- 7 files changed, 147 insertions(+), 49 deletions(-) diff --git a/amp/TEMPLATE/ampTemplate/css_2/amp.css b/amp/TEMPLATE/ampTemplate/css_2/amp.css index 2a41230ab89..e7b4af21423 100644 --- a/amp/TEMPLATE/ampTemplate/css_2/amp.css +++ b/amp/TEMPLATE/ampTemplate/css_2/amp.css @@ -41,7 +41,7 @@ table.fixed-layout {table-layout:fixed; width: 100%;} td select.inp-text-orgType{width:250px;} td input#keyWordTextField{height:22px;} table#addUserContainer tr td input {border:1px solid #D0D0D0; background-color:#FFFFFF;margin:0px 0px 0px 5px; width:150px;} -table tr td.f-names{font-weight:bold;} +table tr td.f-names{font-weight:700; font-size: 14px;} .insidex{font-size:11px;color:#000000;padding:2px;margin:5px} .dropdwn_sm {border:1px solid #D0D0D0; font-size:11px; background-color:#FFFFFF;} .dropdwn_sm_wksp {border:1px solid #CCCCCC; font-size:11px; background-color:#FFFFFF; color:#000000;} @@ -406,12 +406,14 @@ ul.first-of-type li.yui-gen14 {} /*-----rafy-----*/ div.reg_form_container{width:1000px; margin:0 auto;text-align:center;} div.reg_form_container table {margin:0 auto; } -div.reg_form_container input,div.reg_form_container form input, div.reg_form_container form select{border:1px solid #d0d0d0;height:18px;} -div.reg_form_container .buttonx {background-color:#5E8AD1; border-top: 1px solid #99BAF1; border-left:1px solid #99BAF1; border-right:1px solid #225099; border-bottom:1px solid #225099; font-size:11px; color:#FFFFFF; font-weight:bold; padding-left:5px; padding-right:5px; padding-top:3px; padding-bottom:3px; height:25px;} +/* timothymugo - add height of the input boxes */ +div.reg_form_container input,div.reg_form_container form input, div.reg_form_container form select{border:1px solid #d0d0d0;height:30px;} +div.reg_form_container .buttonx {background-color:#68b35b; font-size:11px; color:#FFFFFF; font-weight:bold; padding: 3px 5px; height:30px; width: 200px; margin-right: 392px; } div.reg_form_container form input.dr-menu, div.reg_form_container input.dr-menu{ font-size:14px; font-weight:bold; color:#FFFFFF; background-color:#4A687A; margin:10px;height:25px;border:1px solid #364d5a;} div.reg_form_title{text-align:left;border-top:5px solid #4A687A; margin:0px 0px 20px 0px; background:#f0f0f0;padding:0px 0px 10px 0px;border-bottom:1px solid #ccccce;} div.reg_form_container h2 { font-size:30px; font-weight:bold; color:#FFFFFF; background-color:#4A687A; margin-left:10px; padding:5px; letter-spacing:-1px; margin-right:10px;display:inline;} span.formnote{color:#595959; font-size:14px;font-weight:bold;line-height:20px;} +span.formnote .login_warning_title{font-size: 16px; font-weight: 600; color: #225099FF;} td.title{background-color:#f0f0f0;color:#999; font-size:12px;font-weight:bold;padding:10px;} div.reg_form_container .f-names {color:#000000; font-size:12px;} div.breadcrumbsplaceholder {height:25px; clear:both;margin:20px 0px 20px 0px; width:950px; background:#f0f0f0; color:#000;} @@ -530,16 +532,21 @@ div.adminicon{float:right;} /*-----rafy-----*/ -div.reg_form_container{width:1000px; margin:0 auto;text-align:center;} +div.reg_form_container{width:1000px; margin:0 auto; text-align: left;} div.reg_form_container table {margin:0 auto; } -div.reg_form_container input,div.reg_form_container form input, div.reg_form_container form select{border:1px solid #d0d0d0;height:18px; width:145px;} -div.reg_form_container .buttonx {background-color:#5E8AD1; border-top: 1px solid #99BAF1; border-left:1px solid #99BAF1; border-right:1px solid #225099; border-bottom:1px solid #225099; font-size:11px; color:#FFFFFF; font-weight:bold; padding-left:5px; padding-right:5px; padding-top:3px; padding-bottom:3px; height:25px;} +/* Modify the input boxes - timothymugo */ +div.reg_form_container input,div.reg_form_container form input, div.reg_form_container form select{border:1px solid #d0d0d0;height:30px; font-size: 11px; width: 280px; padding: 5px 20px; border-radius: 5px;} +div.reg_form_container .buttonx {background-color:#68b35b; border-top: 1px solid #99BAF1; font-size:11px; color:#FFFFFF; font-weight:bold; padding: 3px 5px; height:30px;} div.reg_form_container form input.dr-menu, div.reg_form_container input.dr-menu{ font-size:14px; font-weight:bold; color:#FFFFFF; background-color:#4A687A; margin:10px;height:25px;border:1px solid #364d5a;} div.reg_form_title{text-align:left;border-top:5px solid #4A687A; margin:0px 0px 20px 0px; background:#f0f0f0;padding:0px 0px 10px 0px;border-bottom:1px solid #ccccce;} div.reg_form_container h2 { font-size:30px; font-weight:bold; color:#FFFFFF; background-color:#4A687A; margin-left:10px; padding:5px; letter-spacing:-1px; margin-right:10px;display:inline;} -span.formnote{color:#595959; font-size:14px;font-weight:bold;line-height:20px;} +span.formnote{color:#595959; font-size:14px;font-weight:500;line-height:20px;} td.title{background-color:#f0f0f0;color:#999; font-size:12px;font-weight:bold;padding:10px;} -div.reg_form_container .f-names {color:#000000; font-size:12px;} +/* changed font-size */ +div.reg_form_container .f-names {color:#000000; font-size:14px; text-align: right; padding-right: 30px;} +/* added input row container - tmugo */ +div.reg_form_container .input_row_container td { border-bottom: 1px solid #edeff1; padding: 18px;} +div.reg_form_container .reg_submit_btn_container td { padding: 20px 18px; border-bottom: none;} div.breadcrumbsplaceholder {height:25px; clear:both;margin:20px 0px 20px 0px; width:950px; background:#f0f0f0; color:#000;} #amphome{width:1000px; margin:0 auto;} #amphometext{width:740px; float:left;} @@ -760,7 +767,7 @@ html.ie div.header{z-index:9999;} #previewHeaderSectionDiv {background-color:#F5F5F5; text-align:center; padding-top:5px; padding-bottom:5px; border-top:1px solid #E9E9E9; border-bottom:1px solid #E9E9E9; font-size:11px; font-weight:bold; color:#5C5C5C;} #previewHeaderSectionDiv span {font-size:11px; font-weight:bold; color:#5C5C5C; cursor: pointer;} #components_dots table tr td {font-size:11px;} -table tr td {font-size:11px;} +table tr td {} div.breadcrump_cont{display:none;} .dgf_footer {margin-top:15px; margin-bottom:15px; text-align:center; font-size:11px; color:#8B8B8B; line-height:18px;} diff --git a/amp/WEB-INF/src/ehcache.xml b/amp/WEB-INF/src/ehcache.xml index 0bc04209912..854878cea49 100644 --- a/amp/WEB-INF/src/ehcache.xml +++ b/amp/WEB-INF/src/ehcache.xml @@ -111,7 +111,7 @@ /> +<%@ page import="org.digijava.module.aim.util.TeamMemberUtil" %> <%@ page pageEncoding="UTF-8" %> <%@ taglib uri="/taglib/struts-bean" prefix="bean" %> <%@ taglib uri="/taglib/struts-logic" prefix="logic" %> @@ -55,13 +57,32 @@ function validate(){
Change Password
- + + + + + + +
+ + + + You have been granted the right to access these + applications and the information contained in them to facilitate + your official business. Your accounts and passwords are your + responsibility. Do not share them with anyone. + +

+ +
+
- -
  +   @@ -71,12 +92,12 @@ function validate(){
 
- +

+ - + - - + - + - + - + - + @@ -145,34 +173,73 @@ function validate(){ - +<%-- --%>
  + * @@ -84,7 +105,14 @@ function validate(){ -
+ +     + + +     + + + e.g. yourname@emailaddress.com @@ -92,7 +120,7 @@ function validate(){
  @@ -102,7 +130,7 @@ function validate(){
  @@ -116,7 +144,7 @@ function validate(){
  @@ -128,13 +156,13 @@ function validate(){
    - + Submit
  - - - - - - - - - - -
 
- - - You are signing-in to one or more secure applications for - official business. You have been granted the right to access these - applications and the information contained in them to facilitate - your official business. Your accounts and passwords are your - responsibility. Do not share them with anyone. - -

- -
 
- 		--%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%--
 
--%> +<%-- --%> +<%-- --%> +<%-- You are signing-in to one or more secure applications for--%> +<%-- official business. You have been granted the right to access these--%> +<%-- applications and the information contained in them to facilitate--%> +<%-- your official business. Your accounts and passwords are your--%> +<%-- responsibility. Do not share them with anyone.--%> +<%-- --%> +<%--

--%> +<%-- --%> +<%--
 
--%> +<%--
+ +<%--
--%> +<%--
--%> +<%-- Change Password--%> +<%--
--%> + +<%-- --%> +<%-- --%> +<%-- You are signing-in to one or more secure applications for--%> +<%-- official business. You have been granted the right to access these--%> +<%-- applications and the information contained in them to facilitate--%> +<%-- your official business. Your accounts and passwords are your--%> +<%-- responsibility. Do not share them with anyone.--%> +<%-- --%> +<%--

--%> +<%-- --%> + +<%-- --%> +<%-- --%> +<%--
--%> +<%-- --%> +<%--
--%> +<%-- --%> + +<%--
--%> From 4f2f74ff0e0477c81f7c9329f0087bebc7188cdf Mon Sep 17 00:00:00 2001 From: Octavian Ciubotaru Date: Tue, 22 Nov 2022 11:38:17 +0200 Subject: [PATCH 014/135] AMP-30405: Fixed MTEF section in Activity Preview --- .../preview/actions/StartUpAction.jsx | 15 +- .../activity/preview/api/StartUpApi.jsx | 10 +- .../preview/common/ReampConstants.jsx | 4 + .../activity/preview/containers/App.jsx | 19 +- .../preview/reducers/StartUpReducer.jsx | 4 +- .../activity/preview/utils/DateUtils.jsx | 4 + amp/TEMPLATE/reamp/package-lock.json | 1741 +++++++++++------ amp/TEMPLATE/reamp/package.json | 7 +- 8 files changed, 1200 insertions(+), 604 deletions(-) diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/actions/StartUpAction.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/actions/StartUpAction.jsx index 66007c7468a..84ff42eef79 100644 --- a/amp/TEMPLATE/reamp/modules/activity/preview/actions/StartUpAction.jsx +++ b/amp/TEMPLATE/reamp/modules/activity/preview/actions/StartUpAction.jsx @@ -2,6 +2,7 @@ import { loadTranslations } from 'amp/modules/translate'; import { initialTranslations } from '../common/initialTranslations'; import TranslationManager from '../utils/TranslationManager'; import StartUpApi from "../api/StartUpApi"; +import { GS_DEFAULT_CALENDAR } from '../common/ReampConstants'; /** * @@ -9,15 +10,23 @@ import StartUpApi from "../api/StartUpApi"; export const STATE_TRANSLATIONS_LOADED = 'STATE_TRANSLATIONS_LOADED'; export const STATE_APP_INITIALIZED = 'STATE_APP_INITIALIZED'; +const fetchGlobalSettingsAndCalendar = () => StartUpApi.fetchGlobalSettings() + .then(globalSettings => StartUpApi.fetchCalendar(globalSettings[GS_DEFAULT_CALENDAR]) + .then(calendars => ({ globalSettings, calendar: calendars.find(calendar => calendar.id == globalSettings[GS_DEFAULT_CALENDAR]) }))); + export function startUp(dispatch) { - return Promise.all([StartUpApi.fetchSettings(), - loadTranslations(initialTranslations)]).then(([settings, trns]) => { + return Promise.all([ + StartUpApi.fetchSettings(), + fetchGlobalSettingsAndCalendar(), + loadTranslations(initialTranslations), + ]).then(([settings, gsAndCal, trns]) => { TranslationManager.initializeTranslations(trns); return dispatch({ type: STATE_APP_INITIALIZED, payload: { translations: trns, - settings + settings, + ...gsAndCal, } }); }); diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/api/StartUpApi.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/api/StartUpApi.jsx index 1919f9f33fe..db827662d14 100644 --- a/amp/TEMPLATE/reamp/modules/activity/preview/api/StartUpApi.jsx +++ b/amp/TEMPLATE/reamp/modules/activity/preview/api/StartUpApi.jsx @@ -1,4 +1,4 @@ -import { SETTINGS_API } from '../common/ReampConstants'; +import { SETTINGS_API, GLOBAL_SETTINGS_API, CALENDAR_API } from '../common/ReampConstants'; import { fetchJson, postJson } from 'amp/tools/index'; export default class StartUpApi { @@ -6,6 +6,14 @@ export default class StartUpApi { const url = SETTINGS_API; return StartUpApi._fetchData(url); } + static fetchGlobalSettings() { + const url = GLOBAL_SETTINGS_API; + return StartUpApi._fetchData(url); + } + static fetchCalendar(id) { + const url = `${CALENDAR_API}?id=${id}`; + return StartUpApi._fetchData(url); + } static _fetchData(url) { return new Promise((resolve, reject) => { return fetchJson(url).then((result) => { diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/common/ReampConstants.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/common/ReampConstants.jsx index 700d8c04d69..d40be53428c 100644 --- a/amp/TEMPLATE/reamp/modules/activity/preview/common/ReampConstants.jsx +++ b/amp/TEMPLATE/reamp/modules/activity/preview/common/ReampConstants.jsx @@ -7,6 +7,8 @@ export const FIELDS_DEFINITION_API = '/rest/activity/fields-no-workspace'; export const POSSIBLE_VALUES_API = '/rest/activity/field/values/public'; export const FM_API = '/rest/common/fm'; export const SETTINGS_API = '/rest/amp/settings'; +export const GLOBAL_SETTINGS_API = '/rest/amp/global-settings'; +export const CALENDAR_API = '/rest/calendar'; export const ACTIVITY_FIELDS_ID_VALUES_API = '/rest/activity/field/id-values/ws_id?translations=en&language=en'; export const RESOURCES_POSSIBLE_VALUES_API = '/rest/resource/field/values'; export const RESOURCES_ENABLED_FIELDS_API = '/rest/resource/fields'; @@ -31,6 +33,8 @@ export const TRANSACTION_ID = 'transaction_id'; export const WORKSPACE_TYPE = 'workspace-type'; export const WORKSPACE_TYPE_MANAGEMENT = 'Management'; +export const GS_DEFAULT_CALENDAR = 'Default Calendar'; + export const ACTIVITY_FORM_URL = '/wicket/onepager/activity'; export const ACTIVITY_FORM_URL_SSC = '/wicket/onepager/ssc'; export const ACTIVITY_PREVIEW_URL = '/aim/viewActivityPreview.do~activityId='; diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/containers/App.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/containers/App.jsx index 981660c3215..1ef06b59fe2 100644 --- a/amp/TEMPLATE/reamp/modules/activity/preview/containers/App.jsx +++ b/amp/TEMPLATE/reamp/modules/activity/preview/containers/App.jsx @@ -1,5 +1,6 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; +import { createSelector } from 'reselect' import {ActivityPreviewUI, FieldsManager, CurrencyRatesManager, ErrorHelper} from 'amp-ui'; import * as ActivityActions from '../actions/ActivityActions'; import ActivityFundingTotals from '../utils/ActivityFundingTotals'; @@ -11,6 +12,14 @@ import {bindActionCreators} from "redux"; import {connect} from "react-redux"; import {APDocumentPage} from '../containers/APDocumentPage.jsx'; +const getActivityContext = createSelector( + props => props.activityReducer, + props => props.startUpReducer, + (activityReducer, startUpReducer) => ({ + ...activityReducer.activityContext, + calendar: startUpReducer.calendar, + })); + /** * */ @@ -27,8 +36,8 @@ class App extends Component { contactsByIds: PropTypes.object, APDocumentPage: PropTypes.func.isRequired, resourceReducer: PropTypes.object, - activityWsInfo: PropTypes.array.isRequired - + activityWsInfo: PropTypes.array.isRequired, + globalSettings: PropTypes.object.isRequired, } constructor(props, context) { @@ -54,7 +63,8 @@ class App extends Component { currencyRatesManager: this.props.activityReducer.currencyRatesManager, APDocumentPage, resourceReducer: this.props.resourceReducer, - activityWsInfo: this.props.activityReducer.activityWsInfo + activityWsInfo: this.props.activityReducer.activityWsInfo, + globalSettings: this.props.startUpReducer.globalSettings, }; } @@ -71,7 +81,8 @@ class App extends Component { ) } else { - const {activity, activityContext, error} = this.props.activityReducer; + const {activity, error} = this.props.activityReducer; + const activityContext = getActivityContext(this.props); if (error) { return ErrorHelper.showErrors(error, translate); } else { diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/reducers/StartUpReducer.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/reducers/StartUpReducer.jsx index 42af602f19d..f77251ef409 100644 --- a/amp/TEMPLATE/reamp/modules/activity/preview/reducers/StartUpReducer.jsx +++ b/amp/TEMPLATE/reamp/modules/activity/preview/reducers/StartUpReducer.jsx @@ -19,7 +19,9 @@ export default function startUpReducer(state: Object = defaultState, action: Obj return Object.assign({}, state, { translations: action.payload.translations, isStartupInProgress: false, - settings: action.payload.settings + settings: action.payload.settings, + globalSettings: action.payload.globalSettings, + calendar: action.payload.calendar, }); default: diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/utils/DateUtils.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/utils/DateUtils.jsx index d1e0d938209..06d6fd2a635 100644 --- a/amp/TEMPLATE/reamp/modules/activity/preview/utils/DateUtils.jsx +++ b/amp/TEMPLATE/reamp/modules/activity/preview/utils/DateUtils.jsx @@ -28,4 +28,8 @@ export default class DateUtils { } } } + + static getYearFromDate(date) { + return Moment(date).year(); + } } diff --git a/amp/TEMPLATE/reamp/package-lock.json b/amp/TEMPLATE/reamp/package-lock.json index f4be8010cb2..7a692b51fa4 100644 --- a/amp/TEMPLATE/reamp/package-lock.json +++ b/amp/TEMPLATE/reamp/package-lock.json @@ -17,10 +17,11 @@ "react-modal": "^3.3.1", "react-number-input": "^15.0.0-rc2", "react-select": "^1.0.0-rc.3", + "reselect": "^4.1.7", "uglifyjs-webpack-plugin": "^1.3.0" }, "devDependencies": { - "amp-ui": "git+ssh://github.com/devgateway/amp-ui#develop", + "amp-ui": "github:devgateway/amp-ui#AMP-30405-calendar", "babel-core": "^6.26.3", "babel-jest": "^6.0.1", "babel-loader": "^6.3.2", @@ -214,7 +215,6 @@ "node_modules/align-text": { "version": "0.1.4", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", - "dev": true, "dependencies": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -227,14 +227,13 @@ "node_modules/amdefine": { "version": "1.0.1", "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true, "engines": { "node": ">=0.4.2" } }, "node_modules/amp-ui": { - "version": "2.1.0", - "resolved": "git+ssh://git@github.com/devgateway/amp-ui.git#bc63cd7e9b1dd2add7375e3ae21ab4b45cfc062f", + "version": "2.1.1", + "resolved": "git+ssh://git@github.com/devgateway/amp-ui.git#288d4b6980f0940613a8c52cbd911bd936662f29", "dev": true, "license": "MIT", "dependencies": { @@ -288,7 +287,6 @@ "node_modules/anymatch": { "version": "1.3.2", "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", - "dev": true, "dependencies": { "micromatch": "^2.1.5", "normalize-path": "^2.0.0" @@ -326,7 +324,6 @@ "node_modules/arr-union": { "version": "3.1.0", "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -365,7 +362,6 @@ "node_modules/assert": { "version": "1.5.0", "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", - "dev": true, "dependencies": { "object-assign": "^4.1.1", "util": "0.10.3" @@ -381,13 +377,11 @@ }, "node_modules/assert/node_modules/inherits": { "version": "2.0.1", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", - "dev": true + "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=" }, "node_modules/assert/node_modules/util": { "version": "0.10.3", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", - "dev": true, "dependencies": { "inherits": "2.0.1" } @@ -395,20 +389,17 @@ "node_modules/assign-symbols": { "version": "1.0.0", "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", - "dev": true, "engines": { "node": ">=0.10.0" } }, "node_modules/async": { "version": "1.5.2", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" }, "node_modules/async-each": { "version": "1.0.3", - "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==", - "dev": true + "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==" }, "node_modules/asynckit": { "version": "0.4.0", @@ -418,7 +409,6 @@ "node_modules/atob": { "version": "2.1.2", "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", - "dev": true, "bin": { "atob": "bin/atob.js" }, @@ -1350,7 +1340,6 @@ "node_modules/base": { "version": "0.11.2", "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", - "dev": true, "dependencies": { "cache-base": "^1.0.1", "class-utils": "^0.3.5", @@ -1367,7 +1356,6 @@ "node_modules/base/node_modules/define-property": { "version": "1.0.0", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, "dependencies": { "is-descriptor": "^1.0.0" }, @@ -1378,7 +1366,6 @@ "node_modules/base/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1386,7 +1373,6 @@ "node_modules/base64-js": { "version": "1.5.1", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true, "funding": [ { "type": "github", @@ -1418,7 +1404,6 @@ "node_modules/big.js": { "version": "3.2.0", "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==", - "dev": true, "engines": { "node": "*" } @@ -1426,7 +1411,6 @@ "node_modules/binary-extensions": { "version": "1.13.1", "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1545,7 +1529,6 @@ "node_modules/browserify-aes": { "version": "0.4.0", "integrity": "sha1-BnFJtmjfMcS1hTPgLQHoBthgjiw=", - "dev": true, "dependencies": { "inherits": "^2.0.1" } @@ -1553,15 +1536,13 @@ "node_modules/browserify-zlib": { "version": "0.1.4", "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=", - "dev": true, "dependencies": { "pako": "~0.2.0" } }, "node_modules/browserify-zlib/node_modules/pako": { "version": "0.2.9", - "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=", - "dev": true + "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=" }, "node_modules/browserslist": { "version": "0.4.0", @@ -1583,7 +1564,6 @@ "node_modules/buffer": { "version": "4.9.2", "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", - "dev": true, "dependencies": { "base64-js": "^1.0.2", "ieee754": "^1.1.4", @@ -1596,8 +1576,7 @@ }, "node_modules/builtin-status-codes": { "version": "3.0.0", - "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", - "dev": true + "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=" }, "node_modules/bytes": { "version": "3.0.0", @@ -1647,7 +1626,6 @@ "node_modules/cache-base": { "version": "1.0.1", "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", - "dev": true, "dependencies": { "collection-visit": "^1.0.0", "component-emitter": "^1.2.1", @@ -1666,7 +1644,6 @@ "node_modules/cache-base/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1674,7 +1651,6 @@ "node_modules/camelcase": { "version": "1.2.1", "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1692,7 +1668,6 @@ "node_modules/center-align": { "version": "0.1.3", "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", - "dev": true, "dependencies": { "align-text": "^0.1.3", "lazy-cache": "^1.0.3" @@ -1719,7 +1694,6 @@ "version": "1.7.0", "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.", - "dev": true, "dependencies": { "anymatch": "^1.3.0", "async-each": "^1.0.0", @@ -1741,7 +1715,6 @@ "node_modules/class-utils": { "version": "0.3.6", "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", - "dev": true, "dependencies": { "arr-union": "^3.1.0", "define-property": "^0.2.5", @@ -1755,7 +1728,6 @@ "node_modules/class-utils/node_modules/define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "dependencies": { "is-descriptor": "^0.1.0" }, @@ -1766,7 +1738,6 @@ "node_modules/class-utils/node_modules/is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -1777,7 +1748,6 @@ "node_modules/class-utils/node_modules/is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -1788,7 +1758,6 @@ "node_modules/class-utils/node_modules/is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, "dependencies": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -1801,7 +1770,6 @@ "node_modules/class-utils/node_modules/is-descriptor/node_modules/kind-of": { "version": "5.1.0", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1809,7 +1777,6 @@ "node_modules/class-utils/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1832,7 +1799,6 @@ "node_modules/cliui": { "version": "2.1.0", "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", - "dev": true, "dependencies": { "center-align": "^0.1.1", "right-align": "^0.1.1", @@ -1842,7 +1808,6 @@ "node_modules/cliui/node_modules/wordwrap": { "version": "0.0.2", "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", - "dev": true, "engines": { "node": ">=0.4.0" } @@ -1850,7 +1815,6 @@ "node_modules/clone": { "version": "1.0.4", "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", - "dev": true, "engines": { "node": ">=0.8" } @@ -1881,7 +1845,6 @@ "node_modules/collection-visit": { "version": "1.0.0", "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", - "dev": true, "dependencies": { "map-visit": "^1.0.0", "object-visit": "^1.0.0" @@ -1979,8 +1942,7 @@ }, "node_modules/component-emitter": { "version": "1.3.0", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", - "dev": true + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" }, "node_modules/compressible": { "version": "2.0.18", @@ -2057,13 +2019,11 @@ }, "node_modules/console-browserify": { "version": "1.2.0", - "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==", - "dev": true + "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==" }, "node_modules/constants-browserify": { "version": "1.0.0", - "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", - "dev": true + "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=" }, "node_modules/content-disposition": { "version": "0.5.4", @@ -2138,7 +2098,6 @@ "node_modules/copy-descriptor": { "version": "0.1.1", "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -2199,7 +2158,6 @@ "node_modules/crypto-browserify": { "version": "3.3.0", "integrity": "sha1-ufx1u0oO1h3PHNXa6W6zDJw+UGw=", - "dev": true, "dependencies": { "browserify-aes": "0.4.0", "pbkdf2-compat": "2.0.1", @@ -2334,7 +2292,6 @@ "node_modules/decamelize": { "version": "1.2.0", "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -2342,7 +2299,6 @@ "node_modules/decode-uri-component": { "version": "0.2.0", "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", - "dev": true, "engines": { "node": ">=0.10" } @@ -2360,7 +2316,6 @@ "node_modules/define-property": { "version": "2.0.2", "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", - "dev": true, "dependencies": { "is-descriptor": "^1.0.2", "isobject": "^3.0.1" @@ -2372,7 +2327,6 @@ "node_modules/define-property/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -2506,7 +2460,6 @@ "node_modules/domain-browser": { "version": "1.2.0", "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==", - "dev": true, "engines": { "node": ">=0.4", "npm": ">=1.2" @@ -2585,7 +2538,6 @@ "node_modules/emojis-list": { "version": "2.1.0", "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", - "dev": true, "engines": { "node": ">= 0.10" } @@ -2615,7 +2567,6 @@ "node_modules/enhanced-resolve": { "version": "0.9.1", "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=", - "dev": true, "dependencies": { "graceful-fs": "^4.1.2", "memory-fs": "^0.2.0", @@ -2627,8 +2578,7 @@ }, "node_modules/enhanced-resolve/node_modules/memory-fs": { "version": "0.2.0", - "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=", - "dev": true + "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=" }, "node_modules/entities": { "version": "1.1.2", @@ -2769,7 +2719,6 @@ "node_modules/events": { "version": "1.1.1", "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", - "dev": true, "engines": { "node": ">=0.4.x" } @@ -2944,7 +2893,6 @@ "node_modules/extend-shallow": { "version": "3.0.2", "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "dev": true, "dependencies": { "assign-symbols": "^1.0.0", "is-extendable": "^1.0.1" @@ -2956,7 +2904,6 @@ "node_modules/extend-shallow/node_modules/is-extendable": { "version": "1.0.1", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, "dependencies": { "is-plain-object": "^2.0.4" }, @@ -3231,7 +3178,6 @@ "node_modules/fragment-cache": { "version": "0.2.1", "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", - "dev": true, "dependencies": { "map-cache": "^0.2.2" }, @@ -3336,7 +3282,6 @@ "node_modules/get-value": { "version": "2.0.6", "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -3465,7 +3410,6 @@ "node_modules/has-flag": { "version": "1.0.0", "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -3473,7 +3417,6 @@ "node_modules/has-value": { "version": "1.0.0", "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", - "dev": true, "dependencies": { "get-value": "^2.0.6", "has-values": "^1.0.0", @@ -3486,7 +3429,6 @@ "node_modules/has-value/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -3494,7 +3436,6 @@ "node_modules/has-values": { "version": "1.0.0", "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", - "dev": true, "dependencies": { "is-number": "^3.0.0", "kind-of": "^4.0.0" @@ -3506,7 +3447,6 @@ "node_modules/has-values/node_modules/is-number": { "version": "3.0.0", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -3517,7 +3457,6 @@ "node_modules/has-values/node_modules/is-number/node_modules/kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "dependencies": { "is-buffer": "^1.1.5" }, @@ -3528,7 +3467,6 @@ "node_modules/has-values/node_modules/kind-of": { "version": "4.0.0", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", - "dev": true, "dependencies": { "is-buffer": "^1.1.5" }, @@ -3696,8 +3634,7 @@ }, "node_modules/https-browserify": { "version": "0.0.1", - "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=", - "dev": true + "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=" }, "node_modules/iconv-lite": { "version": "0.6.3", @@ -3712,7 +3649,6 @@ "node_modules/ieee754": { "version": "1.2.1", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true, "funding": [ { "type": "github", @@ -3782,8 +3718,7 @@ }, "node_modules/indexof": { "version": "0.0.1", - "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", - "dev": true + "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=" }, "node_modules/inflight": { "version": "1.0.6", @@ -3799,8 +3734,7 @@ }, "node_modules/interpret": { "version": "0.6.6", - "integrity": "sha1-/s16GOfOXKar+5U+H4YhOknxYls=", - "dev": true + "integrity": "sha1-/s16GOfOXKar+5U+H4YhOknxYls=" }, "node_modules/invariant": { "version": "2.2.4", @@ -3828,7 +3762,6 @@ "node_modules/is-accessor-descriptor": { "version": "1.0.0", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, "dependencies": { "kind-of": "^6.0.0" }, @@ -3839,7 +3772,6 @@ "node_modules/is-accessor-descriptor/node_modules/kind-of": { "version": "6.0.3", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -3851,7 +3783,6 @@ "node_modules/is-binary-path": { "version": "1.0.1", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true, "dependencies": { "binary-extensions": "^1.0.0" }, @@ -3876,7 +3807,6 @@ "node_modules/is-data-descriptor": { "version": "1.0.0", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, "dependencies": { "kind-of": "^6.0.0" }, @@ -3887,7 +3817,6 @@ "node_modules/is-data-descriptor/node_modules/kind-of": { "version": "6.0.3", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -3895,7 +3824,6 @@ "node_modules/is-descriptor": { "version": "1.0.2", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, "dependencies": { "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", @@ -3908,7 +3836,6 @@ "node_modules/is-descriptor/node_modules/kind-of": { "version": "6.0.3", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -3985,7 +3912,6 @@ "node_modules/is-plain-object": { "version": "2.0.4", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, "dependencies": { "isobject": "^3.0.1" }, @@ -3996,7 +3922,6 @@ "node_modules/is-plain-object/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -4034,7 +3959,6 @@ "node_modules/is-windows": { "version": "1.0.2", "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -4384,7 +4308,6 @@ "node_modules/lazy-cache": { "version": "1.0.4", "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -4626,7 +4549,6 @@ "node_modules/loader-utils": { "version": "0.2.17", "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", - "dev": true, "dependencies": { "big.js": "^3.1.3", "emojis-list": "^2.0.0", @@ -4772,7 +4694,6 @@ "node_modules/longest": { "version": "1.0.1", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -4823,7 +4744,6 @@ "node_modules/map-cache": { "version": "0.2.2", "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -4831,7 +4751,6 @@ "node_modules/map-visit": { "version": "1.0.0", "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", - "dev": true, "dependencies": { "object-visit": "^1.0.0" }, @@ -4859,7 +4778,6 @@ "node_modules/memory-fs": { "version": "0.3.0", "integrity": "sha1-e8xrYp46Q+hx1+Kaymrop/FcuyA=", - "dev": true, "dependencies": { "errno": "^0.1.3", "readable-stream": "^2.0.1" @@ -4868,7 +4786,6 @@ "node_modules/memory-fs/node_modules/readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -4882,7 +4799,6 @@ "node_modules/memory-fs/node_modules/string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } @@ -4993,7 +4909,6 @@ "node_modules/mixin-deep": { "version": "1.3.2", "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", - "dev": true, "dependencies": { "for-in": "^1.0.2", "is-extendable": "^1.0.1" @@ -5005,7 +4920,6 @@ "node_modules/mixin-deep/node_modules/is-extendable": { "version": "1.0.1", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, "dependencies": { "is-plain-object": "^2.0.4" }, @@ -5050,7 +4964,6 @@ "node_modules/nanomatch": { "version": "1.2.13", "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", - "dev": true, "dependencies": { "arr-diff": "^4.0.0", "array-unique": "^0.3.2", @@ -5071,7 +4984,6 @@ "node_modules/nanomatch/node_modules/arr-diff": { "version": "4.0.0", "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -5079,7 +4991,6 @@ "node_modules/nanomatch/node_modules/array-unique": { "version": "0.3.2", "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -5087,7 +4998,6 @@ "node_modules/nanomatch/node_modules/kind-of": { "version": "6.0.3", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -5142,7 +5052,6 @@ "node_modules/node-libs-browser": { "version": "0.7.0", "integrity": "sha1-PicsCBnjCJNeJmdECNevDhSRuDs=", - "dev": true, "dependencies": { "assert": "^1.1.1", "browserify-zlib": "^0.1.4", @@ -5171,13 +5080,11 @@ }, "node_modules/node-libs-browser/node_modules/punycode": { "version": "1.4.1", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" }, "node_modules/node-libs-browser/node_modules/readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -5191,15 +5098,13 @@ "node_modules/node-libs-browser/node_modules/readable-stream/node_modules/string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } }, "node_modules/node-libs-browser/node_modules/string_decoder": { "version": "0.10.31", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" }, "node_modules/node-worker-pool": { "version": "3.0.2", @@ -5299,7 +5204,6 @@ "node_modules/object-copy": { "version": "0.1.0", "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", - "dev": true, "dependencies": { "copy-descriptor": "^0.1.0", "define-property": "^0.2.5", @@ -5312,7 +5216,6 @@ "node_modules/object-copy/node_modules/define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "dependencies": { "is-descriptor": "^0.1.0" }, @@ -5323,7 +5226,6 @@ "node_modules/object-copy/node_modules/is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -5334,7 +5236,6 @@ "node_modules/object-copy/node_modules/is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -5345,7 +5246,6 @@ "node_modules/object-copy/node_modules/is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, "dependencies": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -5358,7 +5258,6 @@ "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": { "version": "5.1.0", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -5366,7 +5265,6 @@ "node_modules/object-visit": { "version": "1.0.1", "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", - "dev": true, "dependencies": { "isobject": "^3.0.0" }, @@ -5377,7 +5275,6 @@ "node_modules/object-visit/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -5396,7 +5293,6 @@ "node_modules/object.pick": { "version": "1.3.0", "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", - "dev": true, "dependencies": { "isobject": "^3.0.1" }, @@ -5407,7 +5303,6 @@ "node_modules/object.pick/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -5449,7 +5344,6 @@ "node_modules/optimist": { "version": "0.6.1", "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "dev": true, "dependencies": { "minimist": "~0.0.1", "wordwrap": "~0.0.2" @@ -5457,13 +5351,11 @@ }, "node_modules/optimist/node_modules/minimist": { "version": "0.0.10", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", - "dev": true + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" }, "node_modules/optimist/node_modules/wordwrap": { "version": "0.0.3", "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", - "dev": true, "engines": { "node": ">=0.4.0" } @@ -5502,8 +5394,7 @@ }, "node_modules/os-browserify": { "version": "0.2.1", - "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=", - "dev": true + "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=" }, "node_modules/os-homedir": { "version": "1.0.2", @@ -5619,15 +5510,13 @@ "node_modules/pascalcase": { "version": "0.1.1", "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", - "dev": true, "engines": { "node": ">=0.10.0" } }, "node_modules/path-browserify": { "version": "0.0.0", - "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", - "dev": true + "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=" }, "node_modules/path-exists": { "version": "2.1.0", @@ -5669,8 +5558,7 @@ }, "node_modules/pbkdf2-compat": { "version": "2.0.1", - "integrity": "sha1-tuDI+plJTZTgURV1gCpZpcFC8og=", - "dev": true + "integrity": "sha1-tuDI+plJTZTgURV1gCpZpcFC8og=" }, "node_modules/performance-now": { "version": "2.1.0", @@ -5719,7 +5607,6 @@ "node_modules/posix-character-classes": { "version": "0.1.1", "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -6030,7 +5917,6 @@ "node_modules/process": { "version": "0.11.10", "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", - "dev": true, "engines": { "node": ">= 0.6.0" } @@ -6150,7 +6036,6 @@ "version": "0.2.0", "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.", - "dev": true, "engines": { "node": ">=0.4.x" } @@ -6158,7 +6043,6 @@ "node_modules/querystring-es3": { "version": "0.2.1", "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", - "dev": true, "engines": { "node": ">=0.4.x" } @@ -6600,14 +6484,15 @@ "dev": true }, "node_modules/react-scrollspy": { - "version": "3.4.3", - "integrity": "sha512-c2QZpMPWxm1HF71h1EqaxBldx2zLYO0aZ24Bcuo2mUWF79T+F6qOtr7XJCzUDm99NOwhVKQD01a7A8VC6c90CQ==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/react-scrollspy/-/react-scrollspy-3.1.1.tgz", + "integrity": "sha512-0gu/zKi0eZ/PaVJZSe7ew5nNmmEjfb7z97YFuOOR5tbKkIQtKENm9b4KGUZBid7XkMEZkRShUFsQsEYxotBIEw==", "deprecated": "No longer actively maintained. Please use @makotot/ghostui instead.", "dev": true, "dependencies": { - "babel-runtime": "^6.26.0", + "babel-runtime": "^6.23.0", "classnames": "^2.2.5", - "prop-types": "^15.5.10" + "prop-types": "^15.5.8" }, "peerDependencies": { "react": ">=0.14.0", @@ -6699,7 +6584,6 @@ "node_modules/readdirp": { "version": "2.2.1", "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", - "dev": true, "dependencies": { "graceful-fs": "^4.1.11", "micromatch": "^3.1.10", @@ -6712,7 +6596,6 @@ "node_modules/readdirp/node_modules/arr-diff": { "version": "4.0.0", "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -6720,7 +6603,6 @@ "node_modules/readdirp/node_modules/array-unique": { "version": "0.3.2", "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -6728,7 +6610,6 @@ "node_modules/readdirp/node_modules/braces": { "version": "2.3.2", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, "dependencies": { "arr-flatten": "^1.1.0", "array-unique": "^0.3.2", @@ -6748,7 +6629,6 @@ "node_modules/readdirp/node_modules/braces/node_modules/extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -6759,7 +6639,6 @@ "node_modules/readdirp/node_modules/expand-brackets": { "version": "2.1.4", "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "dev": true, "dependencies": { "debug": "^2.3.3", "define-property": "^0.2.5", @@ -6776,7 +6655,6 @@ "node_modules/readdirp/node_modules/expand-brackets/node_modules/define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "dependencies": { "is-descriptor": "^0.1.0" }, @@ -6787,7 +6665,6 @@ "node_modules/readdirp/node_modules/expand-brackets/node_modules/extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -6798,7 +6675,6 @@ "node_modules/readdirp/node_modules/expand-brackets/node_modules/is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, "dependencies": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -6811,7 +6687,6 @@ "node_modules/readdirp/node_modules/expand-brackets/node_modules/kind-of": { "version": "5.1.0", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -6819,7 +6694,6 @@ "node_modules/readdirp/node_modules/extglob": { "version": "2.0.4", "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "dev": true, "dependencies": { "array-unique": "^0.3.2", "define-property": "^1.0.0", @@ -6837,7 +6711,6 @@ "node_modules/readdirp/node_modules/extglob/node_modules/define-property": { "version": "1.0.0", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, "dependencies": { "is-descriptor": "^1.0.0" }, @@ -6848,7 +6721,6 @@ "node_modules/readdirp/node_modules/extglob/node_modules/extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -6859,7 +6731,6 @@ "node_modules/readdirp/node_modules/fill-range": { "version": "4.0.0", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, "dependencies": { "extend-shallow": "^2.0.1", "is-number": "^3.0.0", @@ -6873,7 +6744,6 @@ "node_modules/readdirp/node_modules/fill-range/node_modules/extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -6884,7 +6754,6 @@ "node_modules/readdirp/node_modules/is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -6895,7 +6764,6 @@ "node_modules/readdirp/node_modules/is-accessor-descriptor/node_modules/kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "dependencies": { "is-buffer": "^1.1.5" }, @@ -6906,7 +6774,6 @@ "node_modules/readdirp/node_modules/is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -6917,7 +6784,6 @@ "node_modules/readdirp/node_modules/is-data-descriptor/node_modules/kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "dependencies": { "is-buffer": "^1.1.5" }, @@ -6928,7 +6794,6 @@ "node_modules/readdirp/node_modules/is-number": { "version": "3.0.0", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -6939,7 +6804,6 @@ "node_modules/readdirp/node_modules/is-number/node_modules/kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "dependencies": { "is-buffer": "^1.1.5" }, @@ -6950,7 +6814,6 @@ "node_modules/readdirp/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -6958,7 +6821,6 @@ "node_modules/readdirp/node_modules/kind-of": { "version": "6.0.3", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -6966,7 +6828,6 @@ "node_modules/readdirp/node_modules/micromatch": { "version": "3.1.10", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "dev": true, "dependencies": { "arr-diff": "^4.0.0", "array-unique": "^0.3.2", @@ -6989,7 +6850,6 @@ "node_modules/readdirp/node_modules/readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -7003,7 +6863,6 @@ "node_modules/readdirp/node_modules/string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } @@ -7092,7 +6951,6 @@ "node_modules/regex-not": { "version": "1.0.2", "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", - "dev": true, "dependencies": { "extend-shallow": "^3.0.2", "safe-regex": "^1.1.0" @@ -7203,6 +7061,11 @@ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", "dev": true }, + "node_modules/reselect": { + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.7.tgz", + "integrity": "sha512-Zu1xbUt3/OPwsXL46hvOOoQrap2azE7ZQbokq61BQfiXvhewsKDwhMeZjTX9sX0nvw1t/U5Audyn1I9P/m9z0A==" + }, "node_modules/resolve": { "version": "1.22.0", "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", @@ -7221,13 +7084,11 @@ "node_modules/resolve-url": { "version": "0.2.1", "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", - "deprecated": "https://github.com/lydell/resolve-url#deprecated", - "dev": true + "deprecated": "https://github.com/lydell/resolve-url#deprecated" }, "node_modules/ret": { "version": "0.1.15", "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", - "dev": true, "engines": { "node": ">=0.12" } @@ -7235,7 +7096,6 @@ "node_modules/right-align": { "version": "0.1.3", "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", - "dev": true, "dependencies": { "align-text": "^0.1.1" }, @@ -7273,8 +7133,7 @@ }, "node_modules/ripemd160": { "version": "0.2.0", - "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=", - "dev": true + "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=" }, "node_modules/run-queue": { "version": "1.0.3", @@ -7290,7 +7149,6 @@ "node_modules/safe-regex": { "version": "1.1.0", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", - "dev": true, "dependencies": { "ret": "~0.1.10" } @@ -7441,7 +7299,6 @@ "node_modules/set-value": { "version": "2.0.1", "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", - "dev": true, "dependencies": { "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", @@ -7455,7 +7312,6 @@ "node_modules/set-value/node_modules/extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -7475,7 +7331,6 @@ "node_modules/sha.js": { "version": "2.2.6", "integrity": "sha1-F93t3F9yL7ZlAWWIlUYZd4ZzFbo=", - "dev": true, "bin": { "sha.js": "bin.js" } @@ -7494,7 +7349,6 @@ "node_modules/snapdragon": { "version": "0.8.2", "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", - "dev": true, "dependencies": { "base": "^0.11.1", "debug": "^2.2.0", @@ -7512,7 +7366,6 @@ "node_modules/snapdragon-node": { "version": "2.1.1", "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", - "dev": true, "dependencies": { "define-property": "^1.0.0", "isobject": "^3.0.0", @@ -7525,7 +7378,6 @@ "node_modules/snapdragon-node/node_modules/define-property": { "version": "1.0.0", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, "dependencies": { "is-descriptor": "^1.0.0" }, @@ -7536,7 +7388,6 @@ "node_modules/snapdragon-node/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -7544,7 +7395,6 @@ "node_modules/snapdragon-util": { "version": "3.0.1", "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", - "dev": true, "dependencies": { "kind-of": "^3.2.0" }, @@ -7555,7 +7405,6 @@ "node_modules/snapdragon/node_modules/define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "dependencies": { "is-descriptor": "^0.1.0" }, @@ -7566,7 +7415,6 @@ "node_modules/snapdragon/node_modules/extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -7577,7 +7425,6 @@ "node_modules/snapdragon/node_modules/is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -7588,7 +7435,6 @@ "node_modules/snapdragon/node_modules/is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -7599,7 +7445,6 @@ "node_modules/snapdragon/node_modules/is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, "dependencies": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -7612,7 +7457,6 @@ "node_modules/snapdragon/node_modules/is-descriptor/node_modules/kind-of": { "version": "5.1.0", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -7687,8 +7531,7 @@ }, "node_modules/source-list-map": { "version": "0.1.8", - "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=", - "dev": true + "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=" }, "node_modules/source-map": { "version": "0.5.7", @@ -7701,7 +7544,6 @@ "version": "0.5.3", "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated", - "dev": true, "dependencies": { "atob": "^2.1.2", "decode-uri-component": "^0.2.0", @@ -7720,8 +7562,7 @@ "node_modules/source-map-url": { "version": "0.4.1", "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==", - "deprecated": "See https://github.com/lydell/source-map-url#deprecated", - "dev": true + "deprecated": "See https://github.com/lydell/source-map-url#deprecated" }, "node_modules/spdx-correct": { "version": "3.1.1", @@ -7750,7 +7591,6 @@ "node_modules/split-string": { "version": "3.1.0", "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", - "dev": true, "dependencies": { "extend-shallow": "^3.0.0" }, @@ -7797,7 +7637,6 @@ "node_modules/static-extend": { "version": "0.1.2", "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", - "dev": true, "dependencies": { "define-property": "^0.2.5", "object-copy": "^0.1.0" @@ -7809,7 +7648,6 @@ "node_modules/static-extend/node_modules/define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "dependencies": { "is-descriptor": "^0.1.0" }, @@ -7820,7 +7658,6 @@ "node_modules/static-extend/node_modules/is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -7831,7 +7668,6 @@ "node_modules/static-extend/node_modules/is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -7842,7 +7678,6 @@ "node_modules/static-extend/node_modules/is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, "dependencies": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -7855,7 +7690,6 @@ "node_modules/static-extend/node_modules/is-descriptor/node_modules/kind-of": { "version": "5.1.0", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -7871,7 +7705,6 @@ "node_modules/stream-browserify": { "version": "2.0.2", "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", - "dev": true, "dependencies": { "inherits": "~2.0.1", "readable-stream": "^2.0.2" @@ -7880,7 +7713,6 @@ "node_modules/stream-browserify/node_modules/readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -7894,7 +7726,6 @@ "node_modules/stream-browserify/node_modules/string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } @@ -7918,7 +7749,6 @@ "node_modules/stream-http": { "version": "2.8.3", "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", - "dev": true, "dependencies": { "builtin-status-codes": "^3.0.0", "inherits": "^2.0.1", @@ -7930,7 +7760,6 @@ "node_modules/stream-http/node_modules/readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -7944,7 +7773,6 @@ "node_modules/stream-http/node_modules/string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } @@ -8055,7 +7883,6 @@ "node_modules/tapable": { "version": "0.1.10", "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=", - "dev": true, "engines": { "node": ">=0.6" } @@ -8115,7 +7942,6 @@ "node_modules/timers-browserify": { "version": "2.0.12", "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==", - "dev": true, "dependencies": { "setimmediate": "^1.0.4" }, @@ -8130,8 +7956,7 @@ }, "node_modules/to-arraybuffer": { "version": "1.0.1", - "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", - "dev": true + "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=" }, "node_modules/to-fast-properties": { "version": "1.0.3", @@ -8143,7 +7968,6 @@ "node_modules/to-object-path": { "version": "0.3.0", "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -8154,7 +7978,6 @@ "node_modules/to-regex": { "version": "3.0.2", "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", - "dev": true, "dependencies": { "define-property": "^2.0.2", "extend-shallow": "^3.0.2", @@ -8168,7 +7991,6 @@ "node_modules/to-regex-range": { "version": "2.1.1", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true, "dependencies": { "is-number": "^3.0.0", "repeat-string": "^1.6.1" @@ -8180,7 +8002,6 @@ "node_modules/to-regex-range/node_modules/is-number": { "version": "3.0.0", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -8222,8 +8043,7 @@ }, "node_modules/tty-browserify": { "version": "0.0.0", - "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", - "dev": true + "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=" }, "node_modules/tunnel-agent": { "version": "0.6.0", @@ -8321,8 +8141,7 @@ }, "node_modules/uglify-to-browserify": { "version": "1.0.2", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", - "dev": true + "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=" }, "node_modules/uglifyjs-webpack-plugin": { "version": "1.3.0", @@ -8413,7 +8232,6 @@ "node_modules/union-value": { "version": "1.0.1", "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", - "dev": true, "dependencies": { "arr-union": "^3.1.0", "get-value": "^2.0.6", @@ -8464,7 +8282,6 @@ "node_modules/unset-value": { "version": "1.0.0", "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", - "dev": true, "dependencies": { "has-value": "^0.3.1", "isobject": "^3.0.0" @@ -8476,7 +8293,6 @@ "node_modules/unset-value/node_modules/has-value": { "version": "0.3.1", "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", - "dev": true, "dependencies": { "get-value": "^2.0.3", "has-values": "^0.1.4", @@ -8489,7 +8305,6 @@ "node_modules/unset-value/node_modules/has-value/node_modules/isobject": { "version": "2.1.0", "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true, "dependencies": { "isarray": "1.0.0" }, @@ -8500,7 +8315,6 @@ "node_modules/unset-value/node_modules/has-values": { "version": "0.1.4", "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -8508,7 +8322,6 @@ "node_modules/unset-value/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -8523,13 +8336,11 @@ "node_modules/urix": { "version": "0.1.0", "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", - "deprecated": "Please see https://github.com/lydell/urix#deprecated", - "dev": true + "deprecated": "Please see https://github.com/lydell/urix#deprecated" }, "node_modules/url": { "version": "0.11.0", "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", - "dev": true, "dependencies": { "punycode": "1.3.2", "querystring": "0.2.0" @@ -8546,13 +8357,11 @@ }, "node_modules/url/node_modules/punycode": { "version": "1.3.2", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", - "dev": true + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" }, "node_modules/use": { "version": "3.1.1", "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -8560,7 +8369,6 @@ "node_modules/util": { "version": "0.10.4", "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", - "dev": true, "dependencies": { "inherits": "2.0.3" } @@ -8571,8 +8379,7 @@ }, "node_modules/util/node_modules/inherits": { "version": "2.0.3", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, "node_modules/utils-merge": { "version": "1.0.1", @@ -8623,7 +8430,6 @@ "node_modules/vm-browserify": { "version": "0.0.4", "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", - "dev": true, "dependencies": { "indexof": "0.0.1" } @@ -8654,7 +8460,6 @@ "node_modules/watchpack": { "version": "0.2.9", "integrity": "sha1-Yuqkq15bo1/fwBgnVibjwPXj+ws=", - "dev": true, "dependencies": { "async": "^0.9.0", "chokidar": "^1.0.0", @@ -8663,13 +8468,11 @@ }, "node_modules/watchpack/node_modules/async": { "version": "0.9.2", - "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", - "dev": true + "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=" }, "node_modules/webpack": { "version": "1.15.0", "integrity": "sha1-T/MfU9sDM55VFkqdRo7gMklo/pg=", - "dev": true, "dependencies": { "acorn": "^3.0.0", "async": "^1.3.0", @@ -8697,7 +8500,6 @@ "node_modules/webpack-core": { "version": "0.6.9", "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=", - "dev": true, "dependencies": { "source-list-map": "~0.1.7", "source-map": "~0.4.1" @@ -8709,7 +8511,6 @@ "node_modules/webpack-core/node_modules/source-map": { "version": "0.4.4", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, "dependencies": { "amdefine": ">=0.0.4" }, @@ -8825,7 +8626,6 @@ "node_modules/webpack/node_modules/acorn": { "version": "3.3.0", "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", - "dev": true, "bin": { "acorn": "bin/acorn" }, @@ -8836,7 +8636,6 @@ "node_modules/webpack/node_modules/supports-color": { "version": "3.2.3", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, "dependencies": { "has-flag": "^1.0.0" }, @@ -8847,7 +8646,6 @@ "node_modules/webpack/node_modules/uglify-js": { "version": "2.7.5", "integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=", - "dev": true, "dependencies": { "async": "~0.2.6", "source-map": "~0.5.1", @@ -8863,8 +8661,7 @@ }, "node_modules/webpack/node_modules/uglify-js/node_modules/async": { "version": "0.2.10", - "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=", - "dev": true + "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=" }, "node_modules/websocket-driver": { "version": "0.7.4", @@ -8914,7 +8711,6 @@ "node_modules/window-size": { "version": "0.1.0", "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", - "dev": true, "engines": { "node": ">= 0.8.0" } @@ -8987,7 +8783,6 @@ "node_modules/yargs": { "version": "3.10.0", "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "dev": true, "dependencies": { "camelcase": "^1.0.2", "cliui": "^2.1.0", @@ -8999,6 +8794,7 @@ "dependencies": { "@allenfang/react-toastr": { "version": "2.8.2", + "integrity": "sha1-C+9lhRieBXHda9/E75i8n5xH2gw=", "requires": { "classnames": "^2.2.5", "element-class": "^0.2.2", @@ -9010,6 +8806,7 @@ "dependencies": { "react": { "version": "15.3.2", + "integrity": "sha1-p7zNL+6K8SawMX4iLCjR1UUo0J4=", "requires": { "fbjs": "^0.8.4", "loose-envify": "^1.1.0", @@ -9017,23 +8814,28 @@ } }, "react-dom": { - "version": "15.3.2" + "version": "15.3.2", + "integrity": "sha1-xGsKpTgNe4OOelnEp77/LtMVUx8=", + "requires": {} } } }, "@babel/runtime": { "version": "7.17.2", + "integrity": "sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==", "requires": { "regenerator-runtime": "^0.13.4" }, "dependencies": { "regenerator-runtime": { - "version": "0.13.9" + "version": "0.13.9", + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" } } }, "@babel/runtime-corejs2": { "version": "7.17.2", + "integrity": "sha512-EamjJvKlHTdSmJ8t6yHtqttdiA3xThvTNdmGb0Kh0oqRhV1SU2JGFU5TjVCg35Vnn8MYfUBHHtLZYHIY+W28qw==", "dev": true, "requires": { "core-js": "^2.6.5", @@ -9042,12 +8844,14 @@ "dependencies": { "regenerator-runtime": { "version": "0.13.9", + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==", "dev": true } } }, "@types/image-size": { "version": "0.0.29", + "integrity": "sha512-d47SGzTnoUXSLRn3Kej43FZXLduZjHJqkb26BmxKp9fQveCvjfirtpk7a5iLCGkJ/rur9kxUf7DwD2eKlPxjMg==", "dev": true, "requires": { "@types/node": "*" @@ -9055,6 +8859,7 @@ }, "@types/jszip": { "version": "3.4.1", + "integrity": "sha512-TezXjmf3lj+zQ651r6hPqvSScqBLvyPI9FxdXBqpEwBijNGQ2NXpaFW/7joGzveYkKQUil7iiDHLo6LV71Pc0A==", "dev": true, "requires": { "jszip": "*" @@ -9062,14 +8867,17 @@ }, "@types/node": { "version": "17.0.19", + "integrity": "sha512-PfeQhvcMR4cPFVuYfBN4ifG7p9c+Dlh3yUZR6k+5yQK7wX3gDgVxBly4/WkBRs9x4dmcy1TVl08SY67wwtEvmA==", "dev": true }, "abbrev": { "version": "1.0.9", + "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=", "dev": true }, "accepts": { "version": "1.3.8", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", "dev": true, "requires": { "mime-types": "~2.1.34", @@ -9078,10 +8886,12 @@ }, "acorn": { "version": "2.7.0", + "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=", "dev": true }, "acorn-globals": { "version": "1.0.9", + "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=", "dev": true, "requires": { "acorn": "^2.1.0" @@ -9089,12 +8899,14 @@ }, "add-dom-event-listener": { "version": "1.1.0", + "integrity": "sha512-WCxx1ixHT0GQU9hb0KI/mhgRQhnU+U3GvwY6ZvVjYq8rsihIGoaIOUbY0yMPBxLH5MDtr0kz3fisWGNcbWW7Jw==", "requires": { "object-assign": "4.x" } }, "ajv": { "version": "6.12.6", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -9103,11 +8915,13 @@ } }, "ajv-keywords": { - "version": "3.5.2" + "version": "3.5.2", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "requires": {} }, "align-text": { "version": "0.1.4", - "dev": true, + "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -9116,12 +8930,12 @@ }, "amdefine": { "version": "1.0.1", - "dev": true + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, "amp-ui": { - "version": "git+ssh://git@github.com/devgateway/amp-ui.git#bc63cd7e9b1dd2add7375e3ae21ab4b45cfc062f", + "version": "git+ssh://git@github.com/devgateway/amp-ui.git#288d4b6980f0940613a8c52cbd911bd936662f29", "dev": true, - "from": "amp-ui@git+ssh://github.com/devgateway/amp-ui#develop", + "from": "amp-ui@github:devgateway/amp-ui#AMP-30405-calendar", "requires": { "docx": "^4.7.1", "file-saver": "git+ssh://github.com/devgateway/FileSaver.js", @@ -9146,24 +8960,28 @@ } }, "ansi-regex": { - "version": "2.1.1" + "version": "2.1.1", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, "ansi-styles": { - "version": "2.2.1" + "version": "2.2.1", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" }, "anymatch": { "version": "1.3.2", - "dev": true, + "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", "requires": { "micromatch": "^2.1.5", "normalize-path": "^2.0.0" } }, "aproba": { - "version": "1.2.0" + "version": "1.2.0", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" }, "argparse": { "version": "1.0.10", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "requires": { "sprintf-js": "~1.0.2" @@ -9171,32 +8989,39 @@ }, "arr-diff": { "version": "2.0.0", + "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", "requires": { "arr-flatten": "^1.0.1" } }, "arr-flatten": { - "version": "1.1.0" + "version": "1.1.0", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" }, "arr-union": { "version": "3.1.0", - "dev": true + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=" }, "array-flatten": { "version": "1.1.1", + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", "dev": true }, "array-unique": { - "version": "0.2.1" + "version": "0.2.1", + "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=" }, "arrify": { - "version": "1.0.1" + "version": "1.0.1", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=" }, "asap": { - "version": "2.0.6" + "version": "2.0.6", + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" }, "asn1": { "version": "0.2.6", + "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", "dev": true, "requires": { "safer-buffer": "~2.1.0" @@ -9204,7 +9029,7 @@ }, "assert": { "version": "1.5.0", - "dev": true, + "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", "requires": { "object-assign": "^4.1.1", "util": "0.10.3" @@ -9212,11 +9037,11 @@ "dependencies": { "inherits": { "version": "2.0.1", - "dev": true + "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=" }, "util": { "version": "0.10.3", - "dev": true, + "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", "requires": { "inherits": "2.0.1" } @@ -9225,30 +9050,33 @@ }, "assert-plus": { "version": "1.0.0", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", "dev": true }, "assign-symbols": { "version": "1.0.0", - "dev": true + "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" }, "async": { "version": "1.5.2", - "dev": true + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" }, "async-each": { "version": "1.0.3", - "dev": true + "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==" }, "asynckit": { "version": "0.4.0", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", "dev": true }, "atob": { "version": "2.1.2", - "dev": true + "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" }, "autoprefixer-core": { "version": "5.2.1", + "integrity": "sha1-5kDEFK5Bmq4hwa1DyOoPPbgqVm0=", "dev": true, "requires": { "browserslist": "~0.4.0", @@ -9259,14 +9087,17 @@ }, "aws-sign2": { "version": "0.7.0", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", "dev": true }, "aws4": { "version": "1.11.0", + "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", "dev": true }, "babel-code-frame": { "version": "6.26.0", + "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "requires": { "chalk": "^1.1.3", "esutils": "^2.0.2", @@ -9275,6 +9106,7 @@ }, "babel-core": { "version": "6.26.3", + "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", "requires": { "babel-code-frame": "^6.26.0", "babel-generator": "^6.26.0", @@ -9299,6 +9131,7 @@ }, "babel-generator": { "version": "6.26.1", + "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", "requires": { "babel-messages": "^6.23.0", "babel-runtime": "^6.26.0", @@ -9312,6 +9145,7 @@ }, "babel-helper-bindify-decorators": { "version": "6.24.1", + "integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=", "dev": true, "requires": { "babel-runtime": "^6.22.0", @@ -9321,6 +9155,7 @@ }, "babel-helper-builder-binary-assignment-operator-visitor": { "version": "6.24.1", + "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", "dev": true, "requires": { "babel-helper-explode-assignable-expression": "^6.24.1", @@ -9330,6 +9165,7 @@ }, "babel-helper-builder-react-jsx": { "version": "6.26.0", + "integrity": "sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=", "dev": true, "requires": { "babel-runtime": "^6.26.0", @@ -9339,6 +9175,7 @@ }, "babel-helper-call-delegate": { "version": "6.24.1", + "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", "dev": true, "requires": { "babel-helper-hoist-variables": "^6.24.1", @@ -9349,6 +9186,7 @@ }, "babel-helper-define-map": { "version": "6.26.0", + "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=", "dev": true, "requires": { "babel-helper-function-name": "^6.24.1", @@ -9359,6 +9197,7 @@ }, "babel-helper-explode-assignable-expression": { "version": "6.24.1", + "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", "dev": true, "requires": { "babel-runtime": "^6.22.0", @@ -9368,6 +9207,7 @@ }, "babel-helper-explode-class": { "version": "6.24.1", + "integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=", "dev": true, "requires": { "babel-helper-bindify-decorators": "^6.24.1", @@ -9378,6 +9218,7 @@ }, "babel-helper-function-name": { "version": "6.24.1", + "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", "dev": true, "requires": { "babel-helper-get-function-arity": "^6.24.1", @@ -9389,6 +9230,7 @@ }, "babel-helper-get-function-arity": { "version": "6.24.1", + "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", "dev": true, "requires": { "babel-runtime": "^6.22.0", @@ -9397,6 +9239,7 @@ }, "babel-helper-hoist-variables": { "version": "6.24.1", + "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", "dev": true, "requires": { "babel-runtime": "^6.22.0", @@ -9405,6 +9248,7 @@ }, "babel-helper-optimise-call-expression": { "version": "6.24.1", + "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=", "dev": true, "requires": { "babel-runtime": "^6.22.0", @@ -9413,6 +9257,7 @@ }, "babel-helper-regex": { "version": "6.26.0", + "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", "dev": true, "requires": { "babel-runtime": "^6.26.0", @@ -9422,6 +9267,7 @@ }, "babel-helper-remap-async-to-generator": { "version": "6.24.1", + "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", "dev": true, "requires": { "babel-helper-function-name": "^6.24.1", @@ -9433,6 +9279,7 @@ }, "babel-helper-replace-supers": { "version": "6.24.1", + "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=", "dev": true, "requires": { "babel-helper-optimise-call-expression": "^6.24.1", @@ -9445,6 +9292,7 @@ }, "babel-helpers": { "version": "6.24.1", + "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", "requires": { "babel-runtime": "^6.22.0", "babel-template": "^6.24.1" @@ -9452,6 +9300,7 @@ }, "babel-jest": { "version": "6.0.1", + "integrity": "sha1-MTRjrSN22I5LaxMmRMu896pWMiE=", "dev": true, "requires": { "babel-core": "^6.0.0" @@ -9459,6 +9308,7 @@ }, "babel-loader": { "version": "6.4.1", + "integrity": "sha1-CzQRLVsHSKjc2/Uaz2+b1C1QuMo=", "dev": true, "requires": { "find-cache-dir": "^0.1.1", @@ -9469,12 +9319,14 @@ }, "babel-messages": { "version": "6.23.0", + "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", "requires": { "babel-runtime": "^6.22.0" } }, "babel-plugin-check-es2015-constants": { "version": "6.22.0", + "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", "dev": true, "requires": { "babel-runtime": "^6.22.0" @@ -9482,6 +9334,7 @@ }, "babel-plugin-istanbul": { "version": "4.1.6", + "integrity": "sha512-PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ==", "requires": { "babel-plugin-syntax-object-rest-spread": "^6.13.0", "find-up": "^2.1.0", @@ -9491,6 +9344,7 @@ "dependencies": { "find-up": { "version": "2.1.0", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "requires": { "locate-path": "^2.0.0" } @@ -9498,65 +9352,81 @@ } }, "babel-plugin-jest-hoist": { - "version": "19.0.0" + "version": "19.0.0", + "integrity": "sha1-SuKgTqYSpuc2UfP95SwXiZEwS+o=" }, "babel-plugin-syntax-async-functions": { "version": "6.13.0", + "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=", "dev": true }, "babel-plugin-syntax-async-generators": { "version": "6.13.0", + "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=", "dev": true }, "babel-plugin-syntax-class-constructor-call": { "version": "6.18.0", + "integrity": "sha1-nLnTn+Q8hgC+yBRkVt3L1OGnZBY=", "dev": true }, "babel-plugin-syntax-class-properties": { "version": "6.13.0", + "integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=", "dev": true }, "babel-plugin-syntax-decorators": { "version": "6.13.0", + "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=", "dev": true }, "babel-plugin-syntax-do-expressions": { "version": "6.13.0", + "integrity": "sha1-V0d1YTmqJtOQ0JQQsDdEugfkeW0=", "dev": true }, "babel-plugin-syntax-dynamic-import": { "version": "6.18.0", + "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=", "dev": true }, "babel-plugin-syntax-exponentiation-operator": { "version": "6.13.0", + "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=", "dev": true }, "babel-plugin-syntax-export-extensions": { "version": "6.13.0", + "integrity": "sha1-cKFITw+QiaToStRLrDU8lbmxJyE=", "dev": true }, "babel-plugin-syntax-flow": { "version": "6.18.0", + "integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=", "dev": true }, "babel-plugin-syntax-function-bind": { "version": "6.13.0", + "integrity": "sha1-SMSV8Xe98xqYHnMvVa3AvdJgH0Y=", "dev": true }, "babel-plugin-syntax-jsx": { "version": "6.18.0", + "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=", "dev": true }, "babel-plugin-syntax-object-rest-spread": { - "version": "6.13.0" + "version": "6.13.0", + "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=" }, "babel-plugin-syntax-trailing-function-commas": { "version": "6.22.0", + "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=", "dev": true }, "babel-plugin-transform-async-generator-functions": { "version": "6.24.1", + "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=", "dev": true, "requires": { "babel-helper-remap-async-to-generator": "^6.24.1", @@ -9566,6 +9436,7 @@ }, "babel-plugin-transform-async-to-generator": { "version": "6.24.1", + "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", "dev": true, "requires": { "babel-helper-remap-async-to-generator": "^6.24.1", @@ -9575,6 +9446,7 @@ }, "babel-plugin-transform-class-constructor-call": { "version": "6.24.1", + "integrity": "sha1-gNwoVQWsBn3LjWxl4vbxGrd2Xvk=", "dev": true, "requires": { "babel-plugin-syntax-class-constructor-call": "^6.18.0", @@ -9584,6 +9456,7 @@ }, "babel-plugin-transform-class-properties": { "version": "6.24.1", + "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=", "dev": true, "requires": { "babel-helper-function-name": "^6.24.1", @@ -9594,6 +9467,7 @@ }, "babel-plugin-transform-decorators": { "version": "6.24.1", + "integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=", "dev": true, "requires": { "babel-helper-explode-class": "^6.24.1", @@ -9605,6 +9479,7 @@ }, "babel-plugin-transform-do-expressions": { "version": "6.22.0", + "integrity": "sha1-KMyvkoEtlJws0SgfaQyP3EaK6bs=", "dev": true, "requires": { "babel-plugin-syntax-do-expressions": "^6.8.0", @@ -9613,6 +9488,7 @@ }, "babel-plugin-transform-es2015-arrow-functions": { "version": "6.22.0", + "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=", "dev": true, "requires": { "babel-runtime": "^6.22.0" @@ -9620,6 +9496,7 @@ }, "babel-plugin-transform-es2015-block-scoped-functions": { "version": "6.22.0", + "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=", "dev": true, "requires": { "babel-runtime": "^6.22.0" @@ -9627,6 +9504,7 @@ }, "babel-plugin-transform-es2015-block-scoping": { "version": "6.26.0", + "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=", "dev": true, "requires": { "babel-runtime": "^6.26.0", @@ -9638,6 +9516,7 @@ }, "babel-plugin-transform-es2015-classes": { "version": "6.24.1", + "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=", "dev": true, "requires": { "babel-helper-define-map": "^6.24.1", @@ -9653,6 +9532,7 @@ }, "babel-plugin-transform-es2015-computed-properties": { "version": "6.24.1", + "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=", "dev": true, "requires": { "babel-runtime": "^6.22.0", @@ -9661,6 +9541,7 @@ }, "babel-plugin-transform-es2015-destructuring": { "version": "6.23.0", + "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", "dev": true, "requires": { "babel-runtime": "^6.22.0" @@ -9668,6 +9549,7 @@ }, "babel-plugin-transform-es2015-duplicate-keys": { "version": "6.24.1", + "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=", "dev": true, "requires": { "babel-runtime": "^6.22.0", @@ -9676,6 +9558,7 @@ }, "babel-plugin-transform-es2015-for-of": { "version": "6.23.0", + "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=", "dev": true, "requires": { "babel-runtime": "^6.22.0" @@ -9683,6 +9566,7 @@ }, "babel-plugin-transform-es2015-function-name": { "version": "6.24.1", + "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", "dev": true, "requires": { "babel-helper-function-name": "^6.24.1", @@ -9692,6 +9576,7 @@ }, "babel-plugin-transform-es2015-literals": { "version": "6.22.0", + "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=", "dev": true, "requires": { "babel-runtime": "^6.22.0" @@ -9699,6 +9584,7 @@ }, "babel-plugin-transform-es2015-modules-amd": { "version": "6.24.1", + "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=", "dev": true, "requires": { "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1", @@ -9708,6 +9594,7 @@ }, "babel-plugin-transform-es2015-modules-commonjs": { "version": "6.26.2", + "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==", "dev": true, "requires": { "babel-plugin-transform-strict-mode": "^6.24.1", @@ -9718,6 +9605,7 @@ }, "babel-plugin-transform-es2015-modules-systemjs": { "version": "6.24.1", + "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=", "dev": true, "requires": { "babel-helper-hoist-variables": "^6.24.1", @@ -9727,6 +9615,7 @@ }, "babel-plugin-transform-es2015-modules-umd": { "version": "6.24.1", + "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=", "dev": true, "requires": { "babel-plugin-transform-es2015-modules-amd": "^6.24.1", @@ -9736,6 +9625,7 @@ }, "babel-plugin-transform-es2015-object-super": { "version": "6.24.1", + "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=", "dev": true, "requires": { "babel-helper-replace-supers": "^6.24.1", @@ -9744,6 +9634,7 @@ }, "babel-plugin-transform-es2015-parameters": { "version": "6.24.1", + "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", "dev": true, "requires": { "babel-helper-call-delegate": "^6.24.1", @@ -9756,6 +9647,7 @@ }, "babel-plugin-transform-es2015-shorthand-properties": { "version": "6.24.1", + "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=", "dev": true, "requires": { "babel-runtime": "^6.22.0", @@ -9764,6 +9656,7 @@ }, "babel-plugin-transform-es2015-spread": { "version": "6.22.0", + "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", "dev": true, "requires": { "babel-runtime": "^6.22.0" @@ -9771,6 +9664,7 @@ }, "babel-plugin-transform-es2015-sticky-regex": { "version": "6.24.1", + "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", "dev": true, "requires": { "babel-helper-regex": "^6.24.1", @@ -9780,6 +9674,7 @@ }, "babel-plugin-transform-es2015-template-literals": { "version": "6.22.0", + "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=", "dev": true, "requires": { "babel-runtime": "^6.22.0" @@ -9787,6 +9682,7 @@ }, "babel-plugin-transform-es2015-typeof-symbol": { "version": "6.23.0", + "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=", "dev": true, "requires": { "babel-runtime": "^6.22.0" @@ -9794,6 +9690,7 @@ }, "babel-plugin-transform-es2015-unicode-regex": { "version": "6.24.1", + "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", "dev": true, "requires": { "babel-helper-regex": "^6.24.1", @@ -9803,6 +9700,7 @@ }, "babel-plugin-transform-exponentiation-operator": { "version": "6.24.1", + "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", "dev": true, "requires": { "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1", @@ -9812,6 +9710,7 @@ }, "babel-plugin-transform-export-extensions": { "version": "6.22.0", + "integrity": "sha1-U3OLR+deghhYnuqUbLvTkQm75lM=", "dev": true, "requires": { "babel-plugin-syntax-export-extensions": "^6.8.0", @@ -9820,6 +9719,7 @@ }, "babel-plugin-transform-flow-strip-types": { "version": "6.22.0", + "integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=", "dev": true, "requires": { "babel-plugin-syntax-flow": "^6.18.0", @@ -9828,6 +9728,7 @@ }, "babel-plugin-transform-function-bind": { "version": "6.22.0", + "integrity": "sha1-xvuOlqwpajELjPjqQBRiQH3fapc=", "dev": true, "requires": { "babel-plugin-syntax-function-bind": "^6.8.0", @@ -9836,6 +9737,7 @@ }, "babel-plugin-transform-object-rest-spread": { "version": "6.26.0", + "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=", "dev": true, "requires": { "babel-plugin-syntax-object-rest-spread": "^6.8.0", @@ -9844,6 +9746,7 @@ }, "babel-plugin-transform-react-display-name": { "version": "6.25.0", + "integrity": "sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=", "dev": true, "requires": { "babel-runtime": "^6.22.0" @@ -9851,6 +9754,7 @@ }, "babel-plugin-transform-react-jsx": { "version": "6.24.1", + "integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=", "dev": true, "requires": { "babel-helper-builder-react-jsx": "^6.24.1", @@ -9860,6 +9764,7 @@ }, "babel-plugin-transform-react-jsx-self": { "version": "6.22.0", + "integrity": "sha1-322AqdomEqEh5t3XVYvL7PBuY24=", "dev": true, "requires": { "babel-plugin-syntax-jsx": "^6.8.0", @@ -9868,6 +9773,7 @@ }, "babel-plugin-transform-react-jsx-source": { "version": "6.22.0", + "integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=", "dev": true, "requires": { "babel-plugin-syntax-jsx": "^6.8.0", @@ -9876,6 +9782,7 @@ }, "babel-plugin-transform-regenerator": { "version": "6.26.0", + "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=", "dev": true, "requires": { "regenerator-transform": "^0.10.0" @@ -9883,6 +9790,7 @@ }, "babel-plugin-transform-strict-mode": { "version": "6.24.1", + "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", "dev": true, "requires": { "babel-runtime": "^6.22.0", @@ -9891,10 +9799,12 @@ }, "babel-plugin-typecheck": { "version": "1.3.0", + "integrity": "sha1-SQhlLTGLDLICjrBhbmXyXMVkrpM=", "dev": true }, "babel-polyfill": { "version": "6.26.0", + "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=", "requires": { "babel-runtime": "^6.26.0", "core-js": "^2.5.0", @@ -9903,6 +9813,7 @@ }, "babel-preset-es2015": { "version": "6.24.1", + "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=", "dev": true, "requires": { "babel-plugin-check-es2015-constants": "^6.22.0", @@ -9933,6 +9844,7 @@ }, "babel-preset-flow": { "version": "6.23.0", + "integrity": "sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0=", "dev": true, "requires": { "babel-plugin-transform-flow-strip-types": "^6.22.0" @@ -9940,12 +9852,14 @@ }, "babel-preset-jest": { "version": "19.0.0", + "integrity": "sha1-ItZyAdAjJKGVgRKI6zgpS7PKw5Y=", "requires": { "babel-plugin-jest-hoist": "^19.0.0" } }, "babel-preset-react": { "version": "6.24.1", + "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=", "dev": true, "requires": { "babel-plugin-syntax-jsx": "^6.3.13", @@ -9958,6 +9872,7 @@ }, "babel-preset-stage-0": { "version": "6.24.1", + "integrity": "sha1-VkLRUEL5E4TX5a+LyIsduVsDnmo=", "dev": true, "requires": { "babel-plugin-transform-do-expressions": "^6.22.0", @@ -9967,6 +9882,7 @@ }, "babel-preset-stage-1": { "version": "6.24.1", + "integrity": "sha1-dpLNfc1oSZB+auSgqFWJz7niv7A=", "dev": true, "requires": { "babel-plugin-transform-class-constructor-call": "^6.24.1", @@ -9976,6 +9892,7 @@ }, "babel-preset-stage-2": { "version": "6.24.1", + "integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=", "dev": true, "requires": { "babel-plugin-syntax-dynamic-import": "^6.18.0", @@ -9986,6 +9903,7 @@ }, "babel-preset-stage-3": { "version": "6.24.1", + "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=", "dev": true, "requires": { "babel-plugin-syntax-trailing-function-commas": "^6.22.0", @@ -9997,6 +9915,7 @@ }, "babel-register": { "version": "6.26.0", + "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", "requires": { "babel-core": "^6.26.0", "babel-runtime": "^6.26.0", @@ -10009,18 +9928,21 @@ }, "babel-runtime": { "version": "6.26.0", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "requires": { "core-js": "^2.4.0", "regenerator-runtime": "^0.11.0" }, "dependencies": { "regenerator-runtime": { - "version": "0.11.1" + "version": "0.11.1", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" } } }, "babel-template": { "version": "6.26.0", + "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", "requires": { "babel-runtime": "^6.26.0", "babel-traverse": "^6.26.0", @@ -10031,6 +9953,7 @@ }, "babel-traverse": { "version": "6.26.0", + "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", "requires": { "babel-code-frame": "^6.26.0", "babel-messages": "^6.23.0", @@ -10045,6 +9968,7 @@ }, "babel-types": { "version": "6.26.0", + "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", "requires": { "babel-runtime": "^6.26.0", "esutils": "^2.0.2", @@ -10053,15 +9977,17 @@ } }, "babylon": { - "version": "6.18.0" + "version": "6.18.0", + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==" }, "balanced-match": { "version": "0.2.1", + "integrity": "sha1-e8ZYtL7WHu5CStdPdfXD4sTfPMc=", "dev": true }, "base": { "version": "0.11.2", - "dev": true, + "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", "requires": { "cache-base": "^1.0.1", "class-utils": "^0.3.5", @@ -10074,27 +10000,29 @@ "dependencies": { "define-property": { "version": "1.0.0", - "dev": true, + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { "is-descriptor": "^1.0.0" } }, "isobject": { "version": "3.0.1", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, "base64-js": { "version": "1.5.1", - "dev": true + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" }, "batch": { "version": "0.6.1", + "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=", "dev": true }, "bcrypt-pbkdf": { "version": "1.0.2", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", "dev": true, "requires": { "tweetnacl": "^0.14.3" @@ -10102,20 +10030,23 @@ }, "big.js": { "version": "3.2.0", - "dev": true + "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==" }, "binary-extensions": { "version": "1.13.1", - "dev": true + "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==" }, "blacklist": { - "version": "1.1.4" + "version": "1.1.4", + "integrity": "sha1-st0J1hd2JbLKppg1o3somV+povI=" }, "bluebird": { - "version": "3.7.2" + "version": "3.7.2", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, "body-parser": { "version": "1.19.2", + "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==", "dev": true, "requires": { "bytes": "3.1.2", @@ -10132,10 +10063,12 @@ "dependencies": { "bytes": { "version": "3.1.2", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", "dev": true }, "iconv-lite": { "version": "0.4.24", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "requires": { "safer-buffer": ">= 2.1.2 < 3" @@ -10143,12 +10076,14 @@ }, "qs": { "version": "6.9.7", + "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==", "dev": true } } }, "boom": { "version": "2.10.1", + "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", "dev": true, "optional": true, "requires": { @@ -10157,22 +10092,26 @@ }, "bootstrap": { "version": "3.4.1", + "integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==", "dev": true }, "brace-expansion": { "version": "1.1.11", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" }, "dependencies": { "balanced-match": { - "version": "1.0.2" + "version": "1.0.2", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" } } }, "braces": { "version": "1.8.5", + "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", "requires": { "expand-range": "^1.8.1", "preserve": "^0.2.0", @@ -10181,30 +10120,32 @@ }, "browser-request": { "version": "0.3.3", + "integrity": "sha1-ns5bWsqJopkyJC4Yv5M975h2zBc=", "dev": true }, "browserify-aes": { "version": "0.4.0", - "dev": true, + "integrity": "sha1-BnFJtmjfMcS1hTPgLQHoBthgjiw=", "requires": { "inherits": "^2.0.1" } }, "browserify-zlib": { "version": "0.1.4", - "dev": true, + "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=", "requires": { "pako": "~0.2.0" }, "dependencies": { "pako": { "version": "0.2.9", - "dev": true + "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=" } } }, "browserslist": { "version": "0.4.0", + "integrity": "sha1-O9SrkZncG5FQ1NbbpNnTqrvIbdQ=", "dev": true, "requires": { "caniuse-db": "^1.0.30000153" @@ -10212,6 +10153,7 @@ }, "bser": { "version": "2.1.1", + "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", "dev": true, "requires": { "node-int64": "^0.4.0" @@ -10219,7 +10161,7 @@ }, "buffer": { "version": "4.9.2", - "dev": true, + "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", "requires": { "base64-js": "^1.0.2", "ieee754": "^1.1.4", @@ -10227,18 +10169,21 @@ } }, "buffer-from": { - "version": "1.1.2" + "version": "1.1.2", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" }, "builtin-status-codes": { "version": "3.0.0", - "dev": true + "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=" }, "bytes": { "version": "3.0.0", + "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", "dev": true }, "cacache": { "version": "10.0.4", + "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", "requires": { "bluebird": "^3.5.1", "chownr": "^1.0.1", @@ -10257,6 +10202,7 @@ "dependencies": { "glob": { "version": "7.2.0", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -10270,7 +10216,7 @@ }, "cache-base": { "version": "1.0.1", - "dev": true, + "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", "requires": { "collection-visit": "^1.0.0", "component-emitter": "^1.2.1", @@ -10285,25 +10231,27 @@ "dependencies": { "isobject": { "version": "3.0.1", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, "camelcase": { "version": "1.2.1", - "dev": true + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=" }, "caniuse-db": { "version": "1.0.30001312", + "integrity": "sha512-4eJfCSGxsF9JcQXBLdHclxkpLWv+Va7Y6QESYCWSdrR8b8x16TxUjCoOK/kU7SFC0BdcuK0nvt6ZkM59Q03LjQ==", "dev": true }, "caseless": { "version": "0.12.0", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", "dev": true }, "center-align": { "version": "0.1.3", - "dev": true, + "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", "requires": { "align-text": "^0.1.3", "lazy-cache": "^1.0.3" @@ -10311,6 +10259,7 @@ }, "chalk": { "version": "1.1.3", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "requires": { "ansi-styles": "^2.2.1", "escape-string-regexp": "^1.0.2", @@ -10321,7 +10270,7 @@ }, "chokidar": { "version": "1.7.0", - "dev": true, + "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", "requires": { "anymatch": "^1.3.0", "async-each": "^1.0.0", @@ -10335,11 +10284,12 @@ } }, "chownr": { - "version": "1.1.4" + "version": "1.1.4", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" }, "class-utils": { "version": "0.3.6", - "dev": true, + "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", "requires": { "arr-union": "^3.1.0", "define-property": "^0.2.5", @@ -10349,28 +10299,28 @@ "dependencies": { "define-property": { "version": "0.2.5", - "dev": true, + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { "is-descriptor": "^0.1.0" } }, "is-accessor-descriptor": { "version": "0.1.6", - "dev": true, + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "requires": { "kind-of": "^3.0.2" } }, "is-data-descriptor": { "version": "0.1.4", - "dev": true, + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "requires": { "kind-of": "^3.0.2" } }, "is-descriptor": { "version": "0.1.6", - "dev": true, + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "requires": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -10379,21 +10329,23 @@ "dependencies": { "kind-of": { "version": "5.1.0", - "dev": true + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" } } }, "isobject": { "version": "3.0.1", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, "classnames": { - "version": "2.3.1" + "version": "2.3.1", + "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==" }, "cli-table": { "version": "0.0.2", + "integrity": "sha1-mChn4WQ1Mlxmwgih5xuVM26jCTs=", "dev": true, "requires": { "colors": "0.3.0" @@ -10401,7 +10353,7 @@ }, "cliui": { "version": "2.1.0", - "dev": true, + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", "requires": { "center-align": "^0.1.1", "right-align": "^0.1.1", @@ -10410,26 +10362,28 @@ "dependencies": { "wordwrap": { "version": "0.0.2", - "dev": true + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=" } } }, "clone": { "version": "1.0.4", - "dev": true + "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=" }, "co": { "version": "4.6.0", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", "dev": true, "optional": true }, "coffee-script": { "version": "1.12.7", + "integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==", "dev": true }, "collection-visit": { "version": "1.0.0", - "dev": true, + "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "requires": { "map-visit": "^1.0.0", "object-visit": "^1.0.0" @@ -10437,6 +10391,7 @@ }, "color": { "version": "0.10.1", + "integrity": "sha1-wEGI34KiCd3rzOzazT7DIPGTc58=", "dev": true, "requires": { "color-convert": "^0.5.3", @@ -10445,14 +10400,17 @@ }, "color-convert": { "version": "0.5.3", + "integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=", "dev": true }, "color-name": { "version": "1.1.4", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, "color-string": { "version": "0.3.0", + "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=", "dev": true, "requires": { "color-name": "^1.0.0" @@ -10460,6 +10418,7 @@ }, "colormin": { "version": "1.1.2", + "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=", "dev": true, "requires": { "color": "^0.11.0", @@ -10469,6 +10428,7 @@ "dependencies": { "color": { "version": "0.11.4", + "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=", "dev": true, "requires": { "clone": "^1.0.2", @@ -10478,6 +10438,7 @@ }, "color-convert": { "version": "1.9.3", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, "requires": { "color-name": "1.1.3" @@ -10485,33 +10446,39 @@ }, "color-name": { "version": "1.1.3", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "dev": true } } }, "colors": { "version": "0.3.0", + "integrity": "sha1-wkfWTTTbDKTcjkPz7NbamNCvlOc=", "dev": true }, "combined-stream": { "version": "1.0.8", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "dev": true, "requires": { "delayed-stream": "~1.0.0" } }, "commander": { - "version": "2.13.0" + "version": "2.13.0", + "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==" }, "commondir": { - "version": "1.0.1" + "version": "1.0.1", + "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=" }, "component-emitter": { "version": "1.3.0", - "dev": true + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" }, "compressible": { "version": "2.0.18", + "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", "dev": true, "requires": { "mime-db": ">= 1.43.0 < 2" @@ -10519,6 +10486,7 @@ }, "compression": { "version": "1.7.4", + "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", "dev": true, "requires": { "accepts": "~1.3.5", @@ -10531,10 +10499,12 @@ } }, "concat-map": { - "version": "0.0.1" + "version": "0.0.1", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "concat-stream": { "version": "1.6.2", + "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", "requires": { "buffer-from": "^1.0.0", "inherits": "^2.0.3", @@ -10544,6 +10514,7 @@ "dependencies": { "readable-stream": { "version": "2.3.7", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -10556,6 +10527,7 @@ }, "string_decoder": { "version": "1.1.1", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { "safe-buffer": "~5.1.0" } @@ -10564,18 +10536,20 @@ }, "connect-history-api-fallback": { "version": "1.6.0", + "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==", "dev": true }, "console-browserify": { "version": "1.2.0", - "dev": true + "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==" }, "constants-browserify": { "version": "1.0.0", - "dev": true + "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=" }, "content-disposition": { "version": "0.5.4", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", "dev": true, "requires": { "safe-buffer": "5.2.1" @@ -10583,30 +10557,36 @@ "dependencies": { "safe-buffer": { "version": "5.2.1", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", "dev": true } } }, "content-type": { "version": "1.0.4", + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", "dev": true }, "convert-source-map": { "version": "1.8.0", + "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", "requires": { "safe-buffer": "~5.1.1" } }, "cookie": { "version": "0.4.2", + "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", "dev": true }, "cookie-signature": { "version": "1.0.6", + "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", "dev": true }, "copy-concurrently": { "version": "1.0.5", + "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", "requires": { "aproba": "^1.1.1", "fs-write-stream-atomic": "^1.0.8", @@ -10618,16 +10598,19 @@ }, "copy-descriptor": { "version": "0.1.1", - "dev": true + "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" }, "core-js": { - "version": "2.6.12" + "version": "2.6.12", + "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==" }, "core-util-is": { - "version": "1.0.2" + "version": "1.0.2", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "cover": { "version": "0.2.9", + "integrity": "sha1-JiAp37MXFNSAQ/7ZHt5lhZOVXdQ=", "dev": true, "requires": { "cli-table": "0.0.x", @@ -10638,12 +10621,14 @@ "dependencies": { "which": { "version": "1.0.9", + "integrity": "sha1-RgwdoPgQED0DIam2M6+eV15kSG8=", "dev": true } } }, "create-react-class": { "version": "15.7.0", + "integrity": "sha512-QZv4sFWG9S5RUvkTYWbflxeZX+JG7Cz0Tn33rQBJ+WFQTqTfUTjMjiv9tnfXazjsO5r0KhPs+AqCjyrQX6h2ng==", "requires": { "loose-envify": "^1.3.1", "object-assign": "^4.1.1" @@ -10651,6 +10636,7 @@ }, "cryptiles": { "version": "2.0.5", + "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", "dev": true, "optional": true, "requires": { @@ -10659,7 +10645,7 @@ }, "crypto-browserify": { "version": "3.3.0", - "dev": true, + "integrity": "sha1-ufx1u0oO1h3PHNXa6W6zDJw+UGw=", "requires": { "browserify-aes": "0.4.0", "pbkdf2-compat": "2.0.1", @@ -10669,14 +10655,17 @@ }, "css-color-names": { "version": "0.0.4", + "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=", "dev": true }, "css-list": { "version": "0.1.3", + "integrity": "sha1-p7M7RBn4PUEjIN3pEzoNEASUjXA=", "dev": true }, "css-loader": { "version": "0.15.6", + "integrity": "sha1-Iofe4oSCnr+4H6wLKU2nKbO/oUQ=", "dev": true, "requires": { "css-selector-tokenizer": "^0.5.1", @@ -10691,6 +10680,7 @@ }, "css-selector-tokenizer": { "version": "0.5.4", + "integrity": "sha1-E5uv00o1/QwUKEhwSeBpnm9qLCE=", "dev": true, "requires": { "cssesc": "^0.1.0", @@ -10699,10 +10689,12 @@ }, "cssesc": { "version": "0.1.0", + "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=", "dev": true }, "cssnano": { "version": "2.6.1", + "integrity": "sha1-f7NyEsz/RNPpNuAmxvZ14xR9gCQ=", "dev": true, "requires": { "autoprefixer-core": "^5.2.1", @@ -10739,20 +10731,24 @@ }, "cssom": { "version": "0.3.8", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", "dev": true }, "cssstyle": { "version": "0.2.37", + "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=", "dev": true, "requires": { "cssom": "0.3.x" } }, "cyclist": { - "version": "1.0.1" + "version": "1.0.1", + "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=" }, "dashdash": { "version": "1.14.1", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "dev": true, "requires": { "assert-plus": "^1.0.0" @@ -10760,29 +10756,32 @@ }, "debug": { "version": "2.6.9", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "requires": { "ms": "2.0.0" } }, "decamelize": { "version": "1.2.0", - "dev": true + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, "decode-uri-component": { "version": "0.2.0", - "dev": true + "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" }, "deep-diff": { "version": "0.3.4", + "integrity": "sha1-qsXDmVIjar5fA3ojSQYLoBsArkg=", "dev": true }, "deep-is": { "version": "0.1.4", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "dev": true }, "define-property": { "version": "2.0.2", - "dev": true, + "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", "requires": { "is-descriptor": "^1.0.2", "isobject": "^3.0.1" @@ -10790,38 +10789,45 @@ "dependencies": { "isobject": { "version": "3.0.1", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, "defined": { "version": "1.0.0", + "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=", "dev": true }, "delayed-stream": { "version": "1.0.0", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "dev": true }, "depd": { "version": "1.1.2", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", "dev": true }, "destroy": { "version": "1.0.4", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", "dev": true }, "detect-hover": { "version": "1.0.3", + "integrity": "sha512-HtLoY+tClgYucJNiovNICGWFp9nOGVmHY44s7L62iPqORXM9vujeWFaVcqtA7XRvp/2Y+4RBUfHbDKFGN+xxZQ==", "dev": true }, "detect-indent": { "version": "4.0.0", + "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", "requires": { "repeating": "^2.0.0" } }, "detect-it": { "version": "2.1.1", + "integrity": "sha1-39tgv/CX3p6+c2YgHFNQ1ODWQiU=", "dev": true, "requires": { "detect-hover": "^1.0.1", @@ -10832,22 +10838,27 @@ }, "detect-passive-events": { "version": "1.0.5", + "integrity": "sha512-foW7Q35wwOCxVzW0xLf5XeB5Fhe7oyRgvkBYdiP9IWgLMzjqUqTvsJv9ymuEWGjY6AoDXD3OC294+Z9iuOw0QA==", "dev": true }, "detect-pointer": { "version": "1.0.3", + "integrity": "sha512-d0o/Puo3fiGSCXy6H039h9Kwz+mmYCGKZ/qtPFnpN3WfsumjC1C9b5KKvRu+aYnfdI8peqN/iAe7dPd85qIt2g==", "dev": true }, "detect-touch-events": { "version": "1.0.1", + "integrity": "sha1-EVWEqrdAnAuS3xA6sPv1KFzVDXE=", "dev": true }, "diff": { "version": "2.2.3", + "integrity": "sha1-YOr9DSjukG5Oj/ClLBIpUhAzv5k=", "dev": true }, "docx": { "version": "4.7.1", + "integrity": "sha512-MTToHT11MV8Srnzy+JJ2gyotEhub3t5ey+96J12OCMujvLGjEoLigtTnIvMonKlA+TvDtNKbGsiU2h8WOD6wdw==", "dev": true, "requires": { "@types/image-size": "0.0.29", @@ -10860,12 +10871,14 @@ }, "dom-helpers": { "version": "3.4.0", + "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==", "requires": { "@babel/runtime": "^7.1.2" } }, "dom-serializer": { "version": "0.2.2", + "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", "dev": true, "requires": { "domelementtype": "^2.0.1", @@ -10874,24 +10887,28 @@ "dependencies": { "domelementtype": { "version": "2.2.0", + "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==", "dev": true }, "entities": { "version": "2.2.0", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", "dev": true } } }, "domain-browser": { "version": "1.2.0", - "dev": true + "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==" }, "domelementtype": { "version": "1.3.1", + "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", "dev": true }, "domhandler": { "version": "2.4.2", + "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", "dev": true, "requires": { "domelementtype": "1" @@ -10899,6 +10916,7 @@ }, "domutils": { "version": "1.7.0", + "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", "dev": true, "requires": { "dom-serializer": "0", @@ -10907,6 +10925,7 @@ }, "duplexify": { "version": "3.7.1", + "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", "requires": { "end-of-stream": "^1.0.0", "inherits": "^2.0.1", @@ -10916,6 +10935,7 @@ "dependencies": { "readable-stream": { "version": "2.3.7", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -10928,6 +10948,7 @@ }, "string_decoder": { "version": "1.1.1", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { "safe-buffer": "~5.1.0" } @@ -10936,6 +10957,7 @@ }, "ecc-jsbn": { "version": "0.1.2", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", "dev": true, "requires": { "jsbn": "~0.1.0", @@ -10944,34 +10966,39 @@ }, "ee-first": { "version": "1.1.1", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", "dev": true }, "element-class": { - "version": "0.2.2" + "version": "0.2.2", + "integrity": "sha1-nTu9B2f5AT744cjr5yLBQCpgBQ4=" }, "emojis-list": { "version": "2.1.0", - "dev": true + "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=" }, "encodeurl": { "version": "1.0.2", + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", "dev": true }, "encoding": { "version": "0.1.13", + "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", "requires": { "iconv-lite": "^0.6.2" } }, "end-of-stream": { "version": "1.4.4", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", "requires": { "once": "^1.4.0" } }, "enhanced-resolve": { "version": "0.9.1", - "dev": true, + "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=", "requires": { "graceful-fs": "^4.1.2", "memory-fs": "^0.2.0", @@ -10980,39 +11007,46 @@ "dependencies": { "memory-fs": { "version": "0.2.0", - "dev": true + "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=" } } }, "entities": { "version": "1.1.2", + "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==", "dev": true }, "errno": { "version": "0.1.8", + "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==", "requires": { "prr": "~1.0.1" } }, "error-ex": { "version": "1.3.2", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "requires": { "is-arrayish": "^0.2.1" } }, "es6-promise": { "version": "3.3.1", + "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=", "dev": true }, "escape-html": { "version": "1.0.3", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=", "dev": true }, "escape-string-regexp": { - "version": "1.0.5" + "version": "1.0.5", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "escodegen": { "version": "1.7.1", + "integrity": "sha1-MOz89mypjcZ80v0WKr626vqM5vw=", "dev": true, "requires": { "esprima": "^1.2.2", @@ -11024,10 +11058,12 @@ "dependencies": { "esprima": { "version": "1.2.5", + "integrity": "sha1-CZNQL+r2aBODJXVvMPmlH+7sEek=", "dev": true }, "source-map": { "version": "0.2.0", + "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=", "dev": true, "optional": true, "requires": { @@ -11038,33 +11074,40 @@ }, "esprima": { "version": "2.5.0", + "integrity": "sha1-84ekb9NEwbGjm6+MIL+0O20AWMw=", "dev": true }, "esprima-fb": { "version": "4001.1001.0-dev-harmony-fb", + "integrity": "sha1-9Qn2FuZtEcLFOWomHGGe3MtxKAo=", "dev": true }, "estraverse": { "version": "1.9.3", + "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=", "dev": true }, "esutils": { - "version": "2.0.3" + "version": "2.0.3", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" }, "etag": { "version": "1.8.1", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", "dev": true }, "eventemitter3": { "version": "4.0.7", + "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", "dev": true }, "events": { "version": "1.1.1", - "dev": true + "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=" }, "eventsource": { "version": "1.1.0", + "integrity": "sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==", "dev": true, "requires": { "original": "^1.0.0" @@ -11072,28 +11115,33 @@ }, "exec-sh": { "version": "0.2.2", + "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==", "dev": true, "requires": { "merge": "^1.2.0" } }, "exenv": { - "version": "1.2.2" + "version": "1.2.2", + "integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50=" }, "expand-brackets": { "version": "0.1.5", + "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "requires": { "is-posix-bracket": "^0.1.0" } }, "expand-range": { "version": "1.8.2", + "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "requires": { "fill-range": "^2.1.0" } }, "exports-loader": { "version": "0.6.4", + "integrity": "sha1-1w/GEhl1s1/BKDDPUnVL4nQPyIY=", "dev": true, "requires": { "loader-utils": "^1.0.2", @@ -11102,14 +11150,17 @@ "dependencies": { "big.js": { "version": "5.2.2", + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", "dev": true }, "emojis-list": { "version": "3.0.0", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", "dev": true }, "json5": { "version": "1.0.1", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", "dev": true, "requires": { "minimist": "^1.2.0" @@ -11117,6 +11168,7 @@ }, "loader-utils": { "version": "1.4.0", + "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", "dev": true, "requires": { "big.js": "^5.2.2", @@ -11128,6 +11180,7 @@ }, "express": { "version": "4.17.3", + "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==", "dev": true, "requires": { "accepts": "~1.3.8", @@ -11164,21 +11217,24 @@ "dependencies": { "qs": { "version": "6.9.7", + "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==", "dev": true }, "safe-buffer": { "version": "5.2.1", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", "dev": true } } }, "extend": { "version": "3.0.2", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", "dev": true }, "extend-shallow": { "version": "3.0.2", - "dev": true, + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "requires": { "assign-symbols": "^1.0.0", "is-extendable": "^1.0.1" @@ -11186,7 +11242,7 @@ "dependencies": { "is-extendable": { "version": "1.0.1", - "dev": true, + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "requires": { "is-plain-object": "^2.0.4" } @@ -11195,30 +11251,37 @@ }, "extglob": { "version": "0.3.2", + "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "requires": { "is-extglob": "^1.0.0" } }, "extsprintf": { "version": "1.3.0", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", "dev": true }, "fast-deep-equal": { - "version": "3.1.3" + "version": "3.1.3", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "fast-json-stable-stringify": { - "version": "2.1.0" + "version": "2.1.0", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" }, "fast-levenshtein": { "version": "1.0.7", + "integrity": "sha1-AXjc3uAjuSkFGTrwlZ6KdjnP3Lk=", "dev": true }, "fastparse": { "version": "1.1.2", + "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==", "dev": true }, "faye-websocket": { "version": "0.11.4", + "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==", "dev": true, "requires": { "websocket-driver": ">=0.5.1" @@ -11226,6 +11289,7 @@ }, "fb-watchman": { "version": "2.0.1", + "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==", "dev": true, "requires": { "bser": "2.1.1" @@ -11233,6 +11297,7 @@ }, "fbjs": { "version": "0.8.18", + "integrity": "sha512-EQaWFK+fEPSoibjNy8IxUtaFOMXcWsY0JaVrQoZR9zC8N2Ygf9iDITPWjUTVIax95b6I742JFLqASHfsag/vKA==", "requires": { "core-js": "^1.0.0", "isomorphic-fetch": "^2.1.1", @@ -11244,7 +11309,8 @@ }, "dependencies": { "core-js": { - "version": "1.2.7" + "version": "1.2.7", + "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" } } }, @@ -11254,10 +11320,12 @@ "from": "file-saver@git+ssh://github.com/devgateway/FileSaver.js" }, "filename-regex": { - "version": "2.0.1" + "version": "2.0.1", + "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=" }, "fileset": { "version": "0.2.1", + "integrity": "sha1-WI74lzxmI7KnbfRlEFaWuWqsgGc=", "dev": true, "requires": { "glob": "5.x", @@ -11266,6 +11334,7 @@ "dependencies": { "minimatch": { "version": "2.0.10", + "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", "dev": true, "requires": { "brace-expansion": "^1.0.0" @@ -11275,6 +11344,7 @@ }, "fill-range": { "version": "2.2.4", + "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==", "requires": { "is-number": "^2.1.0", "isobject": "^2.0.0", @@ -11285,6 +11355,7 @@ }, "finalhandler": { "version": "1.1.2", + "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", "dev": true, "requires": { "debug": "2.6.9", @@ -11298,6 +11369,7 @@ }, "find-cache-dir": { "version": "0.1.1", + "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=", "dev": true, "requires": { "commondir": "^1.0.1", @@ -11307,6 +11379,7 @@ }, "find-up": { "version": "1.1.2", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "requires": { "path-exists": "^2.0.0", "pinkie-promise": "^2.0.0" @@ -11314,10 +11387,12 @@ }, "flatten": { "version": "0.0.1", + "integrity": "sha1-VURAdm2goNYDmZ9DNFP2wvxqdcE=", "dev": true }, "flush-write-stream": { "version": "1.1.1", + "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", "requires": { "inherits": "^2.0.3", "readable-stream": "^2.3.6" @@ -11325,6 +11400,7 @@ "dependencies": { "readable-stream": { "version": "2.3.7", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -11337,6 +11413,7 @@ }, "string_decoder": { "version": "1.1.1", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { "safe-buffer": "~5.1.0" } @@ -11345,23 +11422,28 @@ }, "follow-redirects": { "version": "1.14.9", + "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==", "dev": true }, "for-in": { - "version": "1.0.2" + "version": "1.0.2", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" }, "for-own": { "version": "0.1.5", + "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", "requires": { "for-in": "^1.0.1" } }, "forever-agent": { "version": "0.6.1", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", "dev": true }, "form-data": { "version": "2.3.3", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", "dev": true, "requires": { "asynckit": "^0.4.0", @@ -11371,21 +11453,24 @@ }, "forwarded": { "version": "0.2.0", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", "dev": true }, "fragment-cache": { "version": "0.2.1", - "dev": true, + "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "requires": { "map-cache": "^0.2.2" } }, "fresh": { "version": "0.5.2", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", "dev": true }, "from2": { "version": "2.3.0", + "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", "requires": { "inherits": "^2.0.1", "readable-stream": "^2.0.0" @@ -11393,6 +11478,7 @@ "dependencies": { "readable-stream": { "version": "2.3.7", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -11405,6 +11491,7 @@ }, "string_decoder": { "version": "1.1.1", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { "safe-buffer": "~5.1.0" } @@ -11413,10 +11500,12 @@ }, "fs": { "version": "0.0.1-security", + "integrity": "sha1-invTcYa23d84E/I4WLV+yq9eQdQ=", "dev": true }, "fs-extra": { "version": "0.14.0", + "integrity": "sha1-RmCWxroticIAA4DaskULeFn/Z0M=", "dev": true, "requires": { "jsonfile": "^2.0.0", @@ -11426,6 +11515,7 @@ }, "fs-write-stream-atomic": { "version": "1.0.10", + "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", "requires": { "graceful-fs": "^4.1.2", "iferr": "^0.1.5", @@ -11435,6 +11525,7 @@ "dependencies": { "readable-stream": { "version": "2.3.7", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -11447,6 +11538,7 @@ }, "string_decoder": { "version": "1.1.1", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { "safe-buffer": "~5.1.0" } @@ -11454,21 +11546,25 @@ } }, "fs.realpath": { - "version": "1.0.0" + "version": "1.0.0", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "function-bind": { - "version": "1.1.1" + "version": "1.1.1", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "gather-stream": { "version": "1.0.0", + "integrity": "sha1-szmUr0V6gRVwDUEPMXczy+egkEs=", "dev": true }, "get-value": { "version": "2.0.6", - "dev": true + "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=" }, "getpass": { "version": "0.1.7", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "dev": true, "requires": { "assert-plus": "^1.0.0" @@ -11476,6 +11572,7 @@ }, "glob": { "version": "5.0.15", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", "dev": true, "requires": { "inflight": "^1.0.4", @@ -11487,6 +11584,7 @@ }, "glob-base": { "version": "0.3.0", + "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", "requires": { "glob-parent": "^2.0.0", "is-glob": "^2.0.0" @@ -11494,18 +11592,22 @@ }, "glob-parent": { "version": "2.0.0", + "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "requires": { "is-glob": "^2.0.0" } }, "globals": { - "version": "9.18.0" + "version": "9.18.0", + "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==" }, "graceful-fs": { - "version": "4.2.9" + "version": "4.2.9", + "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==" }, "handlebars": { "version": "4.7.7", + "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==", "dev": true, "requires": { "minimist": "^1.2.5", @@ -11517,16 +11619,19 @@ "dependencies": { "source-map": { "version": "0.6.1", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true } } }, "har-schema": { "version": "2.0.0", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", "dev": true }, "har-validator": { "version": "5.1.5", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", "dev": true, "requires": { "ajv": "^6.12.3", @@ -11535,23 +11640,25 @@ }, "has": { "version": "1.0.3", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", "requires": { "function-bind": "^1.1.1" } }, "has-ansi": { "version": "2.0.0", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "requires": { "ansi-regex": "^2.0.0" } }, "has-flag": { "version": "1.0.0", - "dev": true + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" }, "has-value": { "version": "1.0.0", - "dev": true, + "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", "requires": { "get-value": "^2.0.6", "has-values": "^1.0.0", @@ -11560,13 +11667,13 @@ "dependencies": { "isobject": { "version": "3.0.1", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, "has-values": { "version": "1.0.0", - "dev": true, + "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", "requires": { "is-number": "^3.0.0", "kind-of": "^4.0.0" @@ -11574,14 +11681,14 @@ "dependencies": { "is-number": { "version": "3.0.0", - "dev": true, + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "requires": { "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { "version": "3.2.2", - "dev": true, + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { "is-buffer": "^1.1.5" } @@ -11590,7 +11697,7 @@ }, "kind-of": { "version": "4.0.0", - "dev": true, + "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "requires": { "is-buffer": "^1.1.5" } @@ -11599,6 +11706,7 @@ }, "hawk": { "version": "3.1.3", + "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", "dev": true, "optional": true, "requires": { @@ -11610,10 +11718,12 @@ }, "he": { "version": "1.2.0", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", "dev": true }, "history": { "version": "3.3.0", + "integrity": "sha1-/O3M6PEpdTcVRdc1RhAzV5ptrpw=", "dev": true, "requires": { "invariant": "^2.2.1", @@ -11624,11 +11734,13 @@ }, "hoek": { "version": "2.16.3", + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", "dev": true, "optional": true }, "hoist-non-react-statics": { "version": "3.3.2", + "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", "dev": true, "requires": { "react-is": "^16.7.0" @@ -11636,16 +11748,19 @@ }, "home-or-tmp": { "version": "2.0.0", + "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", "requires": { "os-homedir": "^1.0.0", "os-tmpdir": "^1.0.1" } }, "hosted-git-info": { - "version": "2.8.9" + "version": "2.8.9", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==" }, "htmlparser2": { "version": "3.10.1", + "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==", "dev": true, "requires": { "domelementtype": "^1.3.1", @@ -11658,6 +11773,7 @@ }, "http-errors": { "version": "1.8.1", + "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", "dev": true, "requires": { "depd": "~1.1.2", @@ -11669,10 +11785,12 @@ }, "http-parser-js": { "version": "0.5.5", + "integrity": "sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==", "dev": true }, "http-proxy": { "version": "1.18.1", + "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", "dev": true, "requires": { "eventemitter3": "^4.0.0", @@ -11682,6 +11800,7 @@ }, "http-proxy-middleware": { "version": "0.17.4", + "integrity": "sha1-ZC6ISIUdZvCdTxJJEoRtuutBuDM=", "dev": true, "requires": { "http-proxy": "^1.16.2", @@ -11692,10 +11811,12 @@ "dependencies": { "is-extglob": { "version": "2.1.1", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", "dev": true }, "is-glob": { "version": "3.1.0", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "dev": true, "requires": { "is-extglob": "^2.1.0" @@ -11705,6 +11826,7 @@ }, "http-signature": { "version": "1.2.0", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "dev": true, "requires": { "assert-plus": "^1.0.0", @@ -11714,31 +11836,36 @@ }, "https-browserify": { "version": "0.0.1", - "dev": true + "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=" }, "iconv-lite": { "version": "0.6.3", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "requires": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "ieee754": { "version": "1.2.1", - "dev": true + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" }, "iferr": { - "version": "0.1.5" + "version": "0.1.5", + "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=" }, "image-size": { "version": "0.6.3", + "integrity": "sha512-47xSUiQioGaB96nqtp5/q55m0aBQSQdyIloMOc/x+QVTDZLNmXE892IIDrJ0hM1A5vcNUDD5tDffkSP5lCaIIA==", "dev": true }, "immediate": { "version": "3.0.6", + "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=", "dev": true }, "imports-loader": { "version": "0.6.5", + "integrity": "sha1-rnRlMDHVnjezwvslRKxhrq41MKY=", "dev": true, "requires": { "loader-utils": "0.2.x", @@ -11747,6 +11874,7 @@ "dependencies": { "source-map": { "version": "0.1.43", + "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", "dev": true, "requires": { "amdefine": ">=0.0.4" @@ -11755,92 +11883,102 @@ } }, "imurmurhash": { - "version": "0.1.4" + "version": "0.1.4", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" }, "indexes-of": { "version": "1.0.1", + "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=", "dev": true }, "indexof": { "version": "0.0.1", - "dev": true + "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=" }, "inflight": { "version": "1.0.6", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "requires": { "once": "^1.3.0", "wrappy": "1" } }, "inherits": { - "version": "2.0.4" + "version": "2.0.4", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "interpret": { "version": "0.6.6", - "dev": true + "integrity": "sha1-/s16GOfOXKar+5U+H4YhOknxYls=" }, "invariant": { "version": "2.2.4", + "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", "requires": { "loose-envify": "^1.0.0" } }, "ipaddr.js": { "version": "1.9.1", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", "dev": true }, "is-absolute-url": { "version": "2.1.0", + "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=", "dev": true }, "is-accessor-descriptor": { "version": "1.0.0", - "dev": true, + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { "kind-of": "^6.0.0" }, "dependencies": { "kind-of": { "version": "6.0.3", - "dev": true + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" } } }, "is-arrayish": { - "version": "0.2.1" + "version": "0.2.1", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" }, "is-binary-path": { "version": "1.0.1", - "dev": true, + "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "requires": { "binary-extensions": "^1.0.0" } }, "is-buffer": { - "version": "1.1.6" + "version": "1.1.6", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, "is-core-module": { "version": "2.8.1", + "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==", "requires": { "has": "^1.0.3" } }, "is-data-descriptor": { "version": "1.0.0", - "dev": true, + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { "kind-of": "^6.0.0" }, "dependencies": { "kind-of": { "version": "6.0.3", - "dev": true + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" } } }, "is-descriptor": { "version": "1.0.2", - "dev": true, + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", @@ -11849,108 +11987,128 @@ "dependencies": { "kind-of": { "version": "6.0.3", - "dev": true + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" } } }, "is-dotfile": { - "version": "1.0.3" + "version": "1.0.3", + "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=" }, "is-equal-shallow": { "version": "0.1.3", + "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", "requires": { "is-primitive": "^2.0.0" } }, "is-extendable": { - "version": "0.1.1" + "version": "0.1.1", + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" }, "is-extglob": { - "version": "1.0.0" + "version": "1.0.0", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" }, "is-finite": { - "version": "1.1.0" + "version": "1.1.0", + "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==" }, "is-glob": { "version": "2.0.1", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "requires": { "is-extglob": "^1.0.0" } }, "is-number": { "version": "2.1.0", + "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", "requires": { "kind-of": "^3.0.2" } }, "is-plain-obj": { "version": "1.1.0", + "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=", "dev": true }, "is-plain-object": { "version": "2.0.4", - "dev": true, + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "requires": { "isobject": "^3.0.1" }, "dependencies": { "isobject": { "version": "3.0.1", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, "is-posix-bracket": { - "version": "0.1.1" + "version": "0.1.1", + "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=" }, "is-primitive": { - "version": "2.0.0" + "version": "2.0.0", + "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=" }, "is-stream": { - "version": "1.1.0" + "version": "1.1.0", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" }, "is-typedarray": { "version": "1.0.0", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", "dev": true }, "is-utf8": { - "version": "0.2.1" + "version": "0.2.1", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" }, "is-windows": { "version": "1.0.2", - "dev": true + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" }, "isarray": { - "version": "1.0.0" + "version": "1.0.0", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "isexe": { "version": "2.0.0", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, "isobject": { "version": "2.1.0", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", "requires": { "isarray": "1.0.0" } }, "isomorphic-fetch": { "version": "2.2.1", + "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", "requires": { "node-fetch": "^1.0.1", "whatwg-fetch": ">=0.10.0" }, "dependencies": { "whatwg-fetch": { - "version": "3.6.2" + "version": "3.6.2", + "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==" } } }, "isstream": { "version": "0.1.2", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", "dev": true }, "istanbul": { "version": "0.3.22", + "integrity": "sha1-PhZNhQIf4ZyYXR8OfvDD4i0BLrY=", "dev": true, "requires": { "abbrev": "1.0.x", @@ -11971,10 +12129,12 @@ "dependencies": { "resolve": { "version": "1.1.7", + "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", "dev": true }, "supports-color": { "version": "3.2.3", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { "has-flag": "^1.0.0" @@ -11983,10 +12143,12 @@ } }, "istanbul-lib-coverage": { - "version": "1.2.1" + "version": "1.2.1", + "integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==" }, "istanbul-lib-instrument": { "version": "1.10.2", + "integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==", "requires": { "babel-generator": "^6.18.0", "babel-template": "^6.16.0", @@ -11999,6 +12161,7 @@ }, "jasmine-only": { "version": "0.1.2", + "integrity": "sha1-kb27r5B8wCjRmVao46c8kUR4O+c=", "dev": true, "requires": { "coffee-script": "~ 1.6.3" @@ -12006,20 +12169,24 @@ "dependencies": { "coffee-script": { "version": "1.6.3", + "integrity": "sha1-Y1XTLPGwTN/2tITl5xF4Ky8MOb4=", "dev": true } } }, "jasmine-pit": { "version": "2.0.2", + "integrity": "sha1-dVccsb+swK51DWlIrUWNkbqA5ZY=", "dev": true }, "javascript-natural-sort": { "version": "0.7.1", + "integrity": "sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k=", "dev": true }, "jest-cli": { "version": "0.5.10", + "integrity": "sha1-s+S4E+C//8OPC34V6qi8j4RcaIc=", "dev": true, "requires": { "coffee-script": "^1.10.0", @@ -12045,13 +12212,16 @@ }, "js-base64": { "version": "2.1.9", + "integrity": "sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4=", "dev": true }, "js-tokens": { - "version": "3.0.2" + "version": "3.0.2", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" }, "js-yaml": { "version": "3.14.1", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", "dev": true, "requires": { "argparse": "^1.0.7", @@ -12060,16 +12230,19 @@ "dependencies": { "esprima": { "version": "4.0.1", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true } } }, "jsbn": { "version": "0.1.1", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", "dev": true }, "jsdom": { "version": "6.5.1", + "integrity": "sha1-tgZNanZRCBr0HVdu3Fa8UeABIsA=", "dev": true, "requires": { "acorn": "^2.4.0", @@ -12091,21 +12264,26 @@ } }, "jsesc": { - "version": "1.3.0" + "version": "1.3.0", + "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=" }, "json-loader": { "version": "0.5.7", + "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==", "dev": true }, "json-schema": { "version": "0.4.0", + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", "dev": true }, "json-schema-traverse": { - "version": "0.4.1" + "version": "0.4.1", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" }, "json-stable-stringify": { "version": "1.0.1", + "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", "dev": true, "requires": { "jsonify": "~0.0.0" @@ -12113,17 +12291,21 @@ }, "json-stringify-safe": { "version": "5.0.1", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", "dev": true }, "json3": { "version": "3.3.3", + "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==", "dev": true }, "json5": { - "version": "0.5.1" + "version": "0.5.1", + "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=" }, "jsonfile": { "version": "2.4.0", + "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", "dev": true, "requires": { "graceful-fs": "^4.1.6" @@ -12131,10 +12313,12 @@ }, "jsonify": { "version": "0.0.0", + "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", "dev": true }, "jsprim": { "version": "1.4.2", + "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", "dev": true, "requires": { "assert-plus": "1.0.0", @@ -12145,6 +12329,7 @@ }, "jszip": { "version": "3.7.1", + "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==", "dev": true, "requires": { "lie": "~3.3.0", @@ -12155,6 +12340,7 @@ "dependencies": { "readable-stream": { "version": "2.3.7", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { "core-util-is": "~1.0.0", @@ -12168,6 +12354,7 @@ }, "string_decoder": { "version": "1.1.1", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { "safe-buffer": "~5.1.0" @@ -12177,20 +12364,23 @@ }, "keycode": { "version": "2.2.1", + "integrity": "sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==", "dev": true }, "kind-of": { "version": "3.2.2", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { "is-buffer": "^1.1.5" } }, "lazy-cache": { "version": "1.0.4", - "dev": true + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=" }, "less": { "version": "2.7.3", + "integrity": "sha512-KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==", "dev": true, "requires": { "errno": "^0.1.1", @@ -12205,6 +12395,7 @@ "dependencies": { "ajv": { "version": "4.11.8", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", "dev": true, "optional": true, "requires": { @@ -12214,16 +12405,19 @@ }, "assert-plus": { "version": "0.2.0", + "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", "dev": true, "optional": true }, "aws-sign2": { "version": "0.6.0", + "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", "dev": true, "optional": true }, "form-data": { "version": "2.1.4", + "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", "dev": true, "optional": true, "requires": { @@ -12234,11 +12428,13 @@ }, "har-schema": { "version": "1.0.5", + "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=", "dev": true, "optional": true }, "har-validator": { "version": "4.2.1", + "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", "dev": true, "optional": true, "requires": { @@ -12248,6 +12444,7 @@ }, "http-signature": { "version": "1.1.1", + "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", "dev": true, "optional": true, "requires": { @@ -12258,31 +12455,37 @@ }, "image-size": { "version": "0.5.5", + "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=", "dev": true, "optional": true }, "oauth-sign": { "version": "0.8.2", + "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=", "dev": true, "optional": true }, "performance-now": { "version": "0.2.0", + "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=", "dev": true, "optional": true }, "punycode": { "version": "1.4.1", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", "dev": true, "optional": true }, "qs": { "version": "6.4.1", + "integrity": "sha512-LQy1Q1fcva/UsnP/6Iaa4lVeM49WiOitu2T4hZCyA/elLKu37L99qcBJk4VCCk+rdLvnMzfKyiN3SZTqdAZGSQ==", "dev": true, "optional": true }, "request": { "version": "2.81.0", + "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", "dev": true, "optional": true, "requires": { @@ -12312,6 +12515,7 @@ }, "tough-cookie": { "version": "2.3.4", + "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", "dev": true, "optional": true, "requires": { @@ -12322,6 +12526,7 @@ }, "less-loader": { "version": "2.2.3", + "integrity": "sha1-ttj4E5yEk98J2ZKpOgBzSwj4RSg=", "dev": true, "requires": { "loader-utils": "^0.2.5" @@ -12329,6 +12534,7 @@ }, "levn": { "version": "0.2.5", + "integrity": "sha1-uo0znQykphDjo/FFucr0iAcVUFQ=", "dev": true, "requires": { "prelude-ls": "~1.1.0", @@ -12337,6 +12543,7 @@ }, "lie": { "version": "3.3.0", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", "dev": true, "requires": { "immediate": "~3.0.5" @@ -12344,6 +12551,7 @@ }, "load-json-file": { "version": "1.1.0", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "requires": { "graceful-fs": "^4.1.2", "parse-json": "^2.2.0", @@ -12354,7 +12562,7 @@ }, "loader-utils": { "version": "0.2.17", - "dev": true, + "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", "requires": { "big.js": "^3.1.3", "emojis-list": "^2.0.0", @@ -12364,56 +12572,69 @@ }, "locate-path": { "version": "2.0.0", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "requires": { "p-locate": "^2.0.0", "path-exists": "^3.0.0" }, "dependencies": { "path-exists": { - "version": "3.0.0" + "version": "3.0.0", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" } } }, "lodash": { - "version": "4.17.21" + "version": "4.17.21", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "lodash-es": { "version": "4.17.21", + "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==", "dev": true }, "lodash._basecopy": { "version": "3.0.1", + "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", "dev": true }, "lodash._basetostring": { "version": "3.0.1", + "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=", "dev": true }, "lodash._basevalues": { "version": "3.0.0", + "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=", "dev": true }, "lodash._getnative": { "version": "3.9.1", + "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", "dev": true }, "lodash._isiterateecall": { "version": "3.0.9", + "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", "dev": true }, "lodash._reinterpolate": { "version": "3.0.0", + "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=", "dev": true }, "lodash._root": { "version": "3.0.1", + "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=", "dev": true }, "lodash.assign": { - "version": "4.2.0" + "version": "4.2.0", + "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=" }, "lodash.escape": { "version": "3.2.0", + "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", "dev": true, "requires": { "lodash._root": "^3.0.0" @@ -12421,14 +12642,17 @@ }, "lodash.isarguments": { "version": "3.1.0", + "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", "dev": true }, "lodash.isarray": { "version": "3.0.4", + "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", "dev": true }, "lodash.keys": { "version": "3.1.2", + "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", "dev": true, "requires": { "lodash._getnative": "^3.0.0", @@ -12438,10 +12662,12 @@ }, "lodash.restparam": { "version": "3.6.1", + "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=", "dev": true }, "lodash.template": { "version": "3.6.2", + "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", "dev": true, "requires": { "lodash._basecopy": "^3.0.0", @@ -12457,6 +12683,7 @@ }, "lodash.templatesettings": { "version": "3.1.1", + "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", "dev": true, "requires": { "lodash._reinterpolate": "^3.0.0", @@ -12464,20 +12691,23 @@ } }, "loglevel": { - "version": "1.8.0" + "version": "1.8.0", + "integrity": "sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA==" }, "longest": { "version": "1.0.1", - "dev": true + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=" }, "loose-envify": { "version": "1.4.0", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", "requires": { "js-tokens": "^3.0.0 || ^4.0.0" } }, "lru-cache": { "version": "4.1.5", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", "requires": { "pseudomap": "^1.0.2", "yallist": "^2.1.2" @@ -12485,17 +12715,20 @@ }, "make-dir": { "version": "1.3.0", + "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", "requires": { "pify": "^3.0.0" }, "dependencies": { "pify": { - "version": "3.0.0" + "version": "3.0.0", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" } } }, "makeerror": { "version": "1.0.12", + "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", "dev": true, "requires": { "tmpl": "1.0.5" @@ -12503,29 +12736,32 @@ }, "map-cache": { "version": "0.2.2", - "dev": true + "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" }, "map-visit": { "version": "1.0.0", - "dev": true, + "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "requires": { "object-visit": "^1.0.0" } }, "math-expression-evaluator": { "version": "1.3.14", + "integrity": "sha512-M6AMrvq9bO8uL42KvQHPA2/SbAobA0R7gviUmPrcTcGfdwpaLitz4q2Euzx2lP9Oy88vxK3HOrsISgSwKsYS4A==", "dev": true }, "math-random": { - "version": "1.0.4" + "version": "1.0.4", + "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==" }, "media-typer": { "version": "0.3.0", + "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", "dev": true }, "memory-fs": { "version": "0.3.0", - "dev": true, + "integrity": "sha1-e8xrYp46Q+hx1+Kaymrop/FcuyA=", "requires": { "errno": "^0.1.3", "readable-stream": "^2.0.1" @@ -12533,7 +12769,7 @@ "dependencies": { "readable-stream": { "version": "2.3.7", - "dev": true, + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -12546,7 +12782,7 @@ }, "string_decoder": { "version": "1.1.1", - "dev": true, + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { "safe-buffer": "~5.1.0" } @@ -12555,18 +12791,22 @@ }, "merge": { "version": "1.2.1", + "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==", "dev": true }, "merge-descriptors": { "version": "1.0.1", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", "dev": true }, "methods": { "version": "1.1.2", + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", "dev": true }, "micromatch": { "version": "2.3.11", + "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", "requires": { "arr-diff": "^2.0.0", "array-unique": "^0.2.1", @@ -12585,14 +12825,17 @@ }, "mime": { "version": "1.6.0", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", "dev": true }, "mime-db": { "version": "1.51.0", + "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==", "dev": true }, "mime-types": { "version": "2.1.34", + "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==", "dev": true, "requires": { "mime-db": "1.51.0" @@ -12600,15 +12843,18 @@ }, "minimatch": { "version": "3.1.2", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { - "version": "1.2.5" + "version": "1.2.5", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, "mississippi": { "version": "2.0.0", + "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==", "requires": { "concat-stream": "^1.5.0", "duplexify": "^3.4.2", @@ -12624,7 +12870,7 @@ }, "mixin-deep": { "version": "1.3.2", - "dev": true, + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "requires": { "for-in": "^1.0.2", "is-extendable": "^1.0.1" @@ -12632,7 +12878,7 @@ "dependencies": { "is-extendable": { "version": "1.0.1", - "dev": true, + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "requires": { "is-plain-object": "^2.0.4" } @@ -12641,16 +12887,19 @@ }, "mkdirp": { "version": "0.5.5", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "requires": { "minimist": "^1.2.5" } }, "moment": { "version": "2.29.1", + "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==", "dev": true }, "move-concurrently": { "version": "1.0.1", + "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", "requires": { "aproba": "^1.1.1", "copy-concurrently": "^1.0.0", @@ -12661,11 +12910,12 @@ } }, "ms": { - "version": "2.0.0" + "version": "2.0.0", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "nanomatch": { "version": "1.2.13", - "dev": true, + "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", "requires": { "arr-diff": "^4.0.0", "array-unique": "^0.3.2", @@ -12682,36 +12932,41 @@ "dependencies": { "arr-diff": { "version": "4.0.0", - "dev": true + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" }, "array-unique": { "version": "0.3.2", - "dev": true + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" }, "kind-of": { "version": "6.0.3", - "dev": true + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" } } }, "ncp": { "version": "1.0.1", + "integrity": "sha1-0VNn5cuHQyuhF9K/gP30Wuz7QkY=", "dev": true }, "negotiator": { "version": "0.6.3", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", "dev": true }, "neo-async": { "version": "2.6.2", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, "node-balanced": { "version": "0.0.14", + "integrity": "sha1-ozxyeFfTBE8eiL5y3X2anQtPwh8=", "dev": true }, "node-fetch": { "version": "1.7.3", + "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", "requires": { "encoding": "^0.1.11", "is-stream": "^1.0.1" @@ -12719,6 +12974,7 @@ }, "node-haste": { "version": "1.2.8", + "integrity": "sha1-0vEOk9dWfCaJrIP8BNtNdsqnDzw=", "dev": true, "requires": { "esprima-fb": "4001.1001.0-dev-harmony-fb" @@ -12726,11 +12982,12 @@ }, "node-int64": { "version": "0.4.0", + "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=", "dev": true }, "node-libs-browser": { "version": "0.7.0", - "dev": true, + "integrity": "sha1-PicsCBnjCJNeJmdECNevDhSRuDs=", "requires": { "assert": "^1.1.1", "browserify-zlib": "^0.1.4", @@ -12759,11 +13016,11 @@ "dependencies": { "punycode": { "version": "1.4.1", - "dev": true + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" }, "readable-stream": { "version": "2.3.7", - "dev": true, + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -12776,7 +13033,7 @@ "dependencies": { "string_decoder": { "version": "1.1.1", - "dev": true, + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { "safe-buffer": "~5.1.0" } @@ -12785,16 +13042,18 @@ }, "string_decoder": { "version": "0.10.31", - "dev": true + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" } } }, "node-worker-pool": { "version": "3.0.2", + "integrity": "sha1-IQZTLJGhgnnj2aQRe1oqbaGgjpw=", "dev": true }, "nopt": { "version": "3.0.6", + "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "dev": true, "requires": { "abbrev": "1" @@ -12802,6 +13061,7 @@ }, "normalize-package-data": { "version": "2.5.0", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "requires": { "hosted-git-info": "^2.1.4", "resolve": "^1.10.0", @@ -12811,16 +13071,19 @@ }, "normalize-path": { "version": "2.1.1", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "requires": { "remove-trailing-separator": "^1.0.1" } }, "normalize-selector": { "version": "0.2.0", + "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=", "dev": true }, "normalize-url": { "version": "1.9.1", + "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=", "dev": true, "requires": { "object-assign": "^4.0.1", @@ -12831,29 +13094,35 @@ }, "num2fraction": { "version": "1.2.2", + "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=", "dev": true }, "numbro": { - "version": "1.11.1" + "version": "1.11.1", + "integrity": "sha512-qL0Etqbunz4RtPx4bNjMONe9HyUpgbrM4Sa3VpWY5oRdp9ry5DufAj6lCvnIcluRBA9QUacrllYc73QK0G6VAw==" }, "numeral": { "version": "2.0.6", + "integrity": "sha1-StCAk21EPCVhrtnyGX7//iX05QY=", "dev": true }, "nwmatcher": { "version": "1.4.4", + "integrity": "sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==", "dev": true }, "oauth-sign": { "version": "0.9.0", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", "dev": true }, "object-assign": { - "version": "4.1.1" + "version": "4.1.1", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, "object-copy": { "version": "0.1.0", - "dev": true, + "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "requires": { "copy-descriptor": "^0.1.0", "define-property": "^0.2.5", @@ -12862,28 +13131,28 @@ "dependencies": { "define-property": { "version": "0.2.5", - "dev": true, + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { "is-descriptor": "^0.1.0" } }, "is-accessor-descriptor": { "version": "0.1.6", - "dev": true, + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "requires": { "kind-of": "^3.0.2" } }, "is-data-descriptor": { "version": "0.1.4", - "dev": true, + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "requires": { "kind-of": "^3.0.2" } }, "is-descriptor": { "version": "0.1.6", - "dev": true, + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "requires": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -12892,7 +13161,7 @@ "dependencies": { "kind-of": { "version": "5.1.0", - "dev": true + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" } } } @@ -12900,19 +13169,20 @@ }, "object-visit": { "version": "1.0.1", - "dev": true, + "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "requires": { "isobject": "^3.0.0" }, "dependencies": { "isobject": { "version": "3.0.1", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, "object.omit": { "version": "2.0.1", + "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", "requires": { "for-own": "^0.1.4", "is-extendable": "^0.1.1" @@ -12920,19 +13190,20 @@ }, "object.pick": { "version": "1.3.0", - "dev": true, + "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "requires": { "isobject": "^3.0.1" }, "dependencies": { "isobject": { "version": "3.0.1", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, "on-finished": { "version": "2.3.0", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", "dev": true, "requires": { "ee-first": "1.1.1" @@ -12940,21 +13211,24 @@ }, "on-headers": { "version": "1.0.2", + "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", "dev": true }, "once": { "version": "1.4.0", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "requires": { "wrappy": "1" } }, "open": { "version": "0.0.5", + "integrity": "sha1-QsPhjslUZra/DcQvOilFw/DK2Pw=", "dev": true }, "optimist": { "version": "0.6.1", - "dev": true, + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "requires": { "minimist": "~0.0.1", "wordwrap": "~0.0.2" @@ -12962,16 +13236,17 @@ "dependencies": { "minimist": { "version": "0.0.10", - "dev": true + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" }, "wordwrap": { "version": "0.0.3", - "dev": true + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" } } }, "optionator": { "version": "0.5.0", + "integrity": "sha1-t1qJlaLUF98ltuTjhi9QqohlE2g=", "dev": true, "requires": { "deep-is": "~0.1.2", @@ -12984,12 +13259,14 @@ "dependencies": { "wordwrap": { "version": "0.0.3", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", "dev": true } } }, "original": { "version": "1.0.2", + "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==", "dev": true, "requires": { "url-parse": "^1.4.3" @@ -12997,35 +13274,42 @@ }, "os-browserify": { "version": "0.2.1", - "dev": true + "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=" }, "os-homedir": { - "version": "1.0.2" + "version": "1.0.2", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" }, "os-tmpdir": { - "version": "1.0.2" + "version": "1.0.2", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" }, "p-limit": { "version": "1.3.0", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", "requires": { "p-try": "^1.0.0" } }, "p-locate": { "version": "2.0.0", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "requires": { "p-limit": "^1.1.0" } }, "p-try": { - "version": "1.0.0" + "version": "1.0.0", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" }, "pako": { "version": "1.0.11", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", "dev": true }, "parallel-transform": { "version": "1.2.0", + "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==", "requires": { "cyclist": "^1.0.1", "inherits": "^2.0.3", @@ -13034,6 +13318,7 @@ "dependencies": { "readable-stream": { "version": "2.3.7", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -13046,6 +13331,7 @@ }, "string_decoder": { "version": "1.1.1", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { "safe-buffer": "~5.1.0" } @@ -13054,6 +13340,7 @@ }, "parse-glob": { "version": "3.0.4", + "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", "requires": { "glob-base": "^0.3.0", "is-dotfile": "^1.0.0", @@ -13063,44 +13350,52 @@ }, "parse-json": { "version": "2.2.0", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "requires": { "error-ex": "^1.2.0" } }, "parse5": { "version": "1.5.1", + "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=", "dev": true }, "parseurl": { "version": "1.3.3", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", "dev": true }, "pascalcase": { "version": "0.1.1", - "dev": true + "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=" }, "path-browserify": { "version": "0.0.0", - "dev": true + "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=" }, "path-exists": { "version": "2.1.0", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "requires": { "pinkie-promise": "^2.0.0" } }, "path-is-absolute": { - "version": "1.0.1" + "version": "1.0.1", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-parse": { - "version": "1.0.7" + "version": "1.0.7", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" }, "path-to-regexp": { "version": "0.1.7", + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", "dev": true }, "path-type": { "version": "1.1.0", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "requires": { "graceful-fs": "^4.1.2", "pify": "^2.0.0", @@ -13109,40 +13404,47 @@ }, "pbkdf2-compat": { "version": "2.0.1", - "dev": true + "integrity": "sha1-tuDI+plJTZTgURV1gCpZpcFC8og=" }, "performance-now": { "version": "2.1.0", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", "dev": true }, "pify": { - "version": "2.3.0" + "version": "2.3.0", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" }, "pinkie": { - "version": "2.0.4" + "version": "2.0.4", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" }, "pinkie-promise": { "version": "2.0.1", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "requires": { "pinkie": "^2.0.0" } }, "pkg-dir": { "version": "1.0.0", + "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=", "dev": true, "requires": { "find-up": "^1.0.0" } }, "platform": { - "version": "1.3.6" + "version": "1.3.6", + "integrity": "sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==" }, "posix-character-classes": { "version": "0.1.1", - "dev": true + "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "postcss": { "version": "4.1.16", + "integrity": "sha1-TESbTIr53zyvbTf44eV10DYXWNw=", "dev": true, "requires": { "es6-promise": "~2.3.0", @@ -13152,10 +13454,12 @@ "dependencies": { "es6-promise": { "version": "2.3.0", + "integrity": "sha1-lu258v2wGZWCKyY92KratnSBgbw=", "dev": true }, "source-map": { "version": "0.4.4", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { "amdefine": ">=0.0.4" @@ -13165,6 +13469,7 @@ }, "postcss-calc": { "version": "4.1.0", + "integrity": "sha1-vuf/ySjHmGmZ7vF7LdiXDIk31HI=", "dev": true, "requires": { "postcss": "^4.1.11", @@ -13174,6 +13479,7 @@ }, "postcss-colormin": { "version": "1.2.7", + "integrity": "sha1-63Pb6DgE6pGYNWsTL2+Z9GAP1lQ=", "dev": true, "requires": { "color": "^0.10.1", @@ -13184,6 +13490,7 @@ }, "postcss-convert-values": { "version": "1.3.1", + "integrity": "sha1-I/GHxhP6d7Y3p4BblIteCJlpDkY=", "dev": true, "requires": { "postcss": "^4.1.16", @@ -13192,6 +13499,7 @@ }, "postcss-discard-comments": { "version": "1.2.1", + "integrity": "sha1-hR3Ka5NUwPtjFssaEEj29eOWCtA=", "dev": true, "requires": { "node-balanced": "0.0.14", @@ -13200,6 +13508,7 @@ }, "postcss-discard-duplicates": { "version": "1.2.1", + "integrity": "sha1-SbsztNNHcQWwDQSDlfc6KQK8miU=", "dev": true, "requires": { "postcss": "^4.1.16" @@ -13207,6 +13516,7 @@ }, "postcss-discard-empty": { "version": "1.1.2", + "integrity": "sha1-KsVayPy4HCMEPmMQaTT9Y0cNXA0=", "dev": true, "requires": { "postcss": "^4.1.13" @@ -13214,6 +13524,7 @@ }, "postcss-discard-unused": { "version": "1.0.3", + "integrity": "sha1-Xsy5v6xGXqa+VjQpepx3gczQmIY=", "dev": true, "requires": { "flatten": "0.0.1", @@ -13223,6 +13534,7 @@ }, "postcss-filter-plugins": { "version": "1.0.1", + "integrity": "sha1-J/gnnV76t6o8FwmIE5hrS50dUOI=", "dev": true, "requires": { "postcss": "^4.1.11", @@ -13231,6 +13543,7 @@ }, "postcss-font-family": { "version": "1.2.1", + "integrity": "sha1-dQJSSzmDox5q9k5LqhA07W7YQYw=", "dev": true, "requires": { "object-assign": "^3.0.0", @@ -13240,12 +13553,14 @@ "dependencies": { "object-assign": { "version": "3.0.0", + "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=", "dev": true } } }, "postcss-merge-idents": { "version": "1.0.2", + "integrity": "sha1-qToNrXj2UugjfZrew0LkHSwd01s=", "dev": true, "requires": { "css-list": "^0.1.0", @@ -13254,6 +13569,7 @@ }, "postcss-merge-longhand": { "version": "1.0.2", + "integrity": "sha1-QxcgZfz4We4RztMUH1ZkFMZzBX4=", "dev": true, "requires": { "postcss": "^4.1.16" @@ -13261,6 +13577,7 @@ }, "postcss-merge-rules": { "version": "1.3.6", + "integrity": "sha1-sUrRf31AEqMYut032r1ZuT8TUy8=", "dev": true, "requires": { "postcss": "^4.1.16" @@ -13268,10 +13585,12 @@ }, "postcss-message-helpers": { "version": "2.0.0", + "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=", "dev": true }, "postcss-minify-font-weight": { "version": "1.0.1", + "integrity": "sha1-aI5CzfI27Osb1WOojPHSTQOgWIg=", "dev": true, "requires": { "postcss": "^4.1.11" @@ -13279,6 +13598,7 @@ }, "postcss-minify-selectors": { "version": "1.5.0", + "integrity": "sha1-5ZxWxtSVXaFXz30iv4Bptur1Jic=", "dev": true, "requires": { "javascript-natural-sort": "^0.7.1", @@ -13290,6 +13610,7 @@ }, "postcss-modules-extract-imports": { "version": "0.0.5", + "integrity": "sha1-zMy0Cz3SmFmZOEodumDGLJYKbaA=", "dev": true, "requires": { "postcss": "^4.1.11" @@ -13297,6 +13618,7 @@ }, "postcss-modules-local-by-default": { "version": "0.0.11", + "integrity": "sha1-qACvQyHDpOCFLRrlKeb8mRrTlec=", "dev": true, "requires": { "css-selector-tokenizer": "^0.5.1", @@ -13305,6 +13627,7 @@ }, "postcss-modules-scope": { "version": "0.0.8", + "integrity": "sha1-gck1+/KJJyOIyLoulqEcohugmgQ=", "dev": true, "requires": { "css-selector-tokenizer": "^0.5.0", @@ -13313,6 +13636,7 @@ }, "postcss-normalize-url": { "version": "2.1.3", + "integrity": "sha1-8StfShFDyV6gJfx/jgBQkFmPNgI=", "dev": true, "requires": { "is-absolute-url": "^2.0.0", @@ -13324,6 +13648,7 @@ }, "postcss-ordered-values": { "version": "1.1.1", + "integrity": "sha1-nu1PrS55Kr/D0EAs93O6+G/ne4E=", "dev": true, "requires": { "postcss": "^4.1.16", @@ -13332,6 +13657,7 @@ }, "postcss-reduce-idents": { "version": "1.0.3", + "integrity": "sha1-p58bJIXiPZs8x6gfXsY6XCvewg0=", "dev": true, "requires": { "postcss": "^4.1.2", @@ -13340,6 +13666,7 @@ }, "postcss-selector-parser": { "version": "1.3.3", + "integrity": "sha1-0u4Z33pk+O8hwacchvfUg1yIwoE=", "dev": true, "requires": { "flatten": "^1.0.2", @@ -13349,12 +13676,14 @@ "dependencies": { "flatten": { "version": "1.0.3", + "integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==", "dev": true } } }, "postcss-single-charset": { "version": "0.3.0", + "integrity": "sha1-2n/Q3szPYy8bdMei7j41vilFZXM=", "dev": true, "requires": { "fs-extra": "^0.14.0", @@ -13363,6 +13692,7 @@ }, "postcss-unique-selectors": { "version": "1.0.1", + "integrity": "sha1-SBfnTHtPmZzgTI5mRRoZaRT12zw=", "dev": true, "requires": { "javascript-natural-sort": "^0.7.1", @@ -13372,10 +13702,12 @@ }, "postcss-value-parser": { "version": "1.4.2", + "integrity": "sha1-GGVjPhNwH4pyHng02tGFyxRKrQw=", "dev": true }, "postcss-zindex": { "version": "1.1.3", + "integrity": "sha1-SVZKtJ092hcGf42sHIM11/LQDOE=", "dev": true, "requires": { "postcss": "^4.1.2" @@ -13383,36 +13715,44 @@ }, "prelude-ls": { "version": "1.1.2", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", "dev": true }, "prepend-http": { "version": "1.0.4", + "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=", "dev": true }, "preserve": { - "version": "0.2.0" + "version": "0.2.0", + "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=" }, "private": { - "version": "0.1.8" + "version": "0.1.8", + "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==" }, "process": { "version": "0.11.10", - "dev": true + "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=" }, "process-nextick-args": { - "version": "2.0.1" + "version": "2.0.1", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, "promise": { "version": "7.3.1", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", "requires": { "asap": "~2.0.3" } }, "promise-inflight": { - "version": "1.0.1" + "version": "1.0.1", + "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=" }, "prop-types": { "version": "15.8.1", + "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", "requires": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", @@ -13421,6 +13761,7 @@ }, "prop-types-extra": { "version": "1.1.1", + "integrity": "sha512-59+AHNnHYCdiC+vMwY52WmvP5dM3QLeoumYuEyceQDi9aEhtwN9zIQ2ZNo25sMyXnbh32h+P1ezDsUpUH3JAew==", "requires": { "react-is": "^16.3.2", "warning": "^4.0.0" @@ -13428,6 +13769,7 @@ "dependencies": { "warning": { "version": "4.0.3", + "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", "requires": { "loose-envify": "^1.0.0" } @@ -13436,6 +13778,7 @@ }, "proxy-addr": { "version": "2.0.7", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", "dev": true, "requires": { "forwarded": "0.2.0", @@ -13443,17 +13786,21 @@ } }, "prr": { - "version": "1.0.1" + "version": "1.0.1", + "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=" }, "pseudomap": { - "version": "1.0.2" + "version": "1.0.2", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" }, "psl": { "version": "1.8.0", + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", "dev": true }, "pump": { "version": "2.0.1", + "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", "requires": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -13461,6 +13808,7 @@ }, "pumpify": { "version": "1.5.1", + "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", "requires": { "duplexify": "^3.6.0", "inherits": "^2.0.3", @@ -13468,14 +13816,17 @@ } }, "punycode": { - "version": "2.1.1" + "version": "2.1.1", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" }, "qs": { "version": "6.5.3", + "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==", "dev": true }, "query-string": { "version": "4.3.4", + "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", "dev": true, "requires": { "object-assign": "^4.1.0", @@ -13484,18 +13835,20 @@ }, "querystring": { "version": "0.2.0", - "dev": true + "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=" }, "querystring-es3": { "version": "0.2.1", - "dev": true + "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=" }, "querystringify": { "version": "2.2.0", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", "dev": true }, "randomatic": { "version": "3.1.1", + "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==", "requires": { "is-number": "^4.0.0", "kind-of": "^6.0.0", @@ -13503,19 +13856,23 @@ }, "dependencies": { "is-number": { - "version": "4.0.0" + "version": "4.0.0", + "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==" }, "kind-of": { - "version": "6.0.3" + "version": "6.0.3", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" } } }, "range-parser": { "version": "1.2.1", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", "dev": true }, "raw-body": { "version": "2.4.3", + "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==", "dev": true, "requires": { "bytes": "3.1.2", @@ -13526,10 +13883,12 @@ "dependencies": { "bytes": { "version": "3.1.2", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", "dev": true }, "iconv-lite": { "version": "0.4.24", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "requires": { "safer-buffer": ">= 2.1.2 < 3" @@ -13539,6 +13898,7 @@ }, "rc-checkbox": { "version": "1.5.0", + "integrity": "sha1-RkzptAsa2dEZUkztF0pgp7TrdSk=", "requires": { "classnames": "2.x", "rc-util": "^4.0.1" @@ -13546,6 +13906,7 @@ }, "rc-util": { "version": "4.21.1", + "integrity": "sha512-Z+vlkSQVc1l8O2UjR3WQ+XdWlhj5q9BMQNLk2iOBch75CqPfrJyGtcWMcnhRlNuDu0Ndtt4kLVO8JI8BrABobg==", "requires": { "add-dom-event-listener": "^1.1.0", "prop-types": "^15.5.10", @@ -13556,6 +13917,7 @@ }, "react": { "version": "15.4.2", + "integrity": "sha1-QfeZGyYYU5K6m66WyIiefgGDl+8=", "requires": { "fbjs": "^0.8.4", "loose-envify": "^1.1.0", @@ -13563,10 +13925,13 @@ } }, "react-addons-update": { - "version": "15.3.2" + "version": "15.3.2", + "integrity": "sha1-tjhcTbHl3zcYJeBhWwQ2DtlEMP4=", + "requires": {} }, "react-bootstrap": { "version": "0.32.4", + "integrity": "sha512-xj+JfaPOvnvr3ow0aHC7Y3HaBKZNR1mm361hVxVzVX3fcdJNIrfiodbQ0m9nLBpNxiKG6FTU2lq/SbTDYT2vew==", "dev": true, "requires": { "@babel/runtime-corejs2": "^7.0.0", @@ -13585,6 +13950,7 @@ }, "react-bootstrap-table": { "version": "3.5.1", + "integrity": "sha1-wkKKX+zpgj8La97ffxmGMKxVoWQ=", "requires": { "@allenfang/react-toastr": "2.8.2", "classnames": "^2.1.2", @@ -13592,10 +13958,12 @@ }, "dependencies": { "exenv": { - "version": "1.2.0" + "version": "1.2.0", + "integrity": "sha1-ODXxJ6vwdb/ggtCu1EhAV8eOPIk=" }, "react-modal": { "version": "1.9.7", + "integrity": "sha512-oZNqI0ZnPD7NnfObrCMz2hxHTAw5oEuhZJ+gnyFNIQB2rR8h1YbLQTfhms1mtSJigb0J23OOWElHjXYYaKO+wg==", "requires": { "create-react-class": "^15.5.2", "element-class": "^0.2.0", @@ -13609,6 +13977,7 @@ }, "react-bootstrap-typeahead": { "version": "1.4.2", + "integrity": "sha1-GRPjLOpNeb7NA6yrvZM2EWiEgVs=", "requires": { "classnames": "^2.2.0", "create-react-class": "^15.5.2", @@ -13625,6 +13994,7 @@ "dependencies": { "react-overlays": { "version": "0.7.4", + "integrity": "sha512-7vsooMx3siLAuEfTs8FYeP/lAORWWFXTO8PON3KgX0Htq1Oa+po6ioSjGyO0/GO5CVSMNhpWt6V2opeexHgBuQ==", "requires": { "classnames": "^2.2.5", "dom-helpers": "^3.2.1", @@ -13637,6 +14007,7 @@ }, "react-date-picker": { "version": "3.1.10", + "integrity": "sha1-X9V5jbxEqVfUciL3PUdWxs7V4Gk=", "dev": true, "requires": { "moment": "^2.8.0", @@ -13645,6 +14016,7 @@ }, "react-dom": { "version": "15.4.2", + "integrity": "sha1-AVNj8FsKH9Uq6e/dOgBg2QaVII8=", "requires": { "fbjs": "^0.8.1", "loose-envify": "^1.1.0", @@ -13652,13 +14024,17 @@ } }, "react-dom-factories": { - "version": "1.0.2" + "version": "1.0.2", + "integrity": "sha1-63cFxNs2+1AbOqOP91lhaqD/luA=" }, "react-filtered-multiselect": { - "version": "0.4.2" + "version": "0.4.2", + "integrity": "sha1-gZaHX4nl/3zt8JFoQrFWz2hPgSE=", + "requires": {} }, "react-highlighter": { "version": "0.4.3", + "integrity": "sha512-dwItRaGRHBceuzZd5NXeroapdmZ2JCAWZ3AdwdthRlSkdtPCY18DWrd6mPmiMCfSB6lgVwwCPQl4unZzG5sXXw==", "requires": { "blacklist": "^1.1.4", "create-react-class": "^15.6.2", @@ -13668,10 +14044,13 @@ }, "react-hot-api": { "version": "0.4.7", - "dev": true + "integrity": "sha1-p+IqVtJS4Rq9k2a2EmTPRJLFgXE=", + "dev": true, + "requires": {} }, "react-hot-loader": { "version": "1.3.1", + "integrity": "sha1-yVZHrni3Pfzv9uxx/8sEGC/22vk=", "dev": true, "requires": { "react-hot-api": "^0.4.5", @@ -13680,6 +14059,7 @@ "dependencies": { "source-map": { "version": "0.4.4", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { "amdefine": ">=0.0.4" @@ -13689,6 +14069,7 @@ }, "react-input-autosize": { "version": "1.2.0", + "integrity": "sha1-hyQQcRWfdCEjiXaR2meW7DO1fQU=", "requires": { "create-react-class": "^15.5.2", "prop-types": "^15.5.8" @@ -13696,6 +14077,7 @@ }, "react-interactive": { "version": "0.4.1", + "integrity": "sha1-mRK5lyXPwrx0gPlT565fEnvzcug=", "dev": true, "requires": { "detect-it": "^2.0.0", @@ -13703,13 +14085,16 @@ } }, "react-is": { - "version": "16.13.1" + "version": "16.13.1", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "react-lifecycles-compat": { - "version": "3.0.4" + "version": "3.0.4", + "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" }, "react-modal": { "version": "3.14.4", + "integrity": "sha512-8surmulejafYCH9wfUmFyj4UfbSJwjcgbS9gf3oOItu4Hwd6ivJyVBETI0yHRhpJKCLZMUtnhzk76wXTsNL6Qg==", "requires": { "exenv": "^1.2.0", "prop-types": "^15.7.2", @@ -13719,6 +14104,7 @@ "dependencies": { "warning": { "version": "4.0.3", + "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", "requires": { "loose-envify": "^1.0.0" } @@ -13727,6 +14113,7 @@ }, "react-number-input": { "version": "15.5.1", + "integrity": "sha1-54Ae1LFun5+6aZZNv3SsA7lw5FM=", "requires": { "babel-jest": "^19.0.0", "babel-polyfill": "^6.23.0", @@ -13737,6 +14124,7 @@ "dependencies": { "babel-jest": { "version": "19.0.0", + "integrity": "sha1-WTI87ZmjqE01naIZyogQdP/Gzj8=", "requires": { "babel-core": "^6.0.0", "babel-plugin-istanbul": "^4.0.0", @@ -13747,16 +14135,20 @@ }, "react-numeric-input": { "version": "2.0.9", - "dev": true + "integrity": "sha1-ro4awpiOi8yMS7PLEHuy2DutTlo=", + "dev": true, + "requires": {} }, "react-onclickoutside": { "version": "5.11.1", + "integrity": "sha1-ADFOUlZ89V+rqUyrus0RlhkHBiM=", "requires": { "create-react-class": "^15.5.x" } }, "react-overlays": { "version": "0.8.3", + "integrity": "sha512-h6GT3jgy90PgctleP39Yu3eK1v9vaJAW73GOA/UbN9dJ7aAN4BTZD6793eI1D5U+ukMk17qiqN/wl3diK1Z5LA==", "dev": true, "requires": { "classnames": "^2.2.5", @@ -13769,12 +14161,14 @@ }, "react-prop-types": { "version": "0.4.0", + "integrity": "sha1-+ZsL+0AGkpya8gUefBQUpcdbk9A=", "requires": { "warning": "^3.0.0" } }, "react-redux": { "version": "4.4.10", + "integrity": "sha512-tjL0Bmpkj75Td0k+lXlF8Fc8a9GuXFv/3ahUOCXExWs/jhsKiQeTffdH0j5byejCGCRL4tvGFYlrwBF1X/Aujg==", "dev": true, "requires": { "create-react-class": "^15.5.1", @@ -13787,6 +14181,7 @@ }, "react-router": { "version": "3.2.6", + "integrity": "sha512-nlxtQE8B22hb/JxdaslI1tfZacxFU8x8BJryXOnR2RxB4vc01zuHYAHAIgmBkdk1kzXaA25hZxK6KAH/+CXArw==", "dev": true, "requires": { "create-react-class": "^15.5.1", @@ -13801,19 +14196,23 @@ }, "react-router-redux": { "version": "4.0.8", + "integrity": "sha1-InQDWWtRUeGCN32rg1tdRfD4BU4=", "dev": true }, "react-scrollspy": { - "version": "3.4.3", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/react-scrollspy/-/react-scrollspy-3.1.1.tgz", + "integrity": "sha512-0gu/zKi0eZ/PaVJZSe7ew5nNmmEjfb7z97YFuOOR5tbKkIQtKENm9b4KGUZBid7XkMEZkRShUFsQsEYxotBIEw==", "dev": true, "requires": { - "babel-runtime": "^6.26.0", + "babel-runtime": "^6.23.0", "classnames": "^2.2.5", - "prop-types": "^15.5.10" + "prop-types": "^15.5.8" } }, "react-select": { "version": "1.3.0", + "integrity": "sha512-g/QAU1HZrzSfxkwMAo/wzi6/ezdWye302RGZevsATec07hI/iSxcpB1hejFIp7V63DJ8mwuign6KmB3VjdlinQ==", "requires": { "classnames": "^2.2.4", "prop-types": "^15.5.8", @@ -13822,6 +14221,7 @@ "dependencies": { "react-input-autosize": { "version": "2.2.2", + "integrity": "sha512-jQJgYCA3S0j+cuOwzuCd1OjmBmnZLdqQdiLKRYrsMMzbjUrVDS5RvJUDwJqA7sKuksDuzFtm6hZGKFu7Mjk5aw==", "requires": { "prop-types": "^15.5.8" } @@ -13830,6 +14230,7 @@ }, "react-transition-group": { "version": "2.9.0", + "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==", "dev": true, "requires": { "dom-helpers": "^3.4.0", @@ -13840,6 +14241,7 @@ }, "read-file-stdin": { "version": "0.2.1", + "integrity": "sha1-JezP86FTtoCa+ssj7hU4fbng7mE=", "dev": true, "requires": { "gather-stream": "^1.0.0" @@ -13847,6 +14249,7 @@ }, "read-pkg": { "version": "1.1.0", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "requires": { "load-json-file": "^1.0.0", "normalize-package-data": "^2.3.2", @@ -13855,6 +14258,7 @@ }, "read-pkg-up": { "version": "1.0.1", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "requires": { "find-up": "^1.0.0", "read-pkg": "^1.0.0" @@ -13862,6 +14266,7 @@ }, "readable-stream": { "version": "3.6.0", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "dev": true, "requires": { "inherits": "^2.0.3", @@ -13871,7 +14276,7 @@ }, "readdirp": { "version": "2.2.1", - "dev": true, + "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", "requires": { "graceful-fs": "^4.1.11", "micromatch": "^3.1.10", @@ -13880,15 +14285,15 @@ "dependencies": { "arr-diff": { "version": "4.0.0", - "dev": true + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" }, "array-unique": { "version": "0.3.2", - "dev": true + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" }, "braces": { "version": "2.3.2", - "dev": true, + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "requires": { "arr-flatten": "^1.1.0", "array-unique": "^0.3.2", @@ -13904,7 +14309,7 @@ "dependencies": { "extend-shallow": { "version": "2.0.1", - "dev": true, + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { "is-extendable": "^0.1.0" } @@ -13913,7 +14318,7 @@ }, "expand-brackets": { "version": "2.1.4", - "dev": true, + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "requires": { "debug": "^2.3.3", "define-property": "^0.2.5", @@ -13926,21 +14331,21 @@ "dependencies": { "define-property": { "version": "0.2.5", - "dev": true, + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { "is-descriptor": "^0.1.0" } }, "extend-shallow": { "version": "2.0.1", - "dev": true, + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { "is-extendable": "^0.1.0" } }, "is-descriptor": { "version": "0.1.6", - "dev": true, + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "requires": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -13949,13 +14354,13 @@ }, "kind-of": { "version": "5.1.0", - "dev": true + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" } } }, "extglob": { "version": "2.0.4", - "dev": true, + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "requires": { "array-unique": "^0.3.2", "define-property": "^1.0.0", @@ -13969,14 +14374,14 @@ "dependencies": { "define-property": { "version": "1.0.0", - "dev": true, + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { "is-descriptor": "^1.0.0" } }, "extend-shallow": { "version": "2.0.1", - "dev": true, + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { "is-extendable": "^0.1.0" } @@ -13985,7 +14390,7 @@ }, "fill-range": { "version": "4.0.0", - "dev": true, + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "requires": { "extend-shallow": "^2.0.1", "is-number": "^3.0.0", @@ -13995,7 +14400,7 @@ "dependencies": { "extend-shallow": { "version": "2.0.1", - "dev": true, + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { "is-extendable": "^0.1.0" } @@ -14004,14 +14409,14 @@ }, "is-accessor-descriptor": { "version": "0.1.6", - "dev": true, + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "requires": { "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { "version": "3.2.2", - "dev": true, + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { "is-buffer": "^1.1.5" } @@ -14020,14 +14425,14 @@ }, "is-data-descriptor": { "version": "0.1.4", - "dev": true, + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "requires": { "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { "version": "3.2.2", - "dev": true, + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { "is-buffer": "^1.1.5" } @@ -14036,14 +14441,14 @@ }, "is-number": { "version": "3.0.0", - "dev": true, + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "requires": { "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { "version": "3.2.2", - "dev": true, + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { "is-buffer": "^1.1.5" } @@ -14052,15 +14457,15 @@ }, "isobject": { "version": "3.0.1", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" }, "kind-of": { "version": "6.0.3", - "dev": true + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" }, "micromatch": { "version": "3.1.10", - "dev": true, + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "requires": { "arr-diff": "^4.0.0", "array-unique": "^0.3.2", @@ -14079,7 +14484,7 @@ }, "readable-stream": { "version": "2.3.7", - "dev": true, + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -14092,7 +14497,7 @@ }, "string_decoder": { "version": "1.1.1", - "dev": true, + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { "safe-buffer": "~5.1.0" } @@ -14101,6 +14506,7 @@ }, "reduce-css-calc": { "version": "1.3.0", + "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=", "dev": true, "requires": { "balanced-match": "^0.4.2", @@ -14110,12 +14516,14 @@ "dependencies": { "balanced-match": { "version": "0.4.2", + "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=", "dev": true } } }, "reduce-function-call": { "version": "1.0.3", + "integrity": "sha512-Hl/tuV2VDgWgCSEeWMLwxLZqX7OK59eU1guxXsRKTAyeYimivsKdtcV4fu3r710tpG5GmDKDhQ0HSZLExnNmyQ==", "dev": true, "requires": { "balanced-match": "^1.0.0" @@ -14123,12 +14531,14 @@ "dependencies": { "balanced-match": { "version": "1.0.2", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true } } }, "redux": { "version": "3.7.2", + "integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==", "dev": true, "requires": { "lodash": "^4.2.1", @@ -14139,6 +14549,7 @@ }, "redux-logger": { "version": "2.10.2", + "integrity": "sha1-PFpfCm8yV3wd6t9mVfJX+CxsOTc=", "dev": true, "requires": { "deep-diff": "0.3.4" @@ -14146,17 +14557,21 @@ }, "redux-thunk": { "version": "2.2.0", + "integrity": "sha1-5hWhbha0ehmlFXZhM9Hj6Zt4UuU=", "dev": true }, "regenerate": { "version": "1.4.2", + "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==", "dev": true }, "regenerator-runtime": { - "version": "0.10.5" + "version": "0.10.5", + "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=" }, "regenerator-transform": { "version": "0.10.1", + "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==", "dev": true, "requires": { "babel-runtime": "^6.18.0", @@ -14166,13 +14581,14 @@ }, "regex-cache": { "version": "0.4.4", + "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", "requires": { "is-equal-shallow": "^0.1.3" } }, "regex-not": { "version": "1.0.2", - "dev": true, + "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", "requires": { "extend-shallow": "^3.0.2", "safe-regex": "^1.1.0" @@ -14180,6 +14596,7 @@ }, "regexpu-core": { "version": "2.0.0", + "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", "dev": true, "requires": { "regenerate": "^1.2.1", @@ -14189,10 +14606,12 @@ }, "regjsgen": { "version": "0.2.0", + "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=", "dev": true }, "regjsparser": { "version": "0.1.5", + "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "dev": true, "requires": { "jsesc": "~0.5.0" @@ -14200,27 +14619,33 @@ "dependencies": { "jsesc": { "version": "0.5.0", + "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true } } }, "remove-trailing-separator": { - "version": "1.1.0" + "version": "1.1.0", + "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=" }, "repeat-element": { - "version": "1.1.4" + "version": "1.1.4", + "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==" }, "repeat-string": { - "version": "1.6.1" + "version": "1.6.1", + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" }, "repeating": { "version": "2.0.1", + "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "requires": { "is-finite": "^1.0.0" } }, "request": { "version": "2.88.2", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", "dev": true, "requires": { "aws-sign2": "~0.7.0", @@ -14246,14 +14671,22 @@ } }, "require-main-filename": { - "version": "1.0.1" + "version": "1.0.1", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" }, "requires-port": { "version": "1.0.0", + "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", "dev": true }, + "reselect": { + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.7.tgz", + "integrity": "sha512-Zu1xbUt3/OPwsXL46hvOOoQrap2azE7ZQbokq61BQfiXvhewsKDwhMeZjTX9sX0nvw1t/U5Audyn1I9P/m9z0A==" + }, "resolve": { "version": "1.22.0", + "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", "requires": { "is-core-module": "^2.8.1", "path-parse": "^1.0.7", @@ -14262,27 +14695,29 @@ }, "resolve-url": { "version": "0.2.1", - "dev": true + "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" }, "ret": { "version": "0.1.15", - "dev": true + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" }, "right-align": { "version": "0.1.3", - "dev": true, + "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", "requires": { "align-text": "^0.1.1" } }, "rimraf": { "version": "2.7.1", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "requires": { "glob": "^7.1.3" }, "dependencies": { "glob": { "version": "7.2.0", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -14296,29 +14731,33 @@ }, "ripemd160": { "version": "0.2.0", - "dev": true + "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=" }, "run-queue": { "version": "1.0.3", + "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", "requires": { "aproba": "^1.1.1" } }, "safe-buffer": { - "version": "5.1.2" + "version": "5.1.2", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "safe-regex": { "version": "1.1.0", - "dev": true, + "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "requires": { "ret": "~0.1.10" } }, "safer-buffer": { - "version": "2.1.2" + "version": "2.1.2", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sane": { "version": "1.7.0", + "integrity": "sha1-s1ebzLRclM8gNVzIESSZDf00bjA=", "dev": true, "requires": { "anymatch": "^1.3.0", @@ -14332,20 +14771,24 @@ }, "sax": { "version": "1.2.4", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true }, "schema-utils": { "version": "0.4.7", + "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==", "requires": { "ajv": "^6.1.0", "ajv-keywords": "^3.1.0" } }, "semver": { - "version": "5.7.1" + "version": "5.7.1", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" }, "send": { "version": "0.17.2", + "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==", "dev": true, "requires": { "debug": "2.6.9", @@ -14365,15 +14808,18 @@ "dependencies": { "ms": { "version": "2.1.3", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true } } }, "serialize-javascript": { - "version": "1.9.1" + "version": "1.9.1", + "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==" }, "serve-index": { "version": "1.9.1", + "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", "dev": true, "requires": { "accepts": "~1.3.4", @@ -14387,6 +14833,7 @@ "dependencies": { "http-errors": { "version": "1.6.3", + "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "dev": true, "requires": { "depd": "~1.1.2", @@ -14397,16 +14844,19 @@ }, "inherits": { "version": "2.0.3", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true }, "setprototypeof": { "version": "1.1.0", + "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", "dev": true } } }, "serve-static": { "version": "1.14.2", + "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==", "dev": true, "requires": { "encodeurl": "~1.0.2", @@ -14417,11 +14867,12 @@ }, "set-immediate-shim": { "version": "1.0.1", + "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", "dev": true }, "set-value": { "version": "2.0.1", - "dev": true, + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "requires": { "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", @@ -14431,7 +14882,7 @@ "dependencies": { "extend-shallow": { "version": "2.0.1", - "dev": true, + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { "is-extendable": "^0.1.0" } @@ -14439,25 +14890,29 @@ } }, "setimmediate": { - "version": "1.0.5" + "version": "1.0.5", + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" }, "setprototypeof": { "version": "1.2.0", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", "dev": true }, "sha.js": { "version": "2.2.6", - "dev": true + "integrity": "sha1-F93t3F9yL7ZlAWWIlUYZd4ZzFbo=" }, "shallowequal": { - "version": "1.1.0" + "version": "1.1.0", + "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==" }, "slash": { - "version": "1.0.0" + "version": "1.0.0", + "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=" }, "snapdragon": { "version": "0.8.2", - "dev": true, + "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", "requires": { "base": "^0.11.1", "debug": "^2.2.0", @@ -14471,35 +14926,35 @@ "dependencies": { "define-property": { "version": "0.2.5", - "dev": true, + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { "is-descriptor": "^0.1.0" } }, "extend-shallow": { "version": "2.0.1", - "dev": true, + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { "is-extendable": "^0.1.0" } }, "is-accessor-descriptor": { "version": "0.1.6", - "dev": true, + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "requires": { "kind-of": "^3.0.2" } }, "is-data-descriptor": { "version": "0.1.4", - "dev": true, + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "requires": { "kind-of": "^3.0.2" } }, "is-descriptor": { "version": "0.1.6", - "dev": true, + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "requires": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -14508,7 +14963,7 @@ "dependencies": { "kind-of": { "version": "5.1.0", - "dev": true + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" } } } @@ -14516,7 +14971,7 @@ }, "snapdragon-node": { "version": "2.1.1", - "dev": true, + "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", "requires": { "define-property": "^1.0.0", "isobject": "^3.0.0", @@ -14525,26 +14980,27 @@ "dependencies": { "define-property": { "version": "1.0.0", - "dev": true, + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { "is-descriptor": "^1.0.0" } }, "isobject": { "version": "3.0.1", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, "snapdragon-util": { "version": "3.0.1", - "dev": true, + "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "requires": { "kind-of": "^3.2.0" } }, "sntp": { "version": "1.0.9", + "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", "dev": true, "optional": true, "requires": { @@ -14553,6 +15009,7 @@ }, "sockjs": { "version": "0.3.24", + "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==", "dev": true, "requires": { "faye-websocket": "^0.11.3", @@ -14562,12 +15019,14 @@ "dependencies": { "uuid": { "version": "8.3.2", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", "dev": true } } }, "sockjs-client": { "version": "1.5.2", + "integrity": "sha512-ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ==", "dev": true, "requires": { "debug": "^3.2.6", @@ -14580,6 +15039,7 @@ "dependencies": { "debug": { "version": "3.2.7", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "requires": { "ms": "^2.1.1" @@ -14587,12 +15047,14 @@ }, "ms": { "version": "2.1.3", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true } } }, "sort-keys": { "version": "1.1.2", + "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", "dev": true, "requires": { "is-plain-obj": "^1.0.0" @@ -14600,14 +15062,15 @@ }, "source-list-map": { "version": "0.1.8", - "dev": true + "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=" }, "source-map": { - "version": "0.5.7" + "version": "0.5.7", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" }, "source-map-resolve": { "version": "0.5.3", - "dev": true, + "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", "requires": { "atob": "^2.1.2", "decode-uri-component": "^0.2.0", @@ -14618,47 +15081,54 @@ }, "source-map-support": { "version": "0.4.18", + "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", "requires": { "source-map": "^0.5.6" } }, "source-map-url": { "version": "0.4.1", - "dev": true + "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==" }, "spdx-correct": { "version": "3.1.1", + "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", "requires": { "spdx-expression-parse": "^3.0.0", "spdx-license-ids": "^3.0.0" } }, "spdx-exceptions": { - "version": "2.3.0" + "version": "2.3.0", + "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==" }, "spdx-expression-parse": { "version": "3.0.1", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", "requires": { "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" } }, "spdx-license-ids": { - "version": "3.0.11" + "version": "3.0.11", + "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==" }, "split-string": { "version": "3.1.0", - "dev": true, + "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", "requires": { "extend-shallow": "^3.0.0" } }, "sprintf-js": { "version": "1.0.3", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, "sshpk": { "version": "1.17.0", + "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==", "dev": true, "requires": { "asn1": "~0.2.3", @@ -14674,13 +15144,14 @@ }, "ssri": { "version": "5.3.0", + "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==", "requires": { "safe-buffer": "^5.1.1" } }, "static-extend": { "version": "0.1.2", - "dev": true, + "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "requires": { "define-property": "^0.2.5", "object-copy": "^0.1.0" @@ -14688,28 +15159,28 @@ "dependencies": { "define-property": { "version": "0.2.5", - "dev": true, + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { "is-descriptor": "^0.1.0" } }, "is-accessor-descriptor": { "version": "0.1.6", - "dev": true, + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "requires": { "kind-of": "^3.0.2" } }, "is-data-descriptor": { "version": "0.1.4", - "dev": true, + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "requires": { "kind-of": "^3.0.2" } }, "is-descriptor": { "version": "0.1.6", - "dev": true, + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "requires": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -14718,7 +15189,7 @@ "dependencies": { "kind-of": { "version": "5.1.0", - "dev": true + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" } } } @@ -14726,11 +15197,12 @@ }, "statuses": { "version": "1.5.0", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", "dev": true }, "stream-browserify": { "version": "2.0.2", - "dev": true, + "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", "requires": { "inherits": "~2.0.1", "readable-stream": "^2.0.2" @@ -14738,7 +15210,7 @@ "dependencies": { "readable-stream": { "version": "2.3.7", - "dev": true, + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -14751,7 +15223,7 @@ }, "string_decoder": { "version": "1.1.1", - "dev": true, + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { "safe-buffer": "~5.1.0" } @@ -14760,10 +15232,12 @@ }, "stream-cache": { "version": "0.0.2", + "integrity": "sha1-GsWtaDJCjKVWZ9ve45Xa1ObbEY8=", "dev": true }, "stream-each": { "version": "1.2.3", + "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==", "requires": { "end-of-stream": "^1.1.0", "stream-shift": "^1.0.0" @@ -14771,7 +15245,7 @@ }, "stream-http": { "version": "2.8.3", - "dev": true, + "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", "requires": { "builtin-status-codes": "^3.0.0", "inherits": "^2.0.1", @@ -14782,7 +15256,7 @@ "dependencies": { "readable-stream": { "version": "2.3.7", - "dev": true, + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -14795,7 +15269,7 @@ }, "string_decoder": { "version": "1.1.1", - "dev": true, + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { "safe-buffer": "~5.1.0" } @@ -14803,14 +15277,17 @@ } }, "stream-shift": { - "version": "1.0.1" + "version": "1.0.1", + "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==" }, "strict-uri-encode": { "version": "1.1.0", + "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", "dev": true }, "string_decoder": { "version": "1.3.0", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "dev": true, "requires": { "safe-buffer": "~5.2.0" @@ -14818,54 +15295,64 @@ "dependencies": { "safe-buffer": { "version": "5.2.1", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", "dev": true } } }, "stringstream": { "version": "0.0.6", + "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==", "dev": true, "optional": true }, "strip-ansi": { "version": "3.0.1", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { "ansi-regex": "^2.0.0" } }, "strip-bom": { "version": "2.0.0", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "requires": { "is-utf8": "^0.2.0" } }, "style-loader": { "version": "0.12.4", + "integrity": "sha1-rn0GZdxNxlPaov6Xu5CRS8HSLZs=", "dev": true, "requires": { "loader-utils": "^0.2.7" } }, "supports-color": { - "version": "2.0.0" + "version": "2.0.0", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" }, "supports-preserve-symlinks-flag": { - "version": "1.0.0" + "version": "1.0.0", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" }, "symbol-observable": { "version": "1.2.0", + "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==", "dev": true }, "symbol-tree": { "version": "3.2.4", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", "dev": true }, "tapable": { "version": "0.1.10", - "dev": true + "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=" }, "test-exclude": { "version": "4.2.3", + "integrity": "sha512-SYbXgY64PT+4GAL2ocI3HwPa4Q4TBKm0cwAVeKOt/Aoc0gSpNRjJX8w0pA1LMKZ3LBmd8pYBqApFNQLII9kavA==", "requires": { "arrify": "^1.0.1", "micromatch": "^2.3.11", @@ -14876,10 +15363,12 @@ }, "through": { "version": "2.3.8", + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", "dev": true }, "through2": { "version": "2.0.5", + "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", "requires": { "readable-stream": "~2.3.6", "xtend": "~4.0.1" @@ -14887,6 +15376,7 @@ "dependencies": { "readable-stream": { "version": "2.3.7", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -14899,6 +15389,7 @@ }, "string_decoder": { "version": "1.1.1", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { "safe-buffer": "~5.1.0" } @@ -14907,36 +15398,39 @@ }, "time-stamp": { "version": "2.2.0", + "integrity": "sha512-zxke8goJQpBeEgD82CXABeMh0LSJcj7CXEd0OHOg45HgcofF7pxNwZm9+RknpxpDhwN4gFpySkApKfFYfRQnUA==", "dev": true }, "timers-browserify": { "version": "2.0.12", - "dev": true, + "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==", "requires": { "setimmediate": "^1.0.4" } }, "tmpl": { "version": "1.0.5", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", "dev": true }, "to-arraybuffer": { "version": "1.0.1", - "dev": true + "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=" }, "to-fast-properties": { - "version": "1.0.3" + "version": "1.0.3", + "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=" }, "to-object-path": { "version": "0.3.0", - "dev": true, + "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "requires": { "kind-of": "^3.0.2" } }, "to-regex": { "version": "3.0.2", - "dev": true, + "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", "requires": { "define-property": "^2.0.2", "extend-shallow": "^3.0.2", @@ -14946,7 +15440,7 @@ }, "to-regex-range": { "version": "2.1.1", - "dev": true, + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "requires": { "is-number": "^3.0.0", "repeat-string": "^1.6.1" @@ -14954,7 +15448,7 @@ "dependencies": { "is-number": { "version": "3.0.0", - "dev": true, + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "requires": { "kind-of": "^3.0.2" } @@ -14963,10 +15457,12 @@ }, "toidentifier": { "version": "1.0.1", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", "dev": true }, "tough-cookie": { "version": "2.5.0", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", "dev": true, "requires": { "psl": "^1.1.28", @@ -14975,17 +15471,20 @@ }, "tr46": { "version": "0.0.3", + "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", "dev": true }, "trim-right": { - "version": "1.0.1" + "version": "1.0.1", + "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=" }, "tty-browserify": { "version": "0.0.0", - "dev": true + "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=" }, "tunnel-agent": { "version": "0.6.0", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "dev": true, "requires": { "safe-buffer": "^5.0.1" @@ -14993,10 +15492,12 @@ }, "tweetnacl": { "version": "0.14.5", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", "dev": true }, "type-check": { "version": "0.3.2", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "dev": true, "requires": { "prelude-ls": "~1.1.2" @@ -15004,6 +15505,7 @@ }, "type-is": { "version": "1.6.18", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", "dev": true, "requires": { "media-typer": "0.3.0", @@ -15011,34 +15513,40 @@ } }, "typedarray": { - "version": "0.0.6" + "version": "0.0.6", + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, "ua-parser-js": { - "version": "0.7.31" + "version": "0.7.31", + "integrity": "sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==" }, "uglify-es": { "version": "3.3.9", + "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==", "requires": { "commander": "~2.13.0", "source-map": "~0.6.1" }, "dependencies": { "source-map": { - "version": "0.6.1" + "version": "0.6.1", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" } } }, "uglify-js": { "version": "3.15.1", + "integrity": "sha512-FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ==", "dev": true, "optional": true }, "uglify-to-browserify": { "version": "1.0.2", - "dev": true + "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=" }, "uglifyjs-webpack-plugin": { "version": "1.3.0", + "integrity": "sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==", "requires": { "cacache": "^10.0.4", "find-cache-dir": "^1.0.0", @@ -15052,6 +15560,7 @@ "dependencies": { "find-cache-dir": { "version": "1.0.0", + "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", "requires": { "commondir": "^1.0.1", "make-dir": "^1.0.0", @@ -15060,23 +15569,27 @@ }, "find-up": { "version": "2.1.0", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "requires": { "locate-path": "^2.0.0" } }, "pkg-dir": { "version": "2.0.0", + "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", "requires": { "find-up": "^2.1.0" } }, "source-map": { - "version": "0.6.1" + "version": "0.6.1", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" } } }, "uncontrollable": { "version": "5.1.0", + "integrity": "sha512-5FXYaFANKaafg4IVZXUNtGyzsnYEvqlr9wQ3WpZxFpEUxl29A3H6Q4G1Dnnorvq9TGOGATBApWR4YpLAh+F5hw==", "dev": true, "requires": { "invariant": "^2.2.4" @@ -15084,15 +15597,17 @@ }, "underscore": { "version": "1.2.4", + "integrity": "sha1-6NpiQaoG9k3yRzuyWQuMF8hMPH4=", "dev": true }, "underscore.string": { "version": "2.0.0", + "integrity": "sha1-dHCFilSguzVg0DfaVtzGe1GB4Ro=", "dev": true }, "union-value": { "version": "1.0.1", - "dev": true, + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", @@ -15102,35 +15617,41 @@ }, "uniq": { "version": "1.0.1", + "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", "dev": true }, "uniqid": { "version": "1.0.0", + "integrity": "sha1-JYJSTgdASESkLelPviv1SeG3RVU=", "dev": true }, "uniqs": { "version": "2.0.0", + "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=", "dev": true }, "unique-filename": { "version": "1.1.1", + "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", "requires": { "unique-slug": "^2.0.0" } }, "unique-slug": { "version": "2.0.2", + "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", "requires": { "imurmurhash": "^0.1.4" } }, "unpipe": { "version": "1.0.0", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", "dev": true }, "unset-value": { "version": "1.0.0", - "dev": true, + "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "requires": { "has-value": "^0.3.1", "isobject": "^3.0.0" @@ -15138,7 +15659,7 @@ "dependencies": { "has-value": { "version": "0.3.1", - "dev": true, + "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "requires": { "get-value": "^2.0.3", "has-values": "^0.1.4", @@ -15147,7 +15668,7 @@ "dependencies": { "isobject": { "version": "2.1.0", - "dev": true, + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", "requires": { "isarray": "1.0.0" } @@ -15156,27 +15677,28 @@ }, "has-values": { "version": "0.1.4", - "dev": true + "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=" }, "isobject": { "version": "3.0.1", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, "uri-js": { "version": "4.4.1", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "requires": { "punycode": "^2.1.0" } }, "urix": { "version": "0.1.0", - "dev": true + "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=" }, "url": { "version": "0.11.0", - "dev": true, + "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", "requires": { "punycode": "1.3.2", "querystring": "0.2.0" @@ -15184,12 +15706,13 @@ "dependencies": { "punycode": { "version": "1.3.2", - "dev": true + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" } } }, "url-parse": { "version": "1.5.9", + "integrity": "sha512-HpOvhKBvre8wYez+QhHcYiVvVmeF6DVnuSOOPhe3cTum3BnqHhvKaZm8FU5yTiOu/Jut2ZpB2rA/SbBA1JIGlQ==", "dev": true, "requires": { "querystringify": "^2.1.1", @@ -15198,34 +15721,38 @@ }, "use": { "version": "3.1.1", - "dev": true + "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" }, "util": { "version": "0.10.4", - "dev": true, + "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", "requires": { "inherits": "2.0.3" }, "dependencies": { "inherits": { "version": "2.0.3", - "dev": true + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" } } }, "util-deprecate": { - "version": "1.0.2" + "version": "1.0.2", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "utils-merge": { "version": "1.0.1", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", "dev": true }, "uuid": { "version": "3.4.0", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", "dev": true }, "validate-npm-package-license": { "version": "3.0.4", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "requires": { "spdx-correct": "^3.0.0", "spdx-expression-parse": "^3.0.0" @@ -15233,10 +15760,12 @@ }, "vary": { "version": "1.1.2", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", "dev": true }, "verror": { "version": "1.10.0", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "dev": true, "requires": { "assert-plus": "^1.0.0", @@ -15246,13 +15775,14 @@ }, "vm-browserify": { "version": "0.0.4", - "dev": true, + "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", "requires": { "indexof": "0.0.1" } }, "walker": { "version": "1.0.8", + "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", "dev": true, "requires": { "makeerror": "1.0.12" @@ -15260,17 +15790,19 @@ }, "warning": { "version": "3.0.0", + "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=", "requires": { "loose-envify": "^1.0.0" } }, "watch": { "version": "0.10.0", + "integrity": "sha1-d3mLLaD5kQ1ZXxrOWwwiWFIfIdw=", "dev": true }, "watchpack": { "version": "0.2.9", - "dev": true, + "integrity": "sha1-Yuqkq15bo1/fwBgnVibjwPXj+ws=", "requires": { "async": "^0.9.0", "chokidar": "^1.0.0", @@ -15279,13 +15811,13 @@ "dependencies": { "async": { "version": "0.9.2", - "dev": true + "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=" } } }, "webpack": { "version": "1.15.0", - "dev": true, + "integrity": "sha1-T/MfU9sDM55VFkqdRo7gMklo/pg=", "requires": { "acorn": "^3.0.0", "async": "^1.3.0", @@ -15306,18 +15838,18 @@ "dependencies": { "acorn": { "version": "3.3.0", - "dev": true + "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=" }, "supports-color": { "version": "3.2.3", - "dev": true, + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "requires": { "has-flag": "^1.0.0" } }, "uglify-js": { "version": "2.7.5", - "dev": true, + "integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=", "requires": { "async": "~0.2.6", "source-map": "~0.5.1", @@ -15327,7 +15859,7 @@ "dependencies": { "async": { "version": "0.2.10", - "dev": true + "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=" } } } @@ -15335,7 +15867,7 @@ }, "webpack-core": { "version": "0.6.9", - "dev": true, + "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=", "requires": { "source-list-map": "~0.1.7", "source-map": "~0.4.1" @@ -15343,7 +15875,7 @@ "dependencies": { "source-map": { "version": "0.4.4", - "dev": true, + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "requires": { "amdefine": ">=0.0.4" } @@ -15352,6 +15884,7 @@ }, "webpack-dev-middleware": { "version": "1.12.2", + "integrity": "sha512-FCrqPy1yy/sN6U/SaEZcHKRXGlqU0DUaEBL45jkUYoB8foVb6wCnbIJ1HKIx+qUFTW+3JpVcCJCxZ8VATL4e+A==", "dev": true, "requires": { "memory-fs": "~0.4.1", @@ -15363,6 +15896,7 @@ "dependencies": { "memory-fs": { "version": "0.4.1", + "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", "dev": true, "requires": { "errno": "^0.1.3", @@ -15371,6 +15905,7 @@ }, "readable-stream": { "version": "2.3.7", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { "core-util-is": "~1.0.0", @@ -15384,6 +15919,7 @@ }, "string_decoder": { "version": "1.1.1", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { "safe-buffer": "~5.1.0" @@ -15393,6 +15929,7 @@ }, "webpack-dev-server": { "version": "1.16.5", + "integrity": "sha1-DL1fLSrI1OWTqs1clwLnu9XlmJI=", "dev": true, "requires": { "compression": "^1.5.2", @@ -15412,6 +15949,7 @@ "dependencies": { "supports-color": { "version": "3.2.3", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { "has-flag": "^1.0.0" @@ -15421,21 +15959,25 @@ }, "webpack-sources": { "version": "1.4.3", + "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", "requires": { "source-list-map": "^2.0.0", "source-map": "~0.6.1" }, "dependencies": { "source-list-map": { - "version": "2.0.1" + "version": "2.0.1", + "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==" }, "source-map": { - "version": "0.6.1" + "version": "0.6.1", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" } } }, "websocket-driver": { "version": "0.7.4", + "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", "dev": true, "requires": { "http-parser-js": ">=0.5.1", @@ -15445,14 +15987,17 @@ }, "websocket-extensions": { "version": "0.1.4", + "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", "dev": true }, "whatwg-fetch": { "version": "0.9.0", + "integrity": "sha1-DjaExsuZlbQ+/J3wPkw2XZX9nMA=", "dev": true }, "whatwg-url-compat": { "version": "0.6.5", + "integrity": "sha1-AImBEa9om7CXVBzVpFymyHmERb8=", "dev": true, "requires": { "tr46": "~0.0.1" @@ -15460,6 +16005,7 @@ }, "which": { "version": "1.3.1", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { "isexe": "^2.0.0" @@ -15467,31 +16013,37 @@ }, "window-size": { "version": "0.1.0", - "dev": true + "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=" }, "wordwrap": { "version": "1.0.0", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", "dev": true }, "worker-farm": { "version": "1.7.0", + "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==", "requires": { "errno": "~0.1.7" } }, "wrappy": { - "version": "1.0.2" + "version": "1.0.2", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "write-file-stdout": { "version": "0.0.2", + "integrity": "sha1-wlLXx8WxtAKJdjDjRTx7/mkNnKE=", "dev": true }, "xml": { "version": "1.0.1", + "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=", "dev": true }, "xml-js": { "version": "1.6.11", + "integrity": "sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==", "dev": true, "requires": { "sax": "^1.2.4" @@ -15499,24 +16051,29 @@ }, "xml-name-validator": { "version": "2.0.1", + "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=", "dev": true }, "xmlhttprequest": { "version": "1.8.0", + "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=", "dev": true }, "xtend": { - "version": "4.0.2" + "version": "4.0.2", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" }, "y18n": { - "version": "4.0.3" + "version": "4.0.3", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==" }, "yallist": { - "version": "2.1.2" + "version": "2.1.2", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" }, "yargs": { "version": "3.10.0", - "dev": true, + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", "requires": { "camelcase": "^1.0.2", "cliui": "^2.1.0", diff --git a/amp/TEMPLATE/reamp/package.json b/amp/TEMPLATE/reamp/package.json index 2e45456f663..4ede396b0d7 100644 --- a/amp/TEMPLATE/reamp/package.json +++ b/amp/TEMPLATE/reamp/package.json @@ -23,15 +23,15 @@ "author": "Alexei Savca", "license": "inherit", "devDependencies": { - "amp-ui": "git+ssh://github.com/devgateway/amp-ui#v2.1.0", + "amp-ui": "github:devgateway/amp-ui#AMP-30405-calendar", "babel-core": "^6.26.3", "babel-jest": "^6.0.1", "babel-loader": "^6.3.2", + "babel-plugin-typecheck": "^1.2.0", + "babel-polyfill": "^6.16.0", "babel-preset-es2015": "^6.18.0", "babel-preset-react": "^6.16.0", "babel-preset-stage-0": "^6.16.0", - "babel-polyfill": "^6.16.0", - "babel-plugin-typecheck": "^1.2.0", "bootstrap": "^3.3.5", "classnames": "^2.1.3", "css-loader": "^0.15.6", @@ -75,6 +75,7 @@ "react-modal": "^3.3.1", "react-number-input": "^15.0.0-rc2", "react-select": "^1.0.0-rc.3", + "reselect": "^4.1.7", "uglifyjs-webpack-plugin": "^1.3.0" } } From 1e305e346dc745bbd47e2eca1079a68d3e169997 Mon Sep 17 00:00:00 2001 From: Julian de Anquin Date: Fri, 25 Nov 2022 14:40:33 -0300 Subject: [PATCH 015/135] AMP-30405 adjust branch --- amp/TEMPLATE/reamp/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amp/TEMPLATE/reamp/package.json b/amp/TEMPLATE/reamp/package.json index 4ede396b0d7..cacd6879ef9 100644 --- a/amp/TEMPLATE/reamp/package.json +++ b/amp/TEMPLATE/reamp/package.json @@ -23,7 +23,7 @@ "author": "Alexei Savca", "license": "inherit", "devDependencies": { - "amp-ui": "github:devgateway/amp-ui#AMP-30405-calendar", + "amp-ui": "github:devgateway/amp-ui#develop", "babel-core": "^6.26.3", "babel-jest": "^6.0.1", "babel-loader": "^6.3.2", From f9fa271fe84fa110b095ce59b53f9b4ce8a440ab Mon Sep 17 00:00:00 2001 From: Octavian Ciubotaru Date: Tue, 29 Nov 2022 14:21:04 +0200 Subject: [PATCH 016/135] AMP-30377: Save filters in WS admin --- .../reportWizard/filterWidgetLoader.js | 48 +++++++++---------- amp/repository/aim/view/updateWorkspace.jsp | 5 +- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/amp/repository/aim/view/scripts/reportWizard/filterWidgetLoader.js b/amp/repository/aim/view/scripts/reportWizard/filterWidgetLoader.js index a9ff0202285..ddce134745f 100644 --- a/amp/repository/aim/view/scripts/reportWizard/filterWidgetLoader.js +++ b/amp/repository/aim/view/scripts/reportWizard/filterWidgetLoader.js @@ -26,7 +26,6 @@ $(document).ready(function () { reportTypeCode = PLEDGE_TYPE; } var advancedFilters = (document.URL.indexOf('queryEngine.do') > -1); - var isWorkspaceEditor = (document.URL.indexOf('Workspace.do') > -1); var embedded = advancedFilters; widgetFilter = new ampFilter({ el: container, @@ -60,33 +59,30 @@ $(document).ready(function () { // Save just applied filters in case the user hits "reset" button. $('#queryLabelsDiv').html('
'); var serializedFilters = widgetFilter.serialize() || {}; - if (isWorkspaceEditor) { - repFilters.populateSelectedFilters('#listFiltersDiv', widgetFilter); + var url = '/aim/reportsFilterPicker.do?apply=true&cacheBuster='; + if (advancedFilters) { + showSpinner(); + url += new Date().getTime() + '&reportContextId=' + widgetFilter.auxId + '&doreset=true&queryEngine=true'; } else { - var url = '/aim/reportsFilterPicker.do?apply=true&cacheBuster='; - if (advancedFilters) { - showSpinner(); - url += new Date().getTime() + '&reportContextId=' + widgetFilter.auxId + '&doreset=true&queryEngine=true'; - } else { - url += new Date().getTime() + '&reportContextId=' + widgetFilter.reportContextId + - '&sourceIsReportWizard=true'; - } - $.ajax({ - type: 'POST', - url: url, - data: "filtersWidget=" + JSON.stringify(serializedFilters), - success: function (data) { - if (!embedded) { - $('#listFiltersDiv').html(data); - $('#hasFilters').val(true); - } else { - $('#queryLabelsDiv').html(data); - // document.getElementById('queryLabelsDiv').scrollIntoView(); - hideSpinner(); - } - } - }); + url += new Date().getTime() + '&reportContextId=' + widgetFilter.reportContextId + + '&sourceIsReportWizard=true'; } + $.ajax({ + type: 'POST', + url: url, + data: "filtersWidget=" + JSON.stringify(serializedFilters), + success: function (data) { + if (!embedded) { + $('#listFiltersDiv').html(data); + repFilters.populateSelectedFilters('#listFiltersDiv', widgetFilter); + $('#hasFilters').val(true); + } else { + $('#queryLabelsDiv').html(data); + // document.getElementById('queryLabelsDiv').scrollIntoView(); + hideSpinner(); + } + } + }); if (!embedded) { $(container).hide(); $('#useFiltersCheckbox').attr('checked', 'checked'); diff --git a/amp/repository/aim/view/updateWorkspace.jsp b/amp/repository/aim/view/updateWorkspace.jsp index 39bd4592b93..1aeab2a4069 100644 --- a/amp/repository/aim/view/updateWorkspace.jsp +++ b/amp/repository/aim/view/updateWorkspace.jsp @@ -442,8 +442,11 @@ } if (document.aimUpdateWorkspaceForm.computation.checked == true) { var selectedOrganizations = $('[name="selectedOrgId"]'); + var useFilter = $("input[name='useFilter'][value='true']:radio")[0].checked; var hasFilters = $.parseJSON(document.aimUpdateWorkspaceForm.hasFilters.value); - if (!hasFilters && selectedOrganizations.length <= 0) { + if ((useFilter && !hasFilters) || + (!useFilter && selectedOrganizations.length === 0)) { + alert("Please add a filter or a children organization"); document.aimUpdateWorkspaceForm.computation.focus(); return false; From 7e58766a55664e035f15d105ec8d760d72027f8e Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Wed, 30 Nov 2022 15:30:10 +0300 Subject: [PATCH 017/135] AMP-30395 extracted method to log local mail to prevent crashing on staging --- .../digijava/kernel/mail/DgEmailManager.java | 43 ++++++++++++------- amp/deployConfigs/selected.properties | 2 +- 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/amp/WEB-INF/src/org/digijava/kernel/mail/DgEmailManager.java b/amp/WEB-INF/src/org/digijava/kernel/mail/DgEmailManager.java index f0087eac24c..0ea99f42337 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/mail/DgEmailManager.java +++ b/amp/WEB-INF/src/org/digijava/kernel/mail/DgEmailManager.java @@ -466,15 +466,7 @@ public static void sendMail(Address[] to, String from, Address[] cc, Address[] b public static void sendMail(Address[] to, String from, Address[] cc, Address[] bcc, String subject, String text, String charset, boolean asHtml, boolean log, boolean rtl) throws java.lang.Exception { - String toEmails = ""; - if (to != null) { - toEmails = "[" + String.join(", ", - Arrays.asList(to).stream().map(Address::toString).collect(Collectors.toList())) + "]"; - } - emailLogger.debug("Sending mail from " + from + " to " + (to != null ? toEmails : "none") - + " recipient(s). Subject: " - + subject + ". Encoding: " + charset + ". asHtml: " + asHtml); - emailLogger.debug("Mail text:\n" + text); + logEmail(to, from, subject, text, charset, asHtml); if (!EMAIL_SENDING_ENABLED) { return; @@ -560,17 +552,38 @@ public static void sendMail(Address[] to, String from, Address[] cc, Address[] b throw ex; } } - - + + private static void logEmail(Address[] to, String from, String subject, String text, String charset, boolean asHtml) { + String toEmails = ""; + if (to != null) { + toEmails = "[" + String.join(", ", + Arrays.asList(to).stream().map(Address::toString).collect(Collectors.toList())) + "]"; + } + emailLogger.debug("Sending mail from " + from + " to " + (to != null ? toEmails : "none") + + " recipient(s). Subject: " + + subject + ". Encoding: " + charset + ". asHtml: " + asHtml); + emailLogger.debug("Mail text:\n" + text); + } + + public static void sendMail(Address[] to,String from,AmpMessage ampMessage,Sdm attachmentsHolder) throws Exception{ - // Get SMTP object from configuration file, see digi.xml for more details + // Get SMTP object from configuration file, see digi.xml for more detail + String subject = ampMessage.getName(); + String text = ampMessage.getDescription(); + + logEmail(to, from, subject, text, DEFAULT_ENCODING, false); + + if (!EMAIL_SENDING_ENABLED) { + return; + } + Smtp smtp = DigiConfigManager.getConfig().getSmtp(); ForwardEmails forwardEmails = DigiConfigManager.getConfig().getForwardEmails(); // Mail session needs property, // we create default property key and fill it Properties props = new Properties(); - props.put("mail.smtp.host", smtp.getHost()); + props.put("mail.smtp.host", smtp.getHost()); if (smtp.getUserName() != null && smtp.getUserPassword() != null) { props.put("mail.smtp.auth", "true"); } @@ -590,11 +603,11 @@ public static void sendMail(Address[] to,String from,AmpMessage ampMessage,Sdm a } message.setFrom(new InternetAddress(from)); message.addRecipients(Message.RecipientType.TO, to); - message.setSubject(ampMessage.getName(),DEFAULT_ENCODING); + message.setSubject(subject,DEFAULT_ENCODING); message.setSentDate(new Date()); // Set the email message text. MimeBodyPart messagePart = new MimeBodyPart(); - messagePart.setText(ampMessage.getDescription()); + messagePart.setText(text); Multipart multipart = new MimeMultipart(); diff --git a/amp/deployConfigs/selected.properties b/amp/deployConfigs/selected.properties index 41386faadf2..9b900b9fe71 100644 --- a/amp/deployConfigs/selected.properties +++ b/amp/deployConfigs/selected.properties @@ -1,4 +1,4 @@ #Description of the selected config -#Wed, 21 Jul 2021 11:48:25 +0300 +#Mon, 28 Nov 2022 18:23:44 +0300 serverName=local From 086aa63164c8dd3c684e4806c486e864f33b2a3e Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Wed, 30 Nov 2022 18:44:20 +0300 Subject: [PATCH 018/135] AMP-30406 removed piwik.js script from amp-template --- .../amp-boilerplate/src/templates/footer-template.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/src/templates/footer-template.html b/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/src/templates/footer-template.html index 8d0a17dcc60..dfc96ed4326 100644 --- a/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/src/templates/footer-template.html +++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/src/templates/footer-template.html @@ -77,8 +77,7 @@ var u="<%= properties.trackingUrl %>"; _paq.push(["setTrackerUrl", u+"piwik.php"]); _paq.push(["setSiteId", "<%=properties.siteId %>"]); - var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript"; - g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s); + var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; s.parentNode.insertBefore(g,s); })(); } From 1f572e8937dd5751e8534c0c7dc960ea2cd9126c Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Thu, 1 Dec 2022 18:14:31 +0300 Subject: [PATCH 019/135] AMP-30408 added check to check if retlist is empty --- .../services/DashboardsService.java | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/DashboardsService.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/DashboardsService.java index 36ae948b968..c60a518a83a 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/DashboardsService.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/DashboardsService.java @@ -371,6 +371,21 @@ public static FundingTypeChartData getFundingTypeChartData(SettingsAndFiltersPar Map> values = new TreeMap<>(); // Map> ReportOutputColumn toaCol = report.leafHeaders.get(0); + + String fundingTypeConstant = DashboardConstants.FUNDING_TYPE; + String title = TranslatorWorker.translateText(fundingTypeConstant); + List outValues = new ArrayList<>(); + + + // check if report has report contents + if (report.isEmpty) { + retlist.setValues(outValues); + retlist.setName(fundingTypeConstant); + retlist.setTitle(title); + + return retlist; + } + for (ReportArea toaArea : report.reportContents.getChildren()) { String toa = toaArea.getContents().get(toaCol).displayedValue; long toaId = toaArea.getOwner().id; @@ -391,7 +406,7 @@ public static FundingTypeChartData getFundingTypeChartData(SettingsAndFiltersPar //values.computeIfAbsent(year, yr -> new ArrayList<>()).add(toaBean); } } - List outValues = new ArrayList<>(); + for (String yearValue : values.keySet()) { FundingTypeAmountsForYear yearBean = new FundingTypeAmountsForYear(); yearBean.setYear(yearValue); @@ -400,8 +415,8 @@ public static FundingTypeChartData getFundingTypeChartData(SettingsAndFiltersPar } retlist.setValues(outValues); - retlist.setName(DashboardConstants.FUNDING_TYPE); - retlist.setTitle(TranslatorWorker.translateText(DashboardConstants.FUNDING_TYPE)); + retlist.setName(fundingTypeConstant); + retlist.setTitle(title); retlist.setSource(getSource()); return retlist; From 0fe270eaceef95280df4a90308362e0086951363 Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Fri, 9 Dec 2022 13:14:52 +0300 Subject: [PATCH 020/135] AMP-30411 moved the register namespace on the content repository manager --- .../digijava/kernel/content/ContentRepositoryManager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/amp/WEB-INF/src/org/digijava/kernel/content/ContentRepositoryManager.java b/amp/WEB-INF/src/org/digijava/kernel/content/ContentRepositoryManager.java index d24fee87030..efaace053a9 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/content/ContentRepositoryManager.java +++ b/amp/WEB-INF/src/org/digijava/kernel/content/ContentRepositoryManager.java @@ -132,9 +132,10 @@ public static Session getWriteSession(HttpServletRequest request) { request.setAttribute(JCR_WRITE_SESSION, writeSession); } else { writeSession.save(); - registerNamespace(writeSession, "ampdoc", AMP_DOC_NAMESPACE); - registerNamespace(writeSession, "amplabel", AMP_LABLE_NAMESPACE); } + + registerNamespace(writeSession, "ampdoc", AMP_DOC_NAMESPACE); + registerNamespace(writeSession, "amplabel", AMP_LABLE_NAMESPACE); registerObservers(writeSession); } catch (RepositoryException e) { throw new RuntimeException(e.getMessage(), e); From aa6631f7881b9a9bfa02f43f9ab9dff6a4705180 Mon Sep 17 00:00:00 2001 From: Octavian Ciubotaru Date: Fri, 9 Dec 2022 16:08:27 +0200 Subject: [PATCH 021/135] AMP-30342: Switched to AWS ECR --- Jenkinsfile | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 93ee425ed91..ecb50716645 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,7 +25,7 @@ def dbVersion def pgVersion = 14 def country def ampUrl -def dockerRepo = "registry.developmentgateway.org/" +def dockerRepo = "798366298150.dkr.ecr.us-east-1.amazonaws.com/" def updateGitHubCommitStatus(context, message, state) { repoUrl = sh(returnStdout: true, script: "git config --get remote.origin.url").trim() @@ -82,13 +82,9 @@ stage('Build') { checkout scm def image = "${dockerRepo}amp-webapp:${tag}" - def format = branch != null ? "%H" : "%P" - def hash = sh(returnStdout: true, script: "git log --pretty=${format} -n 1").trim() - sh(returnStatus: true, script: "docker pull ${image} > /dev/null") - def imageIds = sh(returnStdout: true, script: "docker images -q -f \"label=git-hash=${hash}\"").trim() - sh(returnStatus: true, script: "docker rmi ${image} > /dev/null") + def hash = sh(returnStdout: true, script: "git log --pretty=%H -n 1").trim() - if (imageIds.equals("")) { + docker.withRegistry("https://798366298150.dkr.ecr.us-east-1.amazonaws.com", "ecr:us-east-1:aws-ecr-credentials-id") { try { updateGitHubCommitStatus('jenkins/build', 'Build in progress', 'PENDING') @@ -130,7 +126,7 @@ stage('Deploy') { dbVersion = sh(returnStdout: true, script: "ssh boad.aws.devgateway.org 'cd /opt/amp_dbs && amp-db find ${codeVersion} ${country}'").trim() // Deploy AMP - sh "ssh boad.aws.devgateway.org 'amp-up ${tag} ${country} ${dbVersion} ${pgVersion}'" + sh "ssh boad.aws.devgateway.org 'amp-up2 ${tag} ${country} ${dbVersion} ${pgVersion}'" slackSend(channel: 'amp-ci', color: 'good', message: "Deploy AMP - Success\nDeployed ${changePretty} will be ready for testing at ${ampUrl} in about 3 minutes") @@ -155,7 +151,7 @@ stage('Deploy again') { } node { try { - sh "ssh boad.aws.devgateway.org 'amp-up ${tag} ${country} ${dbVersion} ${pgVersion}'" + sh "ssh boad.aws.devgateway.org 'amp-up2 ${tag} ${country} ${dbVersion} ${pgVersion}'" slackSend(channel: 'amp-ci', color: 'good', message: "Deploy AMP - Success\nDeployed ${changePretty} will be ready for testing at ${ampUrl} in about 3 minutes") From 90026b7060fd6a49ec32a4b2743494c4dca22c30 Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Wed, 14 Dec 2022 10:50:27 +0300 Subject: [PATCH 022/135] AMP-30380 fixed the userId and made the userId disabled to toggle --- amp/TEMPLATE/ampTemplate/css_2/amp.css | 4 ++-- amp/TEMPLATE/ampTemplate/layout/loginWidget3.jsp | 2 +- .../node_modules/amp-boilerplate/src/css/main.css | 4 ++++ .../module/aim/action/ShowChangePassword.java | 2 +- amp/repository/aim/view/changePassword.jsp | 11 +++-------- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/amp/TEMPLATE/ampTemplate/css_2/amp.css b/amp/TEMPLATE/ampTemplate/css_2/amp.css index e7b4af21423..bb521b89841 100644 --- a/amp/TEMPLATE/ampTemplate/css_2/amp.css +++ b/amp/TEMPLATE/ampTemplate/css_2/amp.css @@ -415,7 +415,7 @@ div.reg_form_container h2 { font-size:30px; font-weight:bold; color:#FFFFFF; bac span.formnote{color:#595959; font-size:14px;font-weight:bold;line-height:20px;} span.formnote .login_warning_title{font-size: 16px; font-weight: 600; color: #225099FF;} td.title{background-color:#f0f0f0;color:#999; font-size:12px;font-weight:bold;padding:10px;} -div.reg_form_container .f-names {color:#000000; font-size:12px;} +div.reg_form_container .f-names {color: rgba(0, 0, 0, 0.6); font-size:12px;} div.breadcrumbsplaceholder {height:25px; clear:both;margin:20px 0px 20px 0px; width:950px; background:#f0f0f0; color:#000;} #amphome{width:1000px; margin:0 auto;} #amphomesidebar{width:220px; float:right;} @@ -543,7 +543,7 @@ div.reg_form_container h2 { font-size:30px; font-weight:bold; color:#FFFFFF; bac span.formnote{color:#595959; font-size:14px;font-weight:500;line-height:20px;} td.title{background-color:#f0f0f0;color:#999; font-size:12px;font-weight:bold;padding:10px;} /* changed font-size */ -div.reg_form_container .f-names {color:#000000; font-size:14px; text-align: right; padding-right: 30px;} +div.reg_form_container .f-names {color: rgba(0, 0, 0, 0.6); font-size:14px; text-align: right; padding-right: 30px;} /* added input row container - tmugo */ div.reg_form_container .input_row_container td { border-bottom: 1px solid #edeff1; padding: 18px;} div.reg_form_container .reg_submit_btn_container td { padding: 20px 18px; border-bottom: none;} diff --git a/amp/TEMPLATE/ampTemplate/layout/loginWidget3.jsp b/amp/TEMPLATE/ampTemplate/layout/loginWidget3.jsp index c99fc7081a6..feb11485f3b 100644 --- a/amp/TEMPLATE/ampTemplate/layout/loginWidget3.jsp +++ b/amp/TEMPLATE/ampTemplate/layout/loginWidget3.jsp @@ -94,7 +94,7 @@ Click here to change your password - + Change Password
diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/src/css/main.css b/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/src/css/main.css index 3458173bbfc..9f642dc0fe2 100644 --- a/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/src/css/main.css +++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/src/css/main.css @@ -183,6 +183,10 @@ div#amp-header div#logincontainer { padding-left: 140px; /* IE9 fix that works everywhere: make room for green login button */ + background-color: red; + height: 100%; + display: flex; + align-items: center; } div#amp-header .login_here { diff --git a/amp/WEB-INF/src/org/digijava/module/aim/action/ShowChangePassword.java b/amp/WEB-INF/src/org/digijava/module/aim/action/ShowChangePassword.java index e71951eac1d..f699dc686ff 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/action/ShowChangePassword.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/action/ShowChangePassword.java @@ -27,7 +27,7 @@ public ActionForward execute(ActionMapping mapping, cpForm.setUserId(tm.getEmail()); cpForm.setUserIdEnabled(true); }else { - cpForm.setUserIdEnabled(true); + cpForm.setUserIdEnabled(false); } return mapping.findForward("forward"); diff --git a/amp/repository/aim/view/changePassword.jsp b/amp/repository/aim/view/changePassword.jsp index a2d44bcabe9..688b1b7431b 100644 --- a/amp/repository/aim/view/changePassword.jsp +++ b/amp/repository/aim/view/changePassword.jsp @@ -101,17 +101,12 @@ function validate(){ * - UserId + User ID 		- -     - - -     - - + +     From 0bcdb666df5c3732afb08feff7c4e61f58e6454c Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Wed, 14 Dec 2022 13:41:56 +0300 Subject: [PATCH 023/135] AMP-30380 changed the header-template styling of change password so that it would be in the middle --- .../ampTemplate/node_modules/amp-boilerplate/src/css/main.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/src/css/main.css b/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/src/css/main.css index 9f642dc0fe2..cebc4dcfd02 100644 --- a/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/src/css/main.css +++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/src/css/main.css @@ -183,10 +183,8 @@ div#amp-header div#logincontainer { padding-left: 140px; /* IE9 fix that works everywhere: make room for green login button */ - background-color: red; height: 100%; - display: flex; - align-items: center; + margin-top: 1.9%; } div#amp-header .login_here { From 34bbca71ea8ed5e2b52fb779b5716498ef736b26 Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Wed, 14 Dec 2022 14:27:24 +0300 Subject: [PATCH 024/135] AMP-30380 fixed the user ID field to be disabled when user is logged in --- .../digijava/module/aim/action/ShowChangePassword.java | 7 ++++--- amp/repository/aim/view/changePassword.jsp | 9 ++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/amp/WEB-INF/src/org/digijava/module/aim/action/ShowChangePassword.java b/amp/WEB-INF/src/org/digijava/module/aim/action/ShowChangePassword.java index f699dc686ff..9eeb54943a0 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/action/ShowChangePassword.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/action/ShowChangePassword.java @@ -9,6 +9,7 @@ import org.digijava.module.aim.helper.Constants; import org.digijava.module.aim.helper.TeamMember; import org.digijava.module.aim.util.TeamUtil; +import org.jfree.util.Log; public class ShowChangePassword extends Action { @@ -21,13 +22,13 @@ public ActionForward execute(ActionMapping mapping, java.lang.Exception { ChangePasswordForm cpForm = (ChangePasswordForm) form; - TeamMember tm = (TeamMember) TLSUtils.getRequest().getSession().getAttribute(Constants.CURRENT_MEMBER); + TeamMember tm = TeamUtil.getCurrentMember(); if (tm != null && tm.getEmail() != null) { cpForm.setUserId(tm.getEmail()); - cpForm.setUserIdEnabled(true); - }else { cpForm.setUserIdEnabled(false); + }else { + cpForm.setUserIdEnabled(true); } return mapping.findForward("forward"); diff --git a/amp/repository/aim/view/changePassword.jsp b/amp/repository/aim/view/changePassword.jsp index 688b1b7431b..3fabe92f1df 100644 --- a/amp/repository/aim/view/changePassword.jsp +++ b/amp/repository/aim/view/changePassword.jsp @@ -105,7 +105,14 @@ function validate(){ - + + +     + + + +     +     From 8931bab78ce09be9cd777fd5ac42b424678c92bd Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Thu, 15 Dec 2022 09:52:59 +0300 Subject: [PATCH 025/135] AMP-30412 fixed fetch activity action to catch error if activity does not exist --- .../preview/actions/ActivityActions.jsx | 123 ++-- .../preview/reducers/ActivityReducer.jsx | 3 +- amp/TEMPLATE/reamp/package-lock.json | 689 ++++++++++++++---- 3 files changed, 621 insertions(+), 194 deletions(-) diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/actions/ActivityActions.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/actions/ActivityActions.jsx index 8066c3be13c..9b27ff44b6e 100644 --- a/amp/TEMPLATE/reamp/modules/activity/preview/actions/ActivityActions.jsx +++ b/amp/TEMPLATE/reamp/modules/activity/preview/actions/ActivityActions.jsx @@ -51,70 +51,77 @@ export function loadActivityForActivityPreview(activityId) { dispatch(sendingRequest()); const paths = [...FieldPathConstants.ADJUSTMENT_TYPE_PATHS]; const {settings} = ownProps().startUpReducer; - ActivityApi.fetchActivityInfo(activityId).then(activityInfo => { - Promise.all([ActivityApi.getActivity(activityId), - ActivityApi.getFieldsDefinition(activityInfo.activityWorkspace[WorkspaceConstants.TEMPLATE_ID]), - ActivityApi.fetchFmConfiguration(FmManagerHelper.getRequestFmSyncUpBody(Object.values(FeatureManagerConstants)))] - ).then(([activity, fieldsDef, fmTree]) => { - const isSSC = activity[ActivityConstants.ACTIVITY_TYPE] === ActivityConstants.ACTIVITY_TYPE_SSC; - _registerSettings(settings.language, settings['default-date-format'].toUpperCase(), isSSC); - if (settings[TEAM_ID]) { - ContactAction.loadHydratedContactsForActivity(activity)(dispatch, ownProps); - loadWsInfoForActivity(activity, dispatch); - } - ResourceAction.loadResourcesForActivity(activity)(dispatch, ownProps); - //TODO find a better way to filter out non enabled paths - const activityFieldsManagerTemp = new FieldsManager(fieldsDef, [], - settings.language, Logger); - const enabledPaths = paths.filter(path => activityFieldsManagerTemp.isFieldPathEnabled(path)); - Promise.all([ActivityApi.fetchPossibleValues(enabledPaths), - ActivityApi.fetchFundingInformation(activityId, settings[Constants.EFFECTIVE_CURRENCY].id)]) - .then(([possibleValuesCollectionAPI, activityFundingInformation]) => { - const activityFieldsManager = new FieldsManager(fieldsDef, - processPossibleValues(possibleValuesCollectionAPI), settings.language, Logger); - _populateFMTree(fmTree); - _configureNumberUtils(settings); - - ActivityApi.fetchValuesForHydration(HydratorHelper.fetchRequestDataForHydration(activity, - activityFieldsManager, ''), - activityInfo.activityWorkspace[WorkspaceConstants.TEMPLATE_ID]) - .then(valuesForHydration => { - HydratorHelper.hydrateObject(activity, activityFieldsManager, '', - null, valuesForHydration); - activity.id = String(activity.internal_id); - _convertCurrency(activity, activityFundingInformation, activityFieldsManagerTemp); - // we create an empty currency rates manager since we will be converting from same currencies, - // it wont be used it will just return 1. - const currencyRatesManager = new CurrencyRatesManager([], - activityFundingInformation.currency, translate, DateUtils, {}); - return dispatch({ - type: ACTIVITY_LOAD_LOADED, - payload: { - activity: activity, - activityFieldsManager, - activityContext: _getActivityContext(settings, activityInfo, activity), - activityFundingTotals: new ActivityFundingTotals(activity, activityFundingInformation), - currencyRatesManager - } - }); - }); - }).catch(error => { - return dispatch({ - type: ACTIVITY_LOAD_FAILED, - payload: { - error: error + + ActivityApi.fetchActivityInfo(activityId) + .then((activityInfo) => { + ActivityApi.fetchActivityInfo(activityId).then(activityInfo => { + + Promise.all([ + ActivityApi.getActivity(activityId), + ActivityApi.getFieldsDefinition(activityInfo.activityWorkspace[WorkspaceConstants.TEMPLATE_ID]), + ActivityApi.fetchFmConfiguration(FmManagerHelper.getRequestFmSyncUpBody(Object.values(FeatureManagerConstants)))] + ).then(([activity, fieldsDef, fmTree]) => { + const isSSC = activity[ActivityConstants.ACTIVITY_TYPE] === ActivityConstants.ACTIVITY_TYPE_SSC; + _registerSettings(settings.language, settings['default-date-format'].toUpperCase(), isSSC); + if (settings[TEAM_ID]) { + ContactAction.loadHydratedContactsForActivity(activity)(dispatch, ownProps); + loadWsInfoForActivity(activity, dispatch); } + ResourceAction.loadResourcesForActivity(activity)(dispatch, ownProps); + //TODO find a better way to filter out non enabled paths + const activityFieldsManagerTemp = new FieldsManager(fieldsDef, [], + settings.language, Logger); + const enabledPaths = paths.filter(path => activityFieldsManagerTemp.isFieldPathEnabled(path)); + Promise.all([ActivityApi.fetchPossibleValues(enabledPaths), + ActivityApi.fetchFundingInformation(activityId, settings[Constants.EFFECTIVE_CURRENCY].id)]) + .then(([possibleValuesCollectionAPI, activityFundingInformation]) => { + const activityFieldsManager = new FieldsManager(fieldsDef, + processPossibleValues(possibleValuesCollectionAPI), settings.language, Logger); + _populateFMTree(fmTree); + _configureNumberUtils(settings); + + ActivityApi.fetchValuesForHydration(HydratorHelper.fetchRequestDataForHydration(activity, + activityFieldsManager, ''), + activityInfo.activityWorkspace[WorkspaceConstants.TEMPLATE_ID]) + .then(valuesForHydration => { + HydratorHelper.hydrateObject(activity, activityFieldsManager, '', + null, valuesForHydration); + activity.id = String(activity.internal_id); + _convertCurrency(activity, activityFundingInformation, activityFieldsManagerTemp); + // we create an empty currency rates manager since we will be converting from same currencies, + // it wont be used it will just return 1. + const currencyRatesManager = new CurrencyRatesManager([], + activityFundingInformation.currency, translate, DateUtils, {}); + return dispatch({ + type: ACTIVITY_LOAD_LOADED, + payload: { + activity: activity, + activityFieldsManager, + activityContext: _getActivityContext(settings, activityInfo, activity), + activityFundingTotals: new ActivityFundingTotals(activity, activityFundingInformation), + currencyRatesManager + } + }); + }); + }).catch(error => { + return dispatch({ + type: ACTIVITY_LOAD_FAILED, + payload: { + error: error + } + }); + }); }); - }); //TODO catch errors - }).catch(error => { + }); + }) + .catch((error) => { return dispatch({ type: ACTIVITY_LOAD_FAILED, payload: { - error: error + error } - }); - }); - }); + }) + }) }; function _registerSettings(lang, pGSDateFormat, isSSC) { diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/reducers/ActivityReducer.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/reducers/ActivityReducer.jsx index f8e83f45a24..416bab466df 100644 --- a/amp/TEMPLATE/reamp/modules/activity/preview/reducers/ActivityReducer.jsx +++ b/amp/TEMPLATE/reamp/modules/activity/preview/reducers/ActivityReducer.jsx @@ -35,7 +35,8 @@ export default function activityReducer(state: Object = defaultState, action: Ob return { ...state, error: action.payload.error, - isActivityLoading: false + isActivityLoading: false, + isActivityLoaded: true }; case ACTIVITY_WS_INFO_LOADED: return {...state, activityWsInfo: action.payload.activityWsInfo}; diff --git a/amp/TEMPLATE/reamp/package-lock.json b/amp/TEMPLATE/reamp/package-lock.json index 7a692b51fa4..22a3a4bdbd9 100644 --- a/amp/TEMPLATE/reamp/package-lock.json +++ b/amp/TEMPLATE/reamp/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "reamp", "version": "0.1.0", "license": "inherit", "dependencies": { @@ -21,7 +22,7 @@ "uglifyjs-webpack-plugin": "^1.3.0" }, "devDependencies": { - "amp-ui": "github:devgateway/amp-ui#AMP-30405-calendar", + "amp-ui": "github:devgateway/amp-ui#develop", "babel-core": "^6.26.3", "babel-jest": "^6.0.1", "babel-loader": "^6.3.2", @@ -215,6 +216,7 @@ "node_modules/align-text": { "version": "0.1.4", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", + "dev": true, "dependencies": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -227,6 +229,7 @@ "node_modules/amdefine": { "version": "1.0.1", "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", + "dev": true, "engines": { "node": ">=0.4.2" } @@ -287,6 +290,7 @@ "node_modules/anymatch": { "version": "1.3.2", "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", + "dev": true, "dependencies": { "micromatch": "^2.1.5", "normalize-path": "^2.0.0" @@ -324,6 +328,7 @@ "node_modules/arr-union": { "version": "3.1.0", "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -362,6 +367,7 @@ "node_modules/assert": { "version": "1.5.0", "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", + "dev": true, "dependencies": { "object-assign": "^4.1.1", "util": "0.10.3" @@ -377,11 +383,13 @@ }, "node_modules/assert/node_modules/inherits": { "version": "2.0.1", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=" + "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", + "dev": true }, "node_modules/assert/node_modules/util": { "version": "0.10.3", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", + "dev": true, "dependencies": { "inherits": "2.0.1" } @@ -389,17 +397,20 @@ "node_modules/assign-symbols": { "version": "1.0.0", "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", + "dev": true, "engines": { "node": ">=0.10.0" } }, "node_modules/async": { "version": "1.5.2", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "dev": true }, "node_modules/async-each": { "version": "1.0.3", - "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==" + "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==", + "dev": true }, "node_modules/asynckit": { "version": "0.4.0", @@ -409,6 +420,7 @@ "node_modules/atob": { "version": "2.1.2", "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", + "dev": true, "bin": { "atob": "bin/atob.js" }, @@ -1340,6 +1352,7 @@ "node_modules/base": { "version": "0.11.2", "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", + "dev": true, "dependencies": { "cache-base": "^1.0.1", "class-utils": "^0.3.5", @@ -1356,6 +1369,7 @@ "node_modules/base/node_modules/define-property": { "version": "1.0.0", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, "dependencies": { "is-descriptor": "^1.0.0" }, @@ -1366,6 +1380,7 @@ "node_modules/base/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -1373,6 +1388,7 @@ "node_modules/base64-js": { "version": "1.5.1", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true, "funding": [ { "type": "github", @@ -1404,6 +1420,7 @@ "node_modules/big.js": { "version": "3.2.0", "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==", + "dev": true, "engines": { "node": "*" } @@ -1411,6 +1428,7 @@ "node_modules/binary-extensions": { "version": "1.13.1", "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -1529,6 +1547,7 @@ "node_modules/browserify-aes": { "version": "0.4.0", "integrity": "sha1-BnFJtmjfMcS1hTPgLQHoBthgjiw=", + "dev": true, "dependencies": { "inherits": "^2.0.1" } @@ -1536,13 +1555,15 @@ "node_modules/browserify-zlib": { "version": "0.1.4", "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=", + "dev": true, "dependencies": { "pako": "~0.2.0" } }, "node_modules/browserify-zlib/node_modules/pako": { "version": "0.2.9", - "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=" + "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=", + "dev": true }, "node_modules/browserslist": { "version": "0.4.0", @@ -1564,6 +1585,7 @@ "node_modules/buffer": { "version": "4.9.2", "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", + "dev": true, "dependencies": { "base64-js": "^1.0.2", "ieee754": "^1.1.4", @@ -1576,7 +1598,8 @@ }, "node_modules/builtin-status-codes": { "version": "3.0.0", - "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=" + "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", + "dev": true }, "node_modules/bytes": { "version": "3.0.0", @@ -1626,6 +1649,7 @@ "node_modules/cache-base": { "version": "1.0.1", "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", + "dev": true, "dependencies": { "collection-visit": "^1.0.0", "component-emitter": "^1.2.1", @@ -1644,6 +1668,7 @@ "node_modules/cache-base/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -1651,6 +1676,7 @@ "node_modules/camelcase": { "version": "1.2.1", "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -1668,6 +1694,7 @@ "node_modules/center-align": { "version": "0.1.3", "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", + "dev": true, "dependencies": { "align-text": "^0.1.3", "lazy-cache": "^1.0.3" @@ -1694,6 +1721,7 @@ "version": "1.7.0", "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.", + "dev": true, "dependencies": { "anymatch": "^1.3.0", "async-each": "^1.0.0", @@ -1715,6 +1743,7 @@ "node_modules/class-utils": { "version": "0.3.6", "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", + "dev": true, "dependencies": { "arr-union": "^3.1.0", "define-property": "^0.2.5", @@ -1728,6 +1757,7 @@ "node_modules/class-utils/node_modules/define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, "dependencies": { "is-descriptor": "^0.1.0" }, @@ -1738,6 +1768,7 @@ "node_modules/class-utils/node_modules/is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -1748,6 +1779,7 @@ "node_modules/class-utils/node_modules/is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -1758,6 +1790,7 @@ "node_modules/class-utils/node_modules/is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, "dependencies": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -1770,6 +1803,7 @@ "node_modules/class-utils/node_modules/is-descriptor/node_modules/kind-of": { "version": "5.1.0", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -1777,6 +1811,7 @@ "node_modules/class-utils/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -1799,6 +1834,7 @@ "node_modules/cliui": { "version": "2.1.0", "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "dev": true, "dependencies": { "center-align": "^0.1.1", "right-align": "^0.1.1", @@ -1808,6 +1844,7 @@ "node_modules/cliui/node_modules/wordwrap": { "version": "0.0.2", "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", + "dev": true, "engines": { "node": ">=0.4.0" } @@ -1815,6 +1852,7 @@ "node_modules/clone": { "version": "1.0.4", "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", + "dev": true, "engines": { "node": ">=0.8" } @@ -1845,6 +1883,7 @@ "node_modules/collection-visit": { "version": "1.0.0", "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", + "dev": true, "dependencies": { "map-visit": "^1.0.0", "object-visit": "^1.0.0" @@ -1942,7 +1981,8 @@ }, "node_modules/component-emitter": { "version": "1.3.0", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", + "dev": true }, "node_modules/compressible": { "version": "2.0.18", @@ -2019,11 +2059,13 @@ }, "node_modules/console-browserify": { "version": "1.2.0", - "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==" + "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==", + "dev": true }, "node_modules/constants-browserify": { "version": "1.0.0", - "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=" + "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", + "dev": true }, "node_modules/content-disposition": { "version": "0.5.4", @@ -2098,6 +2140,7 @@ "node_modules/copy-descriptor": { "version": "0.1.1", "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -2158,6 +2201,7 @@ "node_modules/crypto-browserify": { "version": "3.3.0", "integrity": "sha1-ufx1u0oO1h3PHNXa6W6zDJw+UGw=", + "dev": true, "dependencies": { "browserify-aes": "0.4.0", "pbkdf2-compat": "2.0.1", @@ -2292,6 +2336,7 @@ "node_modules/decamelize": { "version": "1.2.0", "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -2299,6 +2344,7 @@ "node_modules/decode-uri-component": { "version": "0.2.0", "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", + "dev": true, "engines": { "node": ">=0.10" } @@ -2316,6 +2362,7 @@ "node_modules/define-property": { "version": "2.0.2", "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", + "dev": true, "dependencies": { "is-descriptor": "^1.0.2", "isobject": "^3.0.1" @@ -2327,6 +2374,7 @@ "node_modules/define-property/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -2460,6 +2508,7 @@ "node_modules/domain-browser": { "version": "1.2.0", "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==", + "dev": true, "engines": { "node": ">=0.4", "npm": ">=1.2" @@ -2538,6 +2587,7 @@ "node_modules/emojis-list": { "version": "2.1.0", "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", + "dev": true, "engines": { "node": ">= 0.10" } @@ -2567,6 +2617,7 @@ "node_modules/enhanced-resolve": { "version": "0.9.1", "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=", + "dev": true, "dependencies": { "graceful-fs": "^4.1.2", "memory-fs": "^0.2.0", @@ -2578,7 +2629,8 @@ }, "node_modules/enhanced-resolve/node_modules/memory-fs": { "version": "0.2.0", - "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=" + "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=", + "dev": true }, "node_modules/entities": { "version": "1.1.2", @@ -2719,6 +2771,7 @@ "node_modules/events": { "version": "1.1.1", "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", + "dev": true, "engines": { "node": ">=0.4.x" } @@ -2893,6 +2946,7 @@ "node_modules/extend-shallow": { "version": "3.0.2", "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, "dependencies": { "assign-symbols": "^1.0.0", "is-extendable": "^1.0.1" @@ -2904,6 +2958,7 @@ "node_modules/extend-shallow/node_modules/is-extendable": { "version": "1.0.1", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, "dependencies": { "is-plain-object": "^2.0.4" }, @@ -3178,6 +3233,7 @@ "node_modules/fragment-cache": { "version": "0.2.1", "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", + "dev": true, "dependencies": { "map-cache": "^0.2.2" }, @@ -3282,6 +3338,7 @@ "node_modules/get-value": { "version": "2.0.6", "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -3410,6 +3467,7 @@ "node_modules/has-flag": { "version": "1.0.0", "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -3417,6 +3475,7 @@ "node_modules/has-value": { "version": "1.0.0", "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", + "dev": true, "dependencies": { "get-value": "^2.0.6", "has-values": "^1.0.0", @@ -3429,6 +3488,7 @@ "node_modules/has-value/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -3436,6 +3496,7 @@ "node_modules/has-values": { "version": "1.0.0", "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", + "dev": true, "dependencies": { "is-number": "^3.0.0", "kind-of": "^4.0.0" @@ -3447,6 +3508,7 @@ "node_modules/has-values/node_modules/is-number": { "version": "3.0.0", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -3457,6 +3519,7 @@ "node_modules/has-values/node_modules/is-number/node_modules/kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, "dependencies": { "is-buffer": "^1.1.5" }, @@ -3467,6 +3530,7 @@ "node_modules/has-values/node_modules/kind-of": { "version": "4.0.0", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "dev": true, "dependencies": { "is-buffer": "^1.1.5" }, @@ -3634,7 +3698,8 @@ }, "node_modules/https-browserify": { "version": "0.0.1", - "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=" + "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=", + "dev": true }, "node_modules/iconv-lite": { "version": "0.6.3", @@ -3649,6 +3714,7 @@ "node_modules/ieee754": { "version": "1.2.1", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "dev": true, "funding": [ { "type": "github", @@ -3718,7 +3784,8 @@ }, "node_modules/indexof": { "version": "0.0.1", - "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=" + "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", + "dev": true }, "node_modules/inflight": { "version": "1.0.6", @@ -3734,7 +3801,8 @@ }, "node_modules/interpret": { "version": "0.6.6", - "integrity": "sha1-/s16GOfOXKar+5U+H4YhOknxYls=" + "integrity": "sha1-/s16GOfOXKar+5U+H4YhOknxYls=", + "dev": true }, "node_modules/invariant": { "version": "2.2.4", @@ -3762,6 +3830,7 @@ "node_modules/is-accessor-descriptor": { "version": "1.0.0", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, "dependencies": { "kind-of": "^6.0.0" }, @@ -3772,6 +3841,7 @@ "node_modules/is-accessor-descriptor/node_modules/kind-of": { "version": "6.0.3", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -3783,6 +3853,7 @@ "node_modules/is-binary-path": { "version": "1.0.1", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "dev": true, "dependencies": { "binary-extensions": "^1.0.0" }, @@ -3807,6 +3878,7 @@ "node_modules/is-data-descriptor": { "version": "1.0.0", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, "dependencies": { "kind-of": "^6.0.0" }, @@ -3817,6 +3889,7 @@ "node_modules/is-data-descriptor/node_modules/kind-of": { "version": "6.0.3", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -3824,6 +3897,7 @@ "node_modules/is-descriptor": { "version": "1.0.2", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, "dependencies": { "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", @@ -3836,6 +3910,7 @@ "node_modules/is-descriptor/node_modules/kind-of": { "version": "6.0.3", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -3912,6 +3987,7 @@ "node_modules/is-plain-object": { "version": "2.0.4", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "dev": true, "dependencies": { "isobject": "^3.0.1" }, @@ -3922,6 +3998,7 @@ "node_modules/is-plain-object/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -3959,6 +4036,7 @@ "node_modules/is-windows": { "version": "1.0.2", "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -4308,6 +4386,7 @@ "node_modules/lazy-cache": { "version": "1.0.4", "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -4549,6 +4628,7 @@ "node_modules/loader-utils": { "version": "0.2.17", "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", + "dev": true, "dependencies": { "big.js": "^3.1.3", "emojis-list": "^2.0.0", @@ -4694,6 +4774,7 @@ "node_modules/longest": { "version": "1.0.1", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -4744,6 +4825,7 @@ "node_modules/map-cache": { "version": "0.2.2", "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -4751,6 +4833,7 @@ "node_modules/map-visit": { "version": "1.0.0", "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", + "dev": true, "dependencies": { "object-visit": "^1.0.0" }, @@ -4778,6 +4861,7 @@ "node_modules/memory-fs": { "version": "0.3.0", "integrity": "sha1-e8xrYp46Q+hx1+Kaymrop/FcuyA=", + "dev": true, "dependencies": { "errno": "^0.1.3", "readable-stream": "^2.0.1" @@ -4786,6 +4870,7 @@ "node_modules/memory-fs/node_modules/readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -4799,6 +4884,7 @@ "node_modules/memory-fs/node_modules/string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } @@ -4909,6 +4995,7 @@ "node_modules/mixin-deep": { "version": "1.3.2", "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", + "dev": true, "dependencies": { "for-in": "^1.0.2", "is-extendable": "^1.0.1" @@ -4920,6 +5007,7 @@ "node_modules/mixin-deep/node_modules/is-extendable": { "version": "1.0.1", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, "dependencies": { "is-plain-object": "^2.0.4" }, @@ -4964,6 +5052,7 @@ "node_modules/nanomatch": { "version": "1.2.13", "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", + "dev": true, "dependencies": { "arr-diff": "^4.0.0", "array-unique": "^0.3.2", @@ -4984,6 +5073,7 @@ "node_modules/nanomatch/node_modules/arr-diff": { "version": "4.0.0", "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -4991,6 +5081,7 @@ "node_modules/nanomatch/node_modules/array-unique": { "version": "0.3.2", "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -4998,6 +5089,7 @@ "node_modules/nanomatch/node_modules/kind-of": { "version": "6.0.3", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -5052,6 +5144,7 @@ "node_modules/node-libs-browser": { "version": "0.7.0", "integrity": "sha1-PicsCBnjCJNeJmdECNevDhSRuDs=", + "dev": true, "dependencies": { "assert": "^1.1.1", "browserify-zlib": "^0.1.4", @@ -5080,11 +5173,13 @@ }, "node_modules/node-libs-browser/node_modules/punycode": { "version": "1.4.1", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", + "dev": true }, "node_modules/node-libs-browser/node_modules/readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -5098,13 +5193,15 @@ "node_modules/node-libs-browser/node_modules/readable-stream/node_modules/string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } }, "node_modules/node-libs-browser/node_modules/string_decoder": { "version": "0.10.31", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true }, "node_modules/node-worker-pool": { "version": "3.0.2", @@ -5204,6 +5301,7 @@ "node_modules/object-copy": { "version": "0.1.0", "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", + "dev": true, "dependencies": { "copy-descriptor": "^0.1.0", "define-property": "^0.2.5", @@ -5216,6 +5314,7 @@ "node_modules/object-copy/node_modules/define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, "dependencies": { "is-descriptor": "^0.1.0" }, @@ -5226,6 +5325,7 @@ "node_modules/object-copy/node_modules/is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -5236,6 +5336,7 @@ "node_modules/object-copy/node_modules/is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -5246,6 +5347,7 @@ "node_modules/object-copy/node_modules/is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, "dependencies": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -5258,6 +5360,7 @@ "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": { "version": "5.1.0", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -5265,6 +5368,7 @@ "node_modules/object-visit": { "version": "1.0.1", "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", + "dev": true, "dependencies": { "isobject": "^3.0.0" }, @@ -5275,6 +5379,7 @@ "node_modules/object-visit/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -5293,6 +5398,7 @@ "node_modules/object.pick": { "version": "1.3.0", "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", + "dev": true, "dependencies": { "isobject": "^3.0.1" }, @@ -5303,6 +5409,7 @@ "node_modules/object.pick/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -5344,6 +5451,7 @@ "node_modules/optimist": { "version": "0.6.1", "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "dev": true, "dependencies": { "minimist": "~0.0.1", "wordwrap": "~0.0.2" @@ -5351,11 +5459,13 @@ }, "node_modules/optimist/node_modules/minimist": { "version": "0.0.10", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", + "dev": true }, "node_modules/optimist/node_modules/wordwrap": { "version": "0.0.3", "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "dev": true, "engines": { "node": ">=0.4.0" } @@ -5394,7 +5504,8 @@ }, "node_modules/os-browserify": { "version": "0.2.1", - "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=" + "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=", + "dev": true }, "node_modules/os-homedir": { "version": "1.0.2", @@ -5510,13 +5621,15 @@ "node_modules/pascalcase": { "version": "0.1.1", "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", + "dev": true, "engines": { "node": ">=0.10.0" } }, "node_modules/path-browserify": { "version": "0.0.0", - "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=" + "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", + "dev": true }, "node_modules/path-exists": { "version": "2.1.0", @@ -5558,7 +5671,8 @@ }, "node_modules/pbkdf2-compat": { "version": "2.0.1", - "integrity": "sha1-tuDI+plJTZTgURV1gCpZpcFC8og=" + "integrity": "sha1-tuDI+plJTZTgURV1gCpZpcFC8og=", + "dev": true }, "node_modules/performance-now": { "version": "2.1.0", @@ -5607,6 +5721,7 @@ "node_modules/posix-character-classes": { "version": "0.1.1", "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -5917,6 +6032,7 @@ "node_modules/process": { "version": "0.11.10", "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", + "dev": true, "engines": { "node": ">= 0.6.0" } @@ -6036,6 +6152,7 @@ "version": "0.2.0", "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.", + "dev": true, "engines": { "node": ">=0.4.x" } @@ -6043,6 +6160,7 @@ "node_modules/querystring-es3": { "version": "0.2.1", "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", + "dev": true, "engines": { "node": ">=0.4.x" } @@ -6584,6 +6702,7 @@ "node_modules/readdirp": { "version": "2.2.1", "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", + "dev": true, "dependencies": { "graceful-fs": "^4.1.11", "micromatch": "^3.1.10", @@ -6596,6 +6715,7 @@ "node_modules/readdirp/node_modules/arr-diff": { "version": "4.0.0", "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -6603,6 +6723,7 @@ "node_modules/readdirp/node_modules/array-unique": { "version": "0.3.2", "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -6610,6 +6731,7 @@ "node_modules/readdirp/node_modules/braces": { "version": "2.3.2", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, "dependencies": { "arr-flatten": "^1.1.0", "array-unique": "^0.3.2", @@ -6629,6 +6751,7 @@ "node_modules/readdirp/node_modules/braces/node_modules/extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -6639,6 +6762,7 @@ "node_modules/readdirp/node_modules/expand-brackets": { "version": "2.1.4", "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "dev": true, "dependencies": { "debug": "^2.3.3", "define-property": "^0.2.5", @@ -6655,6 +6779,7 @@ "node_modules/readdirp/node_modules/expand-brackets/node_modules/define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, "dependencies": { "is-descriptor": "^0.1.0" }, @@ -6665,6 +6790,7 @@ "node_modules/readdirp/node_modules/expand-brackets/node_modules/extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -6675,6 +6801,7 @@ "node_modules/readdirp/node_modules/expand-brackets/node_modules/is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, "dependencies": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -6687,6 +6814,7 @@ "node_modules/readdirp/node_modules/expand-brackets/node_modules/kind-of": { "version": "5.1.0", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -6694,6 +6822,7 @@ "node_modules/readdirp/node_modules/extglob": { "version": "2.0.4", "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "dev": true, "dependencies": { "array-unique": "^0.3.2", "define-property": "^1.0.0", @@ -6711,6 +6840,7 @@ "node_modules/readdirp/node_modules/extglob/node_modules/define-property": { "version": "1.0.0", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, "dependencies": { "is-descriptor": "^1.0.0" }, @@ -6721,6 +6851,7 @@ "node_modules/readdirp/node_modules/extglob/node_modules/extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -6731,6 +6862,7 @@ "node_modules/readdirp/node_modules/fill-range": { "version": "4.0.0", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, "dependencies": { "extend-shallow": "^2.0.1", "is-number": "^3.0.0", @@ -6744,6 +6876,7 @@ "node_modules/readdirp/node_modules/fill-range/node_modules/extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -6754,6 +6887,7 @@ "node_modules/readdirp/node_modules/is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -6764,6 +6898,7 @@ "node_modules/readdirp/node_modules/is-accessor-descriptor/node_modules/kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, "dependencies": { "is-buffer": "^1.1.5" }, @@ -6774,6 +6909,7 @@ "node_modules/readdirp/node_modules/is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -6784,6 +6920,7 @@ "node_modules/readdirp/node_modules/is-data-descriptor/node_modules/kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, "dependencies": { "is-buffer": "^1.1.5" }, @@ -6794,6 +6931,7 @@ "node_modules/readdirp/node_modules/is-number": { "version": "3.0.0", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -6804,6 +6942,7 @@ "node_modules/readdirp/node_modules/is-number/node_modules/kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, "dependencies": { "is-buffer": "^1.1.5" }, @@ -6814,6 +6953,7 @@ "node_modules/readdirp/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -6821,6 +6961,7 @@ "node_modules/readdirp/node_modules/kind-of": { "version": "6.0.3", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -6828,6 +6969,7 @@ "node_modules/readdirp/node_modules/micromatch": { "version": "3.1.10", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, "dependencies": { "arr-diff": "^4.0.0", "array-unique": "^0.3.2", @@ -6850,6 +6992,7 @@ "node_modules/readdirp/node_modules/readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -6863,6 +7006,7 @@ "node_modules/readdirp/node_modules/string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } @@ -6951,6 +7095,7 @@ "node_modules/regex-not": { "version": "1.0.2", "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", + "dev": true, "dependencies": { "extend-shallow": "^3.0.2", "safe-regex": "^1.1.0" @@ -7084,11 +7229,13 @@ "node_modules/resolve-url": { "version": "0.2.1", "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", - "deprecated": "https://github.com/lydell/resolve-url#deprecated" + "deprecated": "https://github.com/lydell/resolve-url#deprecated", + "dev": true }, "node_modules/ret": { "version": "0.1.15", "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", + "dev": true, "engines": { "node": ">=0.12" } @@ -7096,6 +7243,7 @@ "node_modules/right-align": { "version": "0.1.3", "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", + "dev": true, "dependencies": { "align-text": "^0.1.1" }, @@ -7133,7 +7281,8 @@ }, "node_modules/ripemd160": { "version": "0.2.0", - "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=" + "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=", + "dev": true }, "node_modules/run-queue": { "version": "1.0.3", @@ -7149,6 +7298,7 @@ "node_modules/safe-regex": { "version": "1.1.0", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", + "dev": true, "dependencies": { "ret": "~0.1.10" } @@ -7299,6 +7449,7 @@ "node_modules/set-value": { "version": "2.0.1", "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", + "dev": true, "dependencies": { "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", @@ -7312,6 +7463,7 @@ "node_modules/set-value/node_modules/extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -7331,6 +7483,7 @@ "node_modules/sha.js": { "version": "2.2.6", "integrity": "sha1-F93t3F9yL7ZlAWWIlUYZd4ZzFbo=", + "dev": true, "bin": { "sha.js": "bin.js" } @@ -7349,6 +7502,7 @@ "node_modules/snapdragon": { "version": "0.8.2", "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", + "dev": true, "dependencies": { "base": "^0.11.1", "debug": "^2.2.0", @@ -7366,6 +7520,7 @@ "node_modules/snapdragon-node": { "version": "2.1.1", "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", + "dev": true, "dependencies": { "define-property": "^1.0.0", "isobject": "^3.0.0", @@ -7378,6 +7533,7 @@ "node_modules/snapdragon-node/node_modules/define-property": { "version": "1.0.0", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, "dependencies": { "is-descriptor": "^1.0.0" }, @@ -7388,6 +7544,7 @@ "node_modules/snapdragon-node/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -7395,6 +7552,7 @@ "node_modules/snapdragon-util": { "version": "3.0.1", "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", + "dev": true, "dependencies": { "kind-of": "^3.2.0" }, @@ -7405,6 +7563,7 @@ "node_modules/snapdragon/node_modules/define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, "dependencies": { "is-descriptor": "^0.1.0" }, @@ -7415,6 +7574,7 @@ "node_modules/snapdragon/node_modules/extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -7425,6 +7585,7 @@ "node_modules/snapdragon/node_modules/is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -7435,6 +7596,7 @@ "node_modules/snapdragon/node_modules/is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -7445,6 +7607,7 @@ "node_modules/snapdragon/node_modules/is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, "dependencies": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -7457,6 +7620,7 @@ "node_modules/snapdragon/node_modules/is-descriptor/node_modules/kind-of": { "version": "5.1.0", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -7531,7 +7695,8 @@ }, "node_modules/source-list-map": { "version": "0.1.8", - "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=" + "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=", + "dev": true }, "node_modules/source-map": { "version": "0.5.7", @@ -7544,6 +7709,7 @@ "version": "0.5.3", "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated", + "dev": true, "dependencies": { "atob": "^2.1.2", "decode-uri-component": "^0.2.0", @@ -7562,7 +7728,8 @@ "node_modules/source-map-url": { "version": "0.4.1", "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==", - "deprecated": "See https://github.com/lydell/source-map-url#deprecated" + "deprecated": "See https://github.com/lydell/source-map-url#deprecated", + "dev": true }, "node_modules/spdx-correct": { "version": "3.1.1", @@ -7591,6 +7758,7 @@ "node_modules/split-string": { "version": "3.1.0", "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", + "dev": true, "dependencies": { "extend-shallow": "^3.0.0" }, @@ -7637,6 +7805,7 @@ "node_modules/static-extend": { "version": "0.1.2", "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", + "dev": true, "dependencies": { "define-property": "^0.2.5", "object-copy": "^0.1.0" @@ -7648,6 +7817,7 @@ "node_modules/static-extend/node_modules/define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, "dependencies": { "is-descriptor": "^0.1.0" }, @@ -7658,6 +7828,7 @@ "node_modules/static-extend/node_modules/is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -7668,6 +7839,7 @@ "node_modules/static-extend/node_modules/is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -7678,6 +7850,7 @@ "node_modules/static-extend/node_modules/is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, "dependencies": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -7690,6 +7863,7 @@ "node_modules/static-extend/node_modules/is-descriptor/node_modules/kind-of": { "version": "5.1.0", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -7705,6 +7879,7 @@ "node_modules/stream-browserify": { "version": "2.0.2", "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", + "dev": true, "dependencies": { "inherits": "~2.0.1", "readable-stream": "^2.0.2" @@ -7713,6 +7888,7 @@ "node_modules/stream-browserify/node_modules/readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -7726,6 +7902,7 @@ "node_modules/stream-browserify/node_modules/string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } @@ -7749,6 +7926,7 @@ "node_modules/stream-http": { "version": "2.8.3", "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", + "dev": true, "dependencies": { "builtin-status-codes": "^3.0.0", "inherits": "^2.0.1", @@ -7760,6 +7938,7 @@ "node_modules/stream-http/node_modules/readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -7773,6 +7952,7 @@ "node_modules/stream-http/node_modules/string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } @@ -7883,6 +8063,7 @@ "node_modules/tapable": { "version": "0.1.10", "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=", + "dev": true, "engines": { "node": ">=0.6" } @@ -7942,6 +8123,7 @@ "node_modules/timers-browserify": { "version": "2.0.12", "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==", + "dev": true, "dependencies": { "setimmediate": "^1.0.4" }, @@ -7956,7 +8138,8 @@ }, "node_modules/to-arraybuffer": { "version": "1.0.1", - "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=" + "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", + "dev": true }, "node_modules/to-fast-properties": { "version": "1.0.3", @@ -7968,6 +8151,7 @@ "node_modules/to-object-path": { "version": "0.3.0", "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -7978,6 +8162,7 @@ "node_modules/to-regex": { "version": "3.0.2", "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", + "dev": true, "dependencies": { "define-property": "^2.0.2", "extend-shallow": "^3.0.2", @@ -7991,6 +8176,7 @@ "node_modules/to-regex-range": { "version": "2.1.1", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "dev": true, "dependencies": { "is-number": "^3.0.0", "repeat-string": "^1.6.1" @@ -8002,6 +8188,7 @@ "node_modules/to-regex-range/node_modules/is-number": { "version": "3.0.0", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -8043,7 +8230,8 @@ }, "node_modules/tty-browserify": { "version": "0.0.0", - "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=" + "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", + "dev": true }, "node_modules/tunnel-agent": { "version": "0.6.0", @@ -8141,7 +8329,8 @@ }, "node_modules/uglify-to-browserify": { "version": "1.0.2", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=" + "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", + "dev": true }, "node_modules/uglifyjs-webpack-plugin": { "version": "1.3.0", @@ -8232,6 +8421,7 @@ "node_modules/union-value": { "version": "1.0.1", "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", + "dev": true, "dependencies": { "arr-union": "^3.1.0", "get-value": "^2.0.6", @@ -8282,6 +8472,7 @@ "node_modules/unset-value": { "version": "1.0.0", "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", + "dev": true, "dependencies": { "has-value": "^0.3.1", "isobject": "^3.0.0" @@ -8293,6 +8484,7 @@ "node_modules/unset-value/node_modules/has-value": { "version": "0.3.1", "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", + "dev": true, "dependencies": { "get-value": "^2.0.3", "has-values": "^0.1.4", @@ -8305,6 +8497,7 @@ "node_modules/unset-value/node_modules/has-value/node_modules/isobject": { "version": "2.1.0", "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "dev": true, "dependencies": { "isarray": "1.0.0" }, @@ -8315,6 +8508,7 @@ "node_modules/unset-value/node_modules/has-values": { "version": "0.1.4", "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -8322,6 +8516,7 @@ "node_modules/unset-value/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -8336,11 +8531,13 @@ "node_modules/urix": { "version": "0.1.0", "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", - "deprecated": "Please see https://github.com/lydell/urix#deprecated" + "deprecated": "Please see https://github.com/lydell/urix#deprecated", + "dev": true }, "node_modules/url": { "version": "0.11.0", "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", + "dev": true, "dependencies": { "punycode": "1.3.2", "querystring": "0.2.0" @@ -8357,11 +8554,13 @@ }, "node_modules/url/node_modules/punycode": { "version": "1.3.2", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", + "dev": true }, "node_modules/use": { "version": "3.1.1", "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -8369,6 +8568,7 @@ "node_modules/util": { "version": "0.10.4", "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", + "dev": true, "dependencies": { "inherits": "2.0.3" } @@ -8379,7 +8579,8 @@ }, "node_modules/util/node_modules/inherits": { "version": "2.0.3", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true }, "node_modules/utils-merge": { "version": "1.0.1", @@ -8430,6 +8631,7 @@ "node_modules/vm-browserify": { "version": "0.0.4", "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", + "dev": true, "dependencies": { "indexof": "0.0.1" } @@ -8460,6 +8662,7 @@ "node_modules/watchpack": { "version": "0.2.9", "integrity": "sha1-Yuqkq15bo1/fwBgnVibjwPXj+ws=", + "dev": true, "dependencies": { "async": "^0.9.0", "chokidar": "^1.0.0", @@ -8468,11 +8671,13 @@ }, "node_modules/watchpack/node_modules/async": { "version": "0.9.2", - "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=" + "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", + "dev": true }, "node_modules/webpack": { "version": "1.15.0", "integrity": "sha1-T/MfU9sDM55VFkqdRo7gMklo/pg=", + "dev": true, "dependencies": { "acorn": "^3.0.0", "async": "^1.3.0", @@ -8500,6 +8705,7 @@ "node_modules/webpack-core": { "version": "0.6.9", "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=", + "dev": true, "dependencies": { "source-list-map": "~0.1.7", "source-map": "~0.4.1" @@ -8511,6 +8717,7 @@ "node_modules/webpack-core/node_modules/source-map": { "version": "0.4.4", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "dev": true, "dependencies": { "amdefine": ">=0.0.4" }, @@ -8626,6 +8833,7 @@ "node_modules/webpack/node_modules/acorn": { "version": "3.3.0", "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", + "dev": true, "bin": { "acorn": "bin/acorn" }, @@ -8636,6 +8844,7 @@ "node_modules/webpack/node_modules/supports-color": { "version": "3.2.3", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, "dependencies": { "has-flag": "^1.0.0" }, @@ -8646,6 +8855,7 @@ "node_modules/webpack/node_modules/uglify-js": { "version": "2.7.5", "integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=", + "dev": true, "dependencies": { "async": "~0.2.6", "source-map": "~0.5.1", @@ -8661,7 +8871,8 @@ }, "node_modules/webpack/node_modules/uglify-js/node_modules/async": { "version": "0.2.10", - "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=" + "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=", + "dev": true }, "node_modules/websocket-driver": { "version": "0.7.4", @@ -8711,6 +8922,7 @@ "node_modules/window-size": { "version": "0.1.0", "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", + "dev": true, "engines": { "node": ">= 0.8.0" } @@ -8783,6 +8995,7 @@ "node_modules/yargs": { "version": "3.10.0", "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "dev": true, "dependencies": { "camelcase": "^1.0.2", "cliui": "^2.1.0", @@ -8815,8 +9028,7 @@ }, "react-dom": { "version": "15.3.2", - "integrity": "sha1-xGsKpTgNe4OOelnEp77/LtMVUx8=", - "requires": {} + "integrity": "sha1-xGsKpTgNe4OOelnEp77/LtMVUx8=" } } }, @@ -8916,12 +9128,12 @@ }, "ajv-keywords": { "version": "3.5.2", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "requires": {} + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==" }, "align-text": { "version": "0.1.4", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", + "dev": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -8930,12 +9142,13 @@ }, "amdefine": { "version": "1.0.1", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", + "dev": true }, "amp-ui": { "version": "git+ssh://git@github.com/devgateway/amp-ui.git#288d4b6980f0940613a8c52cbd911bd936662f29", "dev": true, - "from": "amp-ui@github:devgateway/amp-ui#AMP-30405-calendar", + "from": "amp-ui@github:devgateway/amp-ui#develop", "requires": { "docx": "^4.7.1", "file-saver": "git+ssh://github.com/devgateway/FileSaver.js", @@ -8970,6 +9183,7 @@ "anymatch": { "version": "1.3.2", "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", + "dev": true, "requires": { "micromatch": "^2.1.5", "normalize-path": "^2.0.0" @@ -9000,7 +9214,8 @@ }, "arr-union": { "version": "3.1.0", - "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=" + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", + "dev": true }, "array-flatten": { "version": "1.1.1", @@ -9030,6 +9245,7 @@ "assert": { "version": "1.5.0", "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", + "dev": true, "requires": { "object-assign": "^4.1.1", "util": "0.10.3" @@ -9037,11 +9253,13 @@ "dependencies": { "inherits": { "version": "2.0.1", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=" + "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", + "dev": true }, "util": { "version": "0.10.3", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", + "dev": true, "requires": { "inherits": "2.0.1" } @@ -9055,15 +9273,18 @@ }, "assign-symbols": { "version": "1.0.0", - "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" + "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", + "dev": true }, "async": { "version": "1.5.2", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "dev": true }, "async-each": { "version": "1.0.3", - "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==" + "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==", + "dev": true }, "asynckit": { "version": "0.4.0", @@ -9072,7 +9293,8 @@ }, "atob": { "version": "2.1.2", - "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" + "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", + "dev": true }, "autoprefixer-core": { "version": "5.2.1", @@ -9988,6 +10210,7 @@ "base": { "version": "0.11.2", "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", + "dev": true, "requires": { "cache-base": "^1.0.1", "class-utils": "^0.3.5", @@ -10001,19 +10224,22 @@ "define-property": { "version": "1.0.0", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, "requires": { "is-descriptor": "^1.0.0" } }, "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true } } }, "base64-js": { "version": "1.5.1", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true }, "batch": { "version": "0.6.1", @@ -10030,11 +10256,13 @@ }, "big.js": { "version": "3.2.0", - "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==" + "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==", + "dev": true }, "binary-extensions": { "version": "1.13.1", - "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==" + "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", + "dev": true }, "blacklist": { "version": "1.1.4", @@ -10126,6 +10354,7 @@ "browserify-aes": { "version": "0.4.0", "integrity": "sha1-BnFJtmjfMcS1hTPgLQHoBthgjiw=", + "dev": true, "requires": { "inherits": "^2.0.1" } @@ -10133,13 +10362,15 @@ "browserify-zlib": { "version": "0.1.4", "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=", + "dev": true, "requires": { "pako": "~0.2.0" }, "dependencies": { "pako": { "version": "0.2.9", - "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=" + "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=", + "dev": true } } }, @@ -10162,6 +10393,7 @@ "buffer": { "version": "4.9.2", "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", + "dev": true, "requires": { "base64-js": "^1.0.2", "ieee754": "^1.1.4", @@ -10174,7 +10406,8 @@ }, "builtin-status-codes": { "version": "3.0.0", - "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=" + "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", + "dev": true }, "bytes": { "version": "3.0.0", @@ -10217,6 +10450,7 @@ "cache-base": { "version": "1.0.1", "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", + "dev": true, "requires": { "collection-visit": "^1.0.0", "component-emitter": "^1.2.1", @@ -10231,13 +10465,15 @@ "dependencies": { "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true } } }, "camelcase": { "version": "1.2.1", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=" + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "dev": true }, "caniuse-db": { "version": "1.0.30001312", @@ -10252,6 +10488,7 @@ "center-align": { "version": "0.1.3", "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", + "dev": true, "requires": { "align-text": "^0.1.3", "lazy-cache": "^1.0.3" @@ -10271,6 +10508,7 @@ "chokidar": { "version": "1.7.0", "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", + "dev": true, "requires": { "anymatch": "^1.3.0", "async-each": "^1.0.0", @@ -10290,6 +10528,7 @@ "class-utils": { "version": "0.3.6", "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", + "dev": true, "requires": { "arr-union": "^3.1.0", "define-property": "^0.2.5", @@ -10300,6 +10539,7 @@ "define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, "requires": { "is-descriptor": "^0.1.0" } @@ -10307,6 +10547,7 @@ "is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -10314,6 +10555,7 @@ "is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -10321,6 +10563,7 @@ "is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, "requires": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -10329,13 +10572,15 @@ "dependencies": { "kind-of": { "version": "5.1.0", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true } } }, "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true } } }, @@ -10354,6 +10599,7 @@ "cliui": { "version": "2.1.0", "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "dev": true, "requires": { "center-align": "^0.1.1", "right-align": "^0.1.1", @@ -10362,13 +10608,15 @@ "dependencies": { "wordwrap": { "version": "0.0.2", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=" + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", + "dev": true } } }, "clone": { "version": "1.0.4", - "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=" + "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", + "dev": true }, "co": { "version": "4.6.0", @@ -10384,6 +10632,7 @@ "collection-visit": { "version": "1.0.0", "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", + "dev": true, "requires": { "map-visit": "^1.0.0", "object-visit": "^1.0.0" @@ -10474,7 +10723,8 @@ }, "component-emitter": { "version": "1.3.0", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", + "dev": true }, "compressible": { "version": "2.0.18", @@ -10541,11 +10791,13 @@ }, "console-browserify": { "version": "1.2.0", - "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==" + "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==", + "dev": true }, "constants-browserify": { "version": "1.0.0", - "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=" + "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", + "dev": true }, "content-disposition": { "version": "0.5.4", @@ -10598,7 +10850,8 @@ }, "copy-descriptor": { "version": "0.1.1", - "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" + "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", + "dev": true }, "core-js": { "version": "2.6.12", @@ -10646,6 +10899,7 @@ "crypto-browserify": { "version": "3.3.0", "integrity": "sha1-ufx1u0oO1h3PHNXa6W6zDJw+UGw=", + "dev": true, "requires": { "browserify-aes": "0.4.0", "pbkdf2-compat": "2.0.1", @@ -10763,11 +11017,13 @@ }, "decamelize": { "version": "1.2.0", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true }, "decode-uri-component": { "version": "0.2.0", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" + "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", + "dev": true }, "deep-diff": { "version": "0.3.4", @@ -10782,6 +11038,7 @@ "define-property": { "version": "2.0.2", "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", + "dev": true, "requires": { "is-descriptor": "^1.0.2", "isobject": "^3.0.1" @@ -10789,7 +11046,8 @@ "dependencies": { "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true } } }, @@ -10899,7 +11157,8 @@ }, "domain-browser": { "version": "1.2.0", - "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==" + "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==", + "dev": true }, "domelementtype": { "version": "1.3.1", @@ -10975,7 +11234,8 @@ }, "emojis-list": { "version": "2.1.0", - "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=" + "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", + "dev": true }, "encodeurl": { "version": "1.0.2", @@ -10999,6 +11259,7 @@ "enhanced-resolve": { "version": "0.9.1", "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=", + "dev": true, "requires": { "graceful-fs": "^4.1.2", "memory-fs": "^0.2.0", @@ -11007,7 +11268,8 @@ "dependencies": { "memory-fs": { "version": "0.2.0", - "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=" + "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=", + "dev": true } } }, @@ -11103,7 +11365,8 @@ }, "events": { "version": "1.1.1", - "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=" + "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", + "dev": true }, "eventsource": { "version": "1.1.0", @@ -11235,6 +11498,7 @@ "extend-shallow": { "version": "3.0.2", "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, "requires": { "assign-symbols": "^1.0.0", "is-extendable": "^1.0.1" @@ -11243,6 +11507,7 @@ "is-extendable": { "version": "1.0.1", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, "requires": { "is-plain-object": "^2.0.4" } @@ -11459,6 +11724,7 @@ "fragment-cache": { "version": "0.2.1", "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", + "dev": true, "requires": { "map-cache": "^0.2.2" } @@ -11560,7 +11826,8 @@ }, "get-value": { "version": "2.0.6", - "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=" + "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", + "dev": true }, "getpass": { "version": "0.1.7", @@ -11654,11 +11921,13 @@ }, "has-flag": { "version": "1.0.0", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true }, "has-value": { "version": "1.0.0", "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", + "dev": true, "requires": { "get-value": "^2.0.6", "has-values": "^1.0.0", @@ -11667,13 +11936,15 @@ "dependencies": { "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true } } }, "has-values": { "version": "1.0.0", "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", + "dev": true, "requires": { "is-number": "^3.0.0", "kind-of": "^4.0.0" @@ -11682,6 +11953,7 @@ "is-number": { "version": "3.0.0", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, "requires": { "kind-of": "^3.0.2" }, @@ -11689,6 +11961,7 @@ "kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, "requires": { "is-buffer": "^1.1.5" } @@ -11698,6 +11971,7 @@ "kind-of": { "version": "4.0.0", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "dev": true, "requires": { "is-buffer": "^1.1.5" } @@ -11836,7 +12110,8 @@ }, "https-browserify": { "version": "0.0.1", - "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=" + "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=", + "dev": true }, "iconv-lite": { "version": "0.6.3", @@ -11847,7 +12122,8 @@ }, "ieee754": { "version": "1.2.1", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "dev": true }, "iferr": { "version": "0.1.5", @@ -11893,7 +12169,8 @@ }, "indexof": { "version": "0.0.1", - "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=" + "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", + "dev": true }, "inflight": { "version": "1.0.6", @@ -11909,7 +12186,8 @@ }, "interpret": { "version": "0.6.6", - "integrity": "sha1-/s16GOfOXKar+5U+H4YhOknxYls=" + "integrity": "sha1-/s16GOfOXKar+5U+H4YhOknxYls=", + "dev": true }, "invariant": { "version": "2.2.4", @@ -11931,13 +12209,15 @@ "is-accessor-descriptor": { "version": "1.0.0", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, "requires": { "kind-of": "^6.0.0" }, "dependencies": { "kind-of": { "version": "6.0.3", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true } } }, @@ -11948,6 +12228,7 @@ "is-binary-path": { "version": "1.0.1", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "dev": true, "requires": { "binary-extensions": "^1.0.0" } @@ -11966,19 +12247,22 @@ "is-data-descriptor": { "version": "1.0.0", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, "requires": { "kind-of": "^6.0.0" }, "dependencies": { "kind-of": { "version": "6.0.3", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true } } }, "is-descriptor": { "version": "1.0.2", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, "requires": { "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", @@ -11987,7 +12271,8 @@ "dependencies": { "kind-of": { "version": "6.0.3", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true } } }, @@ -12036,13 +12321,15 @@ "is-plain-object": { "version": "2.0.4", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "dev": true, "requires": { "isobject": "^3.0.1" }, "dependencies": { "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true } } }, @@ -12069,7 +12356,8 @@ }, "is-windows": { "version": "1.0.2", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", + "dev": true }, "isarray": { "version": "1.0.0", @@ -12376,7 +12664,8 @@ }, "lazy-cache": { "version": "1.0.4", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=" + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", + "dev": true }, "less": { "version": "2.7.3", @@ -12563,6 +12852,7 @@ "loader-utils": { "version": "0.2.17", "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", + "dev": true, "requires": { "big.js": "^3.1.3", "emojis-list": "^2.0.0", @@ -12696,7 +12986,8 @@ }, "longest": { "version": "1.0.1", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=" + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", + "dev": true }, "loose-envify": { "version": "1.4.0", @@ -12736,11 +13027,13 @@ }, "map-cache": { "version": "0.2.2", - "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" + "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", + "dev": true }, "map-visit": { "version": "1.0.0", "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", + "dev": true, "requires": { "object-visit": "^1.0.0" } @@ -12762,6 +13055,7 @@ "memory-fs": { "version": "0.3.0", "integrity": "sha1-e8xrYp46Q+hx1+Kaymrop/FcuyA=", + "dev": true, "requires": { "errno": "^0.1.3", "readable-stream": "^2.0.1" @@ -12770,6 +13064,7 @@ "readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -12783,6 +13078,7 @@ "string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -12871,6 +13167,7 @@ "mixin-deep": { "version": "1.3.2", "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", + "dev": true, "requires": { "for-in": "^1.0.2", "is-extendable": "^1.0.1" @@ -12879,6 +13176,7 @@ "is-extendable": { "version": "1.0.1", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, "requires": { "is-plain-object": "^2.0.4" } @@ -12916,6 +13214,7 @@ "nanomatch": { "version": "1.2.13", "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", + "dev": true, "requires": { "arr-diff": "^4.0.0", "array-unique": "^0.3.2", @@ -12932,15 +13231,18 @@ "dependencies": { "arr-diff": { "version": "4.0.0", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true }, "array-unique": { "version": "0.3.2", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "dev": true }, "kind-of": { "version": "6.0.3", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true } } }, @@ -12988,6 +13290,7 @@ "node-libs-browser": { "version": "0.7.0", "integrity": "sha1-PicsCBnjCJNeJmdECNevDhSRuDs=", + "dev": true, "requires": { "assert": "^1.1.1", "browserify-zlib": "^0.1.4", @@ -13016,11 +13319,13 @@ "dependencies": { "punycode": { "version": "1.4.1", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", + "dev": true }, "readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -13034,6 +13339,7 @@ "string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -13042,7 +13348,8 @@ }, "string_decoder": { "version": "0.10.31", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true } } }, @@ -13123,6 +13430,7 @@ "object-copy": { "version": "0.1.0", "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", + "dev": true, "requires": { "copy-descriptor": "^0.1.0", "define-property": "^0.2.5", @@ -13132,6 +13440,7 @@ "define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, "requires": { "is-descriptor": "^0.1.0" } @@ -13139,6 +13448,7 @@ "is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -13146,6 +13456,7 @@ "is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -13153,6 +13464,7 @@ "is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, "requires": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -13161,7 +13473,8 @@ "dependencies": { "kind-of": { "version": "5.1.0", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true } } } @@ -13170,13 +13483,15 @@ "object-visit": { "version": "1.0.1", "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", + "dev": true, "requires": { "isobject": "^3.0.0" }, "dependencies": { "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true } } }, @@ -13191,13 +13506,15 @@ "object.pick": { "version": "1.3.0", "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", + "dev": true, "requires": { "isobject": "^3.0.1" }, "dependencies": { "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true } } }, @@ -13229,6 +13546,7 @@ "optimist": { "version": "0.6.1", "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "dev": true, "requires": { "minimist": "~0.0.1", "wordwrap": "~0.0.2" @@ -13236,11 +13554,13 @@ "dependencies": { "minimist": { "version": "0.0.10", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", + "dev": true }, "wordwrap": { "version": "0.0.3", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "dev": true } } }, @@ -13274,7 +13594,8 @@ }, "os-browserify": { "version": "0.2.1", - "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=" + "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=", + "dev": true }, "os-homedir": { "version": "1.0.2", @@ -13367,11 +13688,13 @@ }, "pascalcase": { "version": "0.1.1", - "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=" + "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", + "dev": true }, "path-browserify": { "version": "0.0.0", - "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=" + "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", + "dev": true }, "path-exists": { "version": "2.1.0", @@ -13404,7 +13727,8 @@ }, "pbkdf2-compat": { "version": "2.0.1", - "integrity": "sha1-tuDI+plJTZTgURV1gCpZpcFC8og=" + "integrity": "sha1-tuDI+plJTZTgURV1gCpZpcFC8og=", + "dev": true }, "performance-now": { "version": "2.1.0", @@ -13440,7 +13764,8 @@ }, "posix-character-classes": { "version": "0.1.1", - "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" + "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", + "dev": true }, "postcss": { "version": "4.1.16", @@ -13733,7 +14058,8 @@ }, "process": { "version": "0.11.10", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=" + "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", + "dev": true }, "process-nextick-args": { "version": "2.0.1", @@ -13835,11 +14161,13 @@ }, "querystring": { "version": "0.2.0", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=" + "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", + "dev": true }, "querystring-es3": { "version": "0.2.1", - "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=" + "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", + "dev": true }, "querystringify": { "version": "2.2.0", @@ -13926,8 +14254,7 @@ }, "react-addons-update": { "version": "15.3.2", - "integrity": "sha1-tjhcTbHl3zcYJeBhWwQ2DtlEMP4=", - "requires": {} + "integrity": "sha1-tjhcTbHl3zcYJeBhWwQ2DtlEMP4=" }, "react-bootstrap": { "version": "0.32.4", @@ -14029,8 +14356,7 @@ }, "react-filtered-multiselect": { "version": "0.4.2", - "integrity": "sha1-gZaHX4nl/3zt8JFoQrFWz2hPgSE=", - "requires": {} + "integrity": "sha1-gZaHX4nl/3zt8JFoQrFWz2hPgSE=" }, "react-highlighter": { "version": "0.4.3", @@ -14045,8 +14371,7 @@ "react-hot-api": { "version": "0.4.7", "integrity": "sha1-p+IqVtJS4Rq9k2a2EmTPRJLFgXE=", - "dev": true, - "requires": {} + "dev": true }, "react-hot-loader": { "version": "1.3.1", @@ -14136,8 +14461,7 @@ "react-numeric-input": { "version": "2.0.9", "integrity": "sha1-ro4awpiOi8yMS7PLEHuy2DutTlo=", - "dev": true, - "requires": {} + "dev": true }, "react-onclickoutside": { "version": "5.11.1", @@ -14277,6 +14601,7 @@ "readdirp": { "version": "2.2.1", "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", + "dev": true, "requires": { "graceful-fs": "^4.1.11", "micromatch": "^3.1.10", @@ -14285,15 +14610,18 @@ "dependencies": { "arr-diff": { "version": "4.0.0", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true }, "array-unique": { "version": "0.3.2", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "dev": true }, "braces": { "version": "2.3.2", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, "requires": { "arr-flatten": "^1.1.0", "array-unique": "^0.3.2", @@ -14310,6 +14638,7 @@ "extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, "requires": { "is-extendable": "^0.1.0" } @@ -14319,6 +14648,7 @@ "expand-brackets": { "version": "2.1.4", "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "dev": true, "requires": { "debug": "^2.3.3", "define-property": "^0.2.5", @@ -14332,6 +14662,7 @@ "define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, "requires": { "is-descriptor": "^0.1.0" } @@ -14339,6 +14670,7 @@ "extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, "requires": { "is-extendable": "^0.1.0" } @@ -14346,6 +14678,7 @@ "is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, "requires": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -14354,13 +14687,15 @@ }, "kind-of": { "version": "5.1.0", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true } } }, "extglob": { "version": "2.0.4", "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "dev": true, "requires": { "array-unique": "^0.3.2", "define-property": "^1.0.0", @@ -14375,6 +14710,7 @@ "define-property": { "version": "1.0.0", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, "requires": { "is-descriptor": "^1.0.0" } @@ -14382,6 +14718,7 @@ "extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, "requires": { "is-extendable": "^0.1.0" } @@ -14391,6 +14728,7 @@ "fill-range": { "version": "4.0.0", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, "requires": { "extend-shallow": "^2.0.1", "is-number": "^3.0.0", @@ -14401,6 +14739,7 @@ "extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, "requires": { "is-extendable": "^0.1.0" } @@ -14410,6 +14749,7 @@ "is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, "requires": { "kind-of": "^3.0.2" }, @@ -14417,6 +14757,7 @@ "kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, "requires": { "is-buffer": "^1.1.5" } @@ -14426,6 +14767,7 @@ "is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, "requires": { "kind-of": "^3.0.2" }, @@ -14433,6 +14775,7 @@ "kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, "requires": { "is-buffer": "^1.1.5" } @@ -14442,6 +14785,7 @@ "is-number": { "version": "3.0.0", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, "requires": { "kind-of": "^3.0.2" }, @@ -14449,6 +14793,7 @@ "kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, "requires": { "is-buffer": "^1.1.5" } @@ -14457,15 +14802,18 @@ }, "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true }, "kind-of": { "version": "6.0.3", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true }, "micromatch": { "version": "3.1.10", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, "requires": { "arr-diff": "^4.0.0", "array-unique": "^0.3.2", @@ -14485,6 +14833,7 @@ "readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -14498,6 +14847,7 @@ "string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -14589,6 +14939,7 @@ "regex-not": { "version": "1.0.2", "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", + "dev": true, "requires": { "extend-shallow": "^3.0.2", "safe-regex": "^1.1.0" @@ -14695,15 +15046,18 @@ }, "resolve-url": { "version": "0.2.1", - "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" + "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", + "dev": true }, "ret": { "version": "0.1.15", - "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", + "dev": true }, "right-align": { "version": "0.1.3", "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", + "dev": true, "requires": { "align-text": "^0.1.1" } @@ -14731,7 +15085,8 @@ }, "ripemd160": { "version": "0.2.0", - "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=" + "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=", + "dev": true }, "run-queue": { "version": "1.0.3", @@ -14747,6 +15102,7 @@ "safe-regex": { "version": "1.1.0", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", + "dev": true, "requires": { "ret": "~0.1.10" } @@ -14873,6 +15229,7 @@ "set-value": { "version": "2.0.1", "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", + "dev": true, "requires": { "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", @@ -14883,6 +15240,7 @@ "extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, "requires": { "is-extendable": "^0.1.0" } @@ -14900,7 +15258,8 @@ }, "sha.js": { "version": "2.2.6", - "integrity": "sha1-F93t3F9yL7ZlAWWIlUYZd4ZzFbo=" + "integrity": "sha1-F93t3F9yL7ZlAWWIlUYZd4ZzFbo=", + "dev": true }, "shallowequal": { "version": "1.1.0", @@ -14913,6 +15272,7 @@ "snapdragon": { "version": "0.8.2", "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", + "dev": true, "requires": { "base": "^0.11.1", "debug": "^2.2.0", @@ -14927,6 +15287,7 @@ "define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, "requires": { "is-descriptor": "^0.1.0" } @@ -14934,6 +15295,7 @@ "extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, "requires": { "is-extendable": "^0.1.0" } @@ -14941,6 +15303,7 @@ "is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -14948,6 +15311,7 @@ "is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -14955,6 +15319,7 @@ "is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, "requires": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -14963,7 +15328,8 @@ "dependencies": { "kind-of": { "version": "5.1.0", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true } } } @@ -14972,6 +15338,7 @@ "snapdragon-node": { "version": "2.1.1", "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", + "dev": true, "requires": { "define-property": "^1.0.0", "isobject": "^3.0.0", @@ -14981,19 +15348,22 @@ "define-property": { "version": "1.0.0", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, "requires": { "is-descriptor": "^1.0.0" } }, "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true } } }, "snapdragon-util": { "version": "3.0.1", "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", + "dev": true, "requires": { "kind-of": "^3.2.0" } @@ -15062,7 +15432,8 @@ }, "source-list-map": { "version": "0.1.8", - "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=" + "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=", + "dev": true }, "source-map": { "version": "0.5.7", @@ -15071,6 +15442,7 @@ "source-map-resolve": { "version": "0.5.3", "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", + "dev": true, "requires": { "atob": "^2.1.2", "decode-uri-component": "^0.2.0", @@ -15088,7 +15460,8 @@ }, "source-map-url": { "version": "0.4.1", - "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==" + "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==", + "dev": true }, "spdx-correct": { "version": "3.1.1", @@ -15117,6 +15490,7 @@ "split-string": { "version": "3.1.0", "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", + "dev": true, "requires": { "extend-shallow": "^3.0.0" } @@ -15152,6 +15526,7 @@ "static-extend": { "version": "0.1.2", "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", + "dev": true, "requires": { "define-property": "^0.2.5", "object-copy": "^0.1.0" @@ -15160,6 +15535,7 @@ "define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, "requires": { "is-descriptor": "^0.1.0" } @@ -15167,6 +15543,7 @@ "is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -15174,6 +15551,7 @@ "is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -15181,6 +15559,7 @@ "is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, "requires": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -15189,7 +15568,8 @@ "dependencies": { "kind-of": { "version": "5.1.0", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true } } } @@ -15203,6 +15583,7 @@ "stream-browserify": { "version": "2.0.2", "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", + "dev": true, "requires": { "inherits": "~2.0.1", "readable-stream": "^2.0.2" @@ -15211,6 +15592,7 @@ "readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -15224,6 +15606,7 @@ "string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -15246,6 +15629,7 @@ "stream-http": { "version": "2.8.3", "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", + "dev": true, "requires": { "builtin-status-codes": "^3.0.0", "inherits": "^2.0.1", @@ -15257,6 +15641,7 @@ "readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -15270,6 +15655,7 @@ "string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -15348,7 +15734,8 @@ }, "tapable": { "version": "0.1.10", - "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=" + "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=", + "dev": true }, "test-exclude": { "version": "4.2.3", @@ -15404,6 +15791,7 @@ "timers-browserify": { "version": "2.0.12", "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==", + "dev": true, "requires": { "setimmediate": "^1.0.4" } @@ -15415,7 +15803,8 @@ }, "to-arraybuffer": { "version": "1.0.1", - "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=" + "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", + "dev": true }, "to-fast-properties": { "version": "1.0.3", @@ -15424,6 +15813,7 @@ "to-object-path": { "version": "0.3.0", "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", + "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -15431,6 +15821,7 @@ "to-regex": { "version": "3.0.2", "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", + "dev": true, "requires": { "define-property": "^2.0.2", "extend-shallow": "^3.0.2", @@ -15441,6 +15832,7 @@ "to-regex-range": { "version": "2.1.1", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "dev": true, "requires": { "is-number": "^3.0.0", "repeat-string": "^1.6.1" @@ -15449,6 +15841,7 @@ "is-number": { "version": "3.0.0", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -15480,7 +15873,8 @@ }, "tty-browserify": { "version": "0.0.0", - "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=" + "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", + "dev": true }, "tunnel-agent": { "version": "0.6.0", @@ -15542,7 +15936,8 @@ }, "uglify-to-browserify": { "version": "1.0.2", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=" + "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", + "dev": true }, "uglifyjs-webpack-plugin": { "version": "1.3.0", @@ -15608,6 +16003,7 @@ "union-value": { "version": "1.0.1", "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", + "dev": true, "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", @@ -15652,6 +16048,7 @@ "unset-value": { "version": "1.0.0", "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", + "dev": true, "requires": { "has-value": "^0.3.1", "isobject": "^3.0.0" @@ -15660,6 +16057,7 @@ "has-value": { "version": "0.3.1", "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", + "dev": true, "requires": { "get-value": "^2.0.3", "has-values": "^0.1.4", @@ -15669,6 +16067,7 @@ "isobject": { "version": "2.1.0", "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "dev": true, "requires": { "isarray": "1.0.0" } @@ -15677,11 +16076,13 @@ }, "has-values": { "version": "0.1.4", - "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=" + "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", + "dev": true }, "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true } } }, @@ -15694,11 +16095,13 @@ }, "urix": { "version": "0.1.0", - "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=" + "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", + "dev": true }, "url": { "version": "0.11.0", "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", + "dev": true, "requires": { "punycode": "1.3.2", "querystring": "0.2.0" @@ -15706,7 +16109,8 @@ "dependencies": { "punycode": { "version": "1.3.2", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", + "dev": true } } }, @@ -15721,18 +16125,21 @@ }, "use": { "version": "3.1.1", - "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" + "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", + "dev": true }, "util": { "version": "0.10.4", "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", + "dev": true, "requires": { "inherits": "2.0.3" }, "dependencies": { "inherits": { "version": "2.0.3", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true } } }, @@ -15776,6 +16183,7 @@ "vm-browserify": { "version": "0.0.4", "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", + "dev": true, "requires": { "indexof": "0.0.1" } @@ -15803,6 +16211,7 @@ "watchpack": { "version": "0.2.9", "integrity": "sha1-Yuqkq15bo1/fwBgnVibjwPXj+ws=", + "dev": true, "requires": { "async": "^0.9.0", "chokidar": "^1.0.0", @@ -15811,13 +16220,15 @@ "dependencies": { "async": { "version": "0.9.2", - "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=" + "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", + "dev": true } } }, "webpack": { "version": "1.15.0", "integrity": "sha1-T/MfU9sDM55VFkqdRo7gMklo/pg=", + "dev": true, "requires": { "acorn": "^3.0.0", "async": "^1.3.0", @@ -15838,11 +16249,13 @@ "dependencies": { "acorn": { "version": "3.3.0", - "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=" + "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", + "dev": true }, "supports-color": { "version": "3.2.3", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, "requires": { "has-flag": "^1.0.0" } @@ -15850,6 +16263,7 @@ "uglify-js": { "version": "2.7.5", "integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=", + "dev": true, "requires": { "async": "~0.2.6", "source-map": "~0.5.1", @@ -15859,7 +16273,8 @@ "dependencies": { "async": { "version": "0.2.10", - "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=" + "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=", + "dev": true } } } @@ -15868,6 +16283,7 @@ "webpack-core": { "version": "0.6.9", "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=", + "dev": true, "requires": { "source-list-map": "~0.1.7", "source-map": "~0.4.1" @@ -15876,6 +16292,7 @@ "source-map": { "version": "0.4.4", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "dev": true, "requires": { "amdefine": ">=0.0.4" } @@ -16013,7 +16430,8 @@ }, "window-size": { "version": "0.1.0", - "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=" + "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", + "dev": true }, "wordwrap": { "version": "1.0.0", @@ -16074,6 +16492,7 @@ "yargs": { "version": "3.10.0", "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "dev": true, "requires": { "camelcase": "^1.0.2", "cliui": "^2.1.0", From afbdcf95c7007d396f8ce873589abfd396f4dc82 Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Thu, 15 Dec 2022 10:05:55 +0300 Subject: [PATCH 026/135] AMP-30412 removed the unused activity info code --- .../preview/actions/ActivityActions.jsx | 147 +++++++++--------- 1 file changed, 72 insertions(+), 75 deletions(-) diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/actions/ActivityActions.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/actions/ActivityActions.jsx index 9b27ff44b6e..29b4ec2612d 100644 --- a/amp/TEMPLATE/reamp/modules/activity/preview/actions/ActivityActions.jsx +++ b/amp/TEMPLATE/reamp/modules/activity/preview/actions/ActivityActions.jsx @@ -30,8 +30,8 @@ import { WorkspaceConstants } from "amp-ui"; import processPossibleValues from '../common/PossibleValuesHelper.jsx'; -import Logger from '../utils/LoggerManager' ; -import ActivityFundingTotals from '../utils/ActivityFundingTotals.jsx' +import Logger from '../utils/LoggerManager'; +import ActivityFundingTotals from '../utils/ActivityFundingTotals.jsx'; import translate from '../utils/translate.jsx'; import * as ContactAction from './ContactsAction.jsx'; import * as ResourceAction from './ResourceAction.jsx'; @@ -50,60 +50,58 @@ export function loadActivityForActivityPreview(activityId) { return (dispatch, ownProps) => { dispatch(sendingRequest()); const paths = [...FieldPathConstants.ADJUSTMENT_TYPE_PATHS]; - const {settings} = ownProps().startUpReducer; + const { settings } = ownProps().startUpReducer; ActivityApi.fetchActivityInfo(activityId) .then((activityInfo) => { - ActivityApi.fetchActivityInfo(activityId).then(activityInfo => { - - Promise.all([ - ActivityApi.getActivity(activityId), - ActivityApi.getFieldsDefinition(activityInfo.activityWorkspace[WorkspaceConstants.TEMPLATE_ID]), - ActivityApi.fetchFmConfiguration(FmManagerHelper.getRequestFmSyncUpBody(Object.values(FeatureManagerConstants)))] - ).then(([activity, fieldsDef, fmTree]) => { - const isSSC = activity[ActivityConstants.ACTIVITY_TYPE] === ActivityConstants.ACTIVITY_TYPE_SSC; - _registerSettings(settings.language, settings['default-date-format'].toUpperCase(), isSSC); - if (settings[TEAM_ID]) { - ContactAction.loadHydratedContactsForActivity(activity)(dispatch, ownProps); - loadWsInfoForActivity(activity, dispatch); - } - ResourceAction.loadResourcesForActivity(activity)(dispatch, ownProps); - //TODO find a better way to filter out non enabled paths - const activityFieldsManagerTemp = new FieldsManager(fieldsDef, [], - settings.language, Logger); - const enabledPaths = paths.filter(path => activityFieldsManagerTemp.isFieldPathEnabled(path)); - Promise.all([ActivityApi.fetchPossibleValues(enabledPaths), - ActivityApi.fetchFundingInformation(activityId, settings[Constants.EFFECTIVE_CURRENCY].id)]) - .then(([possibleValuesCollectionAPI, activityFundingInformation]) => { - const activityFieldsManager = new FieldsManager(fieldsDef, - processPossibleValues(possibleValuesCollectionAPI), settings.language, Logger); - _populateFMTree(fmTree); - _configureNumberUtils(settings); - - ActivityApi.fetchValuesForHydration(HydratorHelper.fetchRequestDataForHydration(activity, - activityFieldsManager, ''), - activityInfo.activityWorkspace[WorkspaceConstants.TEMPLATE_ID]) - .then(valuesForHydration => { - HydratorHelper.hydrateObject(activity, activityFieldsManager, '', - null, valuesForHydration); - activity.id = String(activity.internal_id); - _convertCurrency(activity, activityFundingInformation, activityFieldsManagerTemp); - // we create an empty currency rates manager since we will be converting from same currencies, - // it wont be used it will just return 1. - const currencyRatesManager = new CurrencyRatesManager([], - activityFundingInformation.currency, translate, DateUtils, {}); - return dispatch({ - type: ACTIVITY_LOAD_LOADED, - payload: { - activity: activity, - activityFieldsManager, - activityContext: _getActivityContext(settings, activityInfo, activity), - activityFundingTotals: new ActivityFundingTotals(activity, activityFundingInformation), - currencyRatesManager - } - }); + Promise.all([ + ActivityApi.getActivity(activityId), + ActivityApi.getFieldsDefinition(activityInfo.activityWorkspace[WorkspaceConstants.TEMPLATE_ID]), + ActivityApi.fetchFmConfiguration(FmManagerHelper.getRequestFmSyncUpBody(Object.values(FeatureManagerConstants)))] + ).then(([activity, fieldsDef, fmTree]) => { + const isSSC = activity[ActivityConstants.ACTIVITY_TYPE] === ActivityConstants.ACTIVITY_TYPE_SSC; + _registerSettings(settings.language, settings['default-date-format'].toUpperCase(), isSSC); + if (settings[TEAM_ID]) { + ContactAction.loadHydratedContactsForActivity(activity)(dispatch, ownProps); + loadWsInfoForActivity(activity, dispatch); + } + ResourceAction.loadResourcesForActivity(activity)(dispatch, ownProps); + //TODO find a better way to filter out non enabled paths + const activityFieldsManagerTemp = new FieldsManager(fieldsDef, [], + settings.language, Logger); + const enabledPaths = paths.filter(path => activityFieldsManagerTemp.isFieldPathEnabled(path)); + Promise.all([ActivityApi.fetchPossibleValues(enabledPaths), + ActivityApi.fetchFundingInformation(activityId, settings[Constants.EFFECTIVE_CURRENCY].id)]) + .then(([possibleValuesCollectionAPI, activityFundingInformation]) => { + const activityFieldsManager = new FieldsManager(fieldsDef, + processPossibleValues(possibleValuesCollectionAPI), settings.language, Logger); + _populateFMTree(fmTree); + _configureNumberUtils(settings); + + ActivityApi.fetchValuesForHydration(HydratorHelper.fetchRequestDataForHydration(activity, + activityFieldsManager, ''), + activityInfo.activityWorkspace[WorkspaceConstants.TEMPLATE_ID]) + .then(valuesForHydration => { + HydratorHelper.hydrateObject(activity, activityFieldsManager, '', + null, valuesForHydration); + activity.id = String(activity.internal_id); + _convertCurrency(activity, activityFundingInformation, activityFieldsManagerTemp); + // we create an empty currency rates manager since we will be converting from same currencies, + // it wont be used it will just return 1. + const currencyRatesManager = new CurrencyRatesManager([], + activityFundingInformation.currency, translate, DateUtils, {}); + return dispatch({ + type: ACTIVITY_LOAD_LOADED, + payload: { + activity: activity, + activityFieldsManager, + activityContext: _getActivityContext(settings, activityInfo, activity), + activityFundingTotals: new ActivityFundingTotals(activity, activityFundingInformation), + currencyRatesManager + } }); - }).catch(error => { + }); + }).catch(error => { return dispatch({ type: ACTIVITY_LOAD_FAILED, payload: { @@ -111,7 +109,6 @@ export function loadActivityForActivityPreview(activityId) { } }); }); - }); }); }) .catch((error) => { @@ -120,19 +117,19 @@ export function loadActivityForActivityPreview(activityId) { payload: { error } - }) - }) + }); + }); }; function _registerSettings(lang, pGSDateFormat, isSSC) { - const projectEditLink = {url: ACTIVITY_FORM_URL, isExternal: true}; - const editSscLink = {url: ACTIVITY_FORM_URL_SSC, isExternal: true}; + const projectEditLink = { url: ACTIVITY_FORM_URL, isExternal: true }; + const editSscLink = { url: ACTIVITY_FORM_URL_SSC, isExternal: true }; const editLink = isSSC ? editSscLink : projectEditLink; - const viewLink = {url: ACTIVITY_PREVIEW_URL, isExternal: true}; - const versionHistoryLink = {url: VERSION_HISTORY_URL, isExternal: true}; - const compareActivityLink = {url: COMPARE_ACTIVITY_URL, isExternal: true}; - ActivityLinks.registerLinks({editLink, versionHistoryLink, compareActivityLink, viewLink}); - DateUtils.registerSettings({lang, pGSDateFormat}); + const viewLink = { url: ACTIVITY_PREVIEW_URL, isExternal: true }; + const versionHistoryLink = { url: VERSION_HISTORY_URL, isExternal: true }; + const compareActivityLink = { url: COMPARE_ACTIVITY_URL, isExternal: true }; + ActivityLinks.registerLinks({ editLink, versionHistoryLink, compareActivityLink, viewLink }); + DateUtils.registerSettings({ lang, pGSDateFormat }); } function sendingRequest() { @@ -168,7 +165,7 @@ export function loadActivityForActivityPreview(activityId) { activity[ActivityConstants.PPC_AMOUNT].currency.value = currencyCode; } const transactions = [...FieldPathConstants.TRANSACTION_TYPES, - ActivityConstants.ESTIMATED_DISBURSEMENTS, ActivityConstants.MTEF_PROJECTIONS]; + ActivityConstants.ESTIMATED_DISBURSEMENTS, ActivityConstants.MTEF_PROJECTIONS]; if (fundings) { fundings.forEach(funding => { const fundingFromConverted = @@ -187,22 +184,22 @@ export function loadActivityForActivityPreview(activityId) { t[ActivityConstants.TRANSACTION_AMOUNT] = transactionInWsCurrency[ActivityConstants.TRANSACTION_AMOUNT]; // TODO convert the whole curreny not only the code t[ActivityConstants.CURRENCY].value = currencyCode; - }) + }); } }); } }); } - REGIONAL_FUNDINGS.forEach(rf => { - if(activityFieldsManager.isFieldPathEnabled(rf)) { - activity[rf].forEach(regionalFundingItem => { - const convertedAmount = activityFundingInformation[rf].find(arf => arf.id === regionalFundingItem.id); - regionalFundingItem.transaction_amount = convertedAmount.transaction_amount; - // TODO convert the whole curreny not only the code - regionalFundingItem[ActivityConstants.CURRENCY].value = convertedAmount.currency.currencyCode; - }) - } + REGIONAL_FUNDINGS.forEach(rf => { + if (activityFieldsManager.isFieldPathEnabled(rf)) { + activity[rf].forEach(regionalFundingItem => { + const convertedAmount = activityFundingInformation[rf].find(arf => arf.id === regionalFundingItem.id); + regionalFundingItem.transaction_amount = convertedAmount.transaction_amount; + // TODO convert the whole curreny not only the code + regionalFundingItem[ActivityConstants.CURRENCY].value = convertedAmount.currency.currencyCode; + }); + } }); } @@ -211,7 +208,7 @@ export function loadActivityForActivityPreview(activityId) { canEditActivities: settings[WORKSPACE_TYPE] !== WORKSPACE_TYPE_MANAGEMENT, activityStatus: CommonActivityHelper.getActivityStatus(activity), activityWorkspace: activityInfo.activityWorkspace, - calendar: {id: settings[CALENDAR_ID], [IS_FISCAL]: settings[CALENDAR_IS_FISCAL]}, + calendar: { id: settings[CALENDAR_ID], [IS_FISCAL]: settings[CALENDAR_IS_FISCAL] }, workspaceLeadData: activityInfo[ACTIVITY_WORKSPACE_LEAD_DATA], effectiveCurrency: settings[Constants.EFFECTIVE_CURRENCY].code, teamMember: activityInfo.teamMember, @@ -243,7 +240,7 @@ export function loadActivityForActivityPreview(activityId) { payload: { activityWsInfo: activityWsInfo } - }) + }); }).catch(error => { return dispatch({ type: ACTIVITY_LOAD_FAILED, From f50ca455a636ab6b83a91045d0087890230cf75d Mon Sep 17 00:00:00 2001 From: Octavian Ciubotaru Date: Tue, 13 Dec 2022 13:40:23 +0200 Subject: [PATCH 027/135] AMP-30364: Index multilingual projects in lucene --- .../amp/onepager/util/ActivityUtil.java | 19 ++++++----- .../activity/AMPActivityService.java | 7 ++-- .../endpoints/activity/ActivityImporter.java | 8 +++-- .../endpoints/activity/ActivityService.java | 5 +-- .../module/aim/util/IndicatorUtil.java | 3 -- .../aim/util/activity/ActivityCloser.java | 2 ++ .../util/ContentTranslationUtil.java | 32 +++++++++++-------- .../activity/TestActivityService.java | 5 +-- 8 files changed, 47 insertions(+), 34 deletions(-) diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/onepager/util/ActivityUtil.java b/amp/WEB-INF/src/org/dgfoundation/amp/onepager/util/ActivityUtil.java index 01e021a2d9d..bd5b999b3f9 100644 --- a/amp/WEB-INF/src/org/dgfoundation/amp/onepager/util/ActivityUtil.java +++ b/amp/WEB-INF/src/org/dgfoundation/amp/onepager/util/ActivityUtil.java @@ -170,8 +170,10 @@ public static AmpActivityVersion saveActivity(AmpActivityVersion oldA, Collectio boolean newActivity = oldA.getAmpActivityId() == null; AmpActivityVersion a = null; + List cumulativeValues = new ArrayList<>(); try { - a = saveActivityNewVersion(oldA, values, ampCurrentMember, draft, session, saveContext, editorStore, site); + a = saveActivityNewVersion(oldA, values, cumulativeValues, ampCurrentMember, draft, session, saveContext, + editorStore, site); } catch (Exception exception) { logger.error("Error saving activity:", exception); // Log the exception throw new RuntimeException("Can't save activity:", exception); @@ -181,8 +183,7 @@ public static AmpActivityVersion saveActivity(AmpActivityVersion oldA, Collectio new ActivityValidationWorkflowTrigger(a); } - List translations = values == null ? new ArrayList<>() : new ArrayList<>(values); - LuceneUtil.addUpdateActivity(rootRealPath, !newActivity, site, locale, a, oldA, translations); + LuceneUtil.addUpdateActivity(rootRealPath, !newActivity, site, locale, a, oldA, cumulativeValues); return a; } @@ -203,12 +204,13 @@ public static void prepareToSave(AmpActivityVersion a, AmpActivityVersion oldA, } public static AmpActivityVersion saveActivityNewVersion(AmpActivityVersion a, - Collection translations, AmpTeamMember ampCurrentMember, boolean draft, + Collection translations, List cumulativeTranslations, + AmpTeamMember ampCurrentMember, boolean draft, Session session, SaveContext context, EditorStore editorStore, Site site) throws Exception { boolean draftChange = detectDraftChange(a, draft); - return saveActivityNewVersion(a, translations, ampCurrentMember, draft, draftChange, session, context, - editorStore, site); + return saveActivityNewVersion(a, translations, cumulativeTranslations, ampCurrentMember, draft, + draftChange, session, context, editorStore, site); } /** @@ -216,7 +218,8 @@ public static AmpActivityVersion saveActivityNewVersion(AmpActivityVersion a, * returns newActivity */ public static AmpActivityVersion saveActivityNewVersion(AmpActivityVersion a, - Collection translations, AmpTeamMember ampCurrentMember, boolean draft, + Collection translations, List cumulativeTranslations, + AmpTeamMember ampCurrentMember, boolean draft, boolean draftChange, Session session, SaveContext context, EditorStore editorStore, Site site) throws Exception { @@ -236,7 +239,7 @@ public static AmpActivityVersion saveActivityNewVersion(AmpActivityVersion a, } if (ContentTranslationUtil.multilingualIsEnabled()) - ContentTranslationUtil.cloneTranslations(a, translations); + ContentTranslationUtil.cloneTranslations(a, translations, cumulativeTranslations); //is versioning activated? boolean createNewVersion = (draft == draftChange) && ActivityVersionUtil.isVersioningEnabled(); diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/AMPActivityService.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/AMPActivityService.java index ef559958fb9..13ad997c83e 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/AMPActivityService.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/AMPActivityService.java @@ -79,11 +79,12 @@ public AmpActivityVersion getActivity(Long activityId) throws DgException { @Override public AmpActivityVersion saveActivity(AmpActivityVersion newActivity, List translations, - AmpTeamMember modifiedBy, boolean draftChange, SaveContext saveContext, - EditorStore editorStore, Site site) throws Exception { + List cumulativeTranslations, + AmpTeamMember modifiedBy, boolean draftChange, SaveContext saveContext, + EditorStore editorStore, Site site) throws Exception { Session session = PersistenceManager.getSession(); - return saveActivityNewVersion(newActivity, translations, modifiedBy, + return saveActivityNewVersion(newActivity, translations, cumulativeTranslations, modifiedBy, Boolean.TRUE.equals(newActivity.getDraft()), draftChange, session, saveContext, editorStore, site); } diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityImporter.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityImporter.java index 941fc4e155e..c269d6cb0d4 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityImporter.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityImporter.java @@ -4,6 +4,7 @@ import static org.digijava.kernel.ampapi.endpoints.activity.SaveMode.SUBMIT; import java.lang.reflect.Field; +import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -296,10 +297,11 @@ private void importOrUpdateActivity(Long activityId) { prepareToSave(); boolean draftChange = ActivityUtil.detectDraftChange(newActivity, oldActivityDraft); - newActivity = activityService.saveActivity(newActivity, getTranslations(), modifiedBy, draftChange, - saveContext, getEditorStore(), getSite()); + List cumulativeTranslations = new ArrayList<>(); + newActivity = activityService.saveActivity(newActivity, getTranslations(), cumulativeTranslations, + modifiedBy, draftChange, saveContext, getEditorStore(), getSite()); - activityService.updateLuceneIndex(newActivity, oldActivity, update, trnSettings, getTranslations(), + activityService.updateLuceneIndex(newActivity, oldActivity, update, trnSettings, cumulativeTranslations, getSite()); } } catch (Exception e) { diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityService.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityService.java index 8d7cb40ef8a..4ac7014fde3 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityService.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityService.java @@ -21,8 +21,9 @@ public interface ActivityService { AmpActivityVersion getActivity(Long activityId) throws DgException; AmpActivityVersion saveActivity(AmpActivityVersion newActivity, List translations, - AmpTeamMember modifiedBy, boolean draftChange, SaveContext saveContext, - EditorStore editorStore, Site site) throws Exception; + List cumulativeTranslations, + AmpTeamMember modifiedBy, boolean draftChange, SaveContext saveContext, + EditorStore editorStore, Site site) throws Exception; void updateLuceneIndex(AmpActivityVersion newActivity, AmpActivityVersion oldActivity, boolean update, TranslationSettings trnSettings, List translations, Site site); diff --git a/amp/WEB-INF/src/org/digijava/module/aim/util/IndicatorUtil.java b/amp/WEB-INF/src/org/digijava/module/aim/util/IndicatorUtil.java index 3143647f8dd..549d2f8e56f 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/util/IndicatorUtil.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/util/IndicatorUtil.java @@ -1,12 +1,9 @@ package org.digijava.module.aim.util; -import java.sql.SQLException; -import java.text.Collator; import java.text.NumberFormat; import java.text.SimpleDateFormat; import java.util.*; -import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.dgfoundation.amp.ar.viewfetcher.InternationalizedModelDescription; import org.digijava.kernel.exception.DgException; diff --git a/amp/WEB-INF/src/org/digijava/module/aim/util/activity/ActivityCloser.java b/amp/WEB-INF/src/org/digijava/module/aim/util/activity/ActivityCloser.java index ef6909b9f6e..b99d9d577d5 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/util/activity/ActivityCloser.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/util/activity/ActivityCloser.java @@ -18,6 +18,7 @@ import org.digijava.module.categorymanager.util.CategoryConstants; import org.digijava.module.categorymanager.util.CategoryManagerUtil; +import java.util.ArrayList; import java.util.List; import static org.digijava.module.aim.util.activity.GenericUserHelper.getAmpTeamMemberModifier; @@ -89,6 +90,7 @@ public static AmpActivityVersion cloneActivity(AmpTeamMember member, AmpActivit AmpActivityVersion auxActivity = null; auxActivity = org.dgfoundation.amp.onepager.util.ActivityUtil.saveActivityNewVersion(oldActivity, null, + new ArrayList<>(), member, oldActivity.getDraft(), PersistenceManager.getSession(), saveContext, editorStore, site); java.util.Locale javaLocale = new java.util.Locale("en"); LuceneUtil.addUpdateActivity(AMPStartupListener.SERVLET_CONTEXT_ROOT_REAL_PATH, true, diff --git a/amp/WEB-INF/src/org/digijava/module/translation/util/ContentTranslationUtil.java b/amp/WEB-INF/src/org/digijava/module/translation/util/ContentTranslationUtil.java index 1e4110a089d..53eecbbb243 100644 --- a/amp/WEB-INF/src/org/digijava/module/translation/util/ContentTranslationUtil.java +++ b/amp/WEB-INF/src/org/digijava/module/translation/util/ContentTranslationUtil.java @@ -112,15 +112,16 @@ public static boolean translateObject(Object obj, Serializable id, Object[] stat * * @return the identifier for the object in the TranslationStore */ - private static Long getFieldTrnPack(Class clazz, String objClass, Long objId, String fieldName, String currentLocale, String fieldTrnCurrentLocale, List formFieldTrns){ + private static Long getFieldTrnPack(Class clazz, Long objId, String fieldName, + String currentLocale, String fieldTrnCurrentLocale, List formFieldTrns, + List cumulativeTranslations) { + String objClass = clazz.getName(); //get old translations for current field List currentTranslations = loadFieldTranslations(objClass, objId, fieldName); //create the FieldTranslationPack object FieldTranslationPack trnPack = new FieldTranslationPack(objClass, fieldName); - if (currentTranslations != null){ //if we have trns from the db, add them to the list - for (AmpContentTranslation ampContentTranslation : currentTranslations) { - trnPack.add(ampContentTranslation); - } + for (AmpContentTranslation ampContentTranslation : currentTranslations) { + trnPack.add(ampContentTranslation); } if (formFieldTrns != null){//override the translations from the db with the ones from the form if available @@ -139,6 +140,9 @@ private static Long getFieldTrnPack(Class clazz, String objClass, Long objId, St trnPack.add(getBaseLanguage(), baseTrn); } + trnPack.getTranslations().forEach((locale, value) -> + cumulativeTranslations.add(new AmpContentTranslation(objClass, objId, fieldName, locale, value))); + return TranslationStore.insert(trnPack); } @@ -149,7 +153,7 @@ private static Long getFieldTrnPack(Class clazz, String objClass, Long objId, St * @param obj Object that needs translation cloning */ public static void cloneTranslations(Object obj){ - cloneTranslations(obj, null); + cloneTranslations(obj, null, new ArrayList<>()); } /** @@ -201,12 +205,12 @@ public static boolean multilingualIsEnabled() * @param formTranslations the list of translations that were modified using the activity form */ @SuppressWarnings("unchecked") - public static void cloneTranslations(Object obj, Collection formTranslations) - { + public static void cloneTranslations(Object obj, Collection formTranslations, + List cumulativeTranslations) { //check if multilingual is enabled if (!multilingualIsEnabled()) return; - cloneTranslations(obj, formTranslations, new HashSet()); + cloneTranslations(obj, formTranslations, cumulativeTranslations, new HashSet()); } /** @@ -218,7 +222,8 @@ public static void cloneTranslations(Object obj, Collection formTranslations, Set processed){ + private static void cloneTranslations(Object obj, Collection formTranslations, + List cumulativeTranslations, Set processed) { Hibernate.initialize(obj); String objClass = getObjectClassName(obj); Long objId = getObjectId(obj); @@ -259,7 +264,8 @@ private static void cloneTranslations(Object obj, Collection translations, - AmpTeamMember modifiedBy, boolean draftChange, SaveContext saveContext, - EditorStore editorStore, Site site) { + List cumulativeTranslations, + AmpTeamMember modifiedBy, boolean draftChange, SaveContext saveContext, + EditorStore editorStore, Site site) { return newActivity; } From 90fed984e9b1645f0f17760154dee50c28b3e2ce Mon Sep 17 00:00:00 2001 From: Octavian Ciubotaru Date: Thu, 15 Dec 2022 15:23:39 +0200 Subject: [PATCH 028/135] BOAD-7: Parameterized the staging server hostname --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 93ee425ed91..6c4dd03f6c4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -60,7 +60,7 @@ stage('Build') { println "AMP Version: ${codeVersion}" countries = sh(returnStdout: true, - script: "ssh boad.aws.devgateway.org 'cd /opt/amp_dbs && amp-db ls ${codeVersion} | sort'") + script: "ssh ${env.AMP_STAGING_HOSTNAME} 'cd /opt/amp_dbs && amp-db ls ${codeVersion} | sort'") .trim() if (countries == "") { println "There are no database backups compatible with ${codeVersion}" @@ -127,10 +127,10 @@ stage('Deploy') { node { try { // Find latest database version compatible with ${codeVersion} - dbVersion = sh(returnStdout: true, script: "ssh boad.aws.devgateway.org 'cd /opt/amp_dbs && amp-db find ${codeVersion} ${country}'").trim() + dbVersion = sh(returnStdout: true, script: "ssh ${env.AMP_STAGING_HOSTNAME} 'cd /opt/amp_dbs && amp-db find ${codeVersion} ${country}'").trim() // Deploy AMP - sh "ssh boad.aws.devgateway.org 'amp-up ${tag} ${country} ${dbVersion} ${pgVersion}'" + sh "ssh ${env.AMP_STAGING_HOSTNAME} 'amp-up ${tag} ${country} ${dbVersion} ${pgVersion}'" slackSend(channel: 'amp-ci', color: 'good', message: "Deploy AMP - Success\nDeployed ${changePretty} will be ready for testing at ${ampUrl} in about 3 minutes") @@ -155,7 +155,7 @@ stage('Deploy again') { } node { try { - sh "ssh boad.aws.devgateway.org 'amp-up ${tag} ${country} ${dbVersion} ${pgVersion}'" + sh "ssh ${env.AMP_STAGING_HOSTNAME} 'amp-up ${tag} ${country} ${dbVersion} ${pgVersion}'" slackSend(channel: 'amp-ci', color: 'good', message: "Deploy AMP - Success\nDeployed ${changePretty} will be ready for testing at ${ampUrl} in about 3 minutes") From 4b096114e5324b8f59a2223ca8b17a3b58ed6485 Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Fri, 16 Dec 2022 15:05:35 +0300 Subject: [PATCH 029/135] AMP-30412 removed the unused activity info code to show error and changed error key --- amp/TEMPLATE/reamp/modules/activity/preview/utils/ApiHelper.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/utils/ApiHelper.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/utils/ApiHelper.jsx index 7811d9c6bbb..7043598c207 100644 --- a/amp/TEMPLATE/reamp/modules/activity/preview/utils/ApiHelper.jsx +++ b/amp/TEMPLATE/reamp/modules/activity/preview/utils/ApiHelper.jsx @@ -7,7 +7,7 @@ export default class ApiHelper { errors = Array.isArray(errors) ? errors : [errors]; errors.forEach((error) => { for (const key in error) { - const messageKey = 'amp.preview:server-errors-' + key; + const messageKey = "Couldn\nt find activity! It may be no longer exists in the system."; const message = {messageKey}; if (obj && obj.id) { message.id = obj.id; From 3d95391f281f207aa438a5d959803d5952a7a445 Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Fri, 16 Dec 2022 21:00:20 +0300 Subject: [PATCH 030/135] AMP-30412 added error message to the transaltion --- .../activity/preview/common/initialTranslations.jsx | 3 ++- .../reamp/modules/activity/preview/utils/ApiHelper.jsx | 8 +++++--- amp/deployConfigs/selected.properties | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/common/initialTranslations.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/common/initialTranslations.jsx index 62952b96ce9..521ddd574f3 100644 --- a/amp/TEMPLATE/reamp/modules/activity/preview/common/initialTranslations.jsx +++ b/amp/TEMPLATE/reamp/modules/activity/preview/common/initialTranslations.jsx @@ -488,5 +488,6 @@ export const initialTranslations = { "editPermissionError": "You do not have permissions to edit this activity.", "sameUserEditingError": "You may only edit one activity at a time.", "exportToWord":"Export to Word", - "disbursementId":"Disbursement ID" + "disbursementId":"Disbursement ID", + "activityNotFound": "Couldn't find activity! It may be no longer exists in the system" } diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/utils/ApiHelper.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/utils/ApiHelper.jsx index 7043598c207..c54a82786d1 100644 --- a/amp/TEMPLATE/reamp/modules/activity/preview/utils/ApiHelper.jsx +++ b/amp/TEMPLATE/reamp/modules/activity/preview/utils/ApiHelper.jsx @@ -1,4 +1,5 @@ import {fetchJson, postJson} from 'amp/tools/index'; +import translate from '../utils/translate'; export default class ApiHelper { static extractErrors(errors, obj) { @@ -6,9 +7,10 @@ export default class ApiHelper { if (errors) { errors = Array.isArray(errors) ? errors : [errors]; errors.forEach((error) => { - for (const key in error) { - const messageKey = "Couldn\nt find activity! It may be no longer exists in the system."; - const message = {messageKey}; + for (const _key in error) { + const message = { + messageKey: translate("activityNotFound"), + }; if (obj && obj.id) { message.id = obj.id; } diff --git a/amp/deployConfigs/selected.properties b/amp/deployConfigs/selected.properties index 9b900b9fe71..cc8a9a47497 100644 --- a/amp/deployConfigs/selected.properties +++ b/amp/deployConfigs/selected.properties @@ -1,4 +1,4 @@ #Description of the selected config -#Mon, 28 Nov 2022 18:23:44 +0300 +#Fri, 16 Dec 2022 16:39:24 +0300 serverName=local From fd04f319475f294bdd19f3e3810849a638210719 Mon Sep 17 00:00:00 2001 From: Octavian Ciubotaru Date: Thu, 22 Dec 2022 11:38:27 +0200 Subject: [PATCH 031/135] AMP-30342: Renamed the image name to use the forward slash --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ecb50716645..6cb1862cd98 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -81,7 +81,7 @@ stage('Build') { node { checkout scm - def image = "${dockerRepo}amp-webapp:${tag}" + def image = "${dockerRepo}amp/webapp:${tag}" def hash = sh(returnStdout: true, script: "git log --pretty=%H -n 1").trim() docker.withRegistry("https://798366298150.dkr.ecr.us-east-1.amazonaws.com", "ecr:us-east-1:aws-ecr-credentials-id") { From 8ad900a96e9d8df31282f0b985185f6578f5583e Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Thu, 22 Dec 2022 13:46:19 +0300 Subject: [PATCH 032/135] AMP-30423 commented on the gs_lat and gs_long since they are both null in the DB --- .../src/org/digijava/module/aim/util/LocationSkeleton.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amp/WEB-INF/src/org/digijava/module/aim/util/LocationSkeleton.java b/amp/WEB-INF/src/org/digijava/module/aim/util/LocationSkeleton.java index c840c782f20..d3cea4173ef 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/util/LocationSkeleton.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/util/LocationSkeleton.java @@ -56,8 +56,8 @@ public LocationSkeleton fetch(ResultSet rs) throws SQLException { rs.getString("code"), nullInsteadOfZero(rs.getLong("parent_location"))) .withCvId(nullInsteadOfZero(rs.getLong("parent_category_value"))) .withTemplateId(nullInsteadOfZero(rs.getLong("template_id"))) - .withLat(nullInsteadOfZero(rs.getDouble("gs_lat"))) - .withLon(nullInsteadOfZero(rs.getDouble("gs_long"))) +// .withLat(nullInsteadOfZero(rs.getDouble("gs_lat"))) +// .withLon(nullInsteadOfZero(rs.getDouble("gs_long"))) .withGroup(nullInsteadOfZero(rs.getLong("amp_category_value_group_id"))) .withDescription(rs.getString("description")) .getLocationSkeleton(); From 4cb034442e36eedf55d8f1f2a0964a500d57e37f Mon Sep 17 00:00:00 2001 From: timothymugodev Date: Fri, 23 Dec 2022 14:42:54 +0300 Subject: [PATCH 033/135] AMP-30380 fixed font-size of button, changed bg of formnote --- amp/TEMPLATE/ampTemplate/css_2/amp.css | 4 ++-- amp/deployConfigs/selected.properties | 2 +- amp/repository/aim/view/changePassword.jsp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/amp/TEMPLATE/ampTemplate/css_2/amp.css b/amp/TEMPLATE/ampTemplate/css_2/amp.css index bb521b89841..52bf9a9f2b7 100644 --- a/amp/TEMPLATE/ampTemplate/css_2/amp.css +++ b/amp/TEMPLATE/ampTemplate/css_2/amp.css @@ -408,7 +408,7 @@ div.reg_form_container{width:1000px; margin:0 auto;text-align:center;} div.reg_form_container table {margin:0 auto; } /* timothymugo - add height of the input boxes */ div.reg_form_container input,div.reg_form_container form input, div.reg_form_container form select{border:1px solid #d0d0d0;height:30px;} -div.reg_form_container .buttonx {background-color:#68b35b; font-size:11px; color:#FFFFFF; font-weight:bold; padding: 3px 5px; height:30px; width: 200px; margin-right: 392px; } +div.reg_form_container .buttonx {background-color:#68b35b; font-size:14px; color:#FFFFFF; font-weight:bold; padding: 3px 5px; height:30px; width: 200px; margin-right: 392px; } div.reg_form_container form input.dr-menu, div.reg_form_container input.dr-menu{ font-size:14px; font-weight:bold; color:#FFFFFF; background-color:#4A687A; margin:10px;height:25px;border:1px solid #364d5a;} div.reg_form_title{text-align:left;border-top:5px solid #4A687A; margin:0px 0px 20px 0px; background:#f0f0f0;padding:0px 0px 10px 0px;border-bottom:1px solid #ccccce;} div.reg_form_container h2 { font-size:30px; font-weight:bold; color:#FFFFFF; background-color:#4A687A; margin-left:10px; padding:5px; letter-spacing:-1px; margin-right:10px;display:inline;} @@ -536,7 +536,7 @@ div.reg_form_container{width:1000px; margin:0 auto; text-align: left;} div.reg_form_container table {margin:0 auto; } /* Modify the input boxes - timothymugo */ div.reg_form_container input,div.reg_form_container form input, div.reg_form_container form select{border:1px solid #d0d0d0;height:30px; font-size: 11px; width: 280px; padding: 5px 20px; border-radius: 5px;} -div.reg_form_container .buttonx {background-color:#68b35b; border-top: 1px solid #99BAF1; font-size:11px; color:#FFFFFF; font-weight:bold; padding: 3px 5px; height:30px;} +div.reg_form_container .buttonx {background-color:#68b35b; border-top: 1px solid #99BAF1; font-size:14px; color:#FFFFFF; font-weight: 700; padding: 3px 5px; height:30px;} div.reg_form_container form input.dr-menu, div.reg_form_container input.dr-menu{ font-size:14px; font-weight:bold; color:#FFFFFF; background-color:#4A687A; margin:10px;height:25px;border:1px solid #364d5a;} div.reg_form_title{text-align:left;border-top:5px solid #4A687A; margin:0px 0px 20px 0px; background:#f0f0f0;padding:0px 0px 10px 0px;border-bottom:1px solid #ccccce;} div.reg_form_container h2 { font-size:30px; font-weight:bold; color:#FFFFFF; background-color:#4A687A; margin-left:10px; padding:5px; letter-spacing:-1px; margin-right:10px;display:inline;} diff --git a/amp/deployConfigs/selected.properties b/amp/deployConfigs/selected.properties index 9b900b9fe71..7c101b60c36 100644 --- a/amp/deployConfigs/selected.properties +++ b/amp/deployConfigs/selected.properties @@ -1,4 +1,4 @@ #Description of the selected config -#Mon, 28 Nov 2022 18:23:44 +0300 +#Fri, 23 Dec 2022 14:01:27 +0300 serverName=local diff --git a/amp/repository/aim/view/changePassword.jsp b/amp/repository/aim/view/changePassword.jsp index 3fabe92f1df..d9ddfa5ff10 100644 --- a/amp/repository/aim/view/changePassword.jsp +++ b/amp/repository/aim/view/changePassword.jsp @@ -59,7 +59,7 @@ function validate(){ - - - @@ -150,7 +150,7 @@ function validate(){ From 59faeeb086febb5e9265223f185dda84ace64d7e Mon Sep 17 00:00:00 2001 From: Julian de Anquin Date: Tue, 18 Apr 2023 12:58:22 -0300 Subject: [PATCH 071/135] AMP-30372 add setting to configure the feature --- .../activity/ActivityInterchangeUtils.java | 10 +++--- .../AMP-30372-add-hide-document-setting.xml | 36 +++++++++++++++++++ ...MP-30515-Add-hide-empty-total-settings.xml | 13 +++++-- 3 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 amp/xmlpatches/3.5.05.1/AMP-30372-add-hide-document-setting.xml diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java index 48f2dfd8ba0..eab413a43bc 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java @@ -4,6 +4,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.dgfoundation.amp.Util; +import org.dgfoundation.amp.onepager.util.AmpFMTypes; import org.dgfoundation.amp.onepager.util.FMUtil; import org.digijava.kernel.ampapi.endpoints.activity.dto.ActivityInformation; import org.digijava.kernel.ampapi.endpoints.activity.dto.ActivitySummary; @@ -87,7 +88,7 @@ private ActivityInterchangeUtils() { */ public static JsonApiResponse importActivity(Map newJson, boolean update, ActivityImportRules rules, String endpointContextPath) { - + // Load the enumerator for the FM template associated to the activity's workspace (AMPOFFLINE-1562) APIField activityField; Long fmId = getFMTemplateId(newJson); @@ -96,7 +97,7 @@ public static JsonApiResponse importActivity(Map getActivityByAmpId(String ampId, boolean isOff */ public static Map getActivity(Long projectId, boolean isOfflineClientCall) { Map activity = getActivity(projectId, null); - if (!isOfflineClientCall) { + if (!isOfflineClientCall && + FeaturesUtil.isVisibleModule("/REPORTING/Activity Preview/Hide Documents if no donor")) { filterPropertyBasedOnUserPermission(activity, projectId); } return activity; @@ -353,7 +355,7 @@ public static AmpActivityVersion loadActivity(Long actId) { ApiErrorResponseService.reportResourceNotFound( ActivityErrors.ACTIVITY_NOT_FOUND.withDetails(actId.toString())); } - + return ActivityUtil.loadActivity(actId); } catch (DgException e) { throw new RuntimeException(e); diff --git a/amp/xmlpatches/3.5.05.1/AMP-30372-add-hide-document-setting.xml b/amp/xmlpatches/3.5.05.1/AMP-30372-add-hide-document-setting.xml new file mode 100644 index 00000000000..a3c956e2199 --- /dev/null +++ b/amp/xmlpatches/3.5.05.1/AMP-30372-add-hide-document-setting.xml @@ -0,0 +1,36 @@ + + + AMP-30372 + Add hide document settings + jdeanquin + + + + \ No newline at end of file diff --git a/amp/xmlpatches/3.5.05.1/AMP-30515-Add-hide-empty-total-settings.xml b/amp/xmlpatches/3.5.05.1/AMP-30515-Add-hide-empty-total-settings.xml index 47ed22d67f5..f893da74729 100644 --- a/amp/xmlpatches/3.5.05.1/AMP-30515-Add-hide-empty-total-settings.xml +++ b/amp/xmlpatches/3.5.05.1/AMP-30515-Add-hide-empty-total-settings.xml @@ -9,8 +9,16 @@ From d92d7a4086fdfb40d5e5a3ec686765b200d7b0cf Mon Sep 17 00:00:00 2001 From: Julian de Anquin Date: Tue, 18 Apr 2023 13:35:35 -0300 Subject: [PATCH 072/135] AMP-30372 Fix checkstyle --- .../activity/ActivityInterchangeUtils.java | 32 ++++++++----------- .../activity/InterchangeEndpoints.java | 8 ----- .../ampapi/endpoints/common/EPConstants.java | 2 +- .../module/aim/util/ActivityUtil.java | 6 ++-- 4 files changed, 18 insertions(+), 30 deletions(-) diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java index eab413a43bc..4e7b15c14e3 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java @@ -4,8 +4,6 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.dgfoundation.amp.Util; -import org.dgfoundation.amp.onepager.util.AmpFMTypes; -import org.dgfoundation.amp.onepager.util.FMUtil; import org.digijava.kernel.ampapi.endpoints.activity.dto.ActivityInformation; import org.digijava.kernel.ampapi.endpoints.activity.dto.ActivitySummary; import org.digijava.kernel.ampapi.endpoints.activity.dto.TeamMemberInformation; @@ -13,7 +11,6 @@ import org.digijava.kernel.ampapi.endpoints.common.EPConstants; import org.digijava.kernel.ampapi.endpoints.common.EndpointUtils; import org.digijava.kernel.ampapi.endpoints.common.JsonApiResponse; -import org.digijava.kernel.ampapi.endpoints.dto.Activity; import org.digijava.kernel.ampapi.endpoints.errors.ApiError; import org.digijava.kernel.ampapi.endpoints.errors.ApiErrorResponse; import org.digijava.kernel.ampapi.endpoints.errors.ApiErrorResponseService; @@ -21,7 +18,6 @@ import org.digijava.kernel.ampapi.endpoints.errors.GenericErrors; import org.digijava.kernel.ampapi.endpoints.security.SecurityService; import org.digijava.kernel.ampapi.endpoints.security.dto.UserSessionInformation; -import org.digijava.kernel.ampapi.endpoints.security.services.WorkspaceMemberService; import org.digijava.kernel.ampapi.filters.AmpClientModeHolder; import org.digijava.kernel.exception.DgException; import org.digijava.kernel.persistence.PersistenceManager; @@ -32,7 +28,6 @@ import org.digijava.module.aim.dbentity.AmpActivityVersion; import org.digijava.module.aim.dbentity.AmpAnnualProjectBudget; import org.digijava.module.aim.dbentity.AmpOrgRole; -import org.digijava.module.aim.dbentity.AmpOrganisation; import org.digijava.module.aim.dbentity.AmpTeamMember; import org.digijava.module.aim.helper.Constants; import org.digijava.module.aim.helper.CurrencyWorker; @@ -40,6 +35,7 @@ import org.digijava.module.aim.helper.Workspace; import org.digijava.module.aim.util.ActivityUtil; import org.digijava.module.aim.util.ActivityVersionUtil; +import org.digijava.module.aim.util.DbUtil; import org.digijava.module.aim.util.DecimalWraper; import org.digijava.module.aim.util.FeaturesUtil; import org.digijava.module.aim.util.TeamMemberUtil; @@ -51,17 +47,15 @@ import javax.ws.rs.core.PathSegment; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.Set; -import java.util.function.Consumer; import java.util.stream.Collectors; +import static org.digijava.kernel.ampapi.endpoints.common.EPConstants.ACTIVITY_DOCUMENTS; import static org.digijava.module.aim.helper.GlobalSettingsConstants.EXEMPT_ORGANIZATION_REPORT; /** @@ -316,27 +310,27 @@ public static Map getActivity(Long projectId, boolean isOfflineC FeaturesUtil.isVisibleModule("/REPORTING/Activity Preview/Hide Documents if no donor")) { filterPropertyBasedOnUserPermission(activity, projectId); } - return activity; + return activity; } - private static void filterPropertyBasedOnUserPermission(Map activity, Long projectId){ - final long DONOR_ROLE = 1L; - final String ACTIVITY_DOCUMENTS = "activity_documents"; + private static void filterPropertyBasedOnUserPermission(Map activity, Long projectId) { + final Long donorRole = DbUtil.getAmpRole(Constants.FUNDING_AGENCY).getAmpRoleId(); UserSessionInformation userInformation = SecurityService.getInstance().getUserSessionInformation(); if (userInformation != null) { User user = UserUtils.getUser(userInformation.getUserId()); - if (user != null){ - if (user.getAssignedOrgs() != null && !user.getAssignedOrgs().isEmpty()){ + if (user != null) { + if (user.getAssignedOrgs() != null && !user.getAssignedOrgs().isEmpty()) { if (!userBelongToExemptOrgForDocumentVisualization(user)) { List organizationIds = user.getAssignedOrgs().stream() .map(ampOrganisation -> ampOrganisation.getAmpOrgId()).collect(Collectors.toList()); - List ampOrgRoles = ActivityUtil.getAmpRolesForActivityAndOrganizationsAndRole(projectId, - organizationIds, DONOR_ROLE); + List ampOrgRoles = + ActivityUtil.getAmpRolesForActivityAndOrganizationsAndRole(projectId, + organizationIds, donorRole); if (ampOrgRoles == null || ampOrgRoles.size() == 0) { activity.replace(ACTIVITY_DOCUMENTS, null); } } - } else{ + } else { activity.replace(ACTIVITY_DOCUMENTS, null); } } @@ -345,7 +339,9 @@ private static void filterPropertyBasedOnUserPermission(Map acti private static boolean userBelongToExemptOrgForDocumentVisualization(User user) { return user.getAssignedOrgs().stream() - .filter(ampOrganisation -> ampOrganisation.getIdentifier().equals(FeaturesUtil.getGlobalSettingValueLong(EXEMPT_ORGANIZATION_REPORT))) + .filter(ampOrganisation + -> ampOrganisation.getIdentifier().equals( + FeaturesUtil.getGlobalSettingValueLong(EXEMPT_ORGANIZATION_REPORT))) .count() > 0; } diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/InterchangeEndpoints.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/InterchangeEndpoints.java index 6d314a6e833..278891c9806 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/InterchangeEndpoints.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/InterchangeEndpoints.java @@ -8,9 +8,6 @@ import io.swagger.annotations.ApiResponses; import io.swagger.annotations.Example; import io.swagger.annotations.ExampleProperty; -import org.apache.commons.lang3.StringUtils; -import org.apache.http.HttpHeaders; -import org.apache.http.protocol.HTTP; import org.dgfoundation.amp.algo.AmpCollections; import org.digijava.kernel.ampapi.endpoints.activity.dto.ActivityInformation; import org.digijava.kernel.ampapi.endpoints.activity.dto.ActivitySummary; @@ -37,16 +34,11 @@ import org.digijava.kernel.ampapi.filters.AmpClientModeHolder; import org.digijava.kernel.request.TLSUtils; import org.digijava.kernel.services.AmpFieldsEnumerator; -import org.digijava.kernel.util.DgUtil; import org.digijava.module.aim.helper.Constants; import org.digijava.module.aim.helper.TeamMember; import org.digijava.module.aim.util.ActivityUtil; import org.springframework.security.web.util.UrlUtils; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.ws.rs.DefaultValue; import javax.ws.rs.GET; diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/EPConstants.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/EPConstants.java index f57edebd5be..3caa72d2f20 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/EPConstants.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/EPConstants.java @@ -116,7 +116,7 @@ public class EPConstants { public static final String ISO8601_DATE_AND_TIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"; public static final String ISO8601_DATE_FORMAT = "yyyy-MM-dd"; - + public static final String ACTIVITY_DOCUMENTS = "activity_documents"; /** * Map containing the length of date strings used for validation * "2019-02-26T11:08:56.235-0200" - 28 characters diff --git a/amp/WEB-INF/src/org/digijava/module/aim/util/ActivityUtil.java b/amp/WEB-INF/src/org/digijava/module/aim/util/ActivityUtil.java index 8e2a2e1557f..a188db87fa0 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/util/ActivityUtil.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/util/ActivityUtil.java @@ -60,7 +60,7 @@ import org.digijava.module.aim.dbentity.AmpIssues; import org.digijava.module.aim.dbentity.AmpOrgRole; import org.digijava.module.aim.dbentity.AmpOrganisation; -import org.digijava.module.aim.dbentity.AmpRole; +import org.digijava.module.aim.dbentity.amp_togole; import org.digijava.module.aim.dbentity.AmpStructure; import org.digijava.module.aim.dbentity.AmpStructureImg; import org.digijava.module.aim.dbentity.AmpTeam; @@ -553,7 +553,7 @@ public static List getOrgRole(Long id) { return PersistenceManager.getSession().createQuery(queryString).setParameter("actId", id, LongType.INSTANCE).list(); } - public static AmpRole getAmpRole(Long actId, Long orgRoleId) { + public static amp_togole getAmpRole(Long actId, Long orgRoleId) { Session session = null; AmpRole role = null; try { @@ -576,7 +576,7 @@ public static AmpRole getAmpRole(Long actId, Long orgRoleId) { } public static List getAmpRolesForActivityAndOrganizationsAndRole(Long actId, List organizationId, - Long roleId){ + Long roleId) { List ampOrgRoles = new ArrayList<>(); if (organizationId != null && organizationId.size() > 0) { String queryString = "select ar from AmpOrgRole ar " From 201e628d871a92aceb6d396e90a822b2a851ee86 Mon Sep 17 00:00:00 2001 From: Damian Rychter Date: Tue, 18 Apr 2023 17:17:11 -0300 Subject: [PATCH 073/135] AMP-30540 Issue- exception in organization manager when user try to delete organization which is marked as verified --- .../src/java/resources/application.properties | 1 + .../module/aim/action/EditOrganisation.java | 31 +++++++++++-------- .../aim/dbentity/AmpOrganisation.hbm.xml | 5 +++ .../module/aim/dbentity/AmpOrganisation.java | 11 +++++++ amp/repository/um/view/viewEditUser.jsp | 4 +-- 5 files changed, 37 insertions(+), 15 deletions(-) diff --git a/amp/WEB-INF/src/java/resources/application.properties b/amp/WEB-INF/src/java/resources/application.properties index e9a1eb5ee34..86d08a815e1 100644 --- a/amp/WEB-INF/src/java/resources/application.properties +++ b/amp/WEB-INF/src/java/resources/application.properties @@ -579,6 +579,7 @@ error.aim.organizationTypeManager.saveOrgTypeCodeError={0} error.aim.organizationManager.deleteOrgActError=Can not delete this organization as it is currently referenced by the following Activities (AMP Ids): {0}. error.aim.organizationManager.deleteOrgEventError=Can not delete this organization as it is currently referenced by Events error.aim.organizationManager.deleteOrgTeamError=Can not delete this organization as it is currently referenced by Teams +error.aim.organizationManager.deleteOrgVerifiedOrgError=Can not delete this organization as it is currently referenced as verified Organization error.aim.organizationManager.saveOrgPledgeError=Please complete the fields program, amount and date for each Pledge error.aim.organizationManager.saveOrgCodeError=Please choose another organization code as it is currently in use by some other organization. error.aim.organizationManager.saveOrgAcronymError = Please choose another organization acronym as it is currently in \ diff --git a/amp/WEB-INF/src/org/digijava/module/aim/action/EditOrganisation.java b/amp/WEB-INF/src/org/digijava/module/aim/action/EditOrganisation.java index 3ea4cf0ea13..2171c7460ca 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/action/EditOrganisation.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/action/EditOrganisation.java @@ -370,29 +370,29 @@ public ActionForward delete(ActionMapping mapping, ActionForm form,HttpServletRe String topAmpIds = ampIds.stream().limit(MAX_ACTIVITIES).collect(Collectors.joining(", ")); errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.aim.organizationManager.deleteOrgActError", topAmpIds)); - saveErrors(request, errors); - editForm.setActionFlag("edit"); - return mapping.findForward("forward"); - } else { + } + AmpOrganisation org = DbUtil.getOrganisation(editForm.getAmpOrgId()); if (org.getCalendar() != null && org.getCalendar().size() > 0) { errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.aim.organizationManager.deleteOrgEventError")); - saveErrors(request, errors); - editForm.setActionFlag("edit"); - return mapping.findForward("forward"); - } List releatedTeams = TeamUtil.getTeamByOrg(editForm.getAmpOrgId()); if (releatedTeams != null && !releatedTeams.isEmpty()){ errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.aim.organizationManager.deleteOrgTeamError")); + } + + if (org.getUsers() != null && !org.getUsers().isEmpty()) { + errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.aim.organizationManager.deleteOrgVerifiedOrgError")); + } + + if (!errors.isEmpty()){ saveErrors(request, errors); editForm.setActionFlag("edit"); return mapping.findForward("forward"); } - try { DbUtil.deleteOrg(org); } catch (JDBCException e) { @@ -408,18 +408,23 @@ public ActionForward delete(ActionMapping mapping, ActionForm form,HttpServletRe return mapping.findForward("added"); - } } private Set getAmpIdsWithOrg(Long orgId) { Set ids = new TreeSet<>(); - ids.addAll(DbUtil.getAmpIdsByOrg(orgId)); - ids.addAll(ActivityUtil.getAmpIdsByFundingOrg(orgId)); - ids.addAll(DbUtil.getAmpIdsByInternalIdOrg(orgId)); + addAllIfNotNull(ids, DbUtil.getAmpIdsByOrg(orgId)); + addAllIfNotNull(ids, ActivityUtil.getAmpIdsByFundingOrg(orgId)); + addAllIfNotNull(ids, DbUtil.getAmpIdsByInternalIdOrg(orgId)); return ids; } + private void addAllIfNotNull(Set set, Collection collectionToAdd){ + if (set != null && collectionToAdd != null && !collectionToAdd.isEmpty()){ + set.addAll(collectionToAdd); + } + } + public ActionForward addStaffInfo(ActionMapping mapping, ActionForm form,HttpServletRequest request, HttpServletResponse response) throws Exception { if (sessionChkForWInfo(request)) { return mapping.findForward("index"); diff --git a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpOrganisation.hbm.xml b/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpOrganisation.hbm.xml index 827a539e31d..e649c30de2b 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpOrganisation.hbm.xml +++ b/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpOrganisation.hbm.xml @@ -143,6 +143,11 @@ + + + + + diff --git a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpOrganisation.java b/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpOrganisation.java index 78171cdf742..e2883b05ad5 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpOrganisation.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpOrganisation.java @@ -11,6 +11,7 @@ import org.dgfoundation.amp.ar.viewfetcher.InternationalizedModelDescription; import org.digijava.kernel.ampapi.endpoints.common.valueproviders.OrganisationValueProvider; import org.digijava.kernel.dbentity.Country; +import org.digijava.kernel.user.User; import org.digijava.module.aim.annotations.interchange.InterchangeableValue; import org.digijava.module.aim.annotations.interchange.PossibleValueId; import org.digijava.module.aim.annotations.translation.TranslatableClass; @@ -117,6 +118,8 @@ public class AmpOrganisation implements Comparable, Identifiabl private boolean translateable = true; + private Set users; + @OrganizationReportColumn(columnName="Line Ministry Registration Number",propertyType=PropertyType.NGO) public String getLineMinRegNumber() { return lineMinRegNumber; @@ -734,4 +737,12 @@ public static String hqlStringForName(String idSource) return InternationalizedModelDescription.getForProperty(AmpOrganisation.class, "name").getSQLFunctionCall(idSource + ".ampOrgId"); } + public Set getUsers() { + return users; + } + + public void setUsers(Set users) { + this.users = users; + } + } diff --git a/amp/repository/um/view/viewEditUser.jsp b/amp/repository/um/view/viewEditUser.jsp index 012b697e809..254e8b68a91 100644 --- a/amp/repository/um/view/viewEditUser.jsp +++ b/amp/repository/um/view/viewEditUser.jsp @@ -437,11 +437,11 @@ function validateUserInfo(){ From 57f0539457cf17ed94c8aa2727c48de068502012 Mon Sep 17 00:00:00 2001 From: Julian de Anquin Date: Wed, 19 Apr 2023 11:34:11 -0300 Subject: [PATCH 074/135] AMP-30372 implement permission changes --- .../activity/ActivityInterchangeUtils.java | 8 +-- .../aim/helper/GlobalSettingsConstants.java | 2 +- .../module/aim/util/ActivityUtil.java | 44 ++++++------- .../gateperm/gates/RelatedOrgExemptGate.java | 63 +++++++++++++++++++ ...pt-document-permsion-AP-global-setting.xml | 2 +- 5 files changed, 91 insertions(+), 28 deletions(-) create mode 100644 amp/WEB-INF/src/org/digijava/module/gateperm/gates/RelatedOrgExemptGate.java diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java index 4e7b15c14e3..d976b814998 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java @@ -56,7 +56,7 @@ import java.util.stream.Collectors; import static org.digijava.kernel.ampapi.endpoints.common.EPConstants.ACTIVITY_DOCUMENTS; -import static org.digijava.module.aim.helper.GlobalSettingsConstants.EXEMPT_ORGANIZATION_REPORT; +import static org.digijava.module.aim.helper.GlobalSettingsConstants.EXEMPT_ORGANIZATION_DOCUMENT; /** * @author Octavian Ciubotaru @@ -306,8 +306,8 @@ public static Map getActivityByAmpId(String ampId, boolean isOff */ public static Map getActivity(Long projectId, boolean isOfflineClientCall) { Map activity = getActivity(projectId, null); - if (!isOfflineClientCall && - FeaturesUtil.isVisibleModule("/REPORTING/Activity Preview/Hide Documents if no donor")) { + if (!isOfflineClientCall + && FeaturesUtil.isVisibleModule("/REPORTING/Activity Preview/Hide Documents if no donor")) { filterPropertyBasedOnUserPermission(activity, projectId); } return activity; @@ -341,7 +341,7 @@ private static boolean userBelongToExemptOrgForDocumentVisualization(User user) return user.getAssignedOrgs().stream() .filter(ampOrganisation -> ampOrganisation.getIdentifier().equals( - FeaturesUtil.getGlobalSettingValueLong(EXEMPT_ORGANIZATION_REPORT))) + FeaturesUtil.getGlobalSettingValueLong(EXEMPT_ORGANIZATION_DOCUMENT))) .count() > 0; } diff --git a/amp/WEB-INF/src/org/digijava/module/aim/helper/GlobalSettingsConstants.java b/amp/WEB-INF/src/org/digijava/module/aim/helper/GlobalSettingsConstants.java index 342474946e2..68f603e6410 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/helper/GlobalSettingsConstants.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/helper/GlobalSettingsConstants.java @@ -243,6 +243,6 @@ public class GlobalSettingsConstants { */ public final static Set SETTINGS_TO_HIDE = new HashSet<>(Arrays.asList(REPORT_WIZARD_VISIBILITY_SOURCE)); - public static final String EXEMPT_ORGANIZATION_REPORT = "Exempt organization to see reports"; + public static final String EXEMPT_ORGANIZATION_DOCUMENT = "Exempt organization to see documents"; } diff --git a/amp/WEB-INF/src/org/digijava/module/aim/util/ActivityUtil.java b/amp/WEB-INF/src/org/digijava/module/aim/util/ActivityUtil.java index a188db87fa0..c670e7f9681 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/util/ActivityUtil.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/util/ActivityUtil.java @@ -60,7 +60,7 @@ import org.digijava.module.aim.dbentity.AmpIssues; import org.digijava.module.aim.dbentity.AmpOrgRole; import org.digijava.module.aim.dbentity.AmpOrganisation; -import org.digijava.module.aim.dbentity.amp_togole; +import org.digijava.module.aim.dbentity.AmpRole; import org.digijava.module.aim.dbentity.AmpStructure; import org.digijava.module.aim.dbentity.AmpStructureImg; import org.digijava.module.aim.dbentity.AmpTeam; @@ -116,11 +116,11 @@ public static List getComponents(Long actId) { logger.info(" this is the other components getting called...."); try { session = PersistenceManager.getRequestDBSession(); - String rewrittenColumns = SQLUtils.rewriteQuery("amp_components", "ac", + String rewrittenColumns = SQLUtils.rewriteQuery("amp_components", "ac", new HashMap(){{ put("title", InternationalizedModelDescription.getForProperty(AmpComponent.class, "title").getSQLFunctionCall("ac.amp_component_id")); put("description", InternationalizedModelDescription.getForProperty(AmpComponent.class, "description").getSQLFunctionCall("ac.amp_component_id")); - }}); + }}); String queryString = "select " + rewrittenColumns + " from amp_components ac " + "where (ac.amp_activity_id=:actId)"; Query qry = session.createSQLQuery(queryString).addEntity(AmpComponent.class); @@ -165,14 +165,14 @@ public static Collection searchActivities(Long ampThemeId, oql += " order by act.name"; Query query = session.createQuery(oql); - + setSearchActivitiesQueryParams(query, ampThemeId, statusCode, donorOrgId, fromDate, toDate, locationId, teamMember); - + if (pageStart!=null && rowCount!=null){ query.setFirstResult(pageStart); query.setMaxResults(rowCount); } - + result = query.list(); } catch (Exception ex) { @@ -215,8 +215,8 @@ public static Collection searchActivitieProgPercents(Long ampTheme " from " + AmpActivityProgram.class.getName() + " prog "; oql+= getSearchActivitiesWhereClause(ampThemeId, statusCode, donorOrgId, fromDate, toDate, locationId, teamMember); - - + + Query query = session.createQuery(oql); setSearchActivitiesQueryParams(query, ampThemeId, statusCode, donorOrgId, fromDate, toDate, locationId, teamMember); @@ -264,7 +264,7 @@ public static Integer searchActivitiesCount(Long ampThemeId, Query query = session.createQuery(oql); setSearchActivitiesQueryParams(query, ampThemeId, statusCode, donorOrgId, fromDate, toDate, locationId, teamMember); - + result = (Integer)query.uniqueResult(); } catch (Exception ex) { @@ -294,9 +294,9 @@ public static String getSearchActivitiesWhereClause(Long ampThemeId, Date toDate, Long locationId, TeamMember teamMember) { - + String oql=""; - + if (ampThemeId!=null){ oql += " inner join prog.program as theme "; } @@ -352,7 +352,7 @@ public static String getSearchActivitiesWhereClause(Long ampThemeId, whereTeamStatement.append(" and ( latestAct.team.ampTeamId =:teamId ) "); } } - + } if(relatedOrgsCriteria){ oql+=" inner join latestAct.orgrole role "; @@ -390,11 +390,11 @@ public static void setSearchActivitiesQueryParams(Query query, Long ampThemeId, Date toDate, Long locationId, TeamMember teamMember) { - + if (ampThemeId != null) { query.setLong("ampThemeId", ampThemeId.longValue()); } - + if (fromDate != null) { query.setDate("FromDate", fromDate); } @@ -407,7 +407,7 @@ public static void setSearchActivitiesQueryParams(Query query, Long ampThemeId, if (teamMember!=null && teamMember.getTeamId()!=null&&!teamMember.getTeamAccessType().equals("Management")){ query.setLong("teamId", teamMember.getTeamId()); } - + } @SuppressWarnings("unchecked") @@ -422,8 +422,8 @@ public static List getActivityLocations(Long activityId) { return PersistenceManager.getSession().createSQLQuery(queryString).addEntity(AmpActivityLocation.class) .setParameter("actId", activityId, LongType.INSTANCE).list(); } - - + + /** * Load activity from db. * Use this one instead of method below this if you realy want to load all data. @@ -473,7 +473,7 @@ public static AmpActivityVersion loadActivity(Long id) throws DgException { ActivityUtil.setCurrentWorkspacePrefixIntoRequest(result); ActivityUtil.initializeForApi(result); - + } catch (ObjectNotFoundException e) { logger.debug("AmpActivityVersion with id=" + id + " not found"); } catch (Exception e) { @@ -536,11 +536,11 @@ public static List getActivitiesByAmpIds(List ampIds .setParameterList("ampIds", ampIds) .list(); } - + public static AmpActivityVersion loadAmpActivity(Long id){ - return (AmpActivityVersion) PersistenceManager.getSession().load(AmpActivityVersion.class, id); + return (AmpActivityVersion) PersistenceManager.getSession().load(AmpActivityVersion.class, id); } - + public static List getAmpActivitySectors(Long actId) { String queryString = "select a.* from amp_activity_sector a " + "where a.amp_activity_id=:actId"; return PersistenceManager.getSession().createSQLQuery(queryString).addEntity(AmpActivitySector.class) @@ -553,7 +553,7 @@ public static List getOrgRole(Long id) { return PersistenceManager.getSession().createQuery(queryString).setParameter("actId", id, LongType.INSTANCE).list(); } - public static amp_togole getAmpRole(Long actId, Long orgRoleId) { + public static AmpRole getAmpRole(Long actId, Long orgRoleId) { Session session = null; AmpRole role = null; try { diff --git a/amp/WEB-INF/src/org/digijava/module/gateperm/gates/RelatedOrgExemptGate.java b/amp/WEB-INF/src/org/digijava/module/gateperm/gates/RelatedOrgExemptGate.java new file mode 100644 index 00000000000..24ebae57c8d --- /dev/null +++ b/amp/WEB-INF/src/org/digijava/module/gateperm/gates/RelatedOrgExemptGate.java @@ -0,0 +1,63 @@ +/** + * + */ +package org.digijava.module.gateperm.gates; + +import org.dgfoundation.amp.ar.MetaInfo; +import org.digijava.kernel.user.User; +import org.digijava.module.aim.helper.TeamMember; +import org.digijava.module.aim.util.FeaturesUtil; +import org.digijava.module.gateperm.core.Gate; +import org.digijava.module.gateperm.core.GatePermConst; +import org.digijava.module.gateperm.util.PermissionUtil; + +import static org.digijava.module.aim.helper.GlobalSettingsConstants.EXEMPT_ORGANIZATION_DOCUMENT; + +/** + * Gives right if current user is assigned to an org that is related (by any role) to an object - such an activity + * + * @author mihai + */ +public class RelatedOrgExemptGate extends Gate { + + public static final MetaInfo[] SCOPE_KEYS = new MetaInfo[]{GatePermConst.ScopeKeys.CURRENT_MEMBER}; + + public static final MetaInfo[] PARAM_INFO = null; + + private static final String DESCRIPTION = "Gives right if current user is assigned to an org that is " + + "configured in Exempt organization to see documents global setting"; + + public RelatedOrgExemptGate() { + + } + + @Override + public String description() { + return DESCRIPTION; + } + + @Override + public boolean logic() throws Exception { + + TeamMember tm = (TeamMember) scope.get(GatePermConst.ScopeKeys.CURRENT_MEMBER); + if (tm == null) { + return false; + } + + User user = PermissionUtil.getUser(scope, tm); + + + return user.hasVerifiedOrganizationId(FeaturesUtil.getGlobalSettingValueLong(EXEMPT_ORGANIZATION_DOCUMENT)); + } + + @Override + public MetaInfo[] mandatoryScopeKeys() { + return SCOPE_KEYS; + } + + @Override + public MetaInfo[] parameterInfo() { + return PARAM_INFO; + } + +} diff --git a/amp/xmlpatches/3.5.05.1/AMP-30372-organization-exempt-document-permsion-AP-global-setting.xml b/amp/xmlpatches/3.5.05.1/AMP-30372-organization-exempt-document-permsion-AP-global-setting.xml index 856d21c6b43..2b78aa12125 100644 --- a/amp/xmlpatches/3.5.05.1/AMP-30372-organization-exempt-document-permsion-AP-global-setting.xml +++ b/amp/xmlpatches/3.5.05.1/AMP-30372-organization-exempt-document-permsion-AP-global-setting.xml @@ -11,7 +11,7 @@ CREATE OR REPLACE VIEW v_g_settings_amp_organization AS select amp_org_id as id, name as value from amp_organisation order by name asc; insert into amp_global_settings(id, settingsName, possiblevalues, description,section) - values(nextval('amp_global_settings_seq'), 'Exempt organization to see reports', 'v_g_settings_amp_organization','Organization allowed to see reports in AP','general'); + values(nextval('amp_global_settings_seq'), 'Exempt organization to see documents', 'v_g_settings_amp_organization','Organization allowed to see documents in AP and AF','general'); From 9222284ffd87c52e34fb92c9f302c42457398961 Mon Sep 17 00:00:00 2001 From: Damian Rychter Date: Thu, 20 Apr 2023 10:57:03 -0300 Subject: [PATCH 075/135] Rename constant EXEMPT_ORGANIZATION_DOCUMENTS to EXEMPT_ORGANIZATION_REPORTS to match global setting --- .../endpoints/activity/ActivityInterchangeUtils.java | 10 +++++----- .../module/aim/helper/GlobalSettingsConstants.java | 2 +- .../module/gateperm/gates/RelatedOrgExemptGate.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java index d976b814998..1ed48de759f 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java @@ -56,7 +56,7 @@ import java.util.stream.Collectors; import static org.digijava.kernel.ampapi.endpoints.common.EPConstants.ACTIVITY_DOCUMENTS; -import static org.digijava.module.aim.helper.GlobalSettingsConstants.EXEMPT_ORGANIZATION_DOCUMENT; +import static org.digijava.module.aim.helper.GlobalSettingsConstants.EXEMPT_ORGANIZATION_REPORTS; /** * @author Octavian Ciubotaru @@ -306,8 +306,8 @@ public static Map getActivityByAmpId(String ampId, boolean isOff */ public static Map getActivity(Long projectId, boolean isOfflineClientCall) { Map activity = getActivity(projectId, null); - if (!isOfflineClientCall - && FeaturesUtil.isVisibleModule("/REPORTING/Activity Preview/Hide Documents if no donor")) { + if (!isOfflineClientCall){ +// && FeaturesUtil.isVisibleModule("/REPORTING/Activity Preview/Hide Documents if no donor")) { filterPropertyBasedOnUserPermission(activity, projectId); } return activity; @@ -331,7 +331,7 @@ private static void filterPropertyBasedOnUserPermission(Map acti } } } else { - activity.replace(ACTIVITY_DOCUMENTS, null); + activity.remove(ACTIVITY_DOCUMENTS); } } } @@ -341,7 +341,7 @@ private static boolean userBelongToExemptOrgForDocumentVisualization(User user) return user.getAssignedOrgs().stream() .filter(ampOrganisation -> ampOrganisation.getIdentifier().equals( - FeaturesUtil.getGlobalSettingValueLong(EXEMPT_ORGANIZATION_DOCUMENT))) + FeaturesUtil.getGlobalSettingValueLong(EXEMPT_ORGANIZATION_REPORTS))) .count() > 0; } diff --git a/amp/WEB-INF/src/org/digijava/module/aim/helper/GlobalSettingsConstants.java b/amp/WEB-INF/src/org/digijava/module/aim/helper/GlobalSettingsConstants.java index 68f603e6410..d99c19ce45b 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/helper/GlobalSettingsConstants.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/helper/GlobalSettingsConstants.java @@ -243,6 +243,6 @@ public class GlobalSettingsConstants { */ public final static Set SETTINGS_TO_HIDE = new HashSet<>(Arrays.asList(REPORT_WIZARD_VISIBILITY_SOURCE)); - public static final String EXEMPT_ORGANIZATION_DOCUMENT = "Exempt organization to see documents"; + public static final String EXEMPT_ORGANIZATION_REPORTS = "Exempt organization to see reports"; } diff --git a/amp/WEB-INF/src/org/digijava/module/gateperm/gates/RelatedOrgExemptGate.java b/amp/WEB-INF/src/org/digijava/module/gateperm/gates/RelatedOrgExemptGate.java index 24ebae57c8d..e9c0b1841a8 100644 --- a/amp/WEB-INF/src/org/digijava/module/gateperm/gates/RelatedOrgExemptGate.java +++ b/amp/WEB-INF/src/org/digijava/module/gateperm/gates/RelatedOrgExemptGate.java @@ -11,7 +11,7 @@ import org.digijava.module.gateperm.core.GatePermConst; import org.digijava.module.gateperm.util.PermissionUtil; -import static org.digijava.module.aim.helper.GlobalSettingsConstants.EXEMPT_ORGANIZATION_DOCUMENT; +import static org.digijava.module.aim.helper.GlobalSettingsConstants.EXEMPT_ORGANIZATION_REPORTS; /** * Gives right if current user is assigned to an org that is related (by any role) to an object - such an activity @@ -47,7 +47,7 @@ public boolean logic() throws Exception { User user = PermissionUtil.getUser(scope, tm); - return user.hasVerifiedOrganizationId(FeaturesUtil.getGlobalSettingValueLong(EXEMPT_ORGANIZATION_DOCUMENT)); + return user.hasVerifiedOrganizationId(FeaturesUtil.getGlobalSettingValueLong(EXEMPT_ORGANIZATION_REPORTS)); } @Override From fbb864d785eca8917cb5ea3cf115a5b4ad3ffc76 Mon Sep 17 00:00:00 2001 From: Julian de Anquin Date: Fri, 21 Apr 2023 11:33:32 -0300 Subject: [PATCH 076/135] AMP-30372 ADJUST SETTING AND FM --- .../endpoints/activity/ActivityInterchangeUtils.java | 8 ++++---- .../module/aim/helper/GlobalSettingsConstants.java | 2 +- .../module/gateperm/gates/RelatedOrgExemptGate.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java index 1ed48de759f..7963731d877 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java @@ -56,7 +56,7 @@ import java.util.stream.Collectors; import static org.digijava.kernel.ampapi.endpoints.common.EPConstants.ACTIVITY_DOCUMENTS; -import static org.digijava.module.aim.helper.GlobalSettingsConstants.EXEMPT_ORGANIZATION_REPORTS; +import static org.digijava.module.aim.helper.GlobalSettingsConstants.EXEMPT_ORGANIZATION_DOCUMENTS; /** * @author Octavian Ciubotaru @@ -306,8 +306,8 @@ public static Map getActivityByAmpId(String ampId, boolean isOff */ public static Map getActivity(Long projectId, boolean isOfflineClientCall) { Map activity = getActivity(projectId, null); - if (!isOfflineClientCall){ -// && FeaturesUtil.isVisibleModule("/REPORTING/Activity Preview/Hide Documents if no donor")) { + if (!isOfflineClientCall + && FeaturesUtil.isVisibleModule("Hide Documents if no donor")) { filterPropertyBasedOnUserPermission(activity, projectId); } return activity; @@ -341,7 +341,7 @@ private static boolean userBelongToExemptOrgForDocumentVisualization(User user) return user.getAssignedOrgs().stream() .filter(ampOrganisation -> ampOrganisation.getIdentifier().equals( - FeaturesUtil.getGlobalSettingValueLong(EXEMPT_ORGANIZATION_REPORTS))) + FeaturesUtil.getGlobalSettingValueLong(EXEMPT_ORGANIZATION_DOCUMENTS))) .count() > 0; } diff --git a/amp/WEB-INF/src/org/digijava/module/aim/helper/GlobalSettingsConstants.java b/amp/WEB-INF/src/org/digijava/module/aim/helper/GlobalSettingsConstants.java index d99c19ce45b..fa431d92a94 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/helper/GlobalSettingsConstants.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/helper/GlobalSettingsConstants.java @@ -243,6 +243,6 @@ public class GlobalSettingsConstants { */ public final static Set SETTINGS_TO_HIDE = new HashSet<>(Arrays.asList(REPORT_WIZARD_VISIBILITY_SOURCE)); - public static final String EXEMPT_ORGANIZATION_REPORTS = "Exempt organization to see reports"; + public static final String EXEMPT_ORGANIZATION_DOCUMENTS = "Exempt organization to see documents"; } diff --git a/amp/WEB-INF/src/org/digijava/module/gateperm/gates/RelatedOrgExemptGate.java b/amp/WEB-INF/src/org/digijava/module/gateperm/gates/RelatedOrgExemptGate.java index e9c0b1841a8..1033c72252e 100644 --- a/amp/WEB-INF/src/org/digijava/module/gateperm/gates/RelatedOrgExemptGate.java +++ b/amp/WEB-INF/src/org/digijava/module/gateperm/gates/RelatedOrgExemptGate.java @@ -11,7 +11,7 @@ import org.digijava.module.gateperm.core.GatePermConst; import org.digijava.module.gateperm.util.PermissionUtil; -import static org.digijava.module.aim.helper.GlobalSettingsConstants.EXEMPT_ORGANIZATION_REPORTS; +import static org.digijava.module.aim.helper.GlobalSettingsConstants.EXEMPT_ORGANIZATION_DOCUMENTS; /** * Gives right if current user is assigned to an org that is related (by any role) to an object - such an activity @@ -47,7 +47,7 @@ public boolean logic() throws Exception { User user = PermissionUtil.getUser(scope, tm); - return user.hasVerifiedOrganizationId(FeaturesUtil.getGlobalSettingValueLong(EXEMPT_ORGANIZATION_REPORTS)); + return user.hasVerifiedOrganizationId(FeaturesUtil.getGlobalSettingValueLong(EXEMPT_ORGANIZATION_DOCUMENTS)); } @Override From 41a3710a57d25d38cfe547903c10708abc77aa6b Mon Sep 17 00:00:00 2001 From: Julian de Anquin Date: Fri, 21 Apr 2023 12:16:41 -0300 Subject: [PATCH 077/135] AMP-30372 use fully qualified name for module --- .../ampapi/endpoints/activity/ActivityInterchangeUtils.java | 2 +- amp/xmlpatches/3.5.05.1/AMP-30372-add-hide-document-setting.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java index 7963731d877..43a24fdc5c6 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java @@ -307,7 +307,7 @@ public static Map getActivityByAmpId(String ampId, boolean isOff public static Map getActivity(Long projectId, boolean isOfflineClientCall) { Map activity = getActivity(projectId, null); if (!isOfflineClientCall - && FeaturesUtil.isVisibleModule("Hide Documents if no donor")) { + && FeaturesUtil.isVisibleModule("/REPORTING/Activity Preview/Hide Documents if no donor")) { filterPropertyBasedOnUserPermission(activity, projectId); } return activity; diff --git a/amp/xmlpatches/3.5.05.1/AMP-30372-add-hide-document-setting.xml b/amp/xmlpatches/3.5.05.1/AMP-30372-add-hide-document-setting.xml index a3c956e2199..b6aa60f0388 100644 --- a/amp/xmlpatches/3.5.05.1/AMP-30372-add-hide-document-setting.xml +++ b/amp/xmlpatches/3.5.05.1/AMP-30372-add-hide-document-setting.xml @@ -24,7 +24,7 @@ insert into amp_modules_visibility (id, name, haslevel, parent) - values (nextval('amp_modules_visibility_seq'), 'Hide Documents if no donor', true, (select id + values (nextval('amp_modules_visibility_seq'), '/REPORTING/Activity Preview/Hide Documents if no donor', true, (select id from amp_modules_visibility where name = 'Activity Preview' and parent = (select id From 0bfbecec2aa8d0619b2c70d49e844d7c0125d0a3 Mon Sep 17 00:00:00 2001 From: Julian de Anquin Date: Fri, 21 Apr 2023 15:28:56 -0300 Subject: [PATCH 078/135] AMP-30372 ifx merge --- amp/repository/um/view/viewEditUser.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amp/repository/um/view/viewEditUser.jsp b/amp/repository/um/view/viewEditUser.jsp index db46506a624..114adca969c 100644 --- a/amp/repository/um/view/viewEditUser.jsp +++ b/amp/repository/um/view/viewEditUser.jsp @@ -440,11 +440,11 @@ function validateUserInfo(){ From 519b2950e1d7e686b633896bab63efaf90e25f2a Mon Sep 17 00:00:00 2001 From: Damian Rychter Date: Fri, 14 Apr 2023 14:57:55 -0300 Subject: [PATCH 079/135] AMP-30469 issue- AP -error in console --- amp/TEMPLATE/reamp/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amp/TEMPLATE/reamp/package.json b/amp/TEMPLATE/reamp/package.json index 2f28c7d5959..df1a1d16d6a 100644 --- a/amp/TEMPLATE/reamp/package.json +++ b/amp/TEMPLATE/reamp/package.json @@ -23,7 +23,7 @@ "author": "Alexei Savca", "license": "inherit", "devDependencies": { - "amp-ui": "github:devgateway/amp-ui#2dd532adac229aa89af601284a732d2fb71a349d", + "amp-ui": "github:devgateway/amp-ui#97a8694cdd76c43113796d2238b920387282285d", "babel-core": "^6.26.3", "babel-jest": "^6.0.1", "babel-loader": "^6.3.2", From 13742cc8a15cbc95d5861a722ede21933092288e Mon Sep 17 00:00:00 2001 From: Damian Rychter Date: Tue, 25 Apr 2023 09:15:43 -0300 Subject: [PATCH 080/135] Update amp-ui hash --- amp/TEMPLATE/reamp/package-lock.json | 12 ++++++------ amp/TEMPLATE/reamp/package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/amp/TEMPLATE/reamp/package-lock.json b/amp/TEMPLATE/reamp/package-lock.json index 4292f788f0f..9970ff9d6a3 100644 --- a/amp/TEMPLATE/reamp/package-lock.json +++ b/amp/TEMPLATE/reamp/package-lock.json @@ -21,7 +21,7 @@ "uglifyjs-webpack-plugin": "^1.3.0" }, "devDependencies": { - "amp-ui": "github:devgateway/amp-ui#2dd532adac229aa89af601284a732d2fb71a349d", + "amp-ui": "github:devgateway/amp-ui#35d15a9efe2de868113fd47218a10743a393d5d4", "babel-core": "^6.26.3", "babel-jest": "^6.0.1", "babel-loader": "^6.3.2", @@ -233,8 +233,8 @@ }, "node_modules/amp-ui": { "version": "2.1.1", - "resolved": "git+ssh://git@github.com/devgateway/amp-ui.git#2dd532adac229aa89af601284a732d2fb71a349d", - "integrity": "sha512-/klkYzvYMh3reaayL9kCFNMnfBnnv7pl8NBTIkgKSQq47+j3KhMiqll64G7aMFb9Ck5c48qAM8qwXKRhkvlR7A==", + "resolved": "git+ssh://git@github.com/devgateway/amp-ui.git#35d15a9efe2de868113fd47218a10743a393d5d4", + "integrity": "sha512-EGpUyat29ddAvrhjtHQuipbc3qOK3ZSXhRcwHLtxF0F7POsa2TqLi9POmKp7FZKHcby4TjeJHrtFSuZ60GYA2A==", "dev": true, "license": "MIT", "dependencies": { @@ -8934,10 +8934,10 @@ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, "amp-ui": { - "version": "git+ssh://git@github.com/devgateway/amp-ui.git#2dd532adac229aa89af601284a732d2fb71a349d", - "integrity": "sha512-/klkYzvYMh3reaayL9kCFNMnfBnnv7pl8NBTIkgKSQq47+j3KhMiqll64G7aMFb9Ck5c48qAM8qwXKRhkvlR7A==", + "version": "git+ssh://git@github.com/devgateway/amp-ui.git#35d15a9efe2de868113fd47218a10743a393d5d4", + "integrity": "sha512-EGpUyat29ddAvrhjtHQuipbc3qOK3ZSXhRcwHLtxF0F7POsa2TqLi9POmKp7FZKHcby4TjeJHrtFSuZ60GYA2A==", "dev": true, - "from": "amp-ui@github:devgateway/amp-ui#2dd532adac229aa89af601284a732d2fb71a349d", + "from": "amp-ui@github:devgateway/amp-ui#35d15a9efe2de868113fd47218a10743a393d5d4", "requires": { "docx": "^4.7.1", "file-saver": "github:devgateway/FileSaver.js", diff --git a/amp/TEMPLATE/reamp/package.json b/amp/TEMPLATE/reamp/package.json index df1a1d16d6a..8657c08b90d 100644 --- a/amp/TEMPLATE/reamp/package.json +++ b/amp/TEMPLATE/reamp/package.json @@ -23,7 +23,7 @@ "author": "Alexei Savca", "license": "inherit", "devDependencies": { - "amp-ui": "github:devgateway/amp-ui#97a8694cdd76c43113796d2238b920387282285d", + "amp-ui": "github:devgateway/amp-ui#35d15a9efe2de868113fd47218a10743a393d5d4", "babel-core": "^6.26.3", "babel-jest": "^6.0.1", "babel-loader": "^6.3.2", From fc0e5e457f06ce40f529d6e16f2697e2c3f80bf9 Mon Sep 17 00:00:00 2001 From: timothygachengo Date: Fri, 5 May 2023 21:22:11 +0300 Subject: [PATCH 081/135] AMP-30546 created top programs chart --- .../dev/app/js/app/templates/chart.html | 1 + .../initial-translation-request.json | 4 ++- .../dev/app/js/app/views/chart-view-base.js | 32 +++++++++++++++++++ .../dashboard/dev/app/js/app/views/main.js | 7 ++++ .../ampTemplate/dashboard/dev/package.json | 3 +- .../ampTemplate/dashboard/dev/readme.md | 28 +++++++++++++--- .../dashboards/services/TopChartType.java | 3 +- .../dashboards/services/TopsChartService.java | 8 +++++ .../endpoints/util/DashboardConstants.java | 3 +- 9 files changed, 81 insertions(+), 8 deletions(-) diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/chart.html b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/chart.html index 8eacfa31f90..ec0c4764241 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/chart.html +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/chart.html @@ -75,6 +75,7 @@

<% } %> + <% if (model.get('chartType') === 'fragmentation') { %>
diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/initial-translation-request.json b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/initial-translation-request.json index cd00ac12de8..9d693e76aa7 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/initial-translation-request.json +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/initial-translation-request.json @@ -149,5 +149,7 @@ "amp.dashboard:chart-tooltip-download-chart[title]":"Download image or table", "amp.dashboard:chart-tooltip-expand-chart[title]":"Expand chart", "amp.dashboard:chart-tooltip-collapse-chart[title]":"Collapse chart", -"amp.dashboard:chart-tooltip-heatmap-chart[title]":"View heat map" +"amp.dashboard:chart-tooltip-heatmap-chart[title]":"View heat map", +"amp.dashboard:chart-TopPrograms": "Top Programs", +"amp.dashboard:chart-TopPrograms-others": "Others" } \ No newline at end of file diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-view-base.js b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-view-base.js index ad8b8cd2351..394cb9ae5f0 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-view-base.js +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-view-base.js @@ -61,6 +61,7 @@ module.exports = BackboneDash.View.extend({ this.listenTo(this.model, 'change:xAxisColumn', this.render); this.listenTo(this.model, 'change:limit', this.updateData); this.listenTo(this.model, 'change:view', this.render); + this.listenTo(this.model, 'change:programType', this.render); this.app.state.register(this, 'chart:' + this.model.url, { get: _.partial(_(this.model.pick).bind(this.model), 'limit', 'adjtype', 'xAxisColumn', 'view', 'big','stacked','showPlannedDisbursements','showActualDisbursements','seriesToExclude', 'xLimit', 'yLimit', 'swapAxes'), @@ -113,6 +114,37 @@ module.exports = BackboneDash.View.extend({ } else { self.rendered = true; } + + console.log('model=====>', self.model.get('programType')); + + // if (self.model.get('programType')) { // this chart has programs type + // self.rendered = false; + // const pgrOptions = [ + // { + // "id": "prg_level_1", + // "name": "National Planning Objectives Level 1" + // }, + // { + // "id": "prg_level_2", + // "name": "National Planning Objectives Level 2" + // }, + // { + // "id": "prg_level_3", + // "name": "National Planning Objectives Level 3" + // } + // ]; + // self.$('.program-options').html( + // pgrOptions.map(function(opt) { + // return adjOptTemplate({ + // opt: opt, + // current: (opt.id === self.model.get('programType')) + // }); + // }, self) + // ); + + // } else { + // self.rendered = false; + // } // For heatmaps add some extra combos. if (self.model.get('chartType') === 'fragmentation') { diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/main.js b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/main.js index 82d163fc32b..0fb7c62fe19 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/main.js +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/main.js @@ -35,6 +35,7 @@ var NDD = '/Dashboards[true]/Peace-building and State-building Goals[true]'; var SEC = '/Dashboards[true]/Sector Fragmentation[true]'; var LOC = '/Dashboards[true]/Location Fragmentation[true]'; var PRG = '/Dashboards[true]/Program Fragmentation[true]'; +var PR = '/Dashboards[true]/Top Programs[true]'; module.exports = BackboneDash.View.extend({ @@ -89,6 +90,12 @@ module.exports = BackboneDash.View.extend({ {name: 'Top Sectors', big: false, view: 'bar'}, {app: this.app, url: '/rest/dashboard/tops/ps'})); } + + col.push(new TopsChart( + {name: 'Top Programs', big: false, view: 'bar', programType: 'programs'}, + {app: this.app, url: '/rest/dashboard/tops/pr'})); + + if (_.find(enabledCharts, function (item) { return item === AP; })) { diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/package.json b/amp/TEMPLATE/ampTemplate/dashboard/dev/package.json index 732f2f7ae23..bd121a4aa34 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/package.json +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/package.json @@ -6,7 +6,8 @@ "main": "gulpfile.js", "scripts": { "test": "echo 'Testing not yet configured...'", - "build": "gulp build" + "build": "gulp build", + "dev": "gulp dev" }, "license": "TODO: what is the license for AMP?", "devDependencies": { diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/readme.md b/amp/TEMPLATE/ampTemplate/dashboard/dev/readme.md index 7c20fcdcd6a..cbd1e5633bf 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/readme.md +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/readme.md @@ -30,15 +30,35 @@ $ npm install Development ----------- -Build everything, run a development server with livereload, with one easy command: +Build everything, run a development server with livereload, with the following steps: +Replace the following line in `app/index.html` with the following: + +```html + +``` + +
+ +with the following: + +```html + ``` -$ gulp dev -```` + +
+ +Then run the following command: + +```bash +gulp dev +``` + +Ensure that the tomcat server has started on [`localhost:8080`](http://localhost:8080) You can access the dashboards now at -[`localhost:3000/TEMPLATE/ampTemplate/dashboard/dev/app/index.html`](http://localhost:3000/TEMPLATE/ampTemplate/dashboard/dev/app/index.html) +[`http://localhost:8080/TEMPLATE/ampTemplate/dashboard/dev/app/index.html`](http://localhost:8080/TEMPLATE/ampTemplate/dashboard/dev/app/index.html) Testing diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/TopChartType.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/TopChartType.java index e59b6e7b334..a4713b09b63 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/TopChartType.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/TopChartType.java @@ -14,7 +14,8 @@ public enum TopChartType { @JsonProperty("re") RE, @JsonProperty("ps") PS, @JsonProperty("dg") DG, - @JsonProperty("ndd") NDD; + @JsonProperty("ndd") NDD, + @JsonProperty("pr") PR; public static TopChartType fromString(String value) { value = value.toUpperCase(); diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/TopsChartService.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/TopsChartService.java index 09674f42bc8..3578e52dcf7 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/TopsChartService.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/TopsChartService.java @@ -1,5 +1,7 @@ package org.digijava.kernel.ampapi.endpoints.dashboards.services; +import com.google.common.base.CharMatcher; +import org.apache.commons.lang3.StringUtils; import org.dgfoundation.amp.ar.ArConstants; import org.dgfoundation.amp.ar.ColumnConstants; import org.dgfoundation.amp.newreports.AmountCell; @@ -153,6 +155,12 @@ private void prepare() { title = TranslatorWorker.translateText(DashboardConstants.TOP_DONOR_GROUPS); name = DashboardConstants.TOP_DONOR_GROUPS; break; + case PR: + setColumn(ColumnConstants.NATIONAL_PLANNING_OBJECTIVES_LEVEL_1); + applyFilter(FilterUtils.INSTANCE.idFromColumnName(ColumnConstants.NATIONAL_PLANNING_OBJECTIVES_LEVEL_1)); + title = TranslatorWorker.translateText(DashboardConstants.TOP_PROGRAMS); + name = DashboardConstants.TOP_PROGRAMS; + break; case NDD: setColumn(ColumnConstants.SECONDARY_PROGRAM_LEVEL_1); applyFilter(FilterUtils.INSTANCE.idFromColumnName(ColumnConstants.SECONDARY_PROGRAM_LEVEL_1)); diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/util/DashboardConstants.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/util/DashboardConstants.java index 23683b5f7ea..6d3b1283377 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/util/DashboardConstants.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/util/DashboardConstants.java @@ -29,4 +29,5 @@ public class DashboardConstants { public static final String X_COLUMN = "xColumn"; public static final String Y_COLUMN = "yColumn"; -} + + public static final String TOP_PROGRAMS = "Top Programs";} From c92513d23d698012e08be65ebefdf2bbf78c31bc Mon Sep 17 00:00:00 2001 From: timothygachengo Date: Mon, 8 May 2023 15:57:49 +0300 Subject: [PATCH 082/135] AMP-30546 added top programs chart into feature visibility --- .../ampTemplate/dashboard/dev/app/index.html | 2 +- .../dev/app/js/app/views/chart-view-base.js | 31 ------------------- .../dashboard/dev/app/js/app/views/main.js | 8 ++++- .../AMP-30546-create-top-programs-chart.xml | 16 ++++++++++ 4 files changed, 24 insertions(+), 33 deletions(-) create mode 100644 amp/xmlpatches/3.5.05.1/AMP-30546-create-top-programs-chart.xml diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/index.html b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/index.html index a055e066d7f..257347a42d7 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/index.html +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/index.html @@ -26,6 +26,6 @@

Loading...

- + diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-view-base.js b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-view-base.js index 394cb9ae5f0..67721fd7c10 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-view-base.js +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-view-base.js @@ -114,37 +114,6 @@ module.exports = BackboneDash.View.extend({ } else { self.rendered = true; } - - console.log('model=====>', self.model.get('programType')); - - // if (self.model.get('programType')) { // this chart has programs type - // self.rendered = false; - // const pgrOptions = [ - // { - // "id": "prg_level_1", - // "name": "National Planning Objectives Level 1" - // }, - // { - // "id": "prg_level_2", - // "name": "National Planning Objectives Level 2" - // }, - // { - // "id": "prg_level_3", - // "name": "National Planning Objectives Level 3" - // } - // ]; - // self.$('.program-options').html( - // pgrOptions.map(function(opt) { - // return adjOptTemplate({ - // opt: opt, - // current: (opt.id === self.model.get('programType')) - // }); - // }, self) - // ); - - // } else { - // self.rendered = false; - // } // For heatmaps add some extra combos. if (self.model.get('chartType') === 'fragmentation') { diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/main.js b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/main.js index 0fb7c62fe19..65fedcae879 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/main.js +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/main.js @@ -59,6 +59,8 @@ module.exports = BackboneDash.View.extend({ window.location = '/'; } + console.log(enabledChartsFM) + var enabledCharts = enabledChartsFM.models[0].get('fm-settings')['DASHBOARDS']; var col = []; @@ -91,10 +93,14 @@ module.exports = BackboneDash.View.extend({ {app: this.app, url: '/rest/dashboard/tops/ps'})); } + if (_.find(enabledCharts, function (item) { + console.log(item); + return item === PR; + })) { col.push(new TopsChart( {name: 'Top Programs', big: false, view: 'bar', programType: 'programs'}, {app: this.app, url: '/rest/dashboard/tops/pr'})); - + } if (_.find(enabledCharts, function (item) { return item === AP; diff --git a/amp/xmlpatches/3.5.05.1/AMP-30546-create-top-programs-chart.xml b/amp/xmlpatches/3.5.05.1/AMP-30546-create-top-programs-chart.xml new file mode 100644 index 00000000000..da693bcaf0f --- /dev/null +++ b/amp/xmlpatches/3.5.05.1/AMP-30546-create-top-programs-chart.xml @@ -0,0 +1,16 @@ + + + AMP-30546 + Add top programs chart to feature visibility + timothymugo + + + + \ No newline at end of file From 774cd05331cb7b946a49650cc136eb2b984325e9 Mon Sep 17 00:00:00 2001 From: timothygachengo Date: Mon, 8 May 2023 17:02:10 +0300 Subject: [PATCH 083/135] AMP-30546 added program schemes dropdown --- .../dev/app/js/app/templates/chart.html | 9 +++++ .../initial-translation-request.json | 6 +++- .../dev/app/js/app/views/chart-view-base.js | 36 ++++++++++++++++++- .../dashboard/dev/app/js/app/views/main.js | 1 - 4 files changed, 49 insertions(+), 3 deletions(-) diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/chart.html b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/chart.html index ec0c4764241..9a098bd513b 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/chart.html +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/chart.html @@ -75,6 +75,15 @@

<% } %> + + <% if (model.get('programType') === "programs") { %> +
+ + + + <% } %> <% if (model.get('chartType') === 'fragmentation') { %> diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/initial-translation-request.json b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/initial-translation-request.json index 9d693e76aa7..941801c090e 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/initial-translation-request.json +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/initial-translation-request.json @@ -151,5 +151,9 @@ "amp.dashboard:chart-tooltip-collapse-chart[title]":"Collapse chart", "amp.dashboard:chart-tooltip-heatmap-chart[title]":"View heat map", "amp.dashboard:chart-TopPrograms": "Top Programs", -"amp.dashboard:chart-TopPrograms-others": "Others" +"amp.dashboard:chart-TopPrograms-others": "Others", +"amp.dashboard:prgscheme-national-plan-objective": "National Plan Objective", +"amp.dashboard:prgscheme-primary-program": "Primary Program", +"amp.dashboard:prgscheme-secondary-program": "Secondary Program", +"amp.dashboard:prgscheme-tertiary-program": "Tertiary Program" } \ No newline at end of file diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-view-base.js b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-view-base.js index 67721fd7c10..ea6c2b4975b 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-view-base.js +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-view-base.js @@ -29,7 +29,8 @@ module.exports = BackboneDash.View.extend({ 'click .download': 'download', 'click .expand': 'big', 'click .retry': 'render', - 'click .heatmap-switch': 'heatmapSwitchAxis' + 'click .heatmap-switch': 'heatmapSwitchAxis', + 'change .dash-program-type select': 'changeProgramType', }, chartViews: [ @@ -114,6 +115,39 @@ module.exports = BackboneDash.View.extend({ } else { self.rendered = true; } + + if (self.model.get('programType') !== void 0) { // this chart has programs type + self.rendered = true; + const pgrOptions = [ + { + id: "national_plan_objective", + name: app.translator.translateSync('amp.dashboard:prgscheme-national-plan-objective') + }, + { + id: "primary_program", + name: app.translator.translateSync('amp.dashboard:prgscheme-primary-program') + }, + { + id: "secondary_program", + name: app.translator.translateSync('amp.dashboard:prgscheme-secondary-program') + }, + { + id: "tertiary_program", + name: app.translator.translateSync('amp.dashboard:prgscheme-tertiary-program') + } + ]; + self.$('.program-options').html( + pgrOptions.map(function(opt) { + return adjOptTemplate({ + opt: opt, + current: (opt.id === self.model.get('programType')) + }); + }, self) + ); + + } else { + self.rendered = true; + } // For heatmaps add some extra combos. if (self.model.get('chartType') === 'fragmentation') { diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/main.js b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/main.js index 65fedcae879..ab74438a392 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/main.js +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/main.js @@ -94,7 +94,6 @@ module.exports = BackboneDash.View.extend({ } if (_.find(enabledCharts, function (item) { - console.log(item); return item === PR; })) { col.push(new TopsChart( From 181b5463092ed55f1b36b16ead94717ce2b4bb7f Mon Sep 17 00:00:00 2001 From: timothygachengo Date: Mon, 8 May 2023 20:43:28 +0300 Subject: [PATCH 084/135] AMP-30546 added functionality to selct program schemes --- .../dev/app/js/app/models/chart-heatmaps.js | 2 +- .../dev/app/js/app/models/chart-model-base.js | 9 ++++++++- .../dashboard/dev/app/js/app/models/chart-tops.js | 2 +- .../dashboard/dev/app/js/app/templates/chart.html | 2 +- .../dev/app/js/app/views/chart-view-base.js | 15 ++++++++++----- .../dashboard/dev/app/js/app/views/main.js | 4 +--- .../dashboards/services/TopsChartService.java | 6 ++++-- 7 files changed, 26 insertions(+), 14 deletions(-) diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-heatmaps.js b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-heatmaps.js index e6810f0a4c0..a35df30c980 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-heatmaps.js +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-heatmaps.js @@ -18,7 +18,7 @@ module.exports = ChartModel.extend({ swapAxes: false, heatmap_type: null, showResetButton: false, - showFullLegends: false + showFullLegends: false, }, _prepareTranslations: function() { diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-model-base.js b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-model-base.js index 17fcabe2bfb..d4a3a0aa701 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-model-base.js +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-model-base.js @@ -4,7 +4,9 @@ var BackboneDash = require('../backbone-dash'); module.exports = BackboneDash.Model.extend({ - defaults: {}, + defaults: { + defaultProgramType: 'National Planning Objectives Level 1' + }, initialize: function(attrs, options) { this.app = options.app; @@ -30,6 +32,11 @@ module.exports = BackboneDash.Model.extend({ // TODO adjtype hard-coding key for now, should get from settings... data.settings = _({}).extend(data.settings, {'funding-type': this.get('adjtype')}); } + + if (this.get('programType')) { + data.settings = _({}).extend(data.settings, {'program-type': this.get('programType')}); + } + _.defaults(data.settings,{ 'currency-code': this.app.settingsWidget.definitions.getDefaultCurrencyId()}); options.data = JSON.stringify(data); return BackboneDash.Model.prototype.fetch.call(this, options); diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-tops.js b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-tops.js index 5547338fb5f..03960ada973 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-tops.js +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-tops.js @@ -10,7 +10,7 @@ module.exports = ChartModel.extend({ limit: 5, title: '', bigN: 0, - chartType: 'top' + chartType: 'top', }, _prepareTranslations: function() { diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/chart.html b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/chart.html index 9a098bd513b..c8c5b233a4f 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/chart.html +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/chart.html @@ -76,7 +76,7 @@

<% } %> - <% if (model.get('programType') === "programs") { %> + <% if (model.get('programType') && model.get('showMeasuresSelector') === true) { %>
From 93af4ad85b5e97676346ae48de5ae5177e76945d Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Fri, 16 Jun 2023 21:09:51 +0300 Subject: [PATCH 093/135] AMP-30606 changed phone value from actualPhoneNumber to value --- amp/repository/aim/view/addressBookPrintPreview.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amp/repository/aim/view/addressBookPrintPreview.jsp b/amp/repository/aim/view/addressBookPrintPreview.jsp index 2d88e9d59c6..e3788df46a7 100644 --- a/amp/repository/aim/view/addressBookPrintPreview.jsp +++ b/amp/repository/aim/view/addressBookPrintPreview.jsp @@ -72,7 +72,7 @@
  • - ${prop.actualPhoneNumber} + ${prop.value}
    • From 564d0ff491bbacf3846cbe18ab9861e168a30db2 Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Fri, 30 Jun 2023 17:07:14 +0300 Subject: [PATCH 094/135] AMP-30546 fixed measure and program type dropdowns --- .../ampTemplate/dashboard/dev/app/index.html | 6 +-- .../dev/app/js/app/templates/chart.html | 43 +++++++++---------- .../ampTemplate/dashboard/dev/readme.md | 2 +- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/index.html b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/index.html index a055e066d7f..d56fac3c634 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/index.html +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/index.html @@ -6,10 +6,10 @@ Aid Management Platform - Dashboards - + - + @@ -26,6 +26,6 @@

    Loading...

    - + diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/chart.html b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/chart.html index c8c5b233a4f..c8f99af4f24 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/chart.html +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/chart.html @@ -16,7 +16,7 @@

    <% <% } %> - +

    @@ -66,26 +66,25 @@

    - <% if (model.get('adjtype') && model.get('showMeasuresSelector') === true) { %> - - - - - <% } %> - - <% if (model.get('programType') && model.get('showMeasuresSelector') === true) { %> -
    - - - - <% } %> - - + <% if (model.get('adjtype') && model.get('showMeasuresSelector') === true) { %> +
    + + + + <% } %> + + <% if (model.get('programType') && model.get('showMeasuresSelector') === true) { %> +
    + + + + <% } %> + <% if (model.get('chartType') === 'fragmentation') { %>
    diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-tops.js b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-tops.js index fdf3800aad0..e6713ea6968 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-tops.js +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-tops.js @@ -9,20 +9,21 @@ module.exports = ChartViewBase.extend({ uiDefaults: { adjtype: 'FAKE', + programType: 'FAKE', showTotal: true, showMeasuresSelector: true, showTopLegends: true, - showCommonChartArea: true + showCommonChartArea: true }, - + chartViews: [ 'bar', 'pie', - 'table' + 'table' ], - + modalView: undefined, - + //Dont try to call initialize here because it throws a 'Module initialization error' :(( /*initialize: function(options) { this.modalView = new ModalView({ app: options.app, collection: this.model.collection }); @@ -36,7 +37,7 @@ module.exports = ChartViewBase.extend({ var ofTotal = app.translator.translateSync("amp.dashboard:of-total","of total"); var units = app.translator.translateSync(app.generalSettings.numberDividerDescription); var self = this; - + var currencyName = app.settingsWidget.definitions.findCurrencyById(self.model.get('currency')).value; var ofTotal = app.translator.translateSync("amp.dashboard:of-total", "of total"); @@ -49,12 +50,12 @@ module.exports = ChartViewBase.extend({ }}; }, - chartClickHandler: function(context) { + chartClickHandler: function(context) { // clicking on the "others" bar loads five more. if (context.data[context.series.index] .values[context.x.index].special === 'others') { this.model.set('limit', this.model.get('limit') + 5); - this.model.set('big', true); + this.model.set('big', true); } else { this.modalView = new ProjectsListModalView({ app: app, context: context, model: this.model }); this.openInfoWindow((context.x.fmt || context.x.raw)); diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-view-base.js b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-view-base.js index 0c46007006f..d7685a3b0e5 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-view-base.js +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-view-base.js @@ -118,27 +118,18 @@ module.exports = BackboneDash.View.extend({ if (self.model.get('programType') !== void 0) { // this chart has programs type self.rendered = true; - const pgrOptions = [ - { - id: "National Planning Objectives Level 1", - name: app.translator.translateSync('amp.dashboard:prgscheme-national-plan-objective') - }, - { - id: "Primary Program Level 1", - name: app.translator.translateSync('amp.dashboard:prgscheme-primary-program') - }, - { - id: "Secondary Program Level 1", - name: app.translator.translateSync('amp.dashboard:prgscheme-secondary-program') - }, - { - id: "Tertiary Program Level 1", - name: app.translator.translateSync('amp.dashboard:prgscheme-tertiary-program') + const pgrOptions = self.app.settingsWidget.definitions.getProgramSetting(); + + if (!pgrOptions) { + self.app.report('Could not find Program Type settings'); + } else { + if (self.model.get('programType') === 'FAKE') { + self.model.set('programType', pgrOptions.get('value').defaultId); } - ]; + } self.$('.program-options').html( - pgrOptions.map(function(opt) { + _(pgrOptions.get('value').options).map(function(opt) { return adjOptTemplate({ opt: opt, current: (opt.id === self.model.get('programType')) diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/main.js b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/main.js index cc4842d731f..bade81a851c 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/main.js +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/main.js @@ -95,7 +95,7 @@ module.exports = BackboneDash.View.extend({ return item === PR; })) { col.push(new TopsChart( - {name: 'Top Programs', big: false, view: 'bar', programType: 'National Planning Objectives Level 1'}, + {name: 'Top Programs', big: false, view: 'bar'}, {app: this.app, url: '/rest/dashboard/tops/pr'})); } diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/src/collections/settings-definitions-collection.js b/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/src/collections/settings-definitions-collection.js index faa3def1963..5f02ad53c46 100644 --- a/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/src/collections/settings-definitions-collection.js +++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/src/collections/settings-definitions-collection.js @@ -48,6 +48,9 @@ module.exports = Backbone.Collection.extend({ findFundingTypeById: function(id){ return _.find(this.get(Constants.FUNDING_TYPE_ID).get('value').options, function(option){ return option.id === id }); }, + findProgramSettingById: function(id){ + return _.find(this.get(Constants.PROGRAM_SETTINGS).get('value').options, function(option){ return option.id === id }); + }, getCurrencySetting: function(){ return this.get(Constants.CURRENCY_ID); }, @@ -60,6 +63,9 @@ module.exports = Backbone.Collection.extend({ getFundingTypeSetting:function(){ return this.get(Constants.FUNDING_TYPE_ID); }, + getProgramSetting: function(){ + return this.get(Constants.PROGRAM_SETTINGS); + }, getDefaultCurrencyId: function(){ return this.getCurrencySetting().get('value').defaultId; }, @@ -72,6 +78,9 @@ module.exports = Backbone.Collection.extend({ getDefaultFundingTypeById: function(){ return this.getFundingTypeSetting().get('value').defaultId; }, + getDefaultProgramSettingId: function(){ + return this.getProgramSetting().get('value').defaultId; + }, getSelectedOrDefaultCurrencyId : function() { return this.app.toAPIFormat()[Constants.CURRENCY_ID] || this.getDefaultCurrencyId(); }, @@ -80,6 +89,9 @@ module.exports = Backbone.Collection.extend({ }, getSelectedOrDefaultFundingTypeId : function() { return this.app.toAPIFormat()[Constants.FUNDING_TYPE_ID] || this.getDefaultFundingTypeById(); + }, + getSelectedProgramSettingId : function() { + return this.app.toAPIFormat()[Constants.PROGRAM_SETTINGS]; } }); diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/src/common/constants.js b/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/src/common/constants.js index 77079fbb40c..1751db75cfe 100644 --- a/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/src/common/constants.js +++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/src/common/constants.js @@ -15,5 +15,6 @@ module.exports = { DASHBOARDS : 'DASHBOARDS', REPORTS : 'REPORTS', TABS : 'TABS' - } + }, + PROGRAM_SETTINGS : 'program-settings' } \ No newline at end of file diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ColumnConstants.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ColumnConstants.java index 14b5ebbdd41..11d37852fcb 100644 --- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ColumnConstants.java +++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ColumnConstants.java @@ -167,6 +167,7 @@ public class ColumnConstants { public static final String MINORITIES = "Minorities"; public static final String MODE_OF_PAYMENT = "Mode of Payment"; public static final String MULTI_DONOR = "Multi Donor"; + public static final String NATIONAL_PLAN_OBJECTIVE = "National Plan Objective"; public static final String NATIONAL_PLANNING_OBJECTIVES = "National Planning Objectives"; public static final String NATIONAL_PLANNING_OBJECTIVES_LEVEL_0 = "National Planning Objectives Level 0"; public static final String NATIONAL_PLANNING_OBJECTIVES_LEVEL_1 = "National Planning Objectives Level 1"; @@ -434,4 +435,6 @@ public class ColumnConstants { public static final String PROJECT_MONITORING = "Project Monitoring"; public static final String PROJECT_SUSTAINABILITY = "Project Sustainability"; public static final String PROJECT_PROBLEMS = "Project Problems"; + + public static final String PROGRAM_SETTINGS = "Program Settings"; } diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/TopsChartService.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/TopsChartService.java index 6b2c5734e0a..6ece8cd50bb 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/TopsChartService.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/TopsChartService.java @@ -156,7 +156,7 @@ private void prepare() { name = DashboardConstants.TOP_DONOR_GROUPS; break; case PR: - String selectedProgramScheme = (String) config.getSettings().get("program-type"); + String selectedProgramScheme = (String) config.getSettings().get("program-settings"); String fundingType = (String) config.getSettings().get("funding-type"); setColumn(selectedProgramScheme); applyFilter(FilterUtils.INSTANCE.idFromColumnName(fundingType)); diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsConstants.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsConstants.java index c09ee9a7829..acf697fcb65 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsConstants.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsConstants.java @@ -77,7 +77,7 @@ public class SettingsConstants { public static final String REPORT_DEFAULT_MAX_YEAR_RANGE = "report-default-max-year-range"; public static final String REPORT_DEFAULT_MIN_YEAR_RANGE = "report-default-min-year-range"; - + public static final String PROGRAM_SETTINGS = "program-settings"; /** {id, value} map for settings fields ID-NAME map */ @@ -103,6 +103,7 @@ public class SettingsConstants { put(YEAR_FROM, "From:"); put(YEAR_TO, "To:"); put(YEAR_ALL, "All"); + put(PROGRAM_SETTINGS, "Program Settings"); put(SORT_COLUMN, GlobalSettingsConstants.DEFAULT_RESOURCES_SORT_COLUMN); put(MAXIMUM_FILE_SIZE, GlobalSettingsConstants.CR_MAX_FILE_SIZE ); put(LIMIT_FILE_TO_UPLOAD, GlobalSettingsConstants.LIMIT_FILE_TYPE_FOR_UPLOAD); diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsDefinitionsEndpoint.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsDefinitionsEndpoint.java index 2b6f52ad3fe..8348145b827 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsDefinitionsEndpoint.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsDefinitionsEndpoint.java @@ -4,6 +4,7 @@ import static org.digijava.kernel.ampapi.endpoints.settings.SettingsUtils.getCalendarCurrenciesField; import static org.digijava.kernel.ampapi.endpoints.settings.SettingsUtils.getCalendarField; import static org.digijava.kernel.ampapi.endpoints.settings.SettingsUtils.getCurrencyField; +import static org.digijava.kernel.ampapi.endpoints.settings.SettingsUtils.getEnabledProgramField; import static org.digijava.kernel.ampapi.endpoints.settings.SettingsUtils.getFundingTypeField; import static org.digijava.kernel.ampapi.endpoints.settings.SettingsUtils.getReportAmountFormatField; import static org.digijava.kernel.ampapi.endpoints.settings.SettingsUtils.getReportAmountUnits; @@ -53,7 +54,7 @@ public class SettingsDefinitionsEndpoint { + "funding type.") public final List getSettingDefinitionsForDashboards() { return Arrays.asList(getCurrencyField(true), getCalendarField(), getCalendarCurrenciesField(), - getFundingTypeField(new LinkedHashSet<>(GisConstants.FUNDING_TYPES))); + getFundingTypeField(new LinkedHashSet<>(GisConstants.FUNDING_TYPES)), getEnabledProgramField()); } @GET diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsUtils.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsUtils.java index 1bfffcc017e..7f9f61d17ea 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsUtils.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsUtils.java @@ -4,6 +4,7 @@ import org.apache.commons.lang3.math.NumberUtils; import org.apache.log4j.Logger; import org.dgfoundation.amp.ar.AmpARFilter; +import org.dgfoundation.amp.ar.ColumnConstants; import org.dgfoundation.amp.ar.MeasureConstants; import org.dgfoundation.amp.currency.ConstantCurrency; import org.dgfoundation.amp.menu.AmpView; @@ -24,6 +25,7 @@ import org.digijava.kernel.persistence.PersistenceManager; import org.digijava.kernel.request.TLSUtils; import org.digijava.kernel.util.SiteUtils; +import org.digijava.module.aim.dbentity.AmpActivityProgramSettings; import org.digijava.module.aim.dbentity.AmpApplicationSettings; import org.digijava.module.aim.dbentity.AmpCurrency; import org.digijava.module.aim.dbentity.AmpFiscalCalendar; @@ -37,6 +39,7 @@ import org.digijava.module.aim.util.DbUtil; import org.digijava.module.aim.util.FeaturesUtil; import org.digijava.module.aim.util.FiscalCalendarUtil; +import org.digijava.module.aim.util.ProgramUtil; import org.digijava.module.aim.util.ResourceManagerSettingsUtil; import org.digijava.module.aim.util.TeamUtil; import org.digijava.module.common.util.DateTimeUtil; @@ -50,6 +53,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; /** @@ -158,6 +162,32 @@ static SettingOptions getFundingTypeSettings(Set measures) { return new SettingOptions(true, defaultId, options); } + private static SettingOptions getEnabledProgramSettings() { + List programSettings = ProgramUtil.getEnabledProgramSettings(); + List options = new ArrayList<>(); + + programSettings.forEach(programSetting -> { + String programName = programSetting.getName(); + + if (Objects.equals(programName, ColumnConstants.PRIMARY_PROGRAM)) { + programName = ColumnConstants.PRIMARY_PROGRAM_LEVEL_1; + } else if (Objects.equals(programName, ColumnConstants.SECONDARY_PROGRAM)) { + programName = ColumnConstants.SECONDARY_PROGRAM_LEVEL_1; + }else if (Objects.equals(programName, ColumnConstants.TERTIARY_PROGRAM)) { + programName = ColumnConstants.TERTIARY_PROGRAM_LEVEL_1; + }else if (Objects.equals(programName, ColumnConstants.NATIONAL_PLAN_OBJECTIVE)) { + programName = ColumnConstants.NATIONAL_PLANNING_OBJECTIVES_LEVEL_1; + } + + SettingOptions.Option option = new SettingOptions.Option(programName, String.valueOf(programSetting.getName()),true); + options.add(option); + }); + + String defaultId = options.size() > 0 ? options.get(0).value : null; + return new SettingOptions(defaultId, options); + } + + /** * Provides current report settings * @@ -231,7 +261,6 @@ private static SettingRange getReportYearRange(final ReportSettings settings) { return null; } - static SettingField getCalendarCurrenciesField() { return getSettingFieldForOptions(SettingsConstants.CALENDAR_CURRENCIES_ID, getCalendarCurrencySettings()); } @@ -248,6 +277,10 @@ static SettingField getFundingTypeField(Set measures) { return getSettingFieldForOptions(SettingsConstants.FUNDING_TYPE_ID, getFundingTypeSettings(measures)); } + static SettingField getEnabledProgramField() { + return getSettingFieldForOptions(SettingsConstants.PROGRAM_SETTINGS, getEnabledProgramSettings()); + } + static SettingField getReportAmountFormatField() { DecimalFormat format = FormatHelper.getDefaultFormat(); final List formatFields = new ArrayList<>(); diff --git a/amp/WEB-INF/src/org/digijava/module/aim/util/ProgramUtil.java b/amp/WEB-INF/src/org/digijava/module/aim/util/ProgramUtil.java index f264455ae49..da6e2d7c008 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/util/ProgramUtil.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/util/ProgramUtil.java @@ -1506,6 +1506,21 @@ public static List getAmpActivityProgramSettingsList return programSettings; } + public static List getEnabledProgramSettings() { + List programSettings = getAmpActivityProgramSettingsList(true); + if (programSettings.isEmpty()) { + programSettings = createDefaultAmpActivityProgramSettingsList(); + } + + for (AmpActivityProgramSettings programSetting : programSettings) { + if(programSetting.getDefaultHierarchy() == null) { + programSettings.remove(programSetting); + } + } + + return programSettings; + } + public static List createDefaultAmpActivityProgramSettingsList() { Session session = PersistenceManager.getSession(); From 9b62a0655f11713a0a885159677d4f48b7d016c9 Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Mon, 3 Jul 2023 16:17:21 +0300 Subject: [PATCH 097/135] AMP-30546 fixed concurrency error in getEnabledProgramSettings --- .../src/org/digijava/module/aim/util/ProgramUtil.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/amp/WEB-INF/src/org/digijava/module/aim/util/ProgramUtil.java b/amp/WEB-INF/src/org/digijava/module/aim/util/ProgramUtil.java index da6e2d7c008..bbfaf04697a 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/util/ProgramUtil.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/util/ProgramUtil.java @@ -1512,16 +1512,18 @@ public static List getEnabledProgramSettings() { programSettings = createDefaultAmpActivityProgramSettingsList(); } - for (AmpActivityProgramSettings programSetting : programSettings) { + Iterator iterator = programSettings.iterator(); + + while(iterator.hasNext()){ + AmpActivityProgramSettings programSetting = iterator.next(); if(programSetting.getDefaultHierarchy() == null) { - programSettings.remove(programSetting); + iterator.remove(); } } return programSettings; } - public static List createDefaultAmpActivityProgramSettingsList() { Session session = PersistenceManager.getSession(); From 367a850f783cb3a7a726f20043cbb0bff3b6343a Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Mon, 3 Jul 2023 16:30:46 +0300 Subject: [PATCH 098/135] AMP-30546 removed console statements and added comments --- .../dashboard/dev/app/js/app/models/chart-model-base.js | 2 -- .../kernel/ampapi/endpoints/settings/SettingsUtils.java | 3 +++ amp/WEB-INF/src/org/digijava/module/aim/util/ProgramUtil.java | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-model-base.js b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-model-base.js index 41eead4b2a2..a5c740f9c24 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-model-base.js +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-model-base.js @@ -31,8 +31,6 @@ module.exports = BackboneDash.Model.extend({ data.settings = _({}).extend(data.settings, {'funding-type': this.get('adjtype')}); } - console.log(JSON.stringify(this)) - if (this.get('programType') && this.get('showProgramType') === true) { data.settings = _({}).extend(data.settings, {'program-settings': this.get('programType')}); } diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsUtils.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsUtils.java index 7f9f61d17ea..dddcd9230f7 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsUtils.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsUtils.java @@ -162,6 +162,9 @@ static SettingOptions getFundingTypeSettings(Set measures) { return new SettingOptions(true, defaultId, options); } + /** + * @return enabled program settings/schemes + */ private static SettingOptions getEnabledProgramSettings() { List programSettings = ProgramUtil.getEnabledProgramSettings(); List options = new ArrayList<>(); diff --git a/amp/WEB-INF/src/org/digijava/module/aim/util/ProgramUtil.java b/amp/WEB-INF/src/org/digijava/module/aim/util/ProgramUtil.java index bbfaf04697a..10427466031 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/util/ProgramUtil.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/util/ProgramUtil.java @@ -1506,6 +1506,10 @@ public static List getAmpActivityProgramSettingsList return programSettings; } + /** + * Returns a list of all enabled program settings. If no program settings are enabled, a default list is created. + * @return a list of all enabled program settings + */ public static List getEnabledProgramSettings() { List programSettings = getAmpActivityProgramSettingsList(true); if (programSettings.isEmpty()) { From 00b02037635d6cf10e7fe697fabc048319076dbf Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Tue, 4 Jul 2023 14:35:06 +0300 Subject: [PATCH 099/135] AMP-30608 fixed excepton when saving contacts --- .../org/digijava/module/aim/util/DbUtil.java | 36 +++++++++++-------- amp/deployConfigs/selected.properties | 2 +- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/amp/WEB-INF/src/org/digijava/module/aim/util/DbUtil.java b/amp/WEB-INF/src/org/digijava/module/aim/util/DbUtil.java index f2db485c5cf..bcce63a281e 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/util/DbUtil.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/util/DbUtil.java @@ -1406,31 +1406,41 @@ public static void saveOrg(AmpOrganisation org) throws DgException { if (organisationContacts != null) { // this will remove all organisation contact which are linked to // this organisation - for (Iterator iterator = organisationContacts.iterator(); iterator.hasNext();) { - AmpOrganisationContact ampOrganisationContact = (AmpOrganisationContact) iterator.next(); - if (org.getAmpOrgId() != null) { - if (ampOrganisationContact.getId() != null) { + Iterator organisationContactIterator = organisationContacts.iterator(); + + while (organisationContactIterator.hasNext()) { + AmpOrganisationContact ampOrganisationContact = organisationContactIterator.next(); + + if(org.getAmpOrgId() != null) { + if(ampOrganisationContact.getId() != null) { // AmpContact // cont=ampOrganisationContact.getContact(); - AmpOrganisationContact contToBeRemoved = (AmpOrganisationContact) sess - .get(AmpOrganisationContact.class, ampOrganisationContact.getId()); - if (contToBeRemoved != null) { + AmpOrganisationContact contToBeRemoved = + (AmpOrganisationContact) sess + .get(AmpOrganisationContact.class, + ampOrganisationContact.getId()); + if(contToBeRemoved != null) { AmpContact ampContact = contToBeRemoved.getContact(); sess.delete(contToBeRemoved); - ampContact.getOrganizationContacts().remove(contToBeRemoved); + organisationContactIterator.remove(); + ampContact.getOrganizationContacts() + .remove(contToBeRemoved); sess.update(ampContact); - org.getOrganizationContacts().remove(contToBeRemoved); + } } } } - // now re-save all organisation contacts - for (AmpOrganisationContact organizationContact : organisationContacts) { - // save or update contact + // Since you've modified the original set, need to get a new iterator + organisationContactIterator = organisationContacts.iterator(); + + while (organisationContactIterator.hasNext()) { + AmpOrganisationContact organizationContact = organisationContactIterator.next(); AmpContact contact = organizationContact.getContact(); AmpContact ampContact = null; + if (contact.getId() != null) { // contact already exists. ampContact = (AmpContact) sess.get(AmpContact.class, contact.getId()); ampContact.setName(contact.getName()); @@ -1463,7 +1473,6 @@ public static void saveOrg(AmpOrganisation org) throws DgException { } // link org to cont - AmpOrganisationContact newOrgCont = new AmpOrganisationContact(); organizationContact.setOrganisation(org); organizationContact.setPrimaryContact(organizationContact.getPrimaryContact()); if (ampContact != null) { @@ -1472,7 +1481,6 @@ public static void saveOrg(AmpOrganisation org) throws DgException { organizationContact.setContact(contact); } sess.save(organizationContact); - } } diff --git a/amp/deployConfigs/selected.properties b/amp/deployConfigs/selected.properties index b33d2accc17..0f84175e8cb 100644 --- a/amp/deployConfigs/selected.properties +++ b/amp/deployConfigs/selected.properties @@ -1,4 +1,4 @@ #Description of the selected config -#Mon, 29 May 2023 15:19:15 +0300 +#Tue, 04 Jul 2023 13:37:41 +0300 serverName=local From d3d0d0b3b6abb55d20980c765d8d733cfab107b7 Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Thu, 6 Jul 2023 20:11:48 +0300 Subject: [PATCH 100/135] AMP-30517 fixed amp filter to follow date format in report generator --- .../amp-filter/src/utils/date-utils.js | 6 +++--- .../amp-filter/src/views/filters-view.js | 17 +++++++++++++---- amp/deployConfigs/selected.properties | 2 +- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/utils/date-utils.js b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/utils/date-utils.js index 37b64d6e44a..e8d48bb8d8e 100644 --- a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/utils/date-utils.js +++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/utils/date-utils.js @@ -1,6 +1,6 @@ var _ = require('underscore'); -var extractDates = function (settings, filtersOut, minName, maxName) { +var extractDates = function (settings, filtersOut, minName, maxName, formatDateFn) { filtersOut = filtersOut || {}; if (_.isUndefined(filtersOut.date) || _.isEmpty(filtersOut.date)) { filtersOut.date = filtersOut.date || { @@ -10,11 +10,11 @@ var extractDates = function (settings, filtersOut, minName, maxName) { var defaultMinDate = settings.get(minName); if (defaultMinDate !== undefined && defaultMinDate !== '') { - filtersOut.date.start = defaultMinDate; + filtersOut.date.start = formatDateFn(defaultMinDate); } var defaultMaxDate = settings.get(maxName); if (defaultMaxDate !== undefined && defaultMaxDate !== '') { - filtersOut.date.end = defaultMaxDate; + filtersOut.date.end = formatDateFn(defaultMaxDate); } } }; diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/views/filters-view.js b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/views/filters-view.js index dc3146cbbdc..c4d983d2a29 100644 --- a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/views/filters-view.js +++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/views/filters-view.js @@ -87,6 +87,8 @@ module.exports = Backbone.View.extend({ return this; }); + this.formatDate = this.formatDate.bind(this); + this.getDateFormat = this.getDateFormat.bind(this); }, @@ -570,17 +572,24 @@ module.exports = Backbone.View.extend({ }, formatDate: function (date) { - return $.datepicker.formatDate(this.getDateFormat(), ($.datepicker.parseDate(this.PARAMS_DATE_FORMAT, date))); + let dateFormat = this.getDateFormat(); // get date format + let parsedDate = $.datepicker.parseDate(this.PARAMS_DATE_FORMAT, date); // parse date + + if (parsedDate) { // Ensure that date was parsed successfully + return $.datepicker.formatDate(dateFormat, parsedDate).replace(/\//g, '-'); + } else { + console.error('Could not parse date:', date); + } }, setDefaultDates: function (blob) { var self = this; if (self.caller === Constants.CONTEXT_DASHBOARD) { - return DateUtils.extractDates(self.settings, blob, 'dashboard-default-min-date', 'dashboard-default-max-date'); + return DateUtils.extractDates(self.settings, blob, 'dashboard-default-min-date', 'dashboard-default-max-date', this.formatDate); } else if (self.caller === Constants.CONTEXT_GIS) { - return DateUtils.extractDates(self.settings, blob, 'gis-default-min-date', 'gis-default-max-date'); + return DateUtils.extractDates(self.settings, blob, 'gis-default-min-date', 'gis-default-max-date', this.formatDate); } else if (self.caller === Constants.CONTEXT_REPORT) { - return DateUtils.extractDates(self.settings, blob, 'report-default-min-date', 'report-default-max-date'); + return DateUtils.extractDates(self.settings, blob, 'report-default-min-date', 'report-default-max-date', this.formatDate); } return blob; }, diff --git a/amp/deployConfigs/selected.properties b/amp/deployConfigs/selected.properties index 0f84175e8cb..2492bc00532 100644 --- a/amp/deployConfigs/selected.properties +++ b/amp/deployConfigs/selected.properties @@ -1,4 +1,4 @@ #Description of the selected config -#Tue, 04 Jul 2023 13:37:41 +0300 +#Wed, 05 Jul 2023 17:37:10 +0300 serverName=local From 141730f67166ece7d096575a7077f1f21f36ed6b Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Fri, 7 Jul 2023 18:42:01 +0300 Subject: [PATCH 101/135] AMP-30517 changed let to var --- .../node_modules/amp-filter/src/views/filters-view.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/views/filters-view.js b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/views/filters-view.js index c4d983d2a29..1a55214c4dd 100644 --- a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/views/filters-view.js +++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/views/filters-view.js @@ -572,8 +572,8 @@ module.exports = Backbone.View.extend({ }, formatDate: function (date) { - let dateFormat = this.getDateFormat(); // get date format - let parsedDate = $.datepicker.parseDate(this.PARAMS_DATE_FORMAT, date); // parse date + var dateFormat = this.getDateFormat(); // get date format + var parsedDate = $.datepicker.parseDate(this.PARAMS_DATE_FORMAT, date); // parse date if (parsedDate) { // Ensure that date was parsed successfully return $.datepicker.formatDate(dateFormat, parsedDate).replace(/\//g, '-'); From b51806005b1fd99da8fdbc99e7331b54ea51268d Mon Sep 17 00:00:00 2001 From: Julian de Anquin Date: Mon, 17 Jul 2023 18:47:56 -0300 Subject: [PATCH 102/135] AMP-30639 check for null in dashboard dates. --- .../node_modules/amp-filter/src/utils/date-utils.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/utils/date-utils.js b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/utils/date-utils.js index e8d48bb8d8e..c4dadcb8778 100644 --- a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/utils/date-utils.js +++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/utils/date-utils.js @@ -9,11 +9,11 @@ var extractDates = function (settings, filtersOut, minName, maxName, formatDateF }; var defaultMinDate = settings.get(minName); - if (defaultMinDate !== undefined && defaultMinDate !== '') { + if (defaultMinDate !== null && defaultMinDate !== undefined && defaultMinDate !== '') { filtersOut.date.start = formatDateFn(defaultMinDate); } var defaultMaxDate = settings.get(maxName); - if (defaultMaxDate !== undefined && defaultMaxDate !== '') { + if (defaultMaxDate !== null && defaultMaxDate !== undefined && defaultMaxDate !== '') { filtersOut.date.end = formatDateFn(defaultMaxDate); } } From 517d9ce56021499f05bc4c3762df966351e273be Mon Sep 17 00:00:00 2001 From: Julian de Anquin Date: Mon, 17 Jul 2023 19:38:34 -0300 Subject: [PATCH 103/135] AMP-30639 check for null in report dates. --- .../ampTemplate/node_modules/amp-filter/src/main.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/main.js b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/main.js index e134d6c79fd..8cd7de02f74 100644 --- a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/main.js +++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/main.js @@ -85,7 +85,7 @@ _.extend(Widget.prototype, Backbone.Events, { return this.view.serialize({wholeModel: true}); }, - getAppliedFilters: function(options) { + getAppliedFilters: function (options) { return this.view.getAppliedFilters(options || {}); }, @@ -128,11 +128,11 @@ _.extend(Widget.prototype, Backbone.Events, { }; var defaultMinDate = settings.get(minName); - if (defaultMinDate !== undefined && defaultMinDate !== '') { + if (defaultMinDate !== null && defaultMinDate !== undefined && defaultMinDate !== '') { filtersOut.date.start = defaultMinDate; } var defaultMaxDate = settings.get(maxName); - if (defaultMaxDate !== undefined && defaultMaxDate !== '') { + if (defaultMaxDate !== null && defaultMaxDate !== undefined && defaultMaxDate !== '') { filtersOut.date.end = defaultMaxDate; } } From 06562f2c3e60ac8db456e759af538d5b14764d43 Mon Sep 17 00:00:00 2001 From: Julian de Anquin Date: Tue, 18 Jul 2023 10:56:11 -0300 Subject: [PATCH 104/135] AMP-30639 revert wrong fix --- .../ampTemplate/node_modules/amp-filter/src/main.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/main.js b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/main.js index 8cd7de02f74..e134d6c79fd 100644 --- a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/main.js +++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/main.js @@ -85,7 +85,7 @@ _.extend(Widget.prototype, Backbone.Events, { return this.view.serialize({wholeModel: true}); }, - getAppliedFilters: function (options) { + getAppliedFilters: function(options) { return this.view.getAppliedFilters(options || {}); }, @@ -128,11 +128,11 @@ _.extend(Widget.prototype, Backbone.Events, { }; var defaultMinDate = settings.get(minName); - if (defaultMinDate !== null && defaultMinDate !== undefined && defaultMinDate !== '') { + if (defaultMinDate !== undefined && defaultMinDate !== '') { filtersOut.date.start = defaultMinDate; } var defaultMaxDate = settings.get(maxName); - if (defaultMaxDate !== null && defaultMaxDate !== undefined && defaultMaxDate !== '') { + if (defaultMaxDate !== undefined && defaultMaxDate !== '') { filtersOut.date.end = defaultMaxDate; } } From c2d7a25b917f2c46a33b9f0e81ed9e24856bba12 Mon Sep 17 00:00:00 2001 From: Julian de Anquin Date: Tue, 18 Jul 2023 16:20:40 -0300 Subject: [PATCH 105/135] Revert "AMP-30517 changed let to var" This reverts commit 141730f67166ece7d096575a7077f1f21f36ed6b. --- .../node_modules/amp-filter/src/views/filters-view.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/views/filters-view.js b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/views/filters-view.js index 1a55214c4dd..c4d983d2a29 100644 --- a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/views/filters-view.js +++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/views/filters-view.js @@ -572,8 +572,8 @@ module.exports = Backbone.View.extend({ }, formatDate: function (date) { - var dateFormat = this.getDateFormat(); // get date format - var parsedDate = $.datepicker.parseDate(this.PARAMS_DATE_FORMAT, date); // parse date + let dateFormat = this.getDateFormat(); // get date format + let parsedDate = $.datepicker.parseDate(this.PARAMS_DATE_FORMAT, date); // parse date if (parsedDate) { // Ensure that date was parsed successfully return $.datepicker.formatDate(dateFormat, parsedDate).replace(/\//g, '-'); From a940c73ca8235e5dca976582b34e622bfaf599a2 Mon Sep 17 00:00:00 2001 From: Julian de Anquin Date: Tue, 18 Jul 2023 16:23:29 -0300 Subject: [PATCH 106/135] Revert "AMP-30517 fixed amp filter to follow date format in report generator" This reverts commit d3d0d0b3b6abb55d20980c765d8d733cfab107b7. --- .../amp-filter/src/utils/date-utils.js | 10 +++++----- .../amp-filter/src/views/filters-view.js | 17 ++++------------- amp/deployConfigs/selected.properties | 2 +- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/utils/date-utils.js b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/utils/date-utils.js index c4dadcb8778..37b64d6e44a 100644 --- a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/utils/date-utils.js +++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/utils/date-utils.js @@ -1,6 +1,6 @@ var _ = require('underscore'); -var extractDates = function (settings, filtersOut, minName, maxName, formatDateFn) { +var extractDates = function (settings, filtersOut, minName, maxName) { filtersOut = filtersOut || {}; if (_.isUndefined(filtersOut.date) || _.isEmpty(filtersOut.date)) { filtersOut.date = filtersOut.date || { @@ -9,12 +9,12 @@ var extractDates = function (settings, filtersOut, minName, maxName, formatDateF }; var defaultMinDate = settings.get(minName); - if (defaultMinDate !== null && defaultMinDate !== undefined && defaultMinDate !== '') { - filtersOut.date.start = formatDateFn(defaultMinDate); + if (defaultMinDate !== undefined && defaultMinDate !== '') { + filtersOut.date.start = defaultMinDate; } var defaultMaxDate = settings.get(maxName); - if (defaultMaxDate !== null && defaultMaxDate !== undefined && defaultMaxDate !== '') { - filtersOut.date.end = formatDateFn(defaultMaxDate); + if (defaultMaxDate !== undefined && defaultMaxDate !== '') { + filtersOut.date.end = defaultMaxDate; } } }; diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/views/filters-view.js b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/views/filters-view.js index c4d983d2a29..dc3146cbbdc 100644 --- a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/views/filters-view.js +++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/views/filters-view.js @@ -87,8 +87,6 @@ module.exports = Backbone.View.extend({ return this; }); - this.formatDate = this.formatDate.bind(this); - this.getDateFormat = this.getDateFormat.bind(this); }, @@ -572,24 +570,17 @@ module.exports = Backbone.View.extend({ }, formatDate: function (date) { - let dateFormat = this.getDateFormat(); // get date format - let parsedDate = $.datepicker.parseDate(this.PARAMS_DATE_FORMAT, date); // parse date - - if (parsedDate) { // Ensure that date was parsed successfully - return $.datepicker.formatDate(dateFormat, parsedDate).replace(/\//g, '-'); - } else { - console.error('Could not parse date:', date); - } + return $.datepicker.formatDate(this.getDateFormat(), ($.datepicker.parseDate(this.PARAMS_DATE_FORMAT, date))); }, setDefaultDates: function (blob) { var self = this; if (self.caller === Constants.CONTEXT_DASHBOARD) { - return DateUtils.extractDates(self.settings, blob, 'dashboard-default-min-date', 'dashboard-default-max-date', this.formatDate); + return DateUtils.extractDates(self.settings, blob, 'dashboard-default-min-date', 'dashboard-default-max-date'); } else if (self.caller === Constants.CONTEXT_GIS) { - return DateUtils.extractDates(self.settings, blob, 'gis-default-min-date', 'gis-default-max-date', this.formatDate); + return DateUtils.extractDates(self.settings, blob, 'gis-default-min-date', 'gis-default-max-date'); } else if (self.caller === Constants.CONTEXT_REPORT) { - return DateUtils.extractDates(self.settings, blob, 'report-default-min-date', 'report-default-max-date', this.formatDate); + return DateUtils.extractDates(self.settings, blob, 'report-default-min-date', 'report-default-max-date'); } return blob; }, diff --git a/amp/deployConfigs/selected.properties b/amp/deployConfigs/selected.properties index 2492bc00532..0f84175e8cb 100644 --- a/amp/deployConfigs/selected.properties +++ b/amp/deployConfigs/selected.properties @@ -1,4 +1,4 @@ #Description of the selected config -#Wed, 05 Jul 2023 17:37:10 +0300 +#Tue, 04 Jul 2023 13:37:41 +0300 serverName=local From ede9be2fcb0805e32812965675894f803d9c579b Mon Sep 17 00:00:00 2001 From: Octavian Ciubotaru Date: Mon, 31 Jul 2023 16:40:54 +0300 Subject: [PATCH 107/135] AMP-30645: Fixed email configuration for staging --- amp/docker/setenv.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amp/docker/setenv.sh b/amp/docker/setenv.sh index 3f3dd35d5c6..68283551a20 100755 --- a/amp/docker/setenv.sh +++ b/amp/docker/setenv.sh @@ -3,7 +3,7 @@ export UMASK=0022 JAVA_OPTS="-server -Xmx2g -Djava.awt.headless=true" -JAVA_OPTS="$JAVA_OPTS -DsmtpHost=sulfur.migrated.devgateway.org -DsmtpFrom=system@digijava.org" +JAVA_OPTS="$JAVA_OPTS -DsmtpHost=ampdev.aws.devgateway.org -DsmtpFrom=system@digijava.org" JAVA_OPTS="$JAVA_OPTS -XX:HeapDumpPath=/opt/heapdumps -XX:+HeapDumpOnOutOfMemoryError" CATALINA_OPTS="-Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false" From 0405ac4783b4f6f83e656f3f213d09bfae715507 Mon Sep 17 00:00:00 2001 From: Fernando Date: Wed, 2 Aug 2023 17:05:52 -0700 Subject: [PATCH 108/135] AMP-30646 fix error in Windows 11 --- amp/TEMPLATE/ampTemplate/gisModule/dev/gulpfile.js | 14 +++++++------- .../ampTemplate/gisModule/dev/package.json | 7 ++++--- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/amp/TEMPLATE/ampTemplate/gisModule/dev/gulpfile.js b/amp/TEMPLATE/ampTemplate/gisModule/dev/gulpfile.js index a5423b60822..49cb7f4b4a7 100644 --- a/amp/TEMPLATE/ampTemplate/gisModule/dev/gulpfile.js +++ b/amp/TEMPLATE/ampTemplate/gisModule/dev/gulpfile.js @@ -41,6 +41,8 @@ var watchify = require('watchify'); var gulp = require('gulp'); var g = require('gulp-load-plugins')(); var connect = require('gulp-connect'); +var log = require('fancy-log'); + const { createProxyMiddleware } = require('http-proxy-middleware'); var gulpi18nScraper = require('gulp-i18n-scraper'); var gulpUtil = require('gulp-util'); @@ -110,14 +112,12 @@ function _bundlify(ifyer, entry, destFolder, destName) { var rebundle = function() { g.util.log('rebrowserifying ' + entry + '....'); - return bundler.bundle({debug: true}) - /* Fix sourcemaps in firefox (not in amp-filters though)though https://github.com/substack/node-browserify/issues/681#issuecomment-39530724 */ - .pipe(mold.transformSourcesRelativeTo(__dirname)) - .on('error', function(e) { g.util.log('Browserify error: ', e); }) - .pipe(source(destName)) - .pipe(gulp.dest(destFolder)); + return bundler.bundle() + .on('end', function() { log('bundle: finished'); }) + .on('error', function(e) { log('bundle: error: ', e); }) + .pipe(source(destName)) + .pipe(gulp.dest(destFolder)); }; - bundler.on('update', rebundle); return rebundle(); diff --git a/amp/TEMPLATE/ampTemplate/gisModule/dev/package.json b/amp/TEMPLATE/ampTemplate/gisModule/dev/package.json index 6aa7af94623..762d2d88e51 100644 --- a/amp/TEMPLATE/ampTemplate/gisModule/dev/package.json +++ b/amp/TEMPLATE/ampTemplate/gisModule/dev/package.json @@ -11,6 +11,7 @@ "license": "TODO: what is the license for AMP?", "browserify": { "transform": [ + "brfs", "browserify-shim" ] }, @@ -50,9 +51,9 @@ "@babel/polyfill": "^7.2.5", "backbone": "1.1.2", "bootstrap": "3.3.0", - "brfs": "1.2.0", - "browserify": "4.2.3", - "browserify-shim": "3.6.0", + "brfs": "^1.2.0", + "browserify": "^5.12.0", + "browserify-shim": "3.8.12", "cheerio": "0.18.0", "css-element-queries": "1.0.0", "d3-browserify": "3.4.12", From 2acf55411f06809be224a837b061344befb4bb62 Mon Sep 17 00:00:00 2001 From: Julian de Anquin Date: Thu, 3 Aug 2023 18:36:26 -0300 Subject: [PATCH 109/135] AMP-30669 fix amp-ui source map loading --- amp/TEMPLATE/reamp/package-lock.json | 805 +++++++++++++++++++---- amp/TEMPLATE/reamp/package.json | 1 + amp/TEMPLATE/reamp/webpack.dev.config.js | 13 +- 3 files changed, 683 insertions(+), 136 deletions(-) diff --git a/amp/TEMPLATE/reamp/package-lock.json b/amp/TEMPLATE/reamp/package-lock.json index 9970ff9d6a3..58f7c47edc6 100644 --- a/amp/TEMPLATE/reamp/package-lock.json +++ b/amp/TEMPLATE/reamp/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "reamp", "version": "0.1.0", "license": "inherit", "dependencies": { @@ -58,6 +59,7 @@ "redux": "^3.6.0", "redux-logger": "^2.7.4", "redux-thunk": "2.2.0", + "source-map-loader": "^0.2.4", "style-loader": "^0.12.3", "webpack": "^1.13.3", "webpack-dev-server": "^1.10.1", @@ -215,6 +217,7 @@ "node_modules/align-text": { "version": "0.1.4", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", + "dev": true, "dependencies": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -227,6 +230,7 @@ "node_modules/amdefine": { "version": "1.0.1", "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", + "dev": true, "engines": { "node": ">=0.4.2" } @@ -288,6 +292,7 @@ "node_modules/anymatch": { "version": "1.3.2", "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", + "dev": true, "dependencies": { "micromatch": "^2.1.5", "normalize-path": "^2.0.0" @@ -325,6 +330,7 @@ "node_modules/arr-union": { "version": "3.1.0", "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -363,6 +369,7 @@ "node_modules/assert": { "version": "1.5.0", "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", + "dev": true, "dependencies": { "object-assign": "^4.1.1", "util": "0.10.3" @@ -378,11 +385,13 @@ }, "node_modules/assert/node_modules/inherits": { "version": "2.0.1", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=" + "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", + "dev": true }, "node_modules/assert/node_modules/util": { "version": "0.10.3", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", + "dev": true, "dependencies": { "inherits": "2.0.1" } @@ -390,17 +399,20 @@ "node_modules/assign-symbols": { "version": "1.0.0", "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", + "dev": true, "engines": { "node": ">=0.10.0" } }, "node_modules/async": { "version": "1.5.2", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "dev": true }, "node_modules/async-each": { "version": "1.0.3", - "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==" + "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==", + "dev": true }, "node_modules/asynckit": { "version": "0.4.0", @@ -410,6 +422,7 @@ "node_modules/atob": { "version": "2.1.2", "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", + "dev": true, "bin": { "atob": "bin/atob.js" }, @@ -1341,6 +1354,7 @@ "node_modules/base": { "version": "0.11.2", "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", + "dev": true, "dependencies": { "cache-base": "^1.0.1", "class-utils": "^0.3.5", @@ -1357,6 +1371,7 @@ "node_modules/base/node_modules/define-property": { "version": "1.0.0", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, "dependencies": { "is-descriptor": "^1.0.0" }, @@ -1367,6 +1382,7 @@ "node_modules/base/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -1374,6 +1390,7 @@ "node_modules/base64-js": { "version": "1.5.1", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true, "funding": [ { "type": "github", @@ -1405,6 +1422,7 @@ "node_modules/big.js": { "version": "3.2.0", "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==", + "dev": true, "engines": { "node": "*" } @@ -1412,6 +1430,7 @@ "node_modules/binary-extensions": { "version": "1.13.1", "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -1530,6 +1549,7 @@ "node_modules/browserify-aes": { "version": "0.4.0", "integrity": "sha1-BnFJtmjfMcS1hTPgLQHoBthgjiw=", + "dev": true, "dependencies": { "inherits": "^2.0.1" } @@ -1537,13 +1557,15 @@ "node_modules/browserify-zlib": { "version": "0.1.4", "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=", + "dev": true, "dependencies": { "pako": "~0.2.0" } }, "node_modules/browserify-zlib/node_modules/pako": { "version": "0.2.9", - "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=" + "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=", + "dev": true }, "node_modules/browserslist": { "version": "0.4.0", @@ -1565,6 +1587,7 @@ "node_modules/buffer": { "version": "4.9.2", "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", + "dev": true, "dependencies": { "base64-js": "^1.0.2", "ieee754": "^1.1.4", @@ -1577,7 +1600,8 @@ }, "node_modules/builtin-status-codes": { "version": "3.0.0", - "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=" + "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", + "dev": true }, "node_modules/bytes": { "version": "3.0.0", @@ -1627,6 +1651,7 @@ "node_modules/cache-base": { "version": "1.0.1", "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", + "dev": true, "dependencies": { "collection-visit": "^1.0.0", "component-emitter": "^1.2.1", @@ -1645,6 +1670,7 @@ "node_modules/cache-base/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -1652,6 +1678,7 @@ "node_modules/camelcase": { "version": "1.2.1", "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -1669,6 +1696,7 @@ "node_modules/center-align": { "version": "0.1.3", "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", + "dev": true, "dependencies": { "align-text": "^0.1.3", "lazy-cache": "^1.0.3" @@ -1695,6 +1723,7 @@ "version": "1.7.0", "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.", + "dev": true, "dependencies": { "anymatch": "^1.3.0", "async-each": "^1.0.0", @@ -1716,6 +1745,7 @@ "node_modules/class-utils": { "version": "0.3.6", "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", + "dev": true, "dependencies": { "arr-union": "^3.1.0", "define-property": "^0.2.5", @@ -1729,6 +1759,7 @@ "node_modules/class-utils/node_modules/define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, "dependencies": { "is-descriptor": "^0.1.0" }, @@ -1739,6 +1770,7 @@ "node_modules/class-utils/node_modules/is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -1749,6 +1781,7 @@ "node_modules/class-utils/node_modules/is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -1759,6 +1792,7 @@ "node_modules/class-utils/node_modules/is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, "dependencies": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -1771,6 +1805,7 @@ "node_modules/class-utils/node_modules/is-descriptor/node_modules/kind-of": { "version": "5.1.0", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -1778,6 +1813,7 @@ "node_modules/class-utils/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -1800,6 +1836,7 @@ "node_modules/cliui": { "version": "2.1.0", "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "dev": true, "dependencies": { "center-align": "^0.1.1", "right-align": "^0.1.1", @@ -1809,6 +1846,7 @@ "node_modules/cliui/node_modules/wordwrap": { "version": "0.0.2", "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", + "dev": true, "engines": { "node": ">=0.4.0" } @@ -1816,6 +1854,7 @@ "node_modules/clone": { "version": "1.0.4", "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", + "dev": true, "engines": { "node": ">=0.8" } @@ -1846,6 +1885,7 @@ "node_modules/collection-visit": { "version": "1.0.0", "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", + "dev": true, "dependencies": { "map-visit": "^1.0.0", "object-visit": "^1.0.0" @@ -1943,7 +1983,8 @@ }, "node_modules/component-emitter": { "version": "1.3.0", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", + "dev": true }, "node_modules/compressible": { "version": "2.0.18", @@ -2020,11 +2061,13 @@ }, "node_modules/console-browserify": { "version": "1.2.0", - "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==" + "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==", + "dev": true }, "node_modules/constants-browserify": { "version": "1.0.0", - "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=" + "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", + "dev": true }, "node_modules/content-disposition": { "version": "0.5.4", @@ -2099,6 +2142,7 @@ "node_modules/copy-descriptor": { "version": "0.1.1", "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -2159,6 +2203,7 @@ "node_modules/crypto-browserify": { "version": "3.3.0", "integrity": "sha1-ufx1u0oO1h3PHNXa6W6zDJw+UGw=", + "dev": true, "dependencies": { "browserify-aes": "0.4.0", "pbkdf2-compat": "2.0.1", @@ -2293,6 +2338,7 @@ "node_modules/decamelize": { "version": "1.2.0", "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -2300,6 +2346,7 @@ "node_modules/decode-uri-component": { "version": "0.2.0", "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", + "dev": true, "engines": { "node": ">=0.10" } @@ -2317,6 +2364,7 @@ "node_modules/define-property": { "version": "2.0.2", "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", + "dev": true, "dependencies": { "is-descriptor": "^1.0.2", "isobject": "^3.0.1" @@ -2328,6 +2376,7 @@ "node_modules/define-property/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -2461,6 +2510,7 @@ "node_modules/domain-browser": { "version": "1.2.0", "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==", + "dev": true, "engines": { "node": ">=0.4", "npm": ">=1.2" @@ -2539,6 +2589,7 @@ "node_modules/emojis-list": { "version": "2.1.0", "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", + "dev": true, "engines": { "node": ">= 0.10" } @@ -2568,6 +2619,7 @@ "node_modules/enhanced-resolve": { "version": "0.9.1", "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=", + "dev": true, "dependencies": { "graceful-fs": "^4.1.2", "memory-fs": "^0.2.0", @@ -2579,7 +2631,8 @@ }, "node_modules/enhanced-resolve/node_modules/memory-fs": { "version": "0.2.0", - "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=" + "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=", + "dev": true }, "node_modules/entities": { "version": "1.1.2", @@ -2720,6 +2773,7 @@ "node_modules/events": { "version": "1.1.1", "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", + "dev": true, "engines": { "node": ">=0.4.x" } @@ -2894,6 +2948,7 @@ "node_modules/extend-shallow": { "version": "3.0.2", "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, "dependencies": { "assign-symbols": "^1.0.0", "is-extendable": "^1.0.1" @@ -2905,6 +2960,7 @@ "node_modules/extend-shallow/node_modules/is-extendable": { "version": "1.0.1", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, "dependencies": { "is-plain-object": "^2.0.4" }, @@ -3179,6 +3235,7 @@ "node_modules/fragment-cache": { "version": "0.2.1", "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", + "dev": true, "dependencies": { "map-cache": "^0.2.2" }, @@ -3283,6 +3340,7 @@ "node_modules/get-value": { "version": "2.0.6", "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -3411,6 +3469,7 @@ "node_modules/has-flag": { "version": "1.0.0", "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -3418,6 +3477,7 @@ "node_modules/has-value": { "version": "1.0.0", "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", + "dev": true, "dependencies": { "get-value": "^2.0.6", "has-values": "^1.0.0", @@ -3430,6 +3490,7 @@ "node_modules/has-value/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -3437,6 +3498,7 @@ "node_modules/has-values": { "version": "1.0.0", "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", + "dev": true, "dependencies": { "is-number": "^3.0.0", "kind-of": "^4.0.0" @@ -3448,6 +3510,7 @@ "node_modules/has-values/node_modules/is-number": { "version": "3.0.0", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -3458,6 +3521,7 @@ "node_modules/has-values/node_modules/is-number/node_modules/kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, "dependencies": { "is-buffer": "^1.1.5" }, @@ -3468,6 +3532,7 @@ "node_modules/has-values/node_modules/kind-of": { "version": "4.0.0", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "dev": true, "dependencies": { "is-buffer": "^1.1.5" }, @@ -3635,7 +3700,8 @@ }, "node_modules/https-browserify": { "version": "0.0.1", - "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=" + "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=", + "dev": true }, "node_modules/iconv-lite": { "version": "0.6.3", @@ -3650,6 +3716,7 @@ "node_modules/ieee754": { "version": "1.2.1", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "dev": true, "funding": [ { "type": "github", @@ -3719,7 +3786,8 @@ }, "node_modules/indexof": { "version": "0.0.1", - "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=" + "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", + "dev": true }, "node_modules/inflight": { "version": "1.0.6", @@ -3735,7 +3803,8 @@ }, "node_modules/interpret": { "version": "0.6.6", - "integrity": "sha1-/s16GOfOXKar+5U+H4YhOknxYls=" + "integrity": "sha1-/s16GOfOXKar+5U+H4YhOknxYls=", + "dev": true }, "node_modules/invariant": { "version": "2.2.4", @@ -3763,6 +3832,7 @@ "node_modules/is-accessor-descriptor": { "version": "1.0.0", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, "dependencies": { "kind-of": "^6.0.0" }, @@ -3773,6 +3843,7 @@ "node_modules/is-accessor-descriptor/node_modules/kind-of": { "version": "6.0.3", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -3784,6 +3855,7 @@ "node_modules/is-binary-path": { "version": "1.0.1", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "dev": true, "dependencies": { "binary-extensions": "^1.0.0" }, @@ -3808,6 +3880,7 @@ "node_modules/is-data-descriptor": { "version": "1.0.0", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, "dependencies": { "kind-of": "^6.0.0" }, @@ -3818,6 +3891,7 @@ "node_modules/is-data-descriptor/node_modules/kind-of": { "version": "6.0.3", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -3825,6 +3899,7 @@ "node_modules/is-descriptor": { "version": "1.0.2", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, "dependencies": { "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", @@ -3837,6 +3912,7 @@ "node_modules/is-descriptor/node_modules/kind-of": { "version": "6.0.3", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -3913,6 +3989,7 @@ "node_modules/is-plain-object": { "version": "2.0.4", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "dev": true, "dependencies": { "isobject": "^3.0.1" }, @@ -3923,6 +4000,7 @@ "node_modules/is-plain-object/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -3960,6 +4038,7 @@ "node_modules/is-windows": { "version": "1.0.2", "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -4309,6 +4388,7 @@ "node_modules/lazy-cache": { "version": "1.0.4", "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -4550,6 +4630,7 @@ "node_modules/loader-utils": { "version": "0.2.17", "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", + "dev": true, "dependencies": { "big.js": "^3.1.3", "emojis-list": "^2.0.0", @@ -4695,6 +4776,7 @@ "node_modules/longest": { "version": "1.0.1", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -4745,6 +4827,7 @@ "node_modules/map-cache": { "version": "0.2.2", "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -4752,6 +4835,7 @@ "node_modules/map-visit": { "version": "1.0.0", "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", + "dev": true, "dependencies": { "object-visit": "^1.0.0" }, @@ -4779,6 +4863,7 @@ "node_modules/memory-fs": { "version": "0.3.0", "integrity": "sha1-e8xrYp46Q+hx1+Kaymrop/FcuyA=", + "dev": true, "dependencies": { "errno": "^0.1.3", "readable-stream": "^2.0.1" @@ -4787,6 +4872,7 @@ "node_modules/memory-fs/node_modules/readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -4800,6 +4886,7 @@ "node_modules/memory-fs/node_modules/string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } @@ -4910,6 +4997,7 @@ "node_modules/mixin-deep": { "version": "1.3.2", "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", + "dev": true, "dependencies": { "for-in": "^1.0.2", "is-extendable": "^1.0.1" @@ -4921,6 +5009,7 @@ "node_modules/mixin-deep/node_modules/is-extendable": { "version": "1.0.1", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, "dependencies": { "is-plain-object": "^2.0.4" }, @@ -4965,6 +5054,7 @@ "node_modules/nanomatch": { "version": "1.2.13", "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", + "dev": true, "dependencies": { "arr-diff": "^4.0.0", "array-unique": "^0.3.2", @@ -4985,6 +5075,7 @@ "node_modules/nanomatch/node_modules/arr-diff": { "version": "4.0.0", "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -4992,6 +5083,7 @@ "node_modules/nanomatch/node_modules/array-unique": { "version": "0.3.2", "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -4999,6 +5091,7 @@ "node_modules/nanomatch/node_modules/kind-of": { "version": "6.0.3", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -5053,6 +5146,7 @@ "node_modules/node-libs-browser": { "version": "0.7.0", "integrity": "sha1-PicsCBnjCJNeJmdECNevDhSRuDs=", + "dev": true, "dependencies": { "assert": "^1.1.1", "browserify-zlib": "^0.1.4", @@ -5081,11 +5175,13 @@ }, "node_modules/node-libs-browser/node_modules/punycode": { "version": "1.4.1", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", + "dev": true }, "node_modules/node-libs-browser/node_modules/readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -5099,13 +5195,15 @@ "node_modules/node-libs-browser/node_modules/readable-stream/node_modules/string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } }, "node_modules/node-libs-browser/node_modules/string_decoder": { "version": "0.10.31", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true }, "node_modules/node-worker-pool": { "version": "3.0.2", @@ -5205,6 +5303,7 @@ "node_modules/object-copy": { "version": "0.1.0", "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", + "dev": true, "dependencies": { "copy-descriptor": "^0.1.0", "define-property": "^0.2.5", @@ -5217,6 +5316,7 @@ "node_modules/object-copy/node_modules/define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, "dependencies": { "is-descriptor": "^0.1.0" }, @@ -5227,6 +5327,7 @@ "node_modules/object-copy/node_modules/is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -5237,6 +5338,7 @@ "node_modules/object-copy/node_modules/is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -5247,6 +5349,7 @@ "node_modules/object-copy/node_modules/is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, "dependencies": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -5259,6 +5362,7 @@ "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": { "version": "5.1.0", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -5266,6 +5370,7 @@ "node_modules/object-visit": { "version": "1.0.1", "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", + "dev": true, "dependencies": { "isobject": "^3.0.0" }, @@ -5276,6 +5381,7 @@ "node_modules/object-visit/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -5294,6 +5400,7 @@ "node_modules/object.pick": { "version": "1.3.0", "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", + "dev": true, "dependencies": { "isobject": "^3.0.1" }, @@ -5304,6 +5411,7 @@ "node_modules/object.pick/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -5345,6 +5453,7 @@ "node_modules/optimist": { "version": "0.6.1", "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "dev": true, "dependencies": { "minimist": "~0.0.1", "wordwrap": "~0.0.2" @@ -5352,11 +5461,13 @@ }, "node_modules/optimist/node_modules/minimist": { "version": "0.0.10", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", + "dev": true }, "node_modules/optimist/node_modules/wordwrap": { "version": "0.0.3", "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "dev": true, "engines": { "node": ">=0.4.0" } @@ -5395,7 +5506,8 @@ }, "node_modules/os-browserify": { "version": "0.2.1", - "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=" + "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=", + "dev": true }, "node_modules/os-homedir": { "version": "1.0.2", @@ -5511,13 +5623,15 @@ "node_modules/pascalcase": { "version": "0.1.1", "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", + "dev": true, "engines": { "node": ">=0.10.0" } }, "node_modules/path-browserify": { "version": "0.0.0", - "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=" + "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", + "dev": true }, "node_modules/path-exists": { "version": "2.1.0", @@ -5559,7 +5673,8 @@ }, "node_modules/pbkdf2-compat": { "version": "2.0.1", - "integrity": "sha1-tuDI+plJTZTgURV1gCpZpcFC8og=" + "integrity": "sha1-tuDI+plJTZTgURV1gCpZpcFC8og=", + "dev": true }, "node_modules/performance-now": { "version": "2.1.0", @@ -5608,6 +5723,7 @@ "node_modules/posix-character-classes": { "version": "0.1.1", "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -5918,6 +6034,7 @@ "node_modules/process": { "version": "0.11.10", "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", + "dev": true, "engines": { "node": ">= 0.6.0" } @@ -6037,6 +6154,7 @@ "version": "0.2.0", "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.", + "dev": true, "engines": { "node": ">=0.4.x" } @@ -6044,6 +6162,7 @@ "node_modules/querystring-es3": { "version": "0.2.1", "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", + "dev": true, "engines": { "node": ">=0.4.x" } @@ -6585,6 +6704,7 @@ "node_modules/readdirp": { "version": "2.2.1", "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", + "dev": true, "dependencies": { "graceful-fs": "^4.1.11", "micromatch": "^3.1.10", @@ -6597,6 +6717,7 @@ "node_modules/readdirp/node_modules/arr-diff": { "version": "4.0.0", "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -6604,6 +6725,7 @@ "node_modules/readdirp/node_modules/array-unique": { "version": "0.3.2", "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -6611,6 +6733,7 @@ "node_modules/readdirp/node_modules/braces": { "version": "2.3.2", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, "dependencies": { "arr-flatten": "^1.1.0", "array-unique": "^0.3.2", @@ -6630,6 +6753,7 @@ "node_modules/readdirp/node_modules/braces/node_modules/extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -6640,6 +6764,7 @@ "node_modules/readdirp/node_modules/expand-brackets": { "version": "2.1.4", "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "dev": true, "dependencies": { "debug": "^2.3.3", "define-property": "^0.2.5", @@ -6656,6 +6781,7 @@ "node_modules/readdirp/node_modules/expand-brackets/node_modules/define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, "dependencies": { "is-descriptor": "^0.1.0" }, @@ -6666,6 +6792,7 @@ "node_modules/readdirp/node_modules/expand-brackets/node_modules/extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -6676,6 +6803,7 @@ "node_modules/readdirp/node_modules/expand-brackets/node_modules/is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, "dependencies": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -6688,6 +6816,7 @@ "node_modules/readdirp/node_modules/expand-brackets/node_modules/kind-of": { "version": "5.1.0", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -6695,6 +6824,7 @@ "node_modules/readdirp/node_modules/extglob": { "version": "2.0.4", "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "dev": true, "dependencies": { "array-unique": "^0.3.2", "define-property": "^1.0.0", @@ -6712,6 +6842,7 @@ "node_modules/readdirp/node_modules/extglob/node_modules/define-property": { "version": "1.0.0", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, "dependencies": { "is-descriptor": "^1.0.0" }, @@ -6722,6 +6853,7 @@ "node_modules/readdirp/node_modules/extglob/node_modules/extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -6732,6 +6864,7 @@ "node_modules/readdirp/node_modules/fill-range": { "version": "4.0.0", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, "dependencies": { "extend-shallow": "^2.0.1", "is-number": "^3.0.0", @@ -6745,6 +6878,7 @@ "node_modules/readdirp/node_modules/fill-range/node_modules/extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -6755,6 +6889,7 @@ "node_modules/readdirp/node_modules/is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -6765,6 +6900,7 @@ "node_modules/readdirp/node_modules/is-accessor-descriptor/node_modules/kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, "dependencies": { "is-buffer": "^1.1.5" }, @@ -6775,6 +6911,7 @@ "node_modules/readdirp/node_modules/is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -6785,6 +6922,7 @@ "node_modules/readdirp/node_modules/is-data-descriptor/node_modules/kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, "dependencies": { "is-buffer": "^1.1.5" }, @@ -6795,6 +6933,7 @@ "node_modules/readdirp/node_modules/is-number": { "version": "3.0.0", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -6805,6 +6944,7 @@ "node_modules/readdirp/node_modules/is-number/node_modules/kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, "dependencies": { "is-buffer": "^1.1.5" }, @@ -6815,6 +6955,7 @@ "node_modules/readdirp/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -6822,6 +6963,7 @@ "node_modules/readdirp/node_modules/kind-of": { "version": "6.0.3", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -6829,6 +6971,7 @@ "node_modules/readdirp/node_modules/micromatch": { "version": "3.1.10", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, "dependencies": { "arr-diff": "^4.0.0", "array-unique": "^0.3.2", @@ -6851,6 +6994,7 @@ "node_modules/readdirp/node_modules/readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -6864,6 +7008,7 @@ "node_modules/readdirp/node_modules/string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } @@ -6952,6 +7097,7 @@ "node_modules/regex-not": { "version": "1.0.2", "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", + "dev": true, "dependencies": { "extend-shallow": "^3.0.2", "safe-regex": "^1.1.0" @@ -7085,11 +7231,13 @@ "node_modules/resolve-url": { "version": "0.2.1", "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", - "deprecated": "https://github.com/lydell/resolve-url#deprecated" + "deprecated": "https://github.com/lydell/resolve-url#deprecated", + "dev": true }, "node_modules/ret": { "version": "0.1.15", "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", + "dev": true, "engines": { "node": ">=0.12" } @@ -7097,6 +7245,7 @@ "node_modules/right-align": { "version": "0.1.3", "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", + "dev": true, "dependencies": { "align-text": "^0.1.1" }, @@ -7134,7 +7283,8 @@ }, "node_modules/ripemd160": { "version": "0.2.0", - "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=" + "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=", + "dev": true }, "node_modules/run-queue": { "version": "1.0.3", @@ -7150,6 +7300,7 @@ "node_modules/safe-regex": { "version": "1.1.0", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", + "dev": true, "dependencies": { "ret": "~0.1.10" } @@ -7300,6 +7451,7 @@ "node_modules/set-value": { "version": "2.0.1", "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", + "dev": true, "dependencies": { "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", @@ -7313,6 +7465,7 @@ "node_modules/set-value/node_modules/extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -7332,6 +7485,7 @@ "node_modules/sha.js": { "version": "2.2.6", "integrity": "sha1-F93t3F9yL7ZlAWWIlUYZd4ZzFbo=", + "dev": true, "bin": { "sha.js": "bin.js" } @@ -7350,6 +7504,7 @@ "node_modules/snapdragon": { "version": "0.8.2", "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", + "dev": true, "dependencies": { "base": "^0.11.1", "debug": "^2.2.0", @@ -7367,6 +7522,7 @@ "node_modules/snapdragon-node": { "version": "2.1.1", "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", + "dev": true, "dependencies": { "define-property": "^1.0.0", "isobject": "^3.0.0", @@ -7379,6 +7535,7 @@ "node_modules/snapdragon-node/node_modules/define-property": { "version": "1.0.0", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, "dependencies": { "is-descriptor": "^1.0.0" }, @@ -7389,6 +7546,7 @@ "node_modules/snapdragon-node/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -7396,6 +7554,7 @@ "node_modules/snapdragon-util": { "version": "3.0.1", "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", + "dev": true, "dependencies": { "kind-of": "^3.2.0" }, @@ -7406,6 +7565,7 @@ "node_modules/snapdragon/node_modules/define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, "dependencies": { "is-descriptor": "^0.1.0" }, @@ -7416,6 +7576,7 @@ "node_modules/snapdragon/node_modules/extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -7426,6 +7587,7 @@ "node_modules/snapdragon/node_modules/is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -7436,6 +7598,7 @@ "node_modules/snapdragon/node_modules/is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -7446,6 +7609,7 @@ "node_modules/snapdragon/node_modules/is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, "dependencies": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -7458,6 +7622,7 @@ "node_modules/snapdragon/node_modules/is-descriptor/node_modules/kind-of": { "version": "5.1.0", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -7532,7 +7697,8 @@ }, "node_modules/source-list-map": { "version": "0.1.8", - "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=" + "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=", + "dev": true }, "node_modules/source-map": { "version": "0.5.7", @@ -7541,10 +7707,77 @@ "node": ">=0.10.0" } }, + "node_modules/source-map-loader": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.4.tgz", + "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==", + "dev": true, + "dependencies": { + "async": "^2.5.0", + "loader-utils": "^1.1.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/source-map-loader/node_modules/async": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", + "dev": true, + "dependencies": { + "lodash": "^4.17.14" + } + }, + "node_modules/source-map-loader/node_modules/big.js": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/source-map-loader/node_modules/emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/source-map-loader/node_modules/json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, + "node_modules/source-map-loader/node_modules/loader-utils": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", + "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", + "dev": true, + "dependencies": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" + }, + "engines": { + "node": ">=4.0.0" + } + }, "node_modules/source-map-resolve": { "version": "0.5.3", "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated", + "dev": true, "dependencies": { "atob": "^2.1.2", "decode-uri-component": "^0.2.0", @@ -7563,7 +7796,8 @@ "node_modules/source-map-url": { "version": "0.4.1", "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==", - "deprecated": "See https://github.com/lydell/source-map-url#deprecated" + "deprecated": "See https://github.com/lydell/source-map-url#deprecated", + "dev": true }, "node_modules/spdx-correct": { "version": "3.1.1", @@ -7592,6 +7826,7 @@ "node_modules/split-string": { "version": "3.1.0", "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", + "dev": true, "dependencies": { "extend-shallow": "^3.0.0" }, @@ -7638,6 +7873,7 @@ "node_modules/static-extend": { "version": "0.1.2", "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", + "dev": true, "dependencies": { "define-property": "^0.2.5", "object-copy": "^0.1.0" @@ -7649,6 +7885,7 @@ "node_modules/static-extend/node_modules/define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, "dependencies": { "is-descriptor": "^0.1.0" }, @@ -7659,6 +7896,7 @@ "node_modules/static-extend/node_modules/is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -7669,6 +7907,7 @@ "node_modules/static-extend/node_modules/is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -7679,6 +7918,7 @@ "node_modules/static-extend/node_modules/is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, "dependencies": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -7691,6 +7931,7 @@ "node_modules/static-extend/node_modules/is-descriptor/node_modules/kind-of": { "version": "5.1.0", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -7706,6 +7947,7 @@ "node_modules/stream-browserify": { "version": "2.0.2", "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", + "dev": true, "dependencies": { "inherits": "~2.0.1", "readable-stream": "^2.0.2" @@ -7714,6 +7956,7 @@ "node_modules/stream-browserify/node_modules/readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -7727,6 +7970,7 @@ "node_modules/stream-browserify/node_modules/string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } @@ -7750,6 +7994,7 @@ "node_modules/stream-http": { "version": "2.8.3", "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", + "dev": true, "dependencies": { "builtin-status-codes": "^3.0.0", "inherits": "^2.0.1", @@ -7761,6 +8006,7 @@ "node_modules/stream-http/node_modules/readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -7774,6 +8020,7 @@ "node_modules/stream-http/node_modules/string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } @@ -7884,6 +8131,7 @@ "node_modules/tapable": { "version": "0.1.10", "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=", + "dev": true, "engines": { "node": ">=0.6" } @@ -7943,6 +8191,7 @@ "node_modules/timers-browserify": { "version": "2.0.12", "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==", + "dev": true, "dependencies": { "setimmediate": "^1.0.4" }, @@ -7957,7 +8206,8 @@ }, "node_modules/to-arraybuffer": { "version": "1.0.1", - "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=" + "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", + "dev": true }, "node_modules/to-fast-properties": { "version": "1.0.3", @@ -7969,6 +8219,7 @@ "node_modules/to-object-path": { "version": "0.3.0", "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -7979,6 +8230,7 @@ "node_modules/to-regex": { "version": "3.0.2", "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", + "dev": true, "dependencies": { "define-property": "^2.0.2", "extend-shallow": "^3.0.2", @@ -7992,6 +8244,7 @@ "node_modules/to-regex-range": { "version": "2.1.1", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "dev": true, "dependencies": { "is-number": "^3.0.0", "repeat-string": "^1.6.1" @@ -8003,6 +8256,7 @@ "node_modules/to-regex-range/node_modules/is-number": { "version": "3.0.0", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -8044,7 +8298,8 @@ }, "node_modules/tty-browserify": { "version": "0.0.0", - "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=" + "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", + "dev": true }, "node_modules/tunnel-agent": { "version": "0.6.0", @@ -8142,7 +8397,8 @@ }, "node_modules/uglify-to-browserify": { "version": "1.0.2", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=" + "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", + "dev": true }, "node_modules/uglifyjs-webpack-plugin": { "version": "1.3.0", @@ -8233,6 +8489,7 @@ "node_modules/union-value": { "version": "1.0.1", "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", + "dev": true, "dependencies": { "arr-union": "^3.1.0", "get-value": "^2.0.6", @@ -8283,6 +8540,7 @@ "node_modules/unset-value": { "version": "1.0.0", "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", + "dev": true, "dependencies": { "has-value": "^0.3.1", "isobject": "^3.0.0" @@ -8294,6 +8552,7 @@ "node_modules/unset-value/node_modules/has-value": { "version": "0.3.1", "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", + "dev": true, "dependencies": { "get-value": "^2.0.3", "has-values": "^0.1.4", @@ -8306,6 +8565,7 @@ "node_modules/unset-value/node_modules/has-value/node_modules/isobject": { "version": "2.1.0", "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "dev": true, "dependencies": { "isarray": "1.0.0" }, @@ -8316,6 +8576,7 @@ "node_modules/unset-value/node_modules/has-values": { "version": "0.1.4", "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -8323,6 +8584,7 @@ "node_modules/unset-value/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -8337,11 +8599,13 @@ "node_modules/urix": { "version": "0.1.0", "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", - "deprecated": "Please see https://github.com/lydell/urix#deprecated" + "deprecated": "Please see https://github.com/lydell/urix#deprecated", + "dev": true }, "node_modules/url": { "version": "0.11.0", "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", + "dev": true, "dependencies": { "punycode": "1.3.2", "querystring": "0.2.0" @@ -8358,11 +8622,13 @@ }, "node_modules/url/node_modules/punycode": { "version": "1.3.2", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", + "dev": true }, "node_modules/use": { "version": "3.1.1", "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -8370,6 +8636,7 @@ "node_modules/util": { "version": "0.10.4", "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", + "dev": true, "dependencies": { "inherits": "2.0.3" } @@ -8380,7 +8647,8 @@ }, "node_modules/util/node_modules/inherits": { "version": "2.0.3", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true }, "node_modules/utils-merge": { "version": "1.0.1", @@ -8431,6 +8699,7 @@ "node_modules/vm-browserify": { "version": "0.0.4", "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", + "dev": true, "dependencies": { "indexof": "0.0.1" } @@ -8461,6 +8730,7 @@ "node_modules/watchpack": { "version": "0.2.9", "integrity": "sha1-Yuqkq15bo1/fwBgnVibjwPXj+ws=", + "dev": true, "dependencies": { "async": "^0.9.0", "chokidar": "^1.0.0", @@ -8469,11 +8739,13 @@ }, "node_modules/watchpack/node_modules/async": { "version": "0.9.2", - "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=" + "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", + "dev": true }, "node_modules/webpack": { "version": "1.15.0", "integrity": "sha1-T/MfU9sDM55VFkqdRo7gMklo/pg=", + "dev": true, "dependencies": { "acorn": "^3.0.0", "async": "^1.3.0", @@ -8501,6 +8773,7 @@ "node_modules/webpack-core": { "version": "0.6.9", "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=", + "dev": true, "dependencies": { "source-list-map": "~0.1.7", "source-map": "~0.4.1" @@ -8512,6 +8785,7 @@ "node_modules/webpack-core/node_modules/source-map": { "version": "0.4.4", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "dev": true, "dependencies": { "amdefine": ">=0.0.4" }, @@ -8627,6 +8901,7 @@ "node_modules/webpack/node_modules/acorn": { "version": "3.3.0", "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", + "dev": true, "bin": { "acorn": "bin/acorn" }, @@ -8637,6 +8912,7 @@ "node_modules/webpack/node_modules/supports-color": { "version": "3.2.3", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, "dependencies": { "has-flag": "^1.0.0" }, @@ -8647,6 +8923,7 @@ "node_modules/webpack/node_modules/uglify-js": { "version": "2.7.5", "integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=", + "dev": true, "dependencies": { "async": "~0.2.6", "source-map": "~0.5.1", @@ -8662,7 +8939,8 @@ }, "node_modules/webpack/node_modules/uglify-js/node_modules/async": { "version": "0.2.10", - "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=" + "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=", + "dev": true }, "node_modules/websocket-driver": { "version": "0.7.4", @@ -8712,6 +8990,7 @@ "node_modules/window-size": { "version": "0.1.0", "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", + "dev": true, "engines": { "node": ">= 0.8.0" } @@ -8784,6 +9063,7 @@ "node_modules/yargs": { "version": "3.10.0", "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "dev": true, "dependencies": { "camelcase": "^1.0.2", "cliui": "^2.1.0", @@ -8816,8 +9096,7 @@ }, "react-dom": { "version": "15.3.2", - "integrity": "sha1-xGsKpTgNe4OOelnEp77/LtMVUx8=", - "requires": {} + "integrity": "sha1-xGsKpTgNe4OOelnEp77/LtMVUx8=" } } }, @@ -8917,12 +9196,12 @@ }, "ajv-keywords": { "version": "3.5.2", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "requires": {} + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==" }, "align-text": { "version": "0.1.4", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", + "dev": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -8931,7 +9210,8 @@ }, "amdefine": { "version": "1.0.1", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", + "dev": true }, "amp-ui": { "version": "git+ssh://git@github.com/devgateway/amp-ui.git#35d15a9efe2de868113fd47218a10743a393d5d4", @@ -8972,6 +9252,7 @@ "anymatch": { "version": "1.3.2", "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", + "dev": true, "requires": { "micromatch": "^2.1.5", "normalize-path": "^2.0.0" @@ -9002,7 +9283,8 @@ }, "arr-union": { "version": "3.1.0", - "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=" + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", + "dev": true }, "array-flatten": { "version": "1.1.1", @@ -9032,6 +9314,7 @@ "assert": { "version": "1.5.0", "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", + "dev": true, "requires": { "object-assign": "^4.1.1", "util": "0.10.3" @@ -9039,11 +9322,13 @@ "dependencies": { "inherits": { "version": "2.0.1", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=" + "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", + "dev": true }, "util": { "version": "0.10.3", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", + "dev": true, "requires": { "inherits": "2.0.1" } @@ -9057,15 +9342,18 @@ }, "assign-symbols": { "version": "1.0.0", - "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" + "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", + "dev": true }, "async": { "version": "1.5.2", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "dev": true }, "async-each": { "version": "1.0.3", - "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==" + "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==", + "dev": true }, "asynckit": { "version": "0.4.0", @@ -9074,7 +9362,8 @@ }, "atob": { "version": "2.1.2", - "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" + "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", + "dev": true }, "autoprefixer-core": { "version": "5.2.1", @@ -9990,6 +10279,7 @@ "base": { "version": "0.11.2", "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", + "dev": true, "requires": { "cache-base": "^1.0.1", "class-utils": "^0.3.5", @@ -10003,19 +10293,22 @@ "define-property": { "version": "1.0.0", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, "requires": { "is-descriptor": "^1.0.0" } }, "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true } } }, "base64-js": { "version": "1.5.1", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true }, "batch": { "version": "0.6.1", @@ -10032,11 +10325,13 @@ }, "big.js": { "version": "3.2.0", - "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==" + "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==", + "dev": true }, "binary-extensions": { "version": "1.13.1", - "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==" + "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", + "dev": true }, "blacklist": { "version": "1.1.4", @@ -10128,6 +10423,7 @@ "browserify-aes": { "version": "0.4.0", "integrity": "sha1-BnFJtmjfMcS1hTPgLQHoBthgjiw=", + "dev": true, "requires": { "inherits": "^2.0.1" } @@ -10135,13 +10431,15 @@ "browserify-zlib": { "version": "0.1.4", "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=", + "dev": true, "requires": { "pako": "~0.2.0" }, "dependencies": { "pako": { "version": "0.2.9", - "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=" + "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=", + "dev": true } } }, @@ -10164,6 +10462,7 @@ "buffer": { "version": "4.9.2", "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", + "dev": true, "requires": { "base64-js": "^1.0.2", "ieee754": "^1.1.4", @@ -10176,7 +10475,8 @@ }, "builtin-status-codes": { "version": "3.0.0", - "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=" + "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", + "dev": true }, "bytes": { "version": "3.0.0", @@ -10219,6 +10519,7 @@ "cache-base": { "version": "1.0.1", "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", + "dev": true, "requires": { "collection-visit": "^1.0.0", "component-emitter": "^1.2.1", @@ -10233,13 +10534,15 @@ "dependencies": { "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true } } }, "camelcase": { "version": "1.2.1", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=" + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "dev": true }, "caniuse-db": { "version": "1.0.30001312", @@ -10254,6 +10557,7 @@ "center-align": { "version": "0.1.3", "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", + "dev": true, "requires": { "align-text": "^0.1.3", "lazy-cache": "^1.0.3" @@ -10273,6 +10577,7 @@ "chokidar": { "version": "1.7.0", "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", + "dev": true, "requires": { "anymatch": "^1.3.0", "async-each": "^1.0.0", @@ -10292,6 +10597,7 @@ "class-utils": { "version": "0.3.6", "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", + "dev": true, "requires": { "arr-union": "^3.1.0", "define-property": "^0.2.5", @@ -10302,6 +10608,7 @@ "define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, "requires": { "is-descriptor": "^0.1.0" } @@ -10309,6 +10616,7 @@ "is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -10316,6 +10624,7 @@ "is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -10323,6 +10632,7 @@ "is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, "requires": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -10331,13 +10641,15 @@ "dependencies": { "kind-of": { "version": "5.1.0", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true } } }, "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true } } }, @@ -10356,6 +10668,7 @@ "cliui": { "version": "2.1.0", "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "dev": true, "requires": { "center-align": "^0.1.1", "right-align": "^0.1.1", @@ -10364,13 +10677,15 @@ "dependencies": { "wordwrap": { "version": "0.0.2", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=" + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", + "dev": true } } }, "clone": { "version": "1.0.4", - "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=" + "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", + "dev": true }, "co": { "version": "4.6.0", @@ -10386,6 +10701,7 @@ "collection-visit": { "version": "1.0.0", "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", + "dev": true, "requires": { "map-visit": "^1.0.0", "object-visit": "^1.0.0" @@ -10476,7 +10792,8 @@ }, "component-emitter": { "version": "1.3.0", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", + "dev": true }, "compressible": { "version": "2.0.18", @@ -10543,11 +10860,13 @@ }, "console-browserify": { "version": "1.2.0", - "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==" + "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==", + "dev": true }, "constants-browserify": { "version": "1.0.0", - "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=" + "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", + "dev": true }, "content-disposition": { "version": "0.5.4", @@ -10600,7 +10919,8 @@ }, "copy-descriptor": { "version": "0.1.1", - "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" + "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", + "dev": true }, "core-js": { "version": "2.6.12", @@ -10648,6 +10968,7 @@ "crypto-browserify": { "version": "3.3.0", "integrity": "sha1-ufx1u0oO1h3PHNXa6W6zDJw+UGw=", + "dev": true, "requires": { "browserify-aes": "0.4.0", "pbkdf2-compat": "2.0.1", @@ -10765,11 +11086,13 @@ }, "decamelize": { "version": "1.2.0", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true }, "decode-uri-component": { "version": "0.2.0", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" + "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", + "dev": true }, "deep-diff": { "version": "0.3.4", @@ -10784,6 +11107,7 @@ "define-property": { "version": "2.0.2", "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", + "dev": true, "requires": { "is-descriptor": "^1.0.2", "isobject": "^3.0.1" @@ -10791,7 +11115,8 @@ "dependencies": { "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true } } }, @@ -10901,7 +11226,8 @@ }, "domain-browser": { "version": "1.2.0", - "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==" + "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==", + "dev": true }, "domelementtype": { "version": "1.3.1", @@ -10977,7 +11303,8 @@ }, "emojis-list": { "version": "2.1.0", - "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=" + "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", + "dev": true }, "encodeurl": { "version": "1.0.2", @@ -11001,6 +11328,7 @@ "enhanced-resolve": { "version": "0.9.1", "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=", + "dev": true, "requires": { "graceful-fs": "^4.1.2", "memory-fs": "^0.2.0", @@ -11009,7 +11337,8 @@ "dependencies": { "memory-fs": { "version": "0.2.0", - "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=" + "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=", + "dev": true } } }, @@ -11105,7 +11434,8 @@ }, "events": { "version": "1.1.1", - "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=" + "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", + "dev": true }, "eventsource": { "version": "1.1.0", @@ -11237,6 +11567,7 @@ "extend-shallow": { "version": "3.0.2", "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, "requires": { "assign-symbols": "^1.0.0", "is-extendable": "^1.0.1" @@ -11245,6 +11576,7 @@ "is-extendable": { "version": "1.0.1", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, "requires": { "is-plain-object": "^2.0.4" } @@ -11461,6 +11793,7 @@ "fragment-cache": { "version": "0.2.1", "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", + "dev": true, "requires": { "map-cache": "^0.2.2" } @@ -11562,7 +11895,8 @@ }, "get-value": { "version": "2.0.6", - "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=" + "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", + "dev": true }, "getpass": { "version": "0.1.7", @@ -11656,11 +11990,13 @@ }, "has-flag": { "version": "1.0.0", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true }, "has-value": { "version": "1.0.0", "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", + "dev": true, "requires": { "get-value": "^2.0.6", "has-values": "^1.0.0", @@ -11669,13 +12005,15 @@ "dependencies": { "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true } } }, "has-values": { "version": "1.0.0", "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", + "dev": true, "requires": { "is-number": "^3.0.0", "kind-of": "^4.0.0" @@ -11684,6 +12022,7 @@ "is-number": { "version": "3.0.0", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, "requires": { "kind-of": "^3.0.2" }, @@ -11691,6 +12030,7 @@ "kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, "requires": { "is-buffer": "^1.1.5" } @@ -11700,6 +12040,7 @@ "kind-of": { "version": "4.0.0", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "dev": true, "requires": { "is-buffer": "^1.1.5" } @@ -11838,7 +12179,8 @@ }, "https-browserify": { "version": "0.0.1", - "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=" + "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=", + "dev": true }, "iconv-lite": { "version": "0.6.3", @@ -11849,7 +12191,8 @@ }, "ieee754": { "version": "1.2.1", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "dev": true }, "iferr": { "version": "0.1.5", @@ -11895,7 +12238,8 @@ }, "indexof": { "version": "0.0.1", - "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=" + "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", + "dev": true }, "inflight": { "version": "1.0.6", @@ -11911,7 +12255,8 @@ }, "interpret": { "version": "0.6.6", - "integrity": "sha1-/s16GOfOXKar+5U+H4YhOknxYls=" + "integrity": "sha1-/s16GOfOXKar+5U+H4YhOknxYls=", + "dev": true }, "invariant": { "version": "2.2.4", @@ -11933,13 +12278,15 @@ "is-accessor-descriptor": { "version": "1.0.0", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, "requires": { "kind-of": "^6.0.0" }, "dependencies": { "kind-of": { "version": "6.0.3", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true } } }, @@ -11950,6 +12297,7 @@ "is-binary-path": { "version": "1.0.1", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "dev": true, "requires": { "binary-extensions": "^1.0.0" } @@ -11968,19 +12316,22 @@ "is-data-descriptor": { "version": "1.0.0", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, "requires": { "kind-of": "^6.0.0" }, "dependencies": { "kind-of": { "version": "6.0.3", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true } } }, "is-descriptor": { "version": "1.0.2", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, "requires": { "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", @@ -11989,7 +12340,8 @@ "dependencies": { "kind-of": { "version": "6.0.3", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true } } }, @@ -12038,13 +12390,15 @@ "is-plain-object": { "version": "2.0.4", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "dev": true, "requires": { "isobject": "^3.0.1" }, "dependencies": { "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true } } }, @@ -12071,7 +12425,8 @@ }, "is-windows": { "version": "1.0.2", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", + "dev": true }, "isarray": { "version": "1.0.0", @@ -12378,7 +12733,8 @@ }, "lazy-cache": { "version": "1.0.4", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=" + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", + "dev": true }, "less": { "version": "2.7.3", @@ -12565,6 +12921,7 @@ "loader-utils": { "version": "0.2.17", "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", + "dev": true, "requires": { "big.js": "^3.1.3", "emojis-list": "^2.0.0", @@ -12698,7 +13055,8 @@ }, "longest": { "version": "1.0.1", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=" + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", + "dev": true }, "loose-envify": { "version": "1.4.0", @@ -12738,11 +13096,13 @@ }, "map-cache": { "version": "0.2.2", - "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" + "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", + "dev": true }, "map-visit": { "version": "1.0.0", "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", + "dev": true, "requires": { "object-visit": "^1.0.0" } @@ -12764,6 +13124,7 @@ "memory-fs": { "version": "0.3.0", "integrity": "sha1-e8xrYp46Q+hx1+Kaymrop/FcuyA=", + "dev": true, "requires": { "errno": "^0.1.3", "readable-stream": "^2.0.1" @@ -12772,6 +13133,7 @@ "readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -12785,6 +13147,7 @@ "string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -12873,6 +13236,7 @@ "mixin-deep": { "version": "1.3.2", "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", + "dev": true, "requires": { "for-in": "^1.0.2", "is-extendable": "^1.0.1" @@ -12881,6 +13245,7 @@ "is-extendable": { "version": "1.0.1", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, "requires": { "is-plain-object": "^2.0.4" } @@ -12918,6 +13283,7 @@ "nanomatch": { "version": "1.2.13", "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", + "dev": true, "requires": { "arr-diff": "^4.0.0", "array-unique": "^0.3.2", @@ -12934,15 +13300,18 @@ "dependencies": { "arr-diff": { "version": "4.0.0", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true }, "array-unique": { "version": "0.3.2", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "dev": true }, "kind-of": { "version": "6.0.3", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true } } }, @@ -12990,6 +13359,7 @@ "node-libs-browser": { "version": "0.7.0", "integrity": "sha1-PicsCBnjCJNeJmdECNevDhSRuDs=", + "dev": true, "requires": { "assert": "^1.1.1", "browserify-zlib": "^0.1.4", @@ -13018,11 +13388,13 @@ "dependencies": { "punycode": { "version": "1.4.1", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", + "dev": true }, "readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -13036,6 +13408,7 @@ "string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -13044,7 +13417,8 @@ }, "string_decoder": { "version": "0.10.31", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true } } }, @@ -13125,6 +13499,7 @@ "object-copy": { "version": "0.1.0", "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", + "dev": true, "requires": { "copy-descriptor": "^0.1.0", "define-property": "^0.2.5", @@ -13134,6 +13509,7 @@ "define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, "requires": { "is-descriptor": "^0.1.0" } @@ -13141,6 +13517,7 @@ "is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -13148,6 +13525,7 @@ "is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -13155,6 +13533,7 @@ "is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, "requires": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -13163,7 +13542,8 @@ "dependencies": { "kind-of": { "version": "5.1.0", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true } } } @@ -13172,13 +13552,15 @@ "object-visit": { "version": "1.0.1", "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", + "dev": true, "requires": { "isobject": "^3.0.0" }, "dependencies": { "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true } } }, @@ -13193,13 +13575,15 @@ "object.pick": { "version": "1.3.0", "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", + "dev": true, "requires": { "isobject": "^3.0.1" }, "dependencies": { "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true } } }, @@ -13231,6 +13615,7 @@ "optimist": { "version": "0.6.1", "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "dev": true, "requires": { "minimist": "~0.0.1", "wordwrap": "~0.0.2" @@ -13238,11 +13623,13 @@ "dependencies": { "minimist": { "version": "0.0.10", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", + "dev": true }, "wordwrap": { "version": "0.0.3", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "dev": true } } }, @@ -13276,7 +13663,8 @@ }, "os-browserify": { "version": "0.2.1", - "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=" + "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=", + "dev": true }, "os-homedir": { "version": "1.0.2", @@ -13369,11 +13757,13 @@ }, "pascalcase": { "version": "0.1.1", - "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=" + "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", + "dev": true }, "path-browserify": { "version": "0.0.0", - "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=" + "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", + "dev": true }, "path-exists": { "version": "2.1.0", @@ -13406,7 +13796,8 @@ }, "pbkdf2-compat": { "version": "2.0.1", - "integrity": "sha1-tuDI+plJTZTgURV1gCpZpcFC8og=" + "integrity": "sha1-tuDI+plJTZTgURV1gCpZpcFC8og=", + "dev": true }, "performance-now": { "version": "2.1.0", @@ -13442,7 +13833,8 @@ }, "posix-character-classes": { "version": "0.1.1", - "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" + "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", + "dev": true }, "postcss": { "version": "4.1.16", @@ -13735,7 +14127,8 @@ }, "process": { "version": "0.11.10", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=" + "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", + "dev": true }, "process-nextick-args": { "version": "2.0.1", @@ -13837,11 +14230,13 @@ }, "querystring": { "version": "0.2.0", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=" + "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", + "dev": true }, "querystring-es3": { "version": "0.2.1", - "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=" + "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", + "dev": true }, "querystringify": { "version": "2.2.0", @@ -13928,8 +14323,7 @@ }, "react-addons-update": { "version": "15.3.2", - "integrity": "sha1-tjhcTbHl3zcYJeBhWwQ2DtlEMP4=", - "requires": {} + "integrity": "sha1-tjhcTbHl3zcYJeBhWwQ2DtlEMP4=" }, "react-bootstrap": { "version": "0.32.4", @@ -14031,8 +14425,7 @@ }, "react-filtered-multiselect": { "version": "0.4.2", - "integrity": "sha1-gZaHX4nl/3zt8JFoQrFWz2hPgSE=", - "requires": {} + "integrity": "sha1-gZaHX4nl/3zt8JFoQrFWz2hPgSE=" }, "react-highlighter": { "version": "0.4.3", @@ -14047,8 +14440,7 @@ "react-hot-api": { "version": "0.4.7", "integrity": "sha1-p+IqVtJS4Rq9k2a2EmTPRJLFgXE=", - "dev": true, - "requires": {} + "dev": true }, "react-hot-loader": { "version": "1.3.1", @@ -14138,8 +14530,7 @@ "react-numeric-input": { "version": "2.0.9", "integrity": "sha1-ro4awpiOi8yMS7PLEHuy2DutTlo=", - "dev": true, - "requires": {} + "dev": true }, "react-onclickoutside": { "version": "5.11.1", @@ -14279,6 +14670,7 @@ "readdirp": { "version": "2.2.1", "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", + "dev": true, "requires": { "graceful-fs": "^4.1.11", "micromatch": "^3.1.10", @@ -14287,15 +14679,18 @@ "dependencies": { "arr-diff": { "version": "4.0.0", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true }, "array-unique": { "version": "0.3.2", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "dev": true }, "braces": { "version": "2.3.2", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, "requires": { "arr-flatten": "^1.1.0", "array-unique": "^0.3.2", @@ -14312,6 +14707,7 @@ "extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, "requires": { "is-extendable": "^0.1.0" } @@ -14321,6 +14717,7 @@ "expand-brackets": { "version": "2.1.4", "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "dev": true, "requires": { "debug": "^2.3.3", "define-property": "^0.2.5", @@ -14334,6 +14731,7 @@ "define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, "requires": { "is-descriptor": "^0.1.0" } @@ -14341,6 +14739,7 @@ "extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, "requires": { "is-extendable": "^0.1.0" } @@ -14348,6 +14747,7 @@ "is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, "requires": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -14356,13 +14756,15 @@ }, "kind-of": { "version": "5.1.0", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true } } }, "extglob": { "version": "2.0.4", "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "dev": true, "requires": { "array-unique": "^0.3.2", "define-property": "^1.0.0", @@ -14377,6 +14779,7 @@ "define-property": { "version": "1.0.0", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, "requires": { "is-descriptor": "^1.0.0" } @@ -14384,6 +14787,7 @@ "extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, "requires": { "is-extendable": "^0.1.0" } @@ -14393,6 +14797,7 @@ "fill-range": { "version": "4.0.0", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, "requires": { "extend-shallow": "^2.0.1", "is-number": "^3.0.0", @@ -14403,6 +14808,7 @@ "extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, "requires": { "is-extendable": "^0.1.0" } @@ -14412,6 +14818,7 @@ "is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, "requires": { "kind-of": "^3.0.2" }, @@ -14419,6 +14826,7 @@ "kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, "requires": { "is-buffer": "^1.1.5" } @@ -14428,6 +14836,7 @@ "is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, "requires": { "kind-of": "^3.0.2" }, @@ -14435,6 +14844,7 @@ "kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, "requires": { "is-buffer": "^1.1.5" } @@ -14444,6 +14854,7 @@ "is-number": { "version": "3.0.0", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, "requires": { "kind-of": "^3.0.2" }, @@ -14451,6 +14862,7 @@ "kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, "requires": { "is-buffer": "^1.1.5" } @@ -14459,15 +14871,18 @@ }, "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true }, "kind-of": { "version": "6.0.3", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true }, "micromatch": { "version": "3.1.10", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, "requires": { "arr-diff": "^4.0.0", "array-unique": "^0.3.2", @@ -14487,6 +14902,7 @@ "readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -14500,6 +14916,7 @@ "string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -14591,6 +15008,7 @@ "regex-not": { "version": "1.0.2", "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", + "dev": true, "requires": { "extend-shallow": "^3.0.2", "safe-regex": "^1.1.0" @@ -14697,15 +15115,18 @@ }, "resolve-url": { "version": "0.2.1", - "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" + "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", + "dev": true }, "ret": { "version": "0.1.15", - "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", + "dev": true }, "right-align": { "version": "0.1.3", "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", + "dev": true, "requires": { "align-text": "^0.1.1" } @@ -14733,7 +15154,8 @@ }, "ripemd160": { "version": "0.2.0", - "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=" + "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=", + "dev": true }, "run-queue": { "version": "1.0.3", @@ -14749,6 +15171,7 @@ "safe-regex": { "version": "1.1.0", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", + "dev": true, "requires": { "ret": "~0.1.10" } @@ -14875,6 +15298,7 @@ "set-value": { "version": "2.0.1", "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", + "dev": true, "requires": { "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", @@ -14885,6 +15309,7 @@ "extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, "requires": { "is-extendable": "^0.1.0" } @@ -14902,7 +15327,8 @@ }, "sha.js": { "version": "2.2.6", - "integrity": "sha1-F93t3F9yL7ZlAWWIlUYZd4ZzFbo=" + "integrity": "sha1-F93t3F9yL7ZlAWWIlUYZd4ZzFbo=", + "dev": true }, "shallowequal": { "version": "1.1.0", @@ -14915,6 +15341,7 @@ "snapdragon": { "version": "0.8.2", "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", + "dev": true, "requires": { "base": "^0.11.1", "debug": "^2.2.0", @@ -14929,6 +15356,7 @@ "define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, "requires": { "is-descriptor": "^0.1.0" } @@ -14936,6 +15364,7 @@ "extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, "requires": { "is-extendable": "^0.1.0" } @@ -14943,6 +15372,7 @@ "is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -14950,6 +15380,7 @@ "is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -14957,6 +15388,7 @@ "is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, "requires": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -14965,7 +15397,8 @@ "dependencies": { "kind-of": { "version": "5.1.0", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true } } } @@ -14974,6 +15407,7 @@ "snapdragon-node": { "version": "2.1.1", "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", + "dev": true, "requires": { "define-property": "^1.0.0", "isobject": "^3.0.0", @@ -14983,19 +15417,22 @@ "define-property": { "version": "1.0.0", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, "requires": { "is-descriptor": "^1.0.0" } }, "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true } } }, "snapdragon-util": { "version": "3.0.1", "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", + "dev": true, "requires": { "kind-of": "^3.2.0" } @@ -15064,15 +15501,70 @@ }, "source-list-map": { "version": "0.1.8", - "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=" + "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=", + "dev": true }, "source-map": { "version": "0.5.7", "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" }, + "source-map-loader": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.4.tgz", + "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==", + "dev": true, + "requires": { + "async": "^2.5.0", + "loader-utils": "^1.1.0" + }, + "dependencies": { + "async": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", + "dev": true, + "requires": { + "lodash": "^4.17.14" + } + }, + "big.js": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", + "dev": true + }, + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "dev": true + }, + "json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + }, + "loader-utils": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", + "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" + } + } + } + }, "source-map-resolve": { "version": "0.5.3", "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", + "dev": true, "requires": { "atob": "^2.1.2", "decode-uri-component": "^0.2.0", @@ -15090,7 +15582,8 @@ }, "source-map-url": { "version": "0.4.1", - "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==" + "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==", + "dev": true }, "spdx-correct": { "version": "3.1.1", @@ -15119,6 +15612,7 @@ "split-string": { "version": "3.1.0", "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", + "dev": true, "requires": { "extend-shallow": "^3.0.0" } @@ -15154,6 +15648,7 @@ "static-extend": { "version": "0.1.2", "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", + "dev": true, "requires": { "define-property": "^0.2.5", "object-copy": "^0.1.0" @@ -15162,6 +15657,7 @@ "define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, "requires": { "is-descriptor": "^0.1.0" } @@ -15169,6 +15665,7 @@ "is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -15176,6 +15673,7 @@ "is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -15183,6 +15681,7 @@ "is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, "requires": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -15191,7 +15690,8 @@ "dependencies": { "kind-of": { "version": "5.1.0", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true } } } @@ -15205,6 +15705,7 @@ "stream-browserify": { "version": "2.0.2", "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", + "dev": true, "requires": { "inherits": "~2.0.1", "readable-stream": "^2.0.2" @@ -15213,6 +15714,7 @@ "readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -15226,6 +15728,7 @@ "string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -15248,6 +15751,7 @@ "stream-http": { "version": "2.8.3", "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", + "dev": true, "requires": { "builtin-status-codes": "^3.0.0", "inherits": "^2.0.1", @@ -15259,6 +15763,7 @@ "readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -15272,6 +15777,7 @@ "string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -15350,7 +15856,8 @@ }, "tapable": { "version": "0.1.10", - "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=" + "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=", + "dev": true }, "test-exclude": { "version": "4.2.3", @@ -15406,6 +15913,7 @@ "timers-browserify": { "version": "2.0.12", "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==", + "dev": true, "requires": { "setimmediate": "^1.0.4" } @@ -15417,7 +15925,8 @@ }, "to-arraybuffer": { "version": "1.0.1", - "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=" + "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", + "dev": true }, "to-fast-properties": { "version": "1.0.3", @@ -15426,6 +15935,7 @@ "to-object-path": { "version": "0.3.0", "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", + "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -15433,6 +15943,7 @@ "to-regex": { "version": "3.0.2", "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", + "dev": true, "requires": { "define-property": "^2.0.2", "extend-shallow": "^3.0.2", @@ -15443,6 +15954,7 @@ "to-regex-range": { "version": "2.1.1", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "dev": true, "requires": { "is-number": "^3.0.0", "repeat-string": "^1.6.1" @@ -15451,6 +15963,7 @@ "is-number": { "version": "3.0.0", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -15482,7 +15995,8 @@ }, "tty-browserify": { "version": "0.0.0", - "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=" + "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", + "dev": true }, "tunnel-agent": { "version": "0.6.0", @@ -15544,7 +16058,8 @@ }, "uglify-to-browserify": { "version": "1.0.2", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=" + "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", + "dev": true }, "uglifyjs-webpack-plugin": { "version": "1.3.0", @@ -15610,6 +16125,7 @@ "union-value": { "version": "1.0.1", "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", + "dev": true, "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", @@ -15654,6 +16170,7 @@ "unset-value": { "version": "1.0.0", "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", + "dev": true, "requires": { "has-value": "^0.3.1", "isobject": "^3.0.0" @@ -15662,6 +16179,7 @@ "has-value": { "version": "0.3.1", "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", + "dev": true, "requires": { "get-value": "^2.0.3", "has-values": "^0.1.4", @@ -15671,6 +16189,7 @@ "isobject": { "version": "2.1.0", "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "dev": true, "requires": { "isarray": "1.0.0" } @@ -15679,11 +16198,13 @@ }, "has-values": { "version": "0.1.4", - "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=" + "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", + "dev": true }, "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true } } }, @@ -15696,11 +16217,13 @@ }, "urix": { "version": "0.1.0", - "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=" + "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", + "dev": true }, "url": { "version": "0.11.0", "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", + "dev": true, "requires": { "punycode": "1.3.2", "querystring": "0.2.0" @@ -15708,7 +16231,8 @@ "dependencies": { "punycode": { "version": "1.3.2", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", + "dev": true } } }, @@ -15723,18 +16247,21 @@ }, "use": { "version": "3.1.1", - "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" + "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", + "dev": true }, "util": { "version": "0.10.4", "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", + "dev": true, "requires": { "inherits": "2.0.3" }, "dependencies": { "inherits": { "version": "2.0.3", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true } } }, @@ -15778,6 +16305,7 @@ "vm-browserify": { "version": "0.0.4", "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", + "dev": true, "requires": { "indexof": "0.0.1" } @@ -15805,6 +16333,7 @@ "watchpack": { "version": "0.2.9", "integrity": "sha1-Yuqkq15bo1/fwBgnVibjwPXj+ws=", + "dev": true, "requires": { "async": "^0.9.0", "chokidar": "^1.0.0", @@ -15813,13 +16342,15 @@ "dependencies": { "async": { "version": "0.9.2", - "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=" + "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", + "dev": true } } }, "webpack": { "version": "1.15.0", "integrity": "sha1-T/MfU9sDM55VFkqdRo7gMklo/pg=", + "dev": true, "requires": { "acorn": "^3.0.0", "async": "^1.3.0", @@ -15840,11 +16371,13 @@ "dependencies": { "acorn": { "version": "3.3.0", - "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=" + "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", + "dev": true }, "supports-color": { "version": "3.2.3", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, "requires": { "has-flag": "^1.0.0" } @@ -15852,6 +16385,7 @@ "uglify-js": { "version": "2.7.5", "integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=", + "dev": true, "requires": { "async": "~0.2.6", "source-map": "~0.5.1", @@ -15861,7 +16395,8 @@ "dependencies": { "async": { "version": "0.2.10", - "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=" + "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=", + "dev": true } } } @@ -15870,6 +16405,7 @@ "webpack-core": { "version": "0.6.9", "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=", + "dev": true, "requires": { "source-list-map": "~0.1.7", "source-map": "~0.4.1" @@ -15878,6 +16414,7 @@ "source-map": { "version": "0.4.4", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "dev": true, "requires": { "amdefine": ">=0.0.4" } @@ -16015,7 +16552,8 @@ }, "window-size": { "version": "0.1.0", - "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=" + "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", + "dev": true }, "wordwrap": { "version": "1.0.0", @@ -16076,6 +16614,7 @@ "yargs": { "version": "3.10.0", "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "dev": true, "requires": { "camelcase": "^1.0.2", "cliui": "^2.1.0", diff --git a/amp/TEMPLATE/reamp/package.json b/amp/TEMPLATE/reamp/package.json index 8657c08b90d..0a00f928a6b 100644 --- a/amp/TEMPLATE/reamp/package.json +++ b/amp/TEMPLATE/reamp/package.json @@ -60,6 +60,7 @@ "redux": "^3.6.0", "redux-logger": "^2.7.4", "redux-thunk": "2.2.0", + "source-map-loader": "^0.2.4", "style-loader": "^0.12.3", "webpack": "^1.13.3", "webpack-dev-server": "^1.10.1", diff --git a/amp/TEMPLATE/reamp/webpack.dev.config.js b/amp/TEMPLATE/reamp/webpack.dev.config.js index af18beb5c8a..37ea916f105 100644 --- a/amp/TEMPLATE/reamp/webpack.dev.config.js +++ b/amp/TEMPLATE/reamp/webpack.dev.config.js @@ -81,12 +81,19 @@ module.exports = { {test: /\.json$/, loader: 'json'}, {test: /\.css$/, exclude: /\.useable\.css$/, loader: "style!css"}, - {test: /\.less$/, loader: "style!css!less"} + {test: /\.less$/, loader: "style!css!less"}, + { + enforce: 'pre', + test: /\.js$/, + loader: 'source-map-loader', + exclude: /node_modules/ + } ] }, - devtool: 'source-map-inline', - + debug: true, + devtool: 'inline-source-map', resolve: { + symlinks: false, extensions: ['', '.js', '.es6', '.jsx'], alias: { 'react': path.join(__dirname, 'node_modules', 'react'), From 2f846cc51cde14ce9831a49825150cfd608b22e5 Mon Sep 17 00:00:00 2001 From: Julian de Anquin Date: Fri, 4 Aug 2023 14:27:40 -0300 Subject: [PATCH 110/135] AMP-30664 hide save tabs from advanced search --- amp/repository/aim/view/viewNewAdvancedReport.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amp/repository/aim/view/viewNewAdvancedReport.jsp b/amp/repository/aim/view/viewNewAdvancedReport.jsp index 23c923393d7..259b4a7ca53 100644 --- a/amp/repository/aim/view/viewNewAdvancedReport.jsp +++ b/amp/repository/aim/view/viewNewAdvancedReport.jsp @@ -200,7 +200,7 @@
    - +<%// see AMP-30664 for details %> <% counter++; ReportContextData.getFromRequest().setProgressValue(counter); From e4ea3c4c5304c17312b3020f39e7f84c025f76b8 Mon Sep 17 00:00:00 2001 From: Julian de Anquin Date: Fri, 4 Aug 2023 14:29:19 -0300 Subject: [PATCH 111/135] Revert "AMP-30664 hide save tabs from advanced search" This reverts commit 2f846cc51cde14ce9831a49825150cfd608b22e5. --- amp/repository/aim/view/viewNewAdvancedReport.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amp/repository/aim/view/viewNewAdvancedReport.jsp b/amp/repository/aim/view/viewNewAdvancedReport.jsp index 259b4a7ca53..23c923393d7 100644 --- a/amp/repository/aim/view/viewNewAdvancedReport.jsp +++ b/amp/repository/aim/view/viewNewAdvancedReport.jsp @@ -200,7 +200,7 @@ -<%// see AMP-30664 for details %> + <% counter++; ReportContextData.getFromRequest().setProgressValue(counter); From a57de2e0fa86ac6729381794ffbdbe0daf887290 Mon Sep 17 00:00:00 2001 From: Julian de Anquin Date: Fri, 4 Aug 2023 14:32:19 -0300 Subject: [PATCH 112/135] AMP-30664 hide save tabs from advanced search --- amp/repository/aim/view/viewNewAdvancedReport.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amp/repository/aim/view/viewNewAdvancedReport.jsp b/amp/repository/aim/view/viewNewAdvancedReport.jsp index 23c923393d7..259b4a7ca53 100644 --- a/amp/repository/aim/view/viewNewAdvancedReport.jsp +++ b/amp/repository/aim/view/viewNewAdvancedReport.jsp @@ -200,7 +200,7 @@ - +<%// see AMP-30664 for details %> <% counter++; ReportContextData.getFromRequest().setProgressValue(counter); From 3881a79ff421e2ec9bab18ffc77ab6697083d2e4 Mon Sep 17 00:00:00 2001 From: Julian de Anquin Date: Tue, 8 Aug 2023 09:25:06 -0300 Subject: [PATCH 113/135] GGW-60 prevent preview from failing if there are no computed workspaces in an empty amp. --- .../preview/PreviewActivityService.java | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/preview/PreviewActivityService.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/preview/PreviewActivityService.java index 2fe9e4efef6..d6de9ad357e 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/preview/PreviewActivityService.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/preview/PreviewActivityService.java @@ -173,13 +173,13 @@ private List calculateTotals(List previewFu Optional>> allTransactionsByTypeAndAdjustment = previewFundings.stream().map(PreviewFunding::getTransactions). collect(Collectors.toList()).stream().reduce((firstMap, secondMap) - -> Stream.concat(firstMap.entrySet().stream(), secondMap.entrySet().stream()) - .collect(Collectors.toMap(Entry::getKey, Entry::getValue, - (countInFirstMap, countInSecondMap) -> { - countInFirstMap.addAll(countInSecondMap); - return countInFirstMap; - } - ))); + -> Stream.concat(firstMap.entrySet().stream(), secondMap.entrySet().stream()) + .collect(Collectors.toMap(Entry::getKey, Entry::getValue, + (countInFirstMap, countInSecondMap) -> { + countInFirstMap.addAll(countInSecondMap); + return countInFirstMap; + } + ))); List totals = new ArrayList<>(); if (allTransactionsByTypeAndAdjustment.isPresent()) { allTransactionsByTypeAndAdjustment.get().forEach((transactionType, previewFundingTransactions) -> { @@ -286,11 +286,11 @@ private Double calculateUndisbursedBalance(Map t.getAdjustmentType().equals(actualCategoryValueId)). + Collections.emptyList()).stream().filter(t -> t.getAdjustmentType().equals(actualCategoryValueId)). collect(Collectors.summingDouble(PreviewFundingTransaction::getTransactionAmount)); Double totalActualDisbursements = transactions.getOrDefault(ArConstants.DISBURSEMENT.toLowerCase(), - Collections.emptyList()).stream().filter(t -> t.getAdjustmentType().equals(actualCategoryValueId)). + Collections.emptyList()).stream().filter(t -> t.getAdjustmentType().equals(actualCategoryValueId)). collect(Collectors.summingDouble(PreviewFundingTransaction::getTransactionAmount)); return totalActualCommitments != 0 || totalActualDisbursements != 0 @@ -344,33 +344,33 @@ public List getWorkspaces(Long activityId) { .collect(Collectors.toList()); final StringBuffer wsQueries = new StringBuffer(); + for (AmpTeam team : computedTeams) { String wsQuery = WorkspaceFilter.generateWorkspaceFilterQueryForTeam(team.getAmpTeamId()); if (wsQueries.length() > 0) { wsQueries.append(" UNION "); } - wsQueries.append(AmpMessageWorker.addTeamIdToQuery(wsQuery, team.getAmpTeamId(), team.getName())); } final Map> activityTeams = new HashMap<>(); - - PersistenceManager.getSession().doWork(conn -> { - RsInfo teamsInActivityQuery = SQLUtils.rawRunQuery(conn, wsQueries.toString(), null); - while (teamsInActivityQuery.rs.next()) { - // activityTeams - Long ampActivityId = teamsInActivityQuery.rs.getLong(1); - if (activityTeams.get(ampActivityId) == null) { - activityTeams.put(ampActivityId, new ArrayList<>()); + if (computedTeams.size() > 0) { + PersistenceManager.getSession().doWork(conn -> { + RsInfo teamsInActivityQuery = SQLUtils.rawRunQuery(conn, wsQueries.toString(), null); + while (teamsInActivityQuery.rs.next()) { + // activityTeams + Long ampActivityId = teamsInActivityQuery.rs.getLong(1); + if (activityTeams.get(ampActivityId) == null) { + activityTeams.put(ampActivityId, new ArrayList<>()); + } + activityTeams.get(ampActivityId).add( + new Team(teamsInActivityQuery.rs.getLong(2), + teamsInActivityQuery.rs.getString(TEAM_NAME_INDEX))); } - activityTeams.get(ampActivityId).add( - new Team(teamsInActivityQuery.rs.getLong(2), - teamsInActivityQuery.rs.getString(TEAM_NAME_INDEX))); - } - teamsInActivityQuery.close(); - }); - + teamsInActivityQuery.close(); + }); + } if (activityTeams.containsKey(activityId)) { for (Team team : activityTeams.get(activityId)) { previewWorkspaces.add(new PreviewWorkspace(team.getTeamName(), PreviewWorkspace.Type.COMPUTED)); @@ -395,17 +395,17 @@ private void populateRegionalFunding(PreviewActivityFunding activityFunding, Amp activityFunding.getRegionalCommitments().addAll( getAmpRegionalFundings(regionalFundingPerTransaction, Constants.COMMITMENT) .stream().map(ampRegionalFunding -> - generateRegionalFundingTransaction(ampRegionalFunding, currencyTo)). + generateRegionalFundingTransaction(ampRegionalFunding, currencyTo)). collect(Collectors.toList())); activityFunding.getRegionalDisbursements().addAll( getAmpRegionalFundings(regionalFundingPerTransaction, Constants.DISBURSEMENT) .stream().map(ampRegionalFunding -> - generateRegionalFundingTransaction(ampRegionalFunding, currencyTo)). + generateRegionalFundingTransaction(ampRegionalFunding, currencyTo)). collect(Collectors.toList())); activityFunding.getRegionalExpenditures().addAll( getAmpRegionalFundings(regionalFundingPerTransaction, Constants.EXPENDITURE). stream().map(ampRegionalFunding -> - generateRegionalFundingTransaction(ampRegionalFunding, currencyTo)). + generateRegionalFundingTransaction(ampRegionalFunding, currencyTo)). collect(Collectors.toList())); } @@ -426,7 +426,7 @@ private PreviewRegionalFundingItem generateRegionalFundingTransaction(AmpRegiona pfr.setTransactionDate(ampRegionalFunding.getTransactionDate()); pfr.setTransactionAmount(AmpCurrencyConvertor.getInstance().convertAmount(ampRegionalFunding. getTransactionAmount(), ampRegionalFunding.getCurrency().getCurrencyCode(), - currencyTo.getCurrencyCode(), transactionDate)); + currencyTo.getCurrencyCode(), transactionDate)); return pfr; } } From 2762cc839d6a400ec2ff57f5e1a64820107822eb Mon Sep 17 00:00:00 2001 From: Julian de Anquin Date: Tue, 8 Aug 2023 17:47:08 -0300 Subject: [PATCH 114/135] GGW-52 Multi country changes --- .../preview/PreviewActivityService.java | 6 +- .../filters/LocationFilterListManager.java | 20 +- .../module/aim/util/LocationUtil.java | 238 ++++++++++-------- 3 files changed, 143 insertions(+), 121 deletions(-) diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/preview/PreviewActivityService.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/preview/PreviewActivityService.java index d6de9ad357e..605529db9fb 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/preview/PreviewActivityService.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/preview/PreviewActivityService.java @@ -286,11 +286,13 @@ private Double calculateUndisbursedBalance(Map t.getAdjustmentType().equals(actualCategoryValueId)). + Collections.emptyList()).stream().filter(t -> + t.getAdjustmentType().equals(actualCategoryValueId)). collect(Collectors.summingDouble(PreviewFundingTransaction::getTransactionAmount)); Double totalActualDisbursements = transactions.getOrDefault(ArConstants.DISBURSEMENT.toLowerCase(), - Collections.emptyList()).stream().filter(t -> t.getAdjustmentType().equals(actualCategoryValueId)). + Collections.emptyList()).stream().filter(t -> + t.getAdjustmentType().equals(actualCategoryValueId)). collect(Collectors.summingDouble(PreviewFundingTransaction::getTransactionAmount)); return totalActualCommitments != 0 || totalActualDisbursements != 0 diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/filters/LocationFilterListManager.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/filters/LocationFilterListManager.java index b2a2af57d35..8adc36bf846 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/filters/LocationFilterListManager.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/filters/LocationFilterListManager.java @@ -18,7 +18,7 @@ import com.google.common.collect.ImmutableMap; import org.digijava.kernel.ampapi.endpoints.common.EndpointUtils; -import org.digijava.kernel.persistence.PersistenceManager; +import org.digijava.module.aim.util.LocationUtil; import org.digijava.kernel.translator.TranslatorWorker; import org.digijava.module.aim.dbentity.AmpApplicationSettings; import org.digijava.module.aim.dbentity.AmpCategoryValueLocations; @@ -122,19 +122,8 @@ protected Map> getLocationListItems(boolean sho */ protected List getCountriesWithChildrenIds(boolean pShowAllCountries) { - Session session = PersistenceManager.getSession(); - - String queryString = "SELECT loc FROM " + AmpCategoryValueLocations.class.getName() - + " loc WHERE loc.parentLocation IS NULL " - + " AND (loc.deleted != true)"; - if (!pShowAllCountries) { - queryString += " AND (loc.id IN (SELECT DISTINCT parentLocation FROM " - + AmpCategoryValueLocations.class.getName() + "))"; - } - - Query qry = session.createQuery(queryString); - qry.setCacheable(true); - Collection countryCollection = qry.list(); + Collection countryCollection = + LocationUtil.getCountriesWithChildren(pShowAllCountries); AmpApplicationSettings appSettings = EndpointUtils.getAppSettings(); final boolean showAllCountries = appSettings == null ? false : appSettings.getShowAllCountries(); @@ -143,7 +132,8 @@ protected List getCountriesWithChildrenIds(boolean pShowAllCountries) { List countryIds = countryCollection .stream() - .filter(country -> showAllCountries || pShowAllCountries || country.getIso().equals(defaultCountryIso)) + .filter(country -> showAllCountries || pShowAllCountries + || country.getIso().equals(defaultCountryIso) || defaultCountryIso.equals("zz")) .map(country -> country.getId()) .collect(Collectors.toList()); diff --git a/amp/WEB-INF/src/org/digijava/module/aim/util/LocationUtil.java b/amp/WEB-INF/src/org/digijava/module/aim/util/LocationUtil.java index 1e087c63acc..96f0196091d 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/util/LocationUtil.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/util/LocationUtil.java @@ -29,12 +29,14 @@ public final class LocationUtil { private static Logger logger = Logger.getLogger(LocationUtil.class); - - private LocationUtil() { } - - public static final List LOCATIONS_COLUMNS_NAMES = Collections.unmodifiableList( + + private LocationUtil() { + } + + public static final List LOCATIONS_COLUMNS_NAMES = Collections.unmodifiableList( Arrays.asList(ColumnConstants.LOCATION_ADM_LEVEL_0, ColumnConstants.LOCATION_ADM_LEVEL_1, - ColumnConstants.LOCATION_ADM_LEVEL_2, ColumnConstants.LOCATION_ADM_LEVEL_3, ColumnConstants.LOCATION)); + ColumnConstants.LOCATION_ADM_LEVEL_2, ColumnConstants.LOCATION_ADM_LEVEL_3, + ColumnConstants.LOCATION)); //End Search Location. public static AmpLocation getAmpLocationByCVLocation(Long ampCVLocationId) { @@ -43,121 +45,126 @@ public static AmpLocation getAmpLocationByCVLocation(Long ampCVLocationId) { try { session = PersistenceManager.getRequestDBSession(); - - String queryString = "select l from " + AmpLocation.class.getName() + + String queryString = "select l from " + AmpLocation.class.getName() + " l where location=:locationId order by l.ampLocationId"; Query qry = session.createQuery(queryString); qry.setLong("locationId", ampCVLocationId); - - Collection result = qry.list(); - if ( result != null && result.size() > 0 ) { - return (AmpLocation)result.iterator().next(); + + Collection result = qry.list(); + if (result != null && result.size() > 0) { + return (AmpLocation) result.iterator().next(); } - + } catch (Exception e) { logger.error("Uanble to get location :" + e); } return loc; - + } + public static AmpCategoryValueLocations getAmpLocationByGeoCode(String geoCode) { Session session = null; AmpCategoryValueLocations loc = null; try { session = PersistenceManager.getRequestDBSession(); - - String queryString = "select l from " + AmpCategoryValueLocations.class.getName() + + String queryString = "select l from " + AmpCategoryValueLocations.class.getName() + " l where l.geoCode =:geoCode order by l.id"; Query qry = session.createQuery(queryString); qry.setString("geoCode", geoCode); - - Collection result = qry.list(); - if ( result != null && result.size() > 0 ) { + + Collection result = qry.list(); + if (result != null && result.size() > 0) { return (AmpCategoryValueLocations) result.iterator().next(); } - + } catch (Exception e) { logger.error("Uanble to get location :" + e); - } + } return loc; - + } - /** - * Returns list of locations using their ids - * @param ids consists selected locations id separted by comma - * @return List of AmpCategoryValueLocations beans - * @throws DgException if anything goes wrong - */ - - public static List getAllLocations(String ids) throws DgException{ + + /** + * Returns list of locations using their ids + * + * @param ids consists selected locations id separted by comma + * @return List of AmpCategoryValueLocations beans + * @throws DgException if anything goes wrong + */ + + public static List getAllLocations(String ids) throws DgException { Session session = null; - List col = null; + List col = null; try { - + session = PersistenceManager.getRequestDBSession(); - String queryString = " from " + AmpCategoryValueLocations.class.getName()+ - " vl where vl.parentLocation is null " ; - - if(ids!=null&&ids.length()>0){ - String id=ids.substring(0, ids.length()-1); - queryString+=" or vl.parentLocation in ("+id+")"; - } + String queryString = " from " + AmpCategoryValueLocations.class.getName() + + " vl where vl.parentLocation is null "; + + if (ids != null && ids.length() > 0) { + String id = ids.substring(0, ids.length() - 1); + queryString += " or vl.parentLocation in (" + id + ")"; + } Query qry = session.createQuery(queryString); col = qry.list(); } catch (Exception e) { logger.error("Unable to get locations from database " + e.getMessage()); - throw new DgException(e); - } + throw new DgException(e); + } return col; } - - public static List getAllCountriesAndRegions() { - Session session = null; - List col = null; - - try { - - session = PersistenceManager.getRequestDBSession(); - String queryString = " from " + AmpCategoryValueLocations.class.getName(); - - Query qry = session.createQuery(queryString); - col = qry.list(); - } catch (Exception e) { - logger.error("Unable to get locations from database " - + e.getMessage()); - throw new RuntimeException(e); - } - return col; - } - - /** - * Returns location using its id - * @param id of location - * @return AmpCategoryValueLocations bean - * @throws DgException if anything goes wrong - */ - - public static AmpCategoryValueLocations getAmpCategoryValueLocationById(Long id) throws DgException { - return (AmpCategoryValueLocations) PersistenceManager.getSession().load(AmpCategoryValueLocations.class, id); + + public static List getAllCountriesAndRegions() { + Session session = null; + List col = null; + + try { + + session = PersistenceManager.getRequestDBSession(); + String queryString = " from " + AmpCategoryValueLocations.class.getName(); + + Query qry = session.createQuery(queryString); + col = qry.list(); + } catch (Exception e) { + logger.error("Unable to get locations from database " + + e.getMessage()); + throw new RuntimeException(e); } - - /** - * Saves location into the database - * @param b - * @param AmpCategoryValueLocations bean - * @throws DgException - */ - - public static void saveLocation(AmpCategoryValueLocations loc, boolean editing) throws DgException{ + return col; + } + + /** + * Returns location using its id + * + * @param id of location + * @return AmpCategoryValueLocations bean + * @throws DgException if anything goes wrong + */ + + public static AmpCategoryValueLocations getAmpCategoryValueLocationById(Long id) throws DgException { + return (AmpCategoryValueLocations) PersistenceManager.getSession().load(AmpCategoryValueLocations.class, id); + } + + /** + * Saves location into the database + * + * @param b + * @param AmpCategoryValueLocations bean + * @throws DgException + */ + + public static void saveLocation(AmpCategoryValueLocations loc, boolean editing) throws DgException { Session session = null; Transaction tx = null; - if (!editing){ - + if (!editing) { + /* country check for duplicate iso and iso3 codes */ boolean isCountry = CategoryConstants.IMPLEMENTATION_LOCATION_ADM_LEVEL_0.equalsCategoryValue( loc.getParentCategoryValue()); @@ -174,14 +181,16 @@ public static void saveLocation(AmpCategoryValueLocations loc, boolean editing) throw new DuplicateLocationCodeException("There is already a country with the same iso 3!", "iso3", loc.getParentCategoryValue().getValue()); } - + + } + + AmpCategoryValueLocations tempLoc = + DynLocationManagerUtil.getLocationByName(loc.getName(), loc.getParentCategoryValue(), + loc.getParentLocation()); + if (tempLoc != null) { + throw new DuplicateLocationCodeException("There is already a location with the same name!", + "name", loc.getParentCategoryValue().getValue()); } - - AmpCategoryValueLocations tempLoc = - DynLocationManagerUtil.getLocationByName(loc.getName(), loc.getParentCategoryValue(), loc.getParentLocation() ); - if ( tempLoc != null ) - throw new DuplicateLocationCodeException("There is already a location with the same name!", "name", loc.getParentCategoryValue().getValue() ); - if (loc.getParentLocation() != null) { if (loc.getParentLocation().getChildLocations() == null) { loc.getParentLocation().setChildLocations(new HashSet()); @@ -189,7 +198,7 @@ public static void saveLocation(AmpCategoryValueLocations loc, boolean editing) loc.getParentLocation().getChildLocations().add(loc); } } - + try { session = PersistenceManager.getRequestDBSession(); session.saveOrUpdate(loc); @@ -197,17 +206,17 @@ public static void saveLocation(AmpCategoryValueLocations loc, boolean editing) logger.error("Unable to save category value location into the database " + e.getMessage()); throw new DgException(e); } - + DynLocationManagerUtil.getOrCreateAmpLocationByCVL(loc); } - + public static class HelperLocationAncestorLocationNamesAsc implements Comparator { - Locale locale; - Collator collator; + private Locale locale; + private Collator collator; - public HelperLocationAncestorLocationNamesAsc(){ - this.locale=new Locale("en", "EN"); + public HelperLocationAncestorLocationNamesAsc() { + this.locale = new Locale("en", "EN"); } public HelperLocationAncestorLocationNamesAsc(String iso) { @@ -217,20 +226,20 @@ public HelperLocationAncestorLocationNamesAsc(String iso) { public int compare(Location loc1, Location loc2) { collator = Collator.getInstance(locale); collator.setStrength(Collator.TERTIARY); - List loca1AncestorLocationNames=loc1.getAncestorLocationNames(); - List loca2AncestorLocationNames=loc2.getAncestorLocationNames(); - if(loca1AncestorLocationNames==null||loca1AncestorLocationNames.isEmpty()){ + List loca1AncestorLocationNames = loc1.getAncestorLocationNames(); + List loca2AncestorLocationNames = loc2.getAncestorLocationNames(); + if (loca1AncestorLocationNames == null || loca1AncestorLocationNames.isEmpty()) { return -1; } - if(loca2AncestorLocationNames==null||loca2AncestorLocationNames.isEmpty()){ - return 1; + if (loca2AncestorLocationNames == null || loca2AncestorLocationNames.isEmpty()) { + return 1; } - StringBuilder location1FullName=new StringBuilder(); - for(String name:loca1AncestorLocationNames){ + StringBuilder location1FullName = new StringBuilder(); + for (String name : loca1AncestorLocationNames) { location1FullName.append(name); } - StringBuilder location2FullName=new StringBuilder(); - for(String name:loca2AncestorLocationNames){ + StringBuilder location2FullName = new StringBuilder(); + for (String name : loca2AncestorLocationNames) { location2FullName.append(name); } return collator.compare(location1FullName.toString(), location2FullName.toString()); @@ -245,7 +254,7 @@ public static int getIndicatorValuesCountByAmpLocation(AmpLocation ampLocation) .add(Restrictions.eq("location", ampLocation)) .setProjection(Projections.rowCount()) .uniqueResult(); - + return indicatorValuesCount; } @@ -259,4 +268,25 @@ public static List getAllVisibleLocations() { return criteria.list(); } + + /** + * @return Country ids with children or all countries if showAllCountries == true + */ + public static Collection getCountriesWithChildren(boolean pShowAllCountries) { + + Session session = PersistenceManager.getSession(); + + String queryString = "SELECT loc FROM " + AmpCategoryValueLocations.class.getName() + + " loc WHERE loc.parentLocation IS NULL " + + " AND (loc.deleted != true)"; + if (!pShowAllCountries) { + queryString += " AND (loc.id IN (SELECT DISTINCT parentLocation FROM " + + AmpCategoryValueLocations.class.getName() + " cloc where cloc.deleted != true))"; + } + + Query qry = session.createQuery(queryString); + qry.setCacheable(true); + Collection countryCollection = qry.list(); + return countryCollection; + } } From c962c98a7fa3b963b57393f5eae9c66b2770345d Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Fri, 18 Aug 2023 16:14:51 +0300 Subject: [PATCH 115/135] GGW-72 fixed registration form input field design --- amp/TEMPLATE/ampTemplate/css_2/amp.css | 514 ++++++------ amp/repository/aim/view/userRegistration.jsp | 816 +++++++++---------- 2 files changed, 659 insertions(+), 671 deletions(-) diff --git a/amp/TEMPLATE/ampTemplate/css_2/amp.css b/amp/TEMPLATE/ampTemplate/css_2/amp.css index 76ba653439a..134a235fde6 100644 --- a/amp/TEMPLATE/ampTemplate/css_2/amp.css +++ b/amp/TEMPLATE/ampTemplate/css_2/amp.css @@ -64,7 +64,7 @@ li.bullet {margin-left:14px;} #exportDiv td.inside { - vertical-align: top; + vertical-align: top; } td.inside a img {border:0;} @@ -338,9 +338,9 @@ html.chrome #show_login_pop_box{margin-top:44px;} font-size: 11px; margin-top: 25px; padding-bottom: 10px; - width:100%; + width:100%; padding-top: 10px; - text-align:center; + text-align:center; } .dialog {display:none;} @@ -425,10 +425,10 @@ div.breadcrumbsplaceholder {height:25px; clear:both;margin:20px 0px 20px 0px; wi font-size: 11px; margin: 5px; padding: 2px; - background-color: #FFFFFF; + background-color: #FFFFFF; border: 1px solid #D0D0D0;} #Tab_Name td#reportsearchform1 input, #Tab_Name td#reportsearchform2 input - { background-color: #5E8AD1; +{ background-color: #5E8AD1; border-color: #99BAF1 #225099 #225099 #99BAF1; border-style: solid; border-width: 1px; @@ -459,14 +459,14 @@ table#addUserContainer td.addUserButContainer input, td.addUserButContainer inpu font-weight: bold; height: 25px; padding: 3px 5px;} - .ampFormContainer - {width:1000px; - margin:0 auto; - text-align:left;} - .formCheckContainer{text-align:right;font-weight:bold;} +.ampFormContainer +{width:1000px; + margin:0 auto; + text-align:left;} +.formCheckContainer{text-align:right;font-weight:bold;} .formCheckContainer input - {float:right;} - #auditloggertable{border:1px solid #cccccc;border-left:none;} +{float:right;} +#auditloggertable{border:1px solid #cccccc;border-left:none;} #auditloggertable tr td{border-bottom:1px solid #cccccc;border-left:1px solid #cccccc;padding:10px;} #auditloggertable tr td.auditloggername{color:#376091;font-weight:bold;font-size:12px;} #auditloggermanagercontainer{background:#f2f2f2; border:1px solid #cccccc;padding:10px;width:980px;margin:0 auto;} @@ -509,33 +509,33 @@ div.adminicon{float:right;} #breadcrumbs {width:1000px;padding:0px;height:30px;margin:0px 0px 0px 0px;margin:0 auto;position:relative;text-align:left;} #breadcrumbs ul{float:left;} #breadcrumbs ul li { - display:inline; - padding:0px; - margin:0px; - line-height:30px; + display:inline; + padding:0px; + margin:0px; + line-height:30px; } #breadcrumbs, #breadcrumbs li.yuimenuitem a { - color: #376091; - font-size: 10px; - font-family:arial; - padding:3px 10px 3px 0px; - margin:0px; - padding-top:0px; - font-weight:bold; - text-decoration:none; - text-align: left; - background:url(/TEMPLATE/ampTemplate/img_2/breadcrumbsep.gif) no-repeat right; + color: #376091; + font-size: 10px; + font-family:arial; + padding:3px 10px 3px 0px; + margin:0px; + padding-top:0px; + font-weight:bold; + text-decoration:none; + text-align: left; + background:url(/TEMPLATE/ampTemplate/img_2/breadcrumbsep.gif) no-repeat right; } #breadcrumbs .bd li.yuimenuitem a:hover { - text-decoration:underline; + text-decoration:underline; } /*-----rafy-----*/ -div.reg_form_container{width:1000px; margin:0 auto; text-align: left;} +div.reg_form_container{width:1000px; text-align: left;} div.reg_form_container table {margin:0 auto; } /* Modify the input boxes - timothymugo */ -div.reg_form_container input,div.reg_form_container form input, div.reg_form_container form select{border:1px solid #d0d0d0;height:30px; font-size: 11px; width: 280px; padding: 5px 20px; border-radius: 5px;} +div.reg_form_container input,div.reg_form_container form input, div.reg_form_container form select{border:1px solid #e6e9ed;height:32px; font-size: 12px; font-weight: 500; width: 280px; padding: 5px 20px; border-radius: 5px;} div.reg_form_container .buttonx {background-color:#68b35b; border-top: 1px solid #99BAF1; font-size:14px; color:#FFFFFF; font-weight: 700; padding: 3px 5px; height:30px;} div.reg_form_container form input.dr-menu, div.reg_form_container input.dr-menu{ font-size:14px; font-weight:bold; color:#FFFFFF; background-color:#4A687A; margin:10px;height:25px;border:1px solid #364d5a;} div.reg_form_title{text-align:left;border-top:5px solid #4A687A; margin:0px 0px 20px 0px; background:#f0f0f0;padding:0px 0px 10px 0px;border-bottom:1px solid #ccccce;} @@ -543,7 +543,7 @@ div.reg_form_container h2 { font-size:30px; font-weight:bold; color:#FFFFFF; bac span.formnote{color:#595959; font-size:14px;font-weight:500;line-height:20px;} td.title{background-color:#f0f0f0;color:#999; font-size:12px;font-weight:bold;padding:10px;} /* changed font-size */ -div.reg_form_container .f-names {color: rgba(0, 0, 0, 0.6); font-size:14px; text-align: right; padding-right: 10px;} +div.reg_form_container .f-names {color: #3e6280; font-size:14px; text-align: right; padding-right: 10px;} /* added input row container - tmugo */ div.reg_form_container .input_row_container td { border-bottom: 1px solid #edeff1; padding: 8px;} div.reg_form_container .reg_submit_btn_container td { padding: 20px 18px; border-bottom: none;} @@ -560,10 +560,10 @@ html.ie #amphomesidebar{width:200px;} font-size: 11px; margin: 5px; padding: 2px; - background-color: #FFFFFF; + background-color: #FFFFFF; border: 1px solid #D0D0D0;} #Tab_Name td#reportsearchform1 input, #Tab_Name td#reportsearchform2 input - { background-color: #5E8AD1; +{ background-color: #5E8AD1; border-color: #99BAF1 #225099 #225099 #99BAF1; border-style: solid; border-width: 1px; @@ -594,14 +594,14 @@ table#addUserContainer td.addUserButContainer input, td.addUserButContainer inpu font-weight: bold; height: 25px; padding: 3px 5px;} - .ampFormContainer - {width:1000px; - margin:0 auto; - text-align:left;} - .formCheckContainer{text-align:right;font-weight:bold;} +.ampFormContainer +{width:1000px; + margin:0 auto; + text-align:left;} +.formCheckContainer{text-align:right;font-weight:bold;} .formCheckContainer input - {float:right;} - #auditloggertable{border:1px solid #cccccc;border-left:none;} +{float:right;} +#auditloggertable{border:1px solid #cccccc;border-left:none;} #auditloggertable tr td{border-bottom:1px solid #cccccc;border-left:1px solid #cccccc;padding:10px;} #auditloggertable tr td.auditloggername{color:#376091;font-weight:bold;font-size:12px;} #auditloggermanagercontainer{background:#f2f2f2; border:1px solid #cccccc;padding:10px;width:980px;margin:0 auto;} @@ -644,25 +644,25 @@ div.adminicon{float:right;} #breadcrumbs {width:1000px;padding:0px;height:30px;margin:0px 0px 0px 0px;margin:0 auto;position:relative;text-align:left;} #breadcrumbs ul{float:left;} #breadcrumbs ul li { - display:inline; - padding:0px; - margin:0px; - line-height:30px; + display:inline; + padding:0px; + margin:0px; + line-height:30px; } #breadcrumbs, #breadcrumbs li.yuimenuitem a { - color: #376091; - font-size: 10px; - font-family:arial; - padding:3px 10px 3px 0px; - margin:0px; - padding-top:0px; - font-weight:bold; - text-decoration:none; - text-align: left; - background:url(/TEMPLATE/ampTemplate/img_2/breadcrumbsep.gif) no-repeat right; + color: #376091; + font-size: 10px; + font-family:arial; + padding:3px 10px 3px 0px; + margin:0px; + padding-top:0px; + font-weight:bold; + text-decoration:none; + text-align: left; + background:url(/TEMPLATE/ampTemplate/img_2/breadcrumbsep.gif) no-repeat right; } #breadcrumbs .bd li.yuimenuitem a:hover { - text-decoration:underline; + text-decoration:underline; } .usr_menu_logged{position:absolute;top:0px;right:0px;} @@ -709,8 +709,8 @@ div.adminicon{float:right;} .admin_landing_page_tbl {margin-top:10px;} .yui-panel { border-collapse: separate; - font-family:arial; - table-layout:fixed; + font-family:arial; + table-layout:fixed; } /**-----IE FIXES-----**/ /* @@ -721,11 +721,11 @@ html.ie .main_menu{height:25px;margin:0 auto;text-align:left;border:none;positio html.chrome .login_nav{padding:0px;margin:0px;} html.chrome .login_here { - background-color: #65B457; - width: 125px; - height: 33px; - text-align: center; - margin-top:10px; + background-color: #65B457; + width: 125px; + height: 33px; + text-align: center; + margin-top:10px; } html.chrome .login_here:hover { background-color: #B4EEAA; @@ -735,13 +735,13 @@ html.chrome .login_here:hover { html.ie li.yuiampmenuitem a {padding-top: 0px !important;} html.ie #show_login_pop_box{ border:1px solid #cccccc;position:absolute;left:0px; top:15px;z-index:9999;} html.ie .login_here { - background-color: #65B457; - width: 125px; - height: 33px; - text-align: center; - position: absolute; - top: 15px; - left: 10px; + background-color: #65B457; + width: 125px; + height: 33px; + text-align: center; + position: absolute; + top: 15px; + left: 10px; } html.ie .login_here:hover { background-color: #B4EEAA; @@ -808,15 +808,15 @@ h1.admintitle{font-size:16px;text-transform:none;color: #376091;padding:0px 0px /*---rafy was here---*/ td.wrklist div.workspacelist{background: url(../images/arrow-014E86.gif) no-repeat center left #F2F2F2; -padding: 3px 10px 3px 3px; -margin-bottom: 1px; -font-size: 12px; -text-decoration: none; -height: 20px; -line-height: 20px; -background-position: 5px 7px; -text-indent: 20px; -width:75%; + padding: 3px 10px 3px 3px; + margin-bottom: 1px; + font-size: 12px; + text-decoration: none; + height: 20px; + line-height: 20px; + background-position: 5px 7px; + text-indent: 20px; + width:75%; } td.wrklist div.workspacelist a{text-decoration:none; color:#737373;} td.wrklist div.workspacelist a:hover{text-decoration:underline;color:#376091;} @@ -841,20 +841,20 @@ html.ie div.innertabheader input.inputx{margin-top:5px;vertical-align:top;} html.ie div.menucontainer{margin:0 auto;width:1000px;} */ .subtitle-blue { -BORDER-RIGHT: 1px; -BORDER-TOP: 1px; -FONT-WEIGHT: bold; -FONT-SIZE: 11pt; -PADDING-BOTTOM: 10px; -BORDER-LEFT: 1px; -COLOR: #014e86; -PADDING-TOP: 16px; -BORDER-BOTTOM: 1px; -LETTER-SPACING: 1px; -border-right: 1px; -border-top: 1px; -border-left: 1px; -border-bottom: 1px;} + BORDER-RIGHT: 1px; + BORDER-TOP: 1px; + FONT-WEIGHT: bold; + FONT-SIZE: 11pt; + PADDING-BOTTOM: 10px; + BORDER-LEFT: 1px; + COLOR: #014e86; + PADDING-TOP: 16px; + BORDER-BOTTOM: 1px; + LETTER-SPACING: 1px; + border-right: 1px; + border-top: 1px; + border-left: 1px; + border-bottom: 1px;} legend.admtoolsttl{position:absolute;top:-10px;left:10px;} #customDecimalSymbol{width:64px;} span.geostyle{background:#f1f1f1;padding:3px;border:1px solid #e0e0e0;color:#5d5d5b;font-size:11px;font-weight:normal;} @@ -884,155 +884,155 @@ span.geostyle{background:#f1f1f1;padding:3px;border:1px solid #e0e0e0;color:#5d5 .clear,.innerTab { - clear: both; + clear: both; } div#filterContainer { - width: 740px; - min-height: 350px; - margin: 0 auto; - background: #fff; + width: 740px; + min-height: 350px; + margin: 0 auto; + background: #fff; } div.filterContainerHeader { - background: #e9e9fb; - border-bottom: 1px solid #bfd4e0; - height: 26px; + background: #e9e9fb; + border-bottom: 1px solid #bfd4e0; + height: 26px; } div.filterContainerHeader h2 { - line-height: 26px; - font-size: 12px; - font-weight: bold; - text-indent: 11px; - width: 90%; - float: left; + line-height: 26px; + font-size: 12px; + font-weight: bold; + text-indent: 11px; + width: 90%; + float: left; } div.filterContainerTabs { - width: 740px; - margin: 0 auto; - margin-top: 11px; + width: 740px; + margin: 0 auto; + margin-top: 11px; } div.groupingSelector { - width: 311px; - float: left; - border-bottom: 1px solid #cccccc; - border-right: none; - height: 155px; + width: 311px; + float: left; + border-bottom: 1px solid #cccccc; + border-right: none; + height: 155px; } div.membersSelector { - width: 425px; - float: right; - border-left: 1px solid #cccccc; - border-right: 1px solid #cccccc; - border-bottom: 1px solid #cccccc; - height: 155px; + width: 425px; + float: right; + border-left: 1px solid #cccccc; + border-right: 1px solid #cccccc; + border-bottom: 1px solid #cccccc; + height: 155px; } div.innerTabHeader { - border-bottom: 1px solid #cccccc; - background: url(/TEMPLATE/ampTemplate/img_2/ins_header.gif); - height: 31px; + border-bottom: 1px solid #cccccc; + background: url(/TEMPLATE/ampTemplate/img_2/ins_header.gif); + height: 31px; } div.innerTabHeader h3 { - height: 31px; - line-height: 31px; - text-indent: 11px; - float: left; - font-size: 11px; - color: #767676; - margin: 0; - padding: 0; + height: 31px; + line-height: 31px; + text-indent: 11px; + float: left; + font-size: 11px; + color: #767676; + margin: 0; + padding: 0; } div.membersSelector div.memsearch { - padding: 1px 0px 0px 0px; - width: 230px; - float: right; - text-align: right; + padding: 1px 0px 0px 0px; + width: 230px; + float: right; + text-align: right; } .innerTabHeader input.buttonx { - font-size: 11px; + font-size: 11px; } .groupingSelector ul { - margin: 0 auto; - margin-bottom: 15px; - width: 250px; + margin: 0 auto; + margin-bottom: 15px; + width: 250px; } .groupingSelector ul li { - list-style: none; + list-style: none; } .groupingSelector ul li a { - padding: 5px; - font-size: 12px; - display: block; - background: #fff; - color: #000; - text-decoration: none; + padding: 5px; + font-size: 12px; + display: block; + background: #fff; + color: #000; + text-decoration: none; } .groupingSelector ul li a:hover { - background: #bfd2df; + background: #bfd2df; } div.innerTab { - height: 115px; - overflow: auto; - margin: 2px; - width: 99%; + height: 115px; + overflow: auto; + margin: 2px; + width: 99%; } .otherCriteriaFoofet { - padding: 15px 0px 0px 0px; - clear: both; + padding: 15px 0px 0px 0px; + clear: both; } .otherCriteriaFoofet #calendarForm label { - width: 100px; - font-size: 11px; - display: inline-block; + width: 100px; + font-size: 11px; + display: inline-block; } .otherCriteriaFoofet select { - background-color: #FFFFFF; - border: 1px solid #D0D0D0; - color: #000; - font-size: 11px; - padding: 0px; - width: 150px; + background-color: #FFFFFF; + border: 1px solid #D0D0D0; + color: #000; + font-size: 11px; + padding: 0px; + width: 150px; } .tabSubmit { - text-align: center; - padding: 0px 0px 5px 0px; + text-align: center; + padding: 0px 0px 5px 0px; } .groupingSelectors li a span { - display: inline-block; - float: right; - font-size: 11px; + display: inline-block; + float: right; + font-size: 11px; } .groupingSelector, .groupingSelectors{ - margin: 0; - padding: 0; + margin: 0; + padding: 0; } .advancedTranslations {border:1px solid #DBDBDB; padding:20px;} .controlPanel {margin:0 !important; background-color:#EBEBEB; padding:5px;} @@ -1047,57 +1047,57 @@ div.innerTab { .tab_vis_link { - margin-bottom: 15px; - margin-left: 15px; - font-size: 1.15em; - display: inline-block; - padding: 3px; + margin-bottom: 15px; + margin-left: 15px; + font-size: 1.15em; + display: inline-block; + padding: 3px; } .tab_vis_link:hover { - border: 1px dashed gray; - padding: 2px; /* swallow border's +1 paddings */ - background-color: #FFFFDD; + border: 1px dashed gray; + padding: 2px; /* swallow border's +1 paddings */ + background-color: #FFFFDD; } .dashboards_left_container { - height: 210px; - border: 1px solid #CCCCCC; - overflow: auto; - background: white; - maxHeight: 210px; - padding: 5px; - padding-left: 20px; + height: 210px; + border: 1px solid #CCCCCC; + overflow: auto; + background: white; + maxHeight: 210px; + padding: 5px; + padding-left: 20px; } .dashboards_left_container ul.root_list { - margin-left: 0px; - padding-left: 0px; - list-style-type: none; + margin-left: 0px; + padding-left: 0px; + list-style-type: none; } table.component-funding-table tr { - border-top: 1px solid black; + border-top: 1px solid black; } /* TABLE GLOBAL */ .tableEven { - background-color:#EEF5F9; - font-size:8pt; - padding:2px; + background-color:#EEF5F9; + font-size:8pt; + padding:2px; } .tableOdd { - background-color:#FFFFFF; - font-size:8pt;!important - padding:2px; + background-color:#FFFFFF; + font-size:8pt;!important +padding:2px; } .Hovered { - background-color:#a5bcf2; + background-color:#a5bcf2; } @@ -1111,21 +1111,21 @@ table.component-funding-table tr .yui-skin-sam.smallish .yui-navset .yui-nav .selected a em { - padding: .17em .37em !important; /* smaller padding for tab headers */ + padding: .17em .37em !important; /* smaller padding for tab headers */ } .yui-skin-sam.smallish .yui-navset .yui-nav a em, .yui-skin-sam.smallish .yui-navset .yui-navset-top .yui-nav a em { - padding: .17em .37em !important; /* smaller padding for tab headers */ + padding: .17em .37em !important; /* smaller padding for tab headers */ } .yui-skin-sam.smallish input { - width: 85% !important; - padding: 0.05em !important; - margin: 0.4em 0.12em !important; - border: 1px solid gray !important; - border-radius: 4px !important; + width: 85% !important; + padding: 0.05em !important; + margin: 0.4em 0.12em !important; + border: 1px solid gray !important; + border-radius: 4px !important; } /* @@ -1134,59 +1134,59 @@ table.component-funding-table tr */ .dataTable li{ - list-style-position: inside; + list-style-position: inside; } #actions-table { - background-color: rgb(242, 242, 242); - display: table; - border-collapse: separate; - border-spacing: 2px; - border-color: gray; - margin-bottom: 10px; + background-color: rgb(242, 242, 242); + display: table; + border-collapse: separate; + border-spacing: 2px; + border-color: gray; + margin-bottom: 10px; } .amp-table { - display: table; - border-collapse: separate; - border-spacing: 2px; - border-color: gray; - margin-bottom: 10px; - border-collapse: initial; - border: 1px #cccccc solid; - padding:1px; + display: table; + border-collapse: separate; + border-spacing: 2px; + border-color: gray; + margin-bottom: 10px; + border-collapse: initial; + border: 1px #cccccc solid; + padding:1px; } .workspace-table { - display: table; - border-collapse: separate; - border-color: gray; - margin-bottom: 10px; - border-collapse: initial; + display: table; + border-collapse: separate; + border-color: gray; + margin-bottom: 10px; + border-collapse: initial; } .workspace-table td { - border: 1px #cccccc solid; - padding: 3px + border: 1px #cccccc solid; + padding: 3px } .workspace-table table td { - border: 0px; - padding: 3px + border: 0px; + padding: 3px } #TipLayer table { - border: 1px rgb(128, 128, 128) solid; + border: 1px rgb(128, 128, 128) solid; } #TipLayer table td table:first-of-type { - background-color: rgb(128, 128, 128); + background-color: rgb(128, 128, 128); } #TipLayer table td table:nth-of-type(2) { - background-color: #F2F2F2; + background-color: #F2F2F2; } div.footer { - margin-top:15px; + margin-top:15px; } .img-padding { @@ -1195,37 +1195,37 @@ div.footer { .label-column{ - text-align: right; - width: 30%; - padding: 5px; + text-align: right; + width: 30%; + padding: 5px; } .data-column{ - text-align: left; - width: 70%; + text-align: left; + width: 70%; } .buttons-section{ - text-align: center; + text-align: center; } .button-section-padding { - padding-top: 10px; + padding-top: 10px; } .org-type-fieldset { - padding-left:200px; - border:1px solid #CCCCCC; - background-color:#FFFFFF; - text-align: left; + padding-left:200px; + border:1px solid #CCCCCC; + background-color:#FFFFFF; + text-align: left; } .org-type-fieldset>input{ - margin: 4px; + margin: 4px; } - + .header-corner { - background: url(../images/corner-r.gif) no-repeat; + background: url(../images/corner-r.gif) no-repeat; } .right_menu_empty { @@ -1236,25 +1236,25 @@ div.footer { color: #376091; } .frozen{ - width:15px; - height:15px; - background-color:red; - float: left; - margin-right:5px; + width:15px; + height:15px; + background-color:red; + float: left; + margin-right:5px; } .unfrozen{ - width:15px; - height:15px; - background-color:green; - float: left; - margin-right:5px; + width:15px; + height:15px; + background-color:green; + float: left; + margin-right:5px; } .legend-item { - float:left;width:20%; - margin-top:10px; - clear:both; + float:left;width:20%; + margin-top:10px; + clear:both; } .summary-change-container { @@ -1437,6 +1437,6 @@ div.footer { } .loading-spinner{ - display:block; + display:block; margin:auto; } \ No newline at end of file diff --git a/amp/repository/aim/view/userRegistration.jsp b/amp/repository/aim/view/userRegistration.jsp index a4f16778ff5..d19b03ed12c 100644 --- a/amp/repository/aim/view/userRegistration.jsp +++ b/amp/repository/aim/view/userRegistration.jsp @@ -12,373 +12,390 @@ - function optionChanged(flag) { - if (flag == 'otype') { - var index1 = document.aimUserRegisterForm.selectedOrgType.selectedIndex; - var val1 = document.aimUserRegisterForm.selectedOrgType.options[index1].value; - var orgType = document.aimUserRegisterForm.orgType.value; - if ( val1 != "-1") { - if (val1 != orgType) { - document.aimUserRegisterForm.orgType.value = val1; - document.aimUserRegisterForm.actionFlag.value = "typeSelected"; - - document.aimUserRegisterForm.action = "<%= selectType %>"; - document.aimUserRegisterForm.target = "_self"; - document.aimUserRegisterForm.submit(); - } - return false; - } - else - return false; - } - if (flag == 'ogroup') { - var index2 = document.aimUserRegisterForm.selectedOrgGroup.selectedIndex; - var val2 = document.aimUserRegisterForm.selectedOrgGroup.options[index2].value; - var orgGrp = document.aimUserRegisterForm.orgGrp.value; - if ( val2 != "-1") { - if (val2 != orgGrp) { - document.aimUserRegisterForm.orgGrp.value = val2; - document.aimUserRegisterForm.actionFlag.value = "groupSelected"; - - document.aimUserRegisterForm.action = "<%= selectGrp %>"; - document.aimUserRegisterForm.target = "_self"; - document.aimUserRegisterForm.submit(); - } - return false; - } - else - return false; - } - } - - function isVoid(name){ - if (name == "" || name == null || name.charAt(0) == ' '){ - return 1; - } - if (!isNaN(name)){ - return 2; - } - return 0; - } - - function validate(){ - name = document.aimUserRegisterForm.firstNames.value; - lastname = document.aimUserRegisterForm.lastName.value; - password = document.aimUserRegisterForm.password.value; - passwordConfirmation = document.aimUserRegisterForm.passwordConfirmation.value; - selectedOrgType = document.aimUserRegisterForm.selectedOrgType.value; - selectedOrgGroup = document.aimUserRegisterForm.selectedOrgGroup.value; - selectedOrganizationId = document.aimUserRegisterForm.selectedOrganizationId.value; - - if (isVoid(name)==1) - { - - First Name is Blank - - alert("${translation}"); - return false; + function optionChanged(flag) { + if (flag == 'otype') { + var index1 = document.aimUserRegisterForm.selectedOrgType.selectedIndex; + var val1 = document.aimUserRegisterForm.selectedOrgType.options[index1].value; + var orgType = document.aimUserRegisterForm.orgType.value; + if ( val1 != "-1") { + if (val1 != orgType) { + document.aimUserRegisterForm.orgType.value = val1; + document.aimUserRegisterForm.actionFlag.value = "typeSelected"; + + document.aimUserRegisterForm.action = "<%= selectType %>"; + document.aimUserRegisterForm.target = "_self"; + document.aimUserRegisterForm.submit(); } - if (isVoid(name)==2) - { - - First Name can't be only numeric - - alert("${translation}"); - return false; - } - if (isVoid(lastname)==1) - { - - Last Name is Blank - - alert("${translation}"); - return false; - } - if (isVoid(lastname)==2) - { - - LastName can't be only numeric - - alert("${translation}"); - return false; - } - if(validateEmail()==false) - return false - if (isVoid(password)||isVoid(passwordConfirmation)) - { - - Please use at least one letter in the password field. - - alert("${translation}"); - return false; - } - if(password != passwordConfirmation){ - - Passwords in both fields must be the same - - alert("${translation}"); - return false; - } - - if(selectedOrgType=="-1"){ - - Please enter Organization Type - - alert("${translation}"); - return false; - } - if(selectedOrgGroup=="-1"){ - - Please Select Organization Group - - alert("${translation}"); - return false; - } - if(selectedOrganizationId=="-1"){ - - Please Select Organization - - alert("${translation}"); - return false; + return false; + } + else + return false; + } + if (flag == 'ogroup') { + var index2 = document.aimUserRegisterForm.selectedOrgGroup.selectedIndex; + var val2 = document.aimUserRegisterForm.selectedOrgGroup.options[index2].value; + var orgGrp = document.aimUserRegisterForm.orgGrp.value; + if ( val2 != "-1") { + if (val2 != orgGrp) { + document.aimUserRegisterForm.orgGrp.value = val2; + document.aimUserRegisterForm.actionFlag.value = "groupSelected"; + + document.aimUserRegisterForm.action = "<%= selectGrp %>"; + document.aimUserRegisterForm.target = "_self"; + document.aimUserRegisterForm.submit(); } + return false; + } + else + return false; + } + } - return true; - } - - function validateEmail() { - var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/; - var address = document.aimUserRegisterForm.email.value; - var address2 = document.aimUserRegisterForm.emailConfirmation.value; - if(reg.test(address) == false||reg.test(address2) == false) { - - Please enter a valid email address. - - alert("${translation}"); - return false; - } - if(address != address2){ - - Emails in both fields must be the same - - alert("${translation}"); - return false; - } - - var notificationEmail = $('#notificationEmail').val(); - if ($('#notificationEmailEnabled').is(":checked")) { - if(reg.test(notificationEmail) == false) { - Please enter a valid Notification Email - alert("${translation}"); - return false; - } - - if(address == notificationEmail) { - Email address and notification email address must be different - alert("${translation}"); - return false; - } - } - - return true; - } - - function resetFields () { - var list = document.getElementsByTagName('input'); - for(var i = 0; i < list.length; i++) { - if(list[i].type == 'text' || list[i].type == 'password') - { - list[i].value = ''; - } - } - document.getElementsByName("selectedOrgType")[0].selectedIndex = 0; - document.getElementsByName("selectedOrgGroup")[0].selectedIndex = 0; - document.getElementsByName("selectedOrganizationId")[0].selectedIndex = 0; - - $('#notificationEmailEnabled').prop('checked', false); - $('#notificationEmailRow').hide(); - } - - function init() { - $('#notificationEmailEnabled').bind("click", function() { - $('#notificationEmailRow') [this.checked ? "show" : "hide"](); - }); - - $('#notificationEmailRow')[$('#notificationEmailEnabled').is(":checked") ? "show" : "hide"](); - } - - - var enterBinder = new EnterHitBinder('registerUserBtn'); - - YAHOOAmp.util.Event.addListener(window, "load", init); + function isVoid(name){ + if (name == "" || name == null || name.charAt(0) == ' '){ + return 1; + } + if (!isNaN(name)){ + return 2; + } + return 0; + } + + function validate(){ + name = document.aimUserRegisterForm.firstNames.value; + lastname = document.aimUserRegisterForm.lastName.value; + password = document.aimUserRegisterForm.password.value; + passwordConfirmation = document.aimUserRegisterForm.passwordConfirmation.value; + selectedOrgType = document.aimUserRegisterForm.selectedOrgType.value; + selectedOrgGroup = document.aimUserRegisterForm.selectedOrgGroup.value; + selectedOrganizationId = document.aimUserRegisterForm.selectedOrganizationId.value; + + if (isVoid(name)==1) + { + + First Name is Blank + + alert("${translation}"); + return false; + } + if (isVoid(name)==2) + { + + First Name can't be only numeric + + alert("${translation}"); + return false; + } + if (isVoid(lastname)==1) + { + + Last Name is Blank + + alert("${translation}"); + return false; + } + if (isVoid(lastname)==2) + { + + LastName can't be only numeric + + alert("${translation}"); + return false; + } + if(validateEmail()==false) + return false + if (isVoid(password)||isVoid(passwordConfirmation)) + { + + Please use at least one letter in the password field. + + alert("${translation}"); + return false; + } + if(password != passwordConfirmation){ + + Passwords in both fields must be the same + + alert("${translation}"); + return false; + } + + if(selectedOrgType=="-1"){ + + Please enter Organization Type + + alert("${translation}"); + return false; + } + if(selectedOrgGroup=="-1"){ + + Please Select Organization Group + + alert("${translation}"); + return false; + } + if(selectedOrganizationId=="-1"){ + + Please Select Organization + + alert("${translation}"); + return false; + } + + return true; + } + + function validateEmail() { + var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/; + var address = document.aimUserRegisterForm.email.value; + var address2 = document.aimUserRegisterForm.emailConfirmation.value; + if(reg.test(address) == false||reg.test(address2) == false) { + + Please enter a valid email address. + + alert("${translation}"); + return false; + } + if(address != address2){ + + Emails in both fields must be the same + + alert("${translation}"); + return false; + } + + var notificationEmail = $('#notificationEmail').val(); + if ($('#notificationEmailEnabled').is(":checked")) { + if(reg.test(notificationEmail) == false) { + Please enter a valid Notification Email + alert("${translation}"); + return false; + } + + if(address == notificationEmail) { + Email address and notification email address must be different + alert("${translation}"); + return false; + } + } + + return true; + } + + function resetFields () { + var list = document.getElementsByTagName('input'); + for(var i = 0; i < list.length; i++) { + if(list[i].type == 'text' || list[i].type == 'password') + { + list[i].value = ''; + } + } + document.getElementsByName("selectedOrgType")[0].selectedIndex = 0; + document.getElementsByName("selectedOrgGroup")[0].selectedIndex = 0; + document.getElementsByName("selectedOrganizationId")[0].selectedIndex = 0; + + $('#notificationEmailEnabled').prop('checked', false); + $('#notificationEmailRow').hide(); + } + + function init() { + $('#notificationEmailEnabled').bind("click", function() { + $('#notificationEmailRow') [this.checked ? "show" : "hide"](); + }); + + $('#notificationEmailRow')[$('#notificationEmailEnabled').is(":checked") ? "show" : "hide"](); + } + + + var enterBinder = new EnterHitBinder('registerUserBtn'); + + YAHOOAmp.util.Event.addListener(window, "load", init); -Please select this checkbox in case you want to specify an email address to receive system notifications. -This email address will potentially be used by the system to send AMP related information. -If you are unsure now, an AMP admin can add your Notification Email later on. -Please do not attempt to use the Notification Email as user login. + Please select this checkbox in case you want to specify an email address to receive system notifications. + This email address will potentially be used by the system to send AMP related information. + If you are unsure now, an AMP admin can add your Notification Email later on. + Please do not attempt to use the Notification Email as user login. -
    +
    -
    Account information / about you
    - - - - - -

    +
      + * From 997b6798f60d1210ace4b3858c17c70154a082d6 Mon Sep 17 00:00:00 2001 From: timothygachengo Date: Wed, 22 Mar 2023 22:34:12 +0300 Subject: [PATCH 050/135] AMP-30380 reduced padding on the change password page fields --- amp/TEMPLATE/ampTemplate/css_2/amp.css | 4 ++-- amp/deployConfigs/selected.properties | 2 +- amp/repository/aim/view/changePassword.jsp | 4 ++-- ...0-update-user-id-field-to-be-capitalized-in-the-cpform.xml | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/amp/TEMPLATE/ampTemplate/css_2/amp.css b/amp/TEMPLATE/ampTemplate/css_2/amp.css index 2cf1817cda6..76ba653439a 100644 --- a/amp/TEMPLATE/ampTemplate/css_2/amp.css +++ b/amp/TEMPLATE/ampTemplate/css_2/amp.css @@ -408,7 +408,7 @@ div.reg_form_container{width:1000px; margin:0 auto;text-align:center;} div.reg_form_container table {margin:0 auto; } /* timothymugo - add height of the input boxes */ div.reg_form_container input,div.reg_form_container form input, div.reg_form_container form select{border:1px solid #d0d0d0;height:30px;} -div.reg_form_container .buttonx {background-color:#68b35b; font-size:14px; color:#FFFFFF; font-weight:bold; padding: 3px 5px; height:30px; width: 200px; margin-right: 392px; } +div.reg_form_container .buttonx {background-color:#68b35b; font-size:14px; color:#FFFFFF; font-weight:bold; padding: 3px 5px; height:30px; width: 200px; margin-right: 421px; } div.reg_form_container form input.dr-menu, div.reg_form_container input.dr-menu{ font-size:14px; font-weight:bold; color:#FFFFFF; background-color:#4A687A; margin:10px;height:25px;border:1px solid #364d5a;} div.reg_form_title{text-align:left;border-top:5px solid #4A687A; margin:0px 0px 20px 0px; background:#f0f0f0;padding:0px 0px 10px 0px;border-bottom:1px solid #ccccce;} div.reg_form_container h2 { font-size:30px; font-weight:bold; color:#FFFFFF; background-color:#4A687A; margin-left:10px; padding:5px; letter-spacing:-1px; margin-right:10px;display:inline;} @@ -545,7 +545,7 @@ td.title{background-color:#f0f0f0;color:#999; font-size:12px;font-weight:bold;pa /* changed font-size */ div.reg_form_container .f-names {color: rgba(0, 0, 0, 0.6); font-size:14px; text-align: right; padding-right: 10px;} /* added input row container - tmugo */ -div.reg_form_container .input_row_container td { border-bottom: 1px solid #edeff1; padding: 18px;} +div.reg_form_container .input_row_container td { border-bottom: 1px solid #edeff1; padding: 8px;} div.reg_form_container .reg_submit_btn_container td { padding: 20px 18px; border-bottom: none;} div.breadcrumbsplaceholder {height:25px; clear:both;margin:20px 0px 20px 0px; width:950px; background:#f0f0f0; color:#000;} #amphome{width:1000px; margin:0 auto;} diff --git a/amp/deployConfigs/selected.properties b/amp/deployConfigs/selected.properties index d41d86618d8..df29276d4f0 100644 --- a/amp/deployConfigs/selected.properties +++ b/amp/deployConfigs/selected.properties @@ -1,4 +1,4 @@ #Description of the selected config -#Wed, 22 Mar 2023 11:37:07 +0300 +#Wed, 22 Mar 2023 22:01:17 +0300 serverName=local diff --git a/amp/repository/aim/view/changePassword.jsp b/amp/repository/aim/view/changePassword.jsp index 45e2469aa87..4d3fa2bd362 100644 --- a/amp/repository/aim/view/changePassword.jsp +++ b/amp/repository/aim/view/changePassword.jsp @@ -134,7 +134,7 @@ function validate(){
      + * New Password   - * Confirm new + * Confirm New Password diff --git a/amp/xmlpatches/3.5.05.1/AMP-30380-update-user-id-field-to-be-capitalized-in-the-cpform.xml b/amp/xmlpatches/3.5.05.1/AMP-30380-update-user-id-field-to-be-capitalized-in-the-cpform.xml index 1e48b3c6605..a41b3bebd90 100644 --- a/amp/xmlpatches/3.5.05.1/AMP-30380-update-user-id-field-to-be-capitalized-in-the-cpform.xml +++ b/amp/xmlpatches/3.5.05.1/AMP-30380-update-user-id-field-to-be-capitalized-in-the-cpform.xml @@ -3,12 +3,13 @@ xmlns:tns="http://docs.ampdev.net/schemas/xmlpatcher" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://docs.ampdev.net/schemas/xmlpatcher ../../doc/xmlpatcher.xsd "> AMP-30363 - Update User Id field to set the Id to be all capitalized to show in the cpForm + Update User Id and Confirm new Password field to set the Id to be all capitalized to show in the cpForm timothymugo From c13598115377806171b00e22188741de244c82bc Mon Sep 17 00:00:00 2001 From: Damian Rychter Date: Thu, 23 Mar 2023 12:06:39 -0300 Subject: [PATCH 051/135] Add defensive programming to avoid npe on dayValidation --- amp/WEB-INF/src/org/digijava/module/aim/util/ActivityUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amp/WEB-INF/src/org/digijava/module/aim/util/ActivityUtil.java b/amp/WEB-INF/src/org/digijava/module/aim/util/ActivityUtil.java index a3d13f1ac60..0b8910a1bad 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/util/ActivityUtil.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/util/ActivityUtil.java @@ -2106,7 +2106,7 @@ private static int daysBetween(Date d1, Date d2) { public static int daysToValidation(AmpActivityVersion activity) { int result; - int daysBetween = daysBetween(activity.getUpdatedDate(), new Date()); + int daysBetween = daysBetween(activity.getUpdatedDate() != null ? activity.getUpdatedDate(): new Date(), new Date()); String daysBeforeValidation = FeaturesUtil.getGlobalSettingValue( GlobalSettingsConstants.NUMBER_OF_DAYS_BEFORE_AUTOMATIC_VALIDATION); result = (Integer.parseInt(daysBeforeValidation) - daysBetween); From b8510c0a0b86125bbb9d8e5d4b6950bc9a78dc7d Mon Sep 17 00:00:00 2001 From: Damian Rychter Date: Thu, 16 Mar 2023 15:43:45 -0300 Subject: [PATCH 052/135] AMP-30409: Inconsistency in dash vs report data caused by difference in date range in global settings vs real dash. Reports were not displaying date property, setting start and end date to default --- .../amp-filter/src/utils/constants.js | 1 + .../amp-filter/src/views/filters-view.js | 4 +- .../endpoints/common/AmpGeneralSettings.java | 44 +++++++++++++++++++ .../endpoints/settings/SettingsConstants.java | 7 +++ .../endpoints/settings/SettingsUtils.java | 15 +++++++ amp/deployConfigs/selected.properties | 2 +- 6 files changed, 71 insertions(+), 2 deletions(-) diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/utils/constants.js b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/utils/constants.js index 013c7d14358..acb8b58aeab 100644 --- a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/utils/constants.js +++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/utils/constants.js @@ -44,6 +44,7 @@ var constants = { YEAR_SINGLE_VALUE: 'YEAR-SINGLE-VALUE', CONTEXT_DASHBOARD: 'DASHBOARD', CONTEXT_GIS: 'GIS', + CONTEXT_REPORT: 'REPORTS', FUNDING_ORGANIZATIONS: 'Funding Organizations', ACTIVITY: 'Activity', ALL_AGENCIES: 'All Agencies', diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/views/filters-view.js b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/views/filters-view.js index 939769e2356..dc3146cbbdc 100644 --- a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/views/filters-view.js +++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/views/filters-view.js @@ -579,8 +579,10 @@ module.exports = Backbone.View.extend({ return DateUtils.extractDates(self.settings, blob, 'dashboard-default-min-date', 'dashboard-default-max-date'); } else if (self.caller === Constants.CONTEXT_GIS) { return DateUtils.extractDates(self.settings, blob, 'gis-default-min-date', 'gis-default-max-date'); + } else if (self.caller === Constants.CONTEXT_REPORT) { + return DateUtils.extractDates(self.settings, blob, 'report-default-min-date', 'report-default-max-date'); } - return blob + return blob; }, cancel: function () { diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/AmpGeneralSettings.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/AmpGeneralSettings.java index 6e4d2931678..c3a370229f8 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/AmpGeneralSettings.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/AmpGeneralSettings.java @@ -133,6 +133,17 @@ public class AmpGeneralSettings { @JsonProperty(SettingsConstants.GIS_DEFAULT_MIN_YEAR_RANGE) private String gisDefaultMinYearRange; + @JsonProperty(SettingsConstants.REPORT_DEFAULT_MAX_DATE) + private String reportDefaultMaxDate; + + @JsonProperty(SettingsConstants.REPORT_DEFAULT_MIN_DATE) + private String reportDefaultMinDate; + + @JsonProperty(SettingsConstants.REPORT_DEFAULT_MAX_YEAR_RANGE) + private String reportDefaultMaxYearRange; + @JsonProperty(SettingsConstants.REPORT_DEFAULT_MIN_YEAR_RANGE) + private String reportDefaultMinYearRange; + public Boolean getUseIconsForSectorsInProjectList() { return useIconsForSectorsInProjectList; } @@ -476,4 +487,37 @@ public Integer getNddMappingProgramLevel() { public void setNddMappingProgramLevel(Integer nddMappingProgramLevel) { this.nddMappingProgramLevel = nddMappingProgramLevel; } + + public String getReportDefaultMinDate() { + return reportDefaultMinDate; + } + + public void setReportDefaultMinDate(String reportDefaultMinDate) { + this.reportDefaultMinDate = reportDefaultMinDate; + } + + + public String getReportDefaultMaxDate() { + return reportDefaultMaxDate; + } + + public void setReportDefaultMaxDate(String reportDefaultMaxDate) { + this.reportDefaultMaxDate = reportDefaultMaxDate; + } + + public void setReportDefaultMaxYearRange(String reportDefaultMaxYearRange) { + this.reportDefaultMaxYearRange = reportDefaultMaxYearRange; + } + + public void setReportDefaultMinYearRange(String reportDefaultMinYearRange) { + this.reportDefaultMinYearRange = reportDefaultMinYearRange; + } + + public String getReportDefaultMaxYearRange() { + return reportDefaultMaxYearRange; + } + + public String getReportDefaultMinYearRange() { + return reportDefaultMinYearRange; + } } diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsConstants.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsConstants.java index 54b3a7a3ad0..c09ee9a7829 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsConstants.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsConstants.java @@ -70,6 +70,13 @@ public class SettingsConstants { public static final String GIS_DEFAULT_MAX_DATE = "gis-default-max-date"; public static final String GIS_DEFAULT_MIN_DATE = "gis-default-min-date"; + public static final String REPORT_DEFAULT_MAX_DATE = "report-default-max-date"; + + public static final String REPORT_DEFAULT_MIN_DATE = "report-default-min-date"; + + public static final String REPORT_DEFAULT_MAX_YEAR_RANGE = "report-default-max-year-range"; + public static final String REPORT_DEFAULT_MIN_YEAR_RANGE = "report-default-min-year-range"; + diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsUtils.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsUtils.java index f67e7fa8178..1bfffcc017e 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsUtils.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsUtils.java @@ -503,6 +503,13 @@ private static void addDateRangeSettingsForDashboardsAndGis(AmpGeneralSettings s addDateSetting(settings, GlobalSettingsConstants.GIS_DEFAUL_MIN_YEAR_RANGE, SettingsConstants.GIS_DEFAULT_MIN_DATE, SettingsConstants.GIS_DEFAULT_MIN_YEAR_RANGE, gsFiscalCalendar, currentCalendar, false); + addDateSetting(settings, Constants.GlobalSettings.END_YEAR_DEFAULT_VALUE, + SettingsConstants.REPORT_DEFAULT_MAX_DATE, SettingsConstants.REPORT_DEFAULT_MAX_DATE, + gsFiscalCalendar, currentCalendar, true); + addDateSetting(settings, Constants.GlobalSettings.START_YEAR_DEFAULT_VALUE, + SettingsConstants.REPORT_DEFAULT_MIN_DATE, SettingsConstants.REPORT_DEFAULT_MIN_DATE, + gsFiscalCalendar, currentCalendar, false); + } private static void addDateSetting(AmpGeneralSettings settings, String globalSettingsName, String dateSettingsName, @@ -518,6 +525,10 @@ private static void addDateSetting(AmpGeneralSettings settings, String globalSet settings.setGisDefaultMaxYearRange(yearNumber); } else if (yearSettingsName.equals(SettingsConstants.GIS_DEFAULT_MIN_YEAR_RANGE)) { settings.setGisDefaultMinYearRange(yearNumber); + } else if (yearSettingsName.equals(SettingsConstants.REPORT_DEFAULT_MAX_YEAR_RANGE)) { + settings.setReportDefaultMaxYearRange(yearNumber); + } else if (yearSettingsName.equals(SettingsConstants.REPORT_DEFAULT_MIN_YEAR_RANGE)) { + settings.setReportDefaultMinYearRange(yearNumber); } if (!StringUtils.equals(yearNumber, "-1")) { @@ -541,6 +552,10 @@ private static void addDateSetting(AmpGeneralSettings settings, String globalSet settings.setGisDefaultMaxDate(formattedDate); } else if (dateSettingsName.equals(SettingsConstants.GIS_DEFAULT_MIN_DATE)) { settings.setGisDefaultMinDate(formattedDate); + } else if (dateSettingsName.equals(SettingsConstants.REPORT_DEFAULT_MAX_DATE)) { + settings.setReportDefaultMaxDate(formattedDate); + } else if (dateSettingsName.equals(SettingsConstants.REPORT_DEFAULT_MIN_DATE)) { + settings.setReportDefaultMinDate(formattedDate); } } } diff --git a/amp/deployConfigs/selected.properties b/amp/deployConfigs/selected.properties index df29276d4f0..fb9db903d14 100644 --- a/amp/deployConfigs/selected.properties +++ b/amp/deployConfigs/selected.properties @@ -1,4 +1,4 @@ #Description of the selected config #Wed, 22 Mar 2023 22:01:17 +0300 - +# serverName=local From 4939aedb3659939337e434e25daab1edceec80ea Mon Sep 17 00:00:00 2001 From: Damian Rychter Date: Fri, 24 Mar 2023 13:32:00 -0300 Subject: [PATCH 053/135] AMP-30507: Issue- error in console when share dash popup opens. Avoid calling undefine function --- .../ampTemplate/node_modules/amp-state/index.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-state/index.js b/amp/TEMPLATE/ampTemplate/node_modules/amp-state/index.js index b5e6de87ebe..8186b587b1a 100644 --- a/amp/TEMPLATE/ampTemplate/node_modules/amp-state/index.js +++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-state/index.js @@ -87,13 +87,15 @@ _.extend(State.prototype, Backbone.Events, { loadById: function(id, matchedPrefix) { this.loadPromise = this.saved.load(id, matchedPrefix );// TODO: drs: and pass matching prefix.. - this.loadPromise - .done(_(function(stateModel) { - this.load(stateModel.get('stateBlob')); - }).bind(this)) - .fail(function() { - throw new StateLoadError('Could not load state by id: ' + id); - }); + if (this.loadPromise) { + this.loadPromise + .done(_(function (stateModel) { + this.load(stateModel.get('stateBlob')); + }).bind(this)) + .fail(function () { + throw new StateLoadError('Could not load state by id: ' + id); + }); + } }, load: function(statesBlob) { From 54265819222704c082ad5e79af44569ac088ab23 Mon Sep 17 00:00:00 2001 From: Damian Rychter Date: Thu, 30 Mar 2023 15:26:42 -0300 Subject: [PATCH 054/135] AMP-30515: Possibility to hide total fundings from Funding Information --- .../preview/actions/ActivityActions.jsx | 12 ++++- .../activity/preview/containers/App.jsx | 4 +- .../preview/reducers/ActivityReducer.jsx | 3 +- ...MP-30515-Add-hide-empty-total-settings.xml | 45 +++++++++++++++++++ 4 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 amp/xmlpatches/3.5.05.1/AMP-30515-Add-hide-empty-total-settings.xml diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/actions/ActivityActions.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/actions/ActivityActions.jsx index 29b4ec2612d..0e67327af43 100644 --- a/amp/TEMPLATE/reamp/modules/activity/preview/actions/ActivityActions.jsx +++ b/amp/TEMPLATE/reamp/modules/activity/preview/actions/ActivityActions.jsx @@ -45,6 +45,10 @@ export const ACTIVITY_WS_INFO_LOADING = 'ACTIVITY_WS_INFO_LOADING'; export const ACTIVITY_WS_INFO_LOADED = 'ACTIVITY_WS_INFO_LOADED'; export const ACTIVITY_WS_INFO_FAILED = 'ACTIVITY_WS_INFO_FAILED'; +export const FM_SETTINGS = 'fm-settings'; +export const REPORTING = 'REPORTING'; +export const ACTIVITY_PREVIEW = 'Activity Preview'; + export function loadActivityForActivityPreview(activityId) { return (dispatch, ownProps) => { @@ -90,6 +94,11 @@ export function loadActivityForActivityPreview(activityId) { // it wont be used it will just return 1. const currencyRatesManager = new CurrencyRatesManager([], activityFundingInformation.currency, translate, DateUtils, {}); + var reportingTotalVisibilty = {}; + if (fmTree.hasOwnProperty(FM_SETTINGS) && fmTree[FM_SETTINGS].hasOwnProperty(REPORTING) && + fmTree[FM_SETTINGS][REPORTING].hasOwnProperty(ACTIVITY_PREVIEW)){ + reportingTotalVisibilty = fmTree[FM_SETTINGS][REPORTING][ACTIVITY_PREVIEW] + } return dispatch({ type: ACTIVITY_LOAD_LOADED, payload: { @@ -97,7 +106,8 @@ export function loadActivityForActivityPreview(activityId) { activityFieldsManager, activityContext: _getActivityContext(settings, activityInfo, activity), activityFundingTotals: new ActivityFundingTotals(activity, activityFundingInformation), - currencyRatesManager + currencyRatesManager, + reportingTotals: reportingTotalVisibilty, } }); }); diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/containers/App.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/containers/App.jsx index 1ef06b59fe2..c070a76ca42 100644 --- a/amp/TEMPLATE/reamp/modules/activity/preview/containers/App.jsx +++ b/amp/TEMPLATE/reamp/modules/activity/preview/containers/App.jsx @@ -38,6 +38,7 @@ class App extends Component { resourceReducer: PropTypes.object, activityWsInfo: PropTypes.array.isRequired, globalSettings: PropTypes.object.isRequired, + reportingTotals: PropTypes.object } constructor(props, context) { @@ -49,7 +50,7 @@ class App extends Component { } getChildContext() { - const {activityFieldsManager, activityFundingTotals} = this.props.activityReducer; + const {activityFieldsManager, activityFundingTotals, reportingTotals} = this.props.activityReducer; const {contactsByIds, contactFieldsManager} = this.props.contactReducer; return { activityFieldsManager, @@ -65,6 +66,7 @@ class App extends Component { resourceReducer: this.props.resourceReducer, activityWsInfo: this.props.activityReducer.activityWsInfo, globalSettings: this.props.startUpReducer.globalSettings, + reportingTotals }; } diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/reducers/ActivityReducer.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/reducers/ActivityReducer.jsx index 416bab466df..99d8706bdab 100644 --- a/amp/TEMPLATE/reamp/modules/activity/preview/reducers/ActivityReducer.jsx +++ b/amp/TEMPLATE/reamp/modules/activity/preview/reducers/ActivityReducer.jsx @@ -29,7 +29,8 @@ export default function activityReducer(state: Object = defaultState, action: Ob activityFundingTotals: action.payload.activityFundingTotals, currencyRatesManager: action.payload.currencyRatesManager, isActivityLoading: false, - isActivityLoaded: true + isActivityLoaded: true, + reportingTotals: action.payload.reportingTotals }; case ACTIVITY_LOAD_FAILED: return { diff --git a/amp/xmlpatches/3.5.05.1/AMP-30515-Add-hide-empty-total-settings.xml b/amp/xmlpatches/3.5.05.1/AMP-30515-Add-hide-empty-total-settings.xml new file mode 100644 index 00000000000..47ed22d67f5 --- /dev/null +++ b/amp/xmlpatches/3.5.05.1/AMP-30515-Add-hide-empty-total-settings.xml @@ -0,0 +1,45 @@ + + + AMP-30515 + Add hide empty total settings + drychter + + + + \ No newline at end of file From 685290975e2e339f456e56cff13877708e460977 Mon Sep 17 00:00:00 2001 From: Damian Rychter Date: Mon, 3 Apr 2023 15:26:38 -0300 Subject: [PATCH 055/135] Change dev dependencies to hit amp-ui branch --- amp/TEMPLATE/reamp/package-lock.json | 689 ++++++--------------------- amp/TEMPLATE/reamp/package.json | 2 +- 2 files changed, 136 insertions(+), 555 deletions(-) diff --git a/amp/TEMPLATE/reamp/package-lock.json b/amp/TEMPLATE/reamp/package-lock.json index 22a3a4bdbd9..f927501f0a8 100644 --- a/amp/TEMPLATE/reamp/package-lock.json +++ b/amp/TEMPLATE/reamp/package-lock.json @@ -5,7 +5,6 @@ "requires": true, "packages": { "": { - "name": "reamp", "version": "0.1.0", "license": "inherit", "dependencies": { @@ -22,7 +21,7 @@ "uglifyjs-webpack-plugin": "^1.3.0" }, "devDependencies": { - "amp-ui": "github:devgateway/amp-ui#develop", + "amp-ui": "github:devgateway/amp-ui#task/AMP-30515/HideTotals", "babel-core": "^6.26.3", "babel-jest": "^6.0.1", "babel-loader": "^6.3.2", @@ -216,7 +215,6 @@ "node_modules/align-text": { "version": "0.1.4", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", - "dev": true, "dependencies": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -229,7 +227,6 @@ "node_modules/amdefine": { "version": "1.0.1", "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true, "engines": { "node": ">=0.4.2" } @@ -290,7 +287,6 @@ "node_modules/anymatch": { "version": "1.3.2", "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", - "dev": true, "dependencies": { "micromatch": "^2.1.5", "normalize-path": "^2.0.0" @@ -328,7 +324,6 @@ "node_modules/arr-union": { "version": "3.1.0", "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -367,7 +362,6 @@ "node_modules/assert": { "version": "1.5.0", "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", - "dev": true, "dependencies": { "object-assign": "^4.1.1", "util": "0.10.3" @@ -383,13 +377,11 @@ }, "node_modules/assert/node_modules/inherits": { "version": "2.0.1", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", - "dev": true + "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=" }, "node_modules/assert/node_modules/util": { "version": "0.10.3", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", - "dev": true, "dependencies": { "inherits": "2.0.1" } @@ -397,20 +389,17 @@ "node_modules/assign-symbols": { "version": "1.0.0", "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", - "dev": true, "engines": { "node": ">=0.10.0" } }, "node_modules/async": { "version": "1.5.2", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" }, "node_modules/async-each": { "version": "1.0.3", - "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==", - "dev": true + "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==" }, "node_modules/asynckit": { "version": "0.4.0", @@ -420,7 +409,6 @@ "node_modules/atob": { "version": "2.1.2", "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", - "dev": true, "bin": { "atob": "bin/atob.js" }, @@ -1352,7 +1340,6 @@ "node_modules/base": { "version": "0.11.2", "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", - "dev": true, "dependencies": { "cache-base": "^1.0.1", "class-utils": "^0.3.5", @@ -1369,7 +1356,6 @@ "node_modules/base/node_modules/define-property": { "version": "1.0.0", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, "dependencies": { "is-descriptor": "^1.0.0" }, @@ -1380,7 +1366,6 @@ "node_modules/base/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1388,7 +1373,6 @@ "node_modules/base64-js": { "version": "1.5.1", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true, "funding": [ { "type": "github", @@ -1420,7 +1404,6 @@ "node_modules/big.js": { "version": "3.2.0", "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==", - "dev": true, "engines": { "node": "*" } @@ -1428,7 +1411,6 @@ "node_modules/binary-extensions": { "version": "1.13.1", "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1547,7 +1529,6 @@ "node_modules/browserify-aes": { "version": "0.4.0", "integrity": "sha1-BnFJtmjfMcS1hTPgLQHoBthgjiw=", - "dev": true, "dependencies": { "inherits": "^2.0.1" } @@ -1555,15 +1536,13 @@ "node_modules/browserify-zlib": { "version": "0.1.4", "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=", - "dev": true, "dependencies": { "pako": "~0.2.0" } }, "node_modules/browserify-zlib/node_modules/pako": { "version": "0.2.9", - "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=", - "dev": true + "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=" }, "node_modules/browserslist": { "version": "0.4.0", @@ -1585,7 +1564,6 @@ "node_modules/buffer": { "version": "4.9.2", "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", - "dev": true, "dependencies": { "base64-js": "^1.0.2", "ieee754": "^1.1.4", @@ -1598,8 +1576,7 @@ }, "node_modules/builtin-status-codes": { "version": "3.0.0", - "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", - "dev": true + "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=" }, "node_modules/bytes": { "version": "3.0.0", @@ -1649,7 +1626,6 @@ "node_modules/cache-base": { "version": "1.0.1", "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", - "dev": true, "dependencies": { "collection-visit": "^1.0.0", "component-emitter": "^1.2.1", @@ -1668,7 +1644,6 @@ "node_modules/cache-base/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1676,7 +1651,6 @@ "node_modules/camelcase": { "version": "1.2.1", "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1694,7 +1668,6 @@ "node_modules/center-align": { "version": "0.1.3", "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", - "dev": true, "dependencies": { "align-text": "^0.1.3", "lazy-cache": "^1.0.3" @@ -1721,7 +1694,6 @@ "version": "1.7.0", "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.", - "dev": true, "dependencies": { "anymatch": "^1.3.0", "async-each": "^1.0.0", @@ -1743,7 +1715,6 @@ "node_modules/class-utils": { "version": "0.3.6", "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", - "dev": true, "dependencies": { "arr-union": "^3.1.0", "define-property": "^0.2.5", @@ -1757,7 +1728,6 @@ "node_modules/class-utils/node_modules/define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "dependencies": { "is-descriptor": "^0.1.0" }, @@ -1768,7 +1738,6 @@ "node_modules/class-utils/node_modules/is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -1779,7 +1748,6 @@ "node_modules/class-utils/node_modules/is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -1790,7 +1758,6 @@ "node_modules/class-utils/node_modules/is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, "dependencies": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -1803,7 +1770,6 @@ "node_modules/class-utils/node_modules/is-descriptor/node_modules/kind-of": { "version": "5.1.0", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1811,7 +1777,6 @@ "node_modules/class-utils/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1834,7 +1799,6 @@ "node_modules/cliui": { "version": "2.1.0", "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", - "dev": true, "dependencies": { "center-align": "^0.1.1", "right-align": "^0.1.1", @@ -1844,7 +1808,6 @@ "node_modules/cliui/node_modules/wordwrap": { "version": "0.0.2", "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", - "dev": true, "engines": { "node": ">=0.4.0" } @@ -1852,7 +1815,6 @@ "node_modules/clone": { "version": "1.0.4", "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", - "dev": true, "engines": { "node": ">=0.8" } @@ -1883,7 +1845,6 @@ "node_modules/collection-visit": { "version": "1.0.0", "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", - "dev": true, "dependencies": { "map-visit": "^1.0.0", "object-visit": "^1.0.0" @@ -1981,8 +1942,7 @@ }, "node_modules/component-emitter": { "version": "1.3.0", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", - "dev": true + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" }, "node_modules/compressible": { "version": "2.0.18", @@ -2059,13 +2019,11 @@ }, "node_modules/console-browserify": { "version": "1.2.0", - "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==", - "dev": true + "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==" }, "node_modules/constants-browserify": { "version": "1.0.0", - "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", - "dev": true + "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=" }, "node_modules/content-disposition": { "version": "0.5.4", @@ -2140,7 +2098,6 @@ "node_modules/copy-descriptor": { "version": "0.1.1", "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -2201,7 +2158,6 @@ "node_modules/crypto-browserify": { "version": "3.3.0", "integrity": "sha1-ufx1u0oO1h3PHNXa6W6zDJw+UGw=", - "dev": true, "dependencies": { "browserify-aes": "0.4.0", "pbkdf2-compat": "2.0.1", @@ -2336,7 +2292,6 @@ "node_modules/decamelize": { "version": "1.2.0", "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -2344,7 +2299,6 @@ "node_modules/decode-uri-component": { "version": "0.2.0", "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", - "dev": true, "engines": { "node": ">=0.10" } @@ -2362,7 +2316,6 @@ "node_modules/define-property": { "version": "2.0.2", "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", - "dev": true, "dependencies": { "is-descriptor": "^1.0.2", "isobject": "^3.0.1" @@ -2374,7 +2327,6 @@ "node_modules/define-property/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -2508,7 +2460,6 @@ "node_modules/domain-browser": { "version": "1.2.0", "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==", - "dev": true, "engines": { "node": ">=0.4", "npm": ">=1.2" @@ -2587,7 +2538,6 @@ "node_modules/emojis-list": { "version": "2.1.0", "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", - "dev": true, "engines": { "node": ">= 0.10" } @@ -2617,7 +2567,6 @@ "node_modules/enhanced-resolve": { "version": "0.9.1", "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=", - "dev": true, "dependencies": { "graceful-fs": "^4.1.2", "memory-fs": "^0.2.0", @@ -2629,8 +2578,7 @@ }, "node_modules/enhanced-resolve/node_modules/memory-fs": { "version": "0.2.0", - "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=", - "dev": true + "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=" }, "node_modules/entities": { "version": "1.1.2", @@ -2771,7 +2719,6 @@ "node_modules/events": { "version": "1.1.1", "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", - "dev": true, "engines": { "node": ">=0.4.x" } @@ -2946,7 +2893,6 @@ "node_modules/extend-shallow": { "version": "3.0.2", "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "dev": true, "dependencies": { "assign-symbols": "^1.0.0", "is-extendable": "^1.0.1" @@ -2958,7 +2904,6 @@ "node_modules/extend-shallow/node_modules/is-extendable": { "version": "1.0.1", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, "dependencies": { "is-plain-object": "^2.0.4" }, @@ -3233,7 +3178,6 @@ "node_modules/fragment-cache": { "version": "0.2.1", "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", - "dev": true, "dependencies": { "map-cache": "^0.2.2" }, @@ -3338,7 +3282,6 @@ "node_modules/get-value": { "version": "2.0.6", "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -3467,7 +3410,6 @@ "node_modules/has-flag": { "version": "1.0.0", "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -3475,7 +3417,6 @@ "node_modules/has-value": { "version": "1.0.0", "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", - "dev": true, "dependencies": { "get-value": "^2.0.6", "has-values": "^1.0.0", @@ -3488,7 +3429,6 @@ "node_modules/has-value/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -3496,7 +3436,6 @@ "node_modules/has-values": { "version": "1.0.0", "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", - "dev": true, "dependencies": { "is-number": "^3.0.0", "kind-of": "^4.0.0" @@ -3508,7 +3447,6 @@ "node_modules/has-values/node_modules/is-number": { "version": "3.0.0", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -3519,7 +3457,6 @@ "node_modules/has-values/node_modules/is-number/node_modules/kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "dependencies": { "is-buffer": "^1.1.5" }, @@ -3530,7 +3467,6 @@ "node_modules/has-values/node_modules/kind-of": { "version": "4.0.0", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", - "dev": true, "dependencies": { "is-buffer": "^1.1.5" }, @@ -3698,8 +3634,7 @@ }, "node_modules/https-browserify": { "version": "0.0.1", - "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=", - "dev": true + "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=" }, "node_modules/iconv-lite": { "version": "0.6.3", @@ -3714,7 +3649,6 @@ "node_modules/ieee754": { "version": "1.2.1", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true, "funding": [ { "type": "github", @@ -3784,8 +3718,7 @@ }, "node_modules/indexof": { "version": "0.0.1", - "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", - "dev": true + "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=" }, "node_modules/inflight": { "version": "1.0.6", @@ -3801,8 +3734,7 @@ }, "node_modules/interpret": { "version": "0.6.6", - "integrity": "sha1-/s16GOfOXKar+5U+H4YhOknxYls=", - "dev": true + "integrity": "sha1-/s16GOfOXKar+5U+H4YhOknxYls=" }, "node_modules/invariant": { "version": "2.2.4", @@ -3830,7 +3762,6 @@ "node_modules/is-accessor-descriptor": { "version": "1.0.0", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, "dependencies": { "kind-of": "^6.0.0" }, @@ -3841,7 +3772,6 @@ "node_modules/is-accessor-descriptor/node_modules/kind-of": { "version": "6.0.3", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -3853,7 +3783,6 @@ "node_modules/is-binary-path": { "version": "1.0.1", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true, "dependencies": { "binary-extensions": "^1.0.0" }, @@ -3878,7 +3807,6 @@ "node_modules/is-data-descriptor": { "version": "1.0.0", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, "dependencies": { "kind-of": "^6.0.0" }, @@ -3889,7 +3817,6 @@ "node_modules/is-data-descriptor/node_modules/kind-of": { "version": "6.0.3", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -3897,7 +3824,6 @@ "node_modules/is-descriptor": { "version": "1.0.2", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, "dependencies": { "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", @@ -3910,7 +3836,6 @@ "node_modules/is-descriptor/node_modules/kind-of": { "version": "6.0.3", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -3987,7 +3912,6 @@ "node_modules/is-plain-object": { "version": "2.0.4", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, "dependencies": { "isobject": "^3.0.1" }, @@ -3998,7 +3922,6 @@ "node_modules/is-plain-object/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -4036,7 +3959,6 @@ "node_modules/is-windows": { "version": "1.0.2", "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -4386,7 +4308,6 @@ "node_modules/lazy-cache": { "version": "1.0.4", "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -4628,7 +4549,6 @@ "node_modules/loader-utils": { "version": "0.2.17", "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", - "dev": true, "dependencies": { "big.js": "^3.1.3", "emojis-list": "^2.0.0", @@ -4774,7 +4694,6 @@ "node_modules/longest": { "version": "1.0.1", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -4825,7 +4744,6 @@ "node_modules/map-cache": { "version": "0.2.2", "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -4833,7 +4751,6 @@ "node_modules/map-visit": { "version": "1.0.0", "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", - "dev": true, "dependencies": { "object-visit": "^1.0.0" }, @@ -4861,7 +4778,6 @@ "node_modules/memory-fs": { "version": "0.3.0", "integrity": "sha1-e8xrYp46Q+hx1+Kaymrop/FcuyA=", - "dev": true, "dependencies": { "errno": "^0.1.3", "readable-stream": "^2.0.1" @@ -4870,7 +4786,6 @@ "node_modules/memory-fs/node_modules/readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -4884,7 +4799,6 @@ "node_modules/memory-fs/node_modules/string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } @@ -4995,7 +4909,6 @@ "node_modules/mixin-deep": { "version": "1.3.2", "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", - "dev": true, "dependencies": { "for-in": "^1.0.2", "is-extendable": "^1.0.1" @@ -5007,7 +4920,6 @@ "node_modules/mixin-deep/node_modules/is-extendable": { "version": "1.0.1", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, "dependencies": { "is-plain-object": "^2.0.4" }, @@ -5052,7 +4964,6 @@ "node_modules/nanomatch": { "version": "1.2.13", "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", - "dev": true, "dependencies": { "arr-diff": "^4.0.0", "array-unique": "^0.3.2", @@ -5073,7 +4984,6 @@ "node_modules/nanomatch/node_modules/arr-diff": { "version": "4.0.0", "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -5081,7 +4991,6 @@ "node_modules/nanomatch/node_modules/array-unique": { "version": "0.3.2", "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -5089,7 +4998,6 @@ "node_modules/nanomatch/node_modules/kind-of": { "version": "6.0.3", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -5144,7 +5052,6 @@ "node_modules/node-libs-browser": { "version": "0.7.0", "integrity": "sha1-PicsCBnjCJNeJmdECNevDhSRuDs=", - "dev": true, "dependencies": { "assert": "^1.1.1", "browserify-zlib": "^0.1.4", @@ -5173,13 +5080,11 @@ }, "node_modules/node-libs-browser/node_modules/punycode": { "version": "1.4.1", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" }, "node_modules/node-libs-browser/node_modules/readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -5193,15 +5098,13 @@ "node_modules/node-libs-browser/node_modules/readable-stream/node_modules/string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } }, "node_modules/node-libs-browser/node_modules/string_decoder": { "version": "0.10.31", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" }, "node_modules/node-worker-pool": { "version": "3.0.2", @@ -5301,7 +5204,6 @@ "node_modules/object-copy": { "version": "0.1.0", "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", - "dev": true, "dependencies": { "copy-descriptor": "^0.1.0", "define-property": "^0.2.5", @@ -5314,7 +5216,6 @@ "node_modules/object-copy/node_modules/define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "dependencies": { "is-descriptor": "^0.1.0" }, @@ -5325,7 +5226,6 @@ "node_modules/object-copy/node_modules/is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -5336,7 +5236,6 @@ "node_modules/object-copy/node_modules/is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -5347,7 +5246,6 @@ "node_modules/object-copy/node_modules/is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, "dependencies": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -5360,7 +5258,6 @@ "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": { "version": "5.1.0", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -5368,7 +5265,6 @@ "node_modules/object-visit": { "version": "1.0.1", "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", - "dev": true, "dependencies": { "isobject": "^3.0.0" }, @@ -5379,7 +5275,6 @@ "node_modules/object-visit/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -5398,7 +5293,6 @@ "node_modules/object.pick": { "version": "1.3.0", "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", - "dev": true, "dependencies": { "isobject": "^3.0.1" }, @@ -5409,7 +5303,6 @@ "node_modules/object.pick/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -5451,7 +5344,6 @@ "node_modules/optimist": { "version": "0.6.1", "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "dev": true, "dependencies": { "minimist": "~0.0.1", "wordwrap": "~0.0.2" @@ -5459,13 +5351,11 @@ }, "node_modules/optimist/node_modules/minimist": { "version": "0.0.10", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", - "dev": true + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" }, "node_modules/optimist/node_modules/wordwrap": { "version": "0.0.3", "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", - "dev": true, "engines": { "node": ">=0.4.0" } @@ -5504,8 +5394,7 @@ }, "node_modules/os-browserify": { "version": "0.2.1", - "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=", - "dev": true + "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=" }, "node_modules/os-homedir": { "version": "1.0.2", @@ -5621,15 +5510,13 @@ "node_modules/pascalcase": { "version": "0.1.1", "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", - "dev": true, "engines": { "node": ">=0.10.0" } }, "node_modules/path-browserify": { "version": "0.0.0", - "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", - "dev": true + "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=" }, "node_modules/path-exists": { "version": "2.1.0", @@ -5671,8 +5558,7 @@ }, "node_modules/pbkdf2-compat": { "version": "2.0.1", - "integrity": "sha1-tuDI+plJTZTgURV1gCpZpcFC8og=", - "dev": true + "integrity": "sha1-tuDI+plJTZTgURV1gCpZpcFC8og=" }, "node_modules/performance-now": { "version": "2.1.0", @@ -5721,7 +5607,6 @@ "node_modules/posix-character-classes": { "version": "0.1.1", "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -6032,7 +5917,6 @@ "node_modules/process": { "version": "0.11.10", "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", - "dev": true, "engines": { "node": ">= 0.6.0" } @@ -6152,7 +6036,6 @@ "version": "0.2.0", "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.", - "dev": true, "engines": { "node": ">=0.4.x" } @@ -6160,7 +6043,6 @@ "node_modules/querystring-es3": { "version": "0.2.1", "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", - "dev": true, "engines": { "node": ">=0.4.x" } @@ -6702,7 +6584,6 @@ "node_modules/readdirp": { "version": "2.2.1", "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", - "dev": true, "dependencies": { "graceful-fs": "^4.1.11", "micromatch": "^3.1.10", @@ -6715,7 +6596,6 @@ "node_modules/readdirp/node_modules/arr-diff": { "version": "4.0.0", "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -6723,7 +6603,6 @@ "node_modules/readdirp/node_modules/array-unique": { "version": "0.3.2", "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -6731,7 +6610,6 @@ "node_modules/readdirp/node_modules/braces": { "version": "2.3.2", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, "dependencies": { "arr-flatten": "^1.1.0", "array-unique": "^0.3.2", @@ -6751,7 +6629,6 @@ "node_modules/readdirp/node_modules/braces/node_modules/extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -6762,7 +6639,6 @@ "node_modules/readdirp/node_modules/expand-brackets": { "version": "2.1.4", "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "dev": true, "dependencies": { "debug": "^2.3.3", "define-property": "^0.2.5", @@ -6779,7 +6655,6 @@ "node_modules/readdirp/node_modules/expand-brackets/node_modules/define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "dependencies": { "is-descriptor": "^0.1.0" }, @@ -6790,7 +6665,6 @@ "node_modules/readdirp/node_modules/expand-brackets/node_modules/extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -6801,7 +6675,6 @@ "node_modules/readdirp/node_modules/expand-brackets/node_modules/is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, "dependencies": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -6814,7 +6687,6 @@ "node_modules/readdirp/node_modules/expand-brackets/node_modules/kind-of": { "version": "5.1.0", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -6822,7 +6694,6 @@ "node_modules/readdirp/node_modules/extglob": { "version": "2.0.4", "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "dev": true, "dependencies": { "array-unique": "^0.3.2", "define-property": "^1.0.0", @@ -6840,7 +6711,6 @@ "node_modules/readdirp/node_modules/extglob/node_modules/define-property": { "version": "1.0.0", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, "dependencies": { "is-descriptor": "^1.0.0" }, @@ -6851,7 +6721,6 @@ "node_modules/readdirp/node_modules/extglob/node_modules/extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -6862,7 +6731,6 @@ "node_modules/readdirp/node_modules/fill-range": { "version": "4.0.0", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, "dependencies": { "extend-shallow": "^2.0.1", "is-number": "^3.0.0", @@ -6876,7 +6744,6 @@ "node_modules/readdirp/node_modules/fill-range/node_modules/extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -6887,7 +6754,6 @@ "node_modules/readdirp/node_modules/is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -6898,7 +6764,6 @@ "node_modules/readdirp/node_modules/is-accessor-descriptor/node_modules/kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "dependencies": { "is-buffer": "^1.1.5" }, @@ -6909,7 +6774,6 @@ "node_modules/readdirp/node_modules/is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -6920,7 +6784,6 @@ "node_modules/readdirp/node_modules/is-data-descriptor/node_modules/kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "dependencies": { "is-buffer": "^1.1.5" }, @@ -6931,7 +6794,6 @@ "node_modules/readdirp/node_modules/is-number": { "version": "3.0.0", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -6942,7 +6804,6 @@ "node_modules/readdirp/node_modules/is-number/node_modules/kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "dependencies": { "is-buffer": "^1.1.5" }, @@ -6953,7 +6814,6 @@ "node_modules/readdirp/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -6961,7 +6821,6 @@ "node_modules/readdirp/node_modules/kind-of": { "version": "6.0.3", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -6969,7 +6828,6 @@ "node_modules/readdirp/node_modules/micromatch": { "version": "3.1.10", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "dev": true, "dependencies": { "arr-diff": "^4.0.0", "array-unique": "^0.3.2", @@ -6992,7 +6850,6 @@ "node_modules/readdirp/node_modules/readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -7006,7 +6863,6 @@ "node_modules/readdirp/node_modules/string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } @@ -7095,7 +6951,6 @@ "node_modules/regex-not": { "version": "1.0.2", "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", - "dev": true, "dependencies": { "extend-shallow": "^3.0.2", "safe-regex": "^1.1.0" @@ -7229,13 +7084,11 @@ "node_modules/resolve-url": { "version": "0.2.1", "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", - "deprecated": "https://github.com/lydell/resolve-url#deprecated", - "dev": true + "deprecated": "https://github.com/lydell/resolve-url#deprecated" }, "node_modules/ret": { "version": "0.1.15", "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", - "dev": true, "engines": { "node": ">=0.12" } @@ -7243,7 +7096,6 @@ "node_modules/right-align": { "version": "0.1.3", "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", - "dev": true, "dependencies": { "align-text": "^0.1.1" }, @@ -7281,8 +7133,7 @@ }, "node_modules/ripemd160": { "version": "0.2.0", - "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=", - "dev": true + "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=" }, "node_modules/run-queue": { "version": "1.0.3", @@ -7298,7 +7149,6 @@ "node_modules/safe-regex": { "version": "1.1.0", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", - "dev": true, "dependencies": { "ret": "~0.1.10" } @@ -7449,7 +7299,6 @@ "node_modules/set-value": { "version": "2.0.1", "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", - "dev": true, "dependencies": { "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", @@ -7463,7 +7312,6 @@ "node_modules/set-value/node_modules/extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -7483,7 +7331,6 @@ "node_modules/sha.js": { "version": "2.2.6", "integrity": "sha1-F93t3F9yL7ZlAWWIlUYZd4ZzFbo=", - "dev": true, "bin": { "sha.js": "bin.js" } @@ -7502,7 +7349,6 @@ "node_modules/snapdragon": { "version": "0.8.2", "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", - "dev": true, "dependencies": { "base": "^0.11.1", "debug": "^2.2.0", @@ -7520,7 +7366,6 @@ "node_modules/snapdragon-node": { "version": "2.1.1", "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", - "dev": true, "dependencies": { "define-property": "^1.0.0", "isobject": "^3.0.0", @@ -7533,7 +7378,6 @@ "node_modules/snapdragon-node/node_modules/define-property": { "version": "1.0.0", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, "dependencies": { "is-descriptor": "^1.0.0" }, @@ -7544,7 +7388,6 @@ "node_modules/snapdragon-node/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -7552,7 +7395,6 @@ "node_modules/snapdragon-util": { "version": "3.0.1", "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", - "dev": true, "dependencies": { "kind-of": "^3.2.0" }, @@ -7563,7 +7405,6 @@ "node_modules/snapdragon/node_modules/define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "dependencies": { "is-descriptor": "^0.1.0" }, @@ -7574,7 +7415,6 @@ "node_modules/snapdragon/node_modules/extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -7585,7 +7425,6 @@ "node_modules/snapdragon/node_modules/is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -7596,7 +7435,6 @@ "node_modules/snapdragon/node_modules/is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -7607,7 +7445,6 @@ "node_modules/snapdragon/node_modules/is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, "dependencies": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -7620,7 +7457,6 @@ "node_modules/snapdragon/node_modules/is-descriptor/node_modules/kind-of": { "version": "5.1.0", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -7695,8 +7531,7 @@ }, "node_modules/source-list-map": { "version": "0.1.8", - "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=", - "dev": true + "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=" }, "node_modules/source-map": { "version": "0.5.7", @@ -7709,7 +7544,6 @@ "version": "0.5.3", "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated", - "dev": true, "dependencies": { "atob": "^2.1.2", "decode-uri-component": "^0.2.0", @@ -7728,8 +7562,7 @@ "node_modules/source-map-url": { "version": "0.4.1", "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==", - "deprecated": "See https://github.com/lydell/source-map-url#deprecated", - "dev": true + "deprecated": "See https://github.com/lydell/source-map-url#deprecated" }, "node_modules/spdx-correct": { "version": "3.1.1", @@ -7758,7 +7591,6 @@ "node_modules/split-string": { "version": "3.1.0", "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", - "dev": true, "dependencies": { "extend-shallow": "^3.0.0" }, @@ -7805,7 +7637,6 @@ "node_modules/static-extend": { "version": "0.1.2", "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", - "dev": true, "dependencies": { "define-property": "^0.2.5", "object-copy": "^0.1.0" @@ -7817,7 +7648,6 @@ "node_modules/static-extend/node_modules/define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "dependencies": { "is-descriptor": "^0.1.0" }, @@ -7828,7 +7658,6 @@ "node_modules/static-extend/node_modules/is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -7839,7 +7668,6 @@ "node_modules/static-extend/node_modules/is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -7850,7 +7678,6 @@ "node_modules/static-extend/node_modules/is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, "dependencies": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -7863,7 +7690,6 @@ "node_modules/static-extend/node_modules/is-descriptor/node_modules/kind-of": { "version": "5.1.0", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -7879,7 +7705,6 @@ "node_modules/stream-browserify": { "version": "2.0.2", "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", - "dev": true, "dependencies": { "inherits": "~2.0.1", "readable-stream": "^2.0.2" @@ -7888,7 +7713,6 @@ "node_modules/stream-browserify/node_modules/readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -7902,7 +7726,6 @@ "node_modules/stream-browserify/node_modules/string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } @@ -7926,7 +7749,6 @@ "node_modules/stream-http": { "version": "2.8.3", "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", - "dev": true, "dependencies": { "builtin-status-codes": "^3.0.0", "inherits": "^2.0.1", @@ -7938,7 +7760,6 @@ "node_modules/stream-http/node_modules/readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -7952,7 +7773,6 @@ "node_modules/stream-http/node_modules/string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } @@ -8063,7 +7883,6 @@ "node_modules/tapable": { "version": "0.1.10", "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=", - "dev": true, "engines": { "node": ">=0.6" } @@ -8123,7 +7942,6 @@ "node_modules/timers-browserify": { "version": "2.0.12", "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==", - "dev": true, "dependencies": { "setimmediate": "^1.0.4" }, @@ -8138,8 +7956,7 @@ }, "node_modules/to-arraybuffer": { "version": "1.0.1", - "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", - "dev": true + "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=" }, "node_modules/to-fast-properties": { "version": "1.0.3", @@ -8151,7 +7968,6 @@ "node_modules/to-object-path": { "version": "0.3.0", "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -8162,7 +7978,6 @@ "node_modules/to-regex": { "version": "3.0.2", "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", - "dev": true, "dependencies": { "define-property": "^2.0.2", "extend-shallow": "^3.0.2", @@ -8176,7 +7991,6 @@ "node_modules/to-regex-range": { "version": "2.1.1", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true, "dependencies": { "is-number": "^3.0.0", "repeat-string": "^1.6.1" @@ -8188,7 +8002,6 @@ "node_modules/to-regex-range/node_modules/is-number": { "version": "3.0.0", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, "dependencies": { "kind-of": "^3.0.2" }, @@ -8230,8 +8043,7 @@ }, "node_modules/tty-browserify": { "version": "0.0.0", - "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", - "dev": true + "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=" }, "node_modules/tunnel-agent": { "version": "0.6.0", @@ -8329,8 +8141,7 @@ }, "node_modules/uglify-to-browserify": { "version": "1.0.2", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", - "dev": true + "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=" }, "node_modules/uglifyjs-webpack-plugin": { "version": "1.3.0", @@ -8421,7 +8232,6 @@ "node_modules/union-value": { "version": "1.0.1", "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", - "dev": true, "dependencies": { "arr-union": "^3.1.0", "get-value": "^2.0.6", @@ -8472,7 +8282,6 @@ "node_modules/unset-value": { "version": "1.0.0", "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", - "dev": true, "dependencies": { "has-value": "^0.3.1", "isobject": "^3.0.0" @@ -8484,7 +8293,6 @@ "node_modules/unset-value/node_modules/has-value": { "version": "0.3.1", "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", - "dev": true, "dependencies": { "get-value": "^2.0.3", "has-values": "^0.1.4", @@ -8497,7 +8305,6 @@ "node_modules/unset-value/node_modules/has-value/node_modules/isobject": { "version": "2.1.0", "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true, "dependencies": { "isarray": "1.0.0" }, @@ -8508,7 +8315,6 @@ "node_modules/unset-value/node_modules/has-values": { "version": "0.1.4", "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -8516,7 +8322,6 @@ "node_modules/unset-value/node_modules/isobject": { "version": "3.0.1", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -8531,13 +8336,11 @@ "node_modules/urix": { "version": "0.1.0", "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", - "deprecated": "Please see https://github.com/lydell/urix#deprecated", - "dev": true + "deprecated": "Please see https://github.com/lydell/urix#deprecated" }, "node_modules/url": { "version": "0.11.0", "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", - "dev": true, "dependencies": { "punycode": "1.3.2", "querystring": "0.2.0" @@ -8554,13 +8357,11 @@ }, "node_modules/url/node_modules/punycode": { "version": "1.3.2", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", - "dev": true + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" }, "node_modules/use": { "version": "3.1.1", "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -8568,7 +8369,6 @@ "node_modules/util": { "version": "0.10.4", "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", - "dev": true, "dependencies": { "inherits": "2.0.3" } @@ -8579,8 +8379,7 @@ }, "node_modules/util/node_modules/inherits": { "version": "2.0.3", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, "node_modules/utils-merge": { "version": "1.0.1", @@ -8631,7 +8430,6 @@ "node_modules/vm-browserify": { "version": "0.0.4", "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", - "dev": true, "dependencies": { "indexof": "0.0.1" } @@ -8662,7 +8460,6 @@ "node_modules/watchpack": { "version": "0.2.9", "integrity": "sha1-Yuqkq15bo1/fwBgnVibjwPXj+ws=", - "dev": true, "dependencies": { "async": "^0.9.0", "chokidar": "^1.0.0", @@ -8671,13 +8468,11 @@ }, "node_modules/watchpack/node_modules/async": { "version": "0.9.2", - "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", - "dev": true + "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=" }, "node_modules/webpack": { "version": "1.15.0", "integrity": "sha1-T/MfU9sDM55VFkqdRo7gMklo/pg=", - "dev": true, "dependencies": { "acorn": "^3.0.0", "async": "^1.3.0", @@ -8705,7 +8500,6 @@ "node_modules/webpack-core": { "version": "0.6.9", "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=", - "dev": true, "dependencies": { "source-list-map": "~0.1.7", "source-map": "~0.4.1" @@ -8717,7 +8511,6 @@ "node_modules/webpack-core/node_modules/source-map": { "version": "0.4.4", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, "dependencies": { "amdefine": ">=0.0.4" }, @@ -8833,7 +8626,6 @@ "node_modules/webpack/node_modules/acorn": { "version": "3.3.0", "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", - "dev": true, "bin": { "acorn": "bin/acorn" }, @@ -8844,7 +8636,6 @@ "node_modules/webpack/node_modules/supports-color": { "version": "3.2.3", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, "dependencies": { "has-flag": "^1.0.0" }, @@ -8855,7 +8646,6 @@ "node_modules/webpack/node_modules/uglify-js": { "version": "2.7.5", "integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=", - "dev": true, "dependencies": { "async": "~0.2.6", "source-map": "~0.5.1", @@ -8871,8 +8661,7 @@ }, "node_modules/webpack/node_modules/uglify-js/node_modules/async": { "version": "0.2.10", - "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=", - "dev": true + "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=" }, "node_modules/websocket-driver": { "version": "0.7.4", @@ -8922,7 +8711,6 @@ "node_modules/window-size": { "version": "0.1.0", "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", - "dev": true, "engines": { "node": ">= 0.8.0" } @@ -8995,7 +8783,6 @@ "node_modules/yargs": { "version": "3.10.0", "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "dev": true, "dependencies": { "camelcase": "^1.0.2", "cliui": "^2.1.0", @@ -9028,7 +8815,8 @@ }, "react-dom": { "version": "15.3.2", - "integrity": "sha1-xGsKpTgNe4OOelnEp77/LtMVUx8=" + "integrity": "sha1-xGsKpTgNe4OOelnEp77/LtMVUx8=", + "requires": {} } } }, @@ -9128,12 +8916,12 @@ }, "ajv-keywords": { "version": "3.5.2", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==" + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "requires": {} }, "align-text": { "version": "0.1.4", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", - "dev": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -9142,13 +8930,12 @@ }, "amdefine": { "version": "1.0.1", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, "amp-ui": { "version": "git+ssh://git@github.com/devgateway/amp-ui.git#288d4b6980f0940613a8c52cbd911bd936662f29", "dev": true, - "from": "amp-ui@github:devgateway/amp-ui#develop", + "from": "amp-ui@github:devgateway/amp-ui#task/AMP-30515/HideTotals", "requires": { "docx": "^4.7.1", "file-saver": "git+ssh://github.com/devgateway/FileSaver.js", @@ -9183,7 +8970,6 @@ "anymatch": { "version": "1.3.2", "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", - "dev": true, "requires": { "micromatch": "^2.1.5", "normalize-path": "^2.0.0" @@ -9214,8 +9000,7 @@ }, "arr-union": { "version": "3.1.0", - "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", - "dev": true + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=" }, "array-flatten": { "version": "1.1.1", @@ -9245,7 +9030,6 @@ "assert": { "version": "1.5.0", "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", - "dev": true, "requires": { "object-assign": "^4.1.1", "util": "0.10.3" @@ -9253,13 +9037,11 @@ "dependencies": { "inherits": { "version": "2.0.1", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", - "dev": true + "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=" }, "util": { "version": "0.10.3", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", - "dev": true, "requires": { "inherits": "2.0.1" } @@ -9273,18 +9055,15 @@ }, "assign-symbols": { "version": "1.0.0", - "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", - "dev": true + "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" }, "async": { "version": "1.5.2", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" }, "async-each": { "version": "1.0.3", - "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==", - "dev": true + "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==" }, "asynckit": { "version": "0.4.0", @@ -9293,8 +9072,7 @@ }, "atob": { "version": "2.1.2", - "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", - "dev": true + "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" }, "autoprefixer-core": { "version": "5.2.1", @@ -10210,7 +9988,6 @@ "base": { "version": "0.11.2", "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", - "dev": true, "requires": { "cache-base": "^1.0.1", "class-utils": "^0.3.5", @@ -10224,22 +10001,19 @@ "define-property": { "version": "1.0.0", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, "requires": { "is-descriptor": "^1.0.0" } }, "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, "base64-js": { "version": "1.5.1", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" }, "batch": { "version": "0.6.1", @@ -10256,13 +10030,11 @@ }, "big.js": { "version": "3.2.0", - "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==", - "dev": true + "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==" }, "binary-extensions": { "version": "1.13.1", - "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", - "dev": true + "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==" }, "blacklist": { "version": "1.1.4", @@ -10354,7 +10126,6 @@ "browserify-aes": { "version": "0.4.0", "integrity": "sha1-BnFJtmjfMcS1hTPgLQHoBthgjiw=", - "dev": true, "requires": { "inherits": "^2.0.1" } @@ -10362,15 +10133,13 @@ "browserify-zlib": { "version": "0.1.4", "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=", - "dev": true, "requires": { "pako": "~0.2.0" }, "dependencies": { "pako": { "version": "0.2.9", - "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=", - "dev": true + "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=" } } }, @@ -10393,7 +10162,6 @@ "buffer": { "version": "4.9.2", "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", - "dev": true, "requires": { "base64-js": "^1.0.2", "ieee754": "^1.1.4", @@ -10406,8 +10174,7 @@ }, "builtin-status-codes": { "version": "3.0.0", - "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", - "dev": true + "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=" }, "bytes": { "version": "3.0.0", @@ -10450,7 +10217,6 @@ "cache-base": { "version": "1.0.1", "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", - "dev": true, "requires": { "collection-visit": "^1.0.0", "component-emitter": "^1.2.1", @@ -10465,15 +10231,13 @@ "dependencies": { "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, "camelcase": { "version": "1.2.1", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", - "dev": true + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=" }, "caniuse-db": { "version": "1.0.30001312", @@ -10488,7 +10252,6 @@ "center-align": { "version": "0.1.3", "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", - "dev": true, "requires": { "align-text": "^0.1.3", "lazy-cache": "^1.0.3" @@ -10508,7 +10271,6 @@ "chokidar": { "version": "1.7.0", "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", - "dev": true, "requires": { "anymatch": "^1.3.0", "async-each": "^1.0.0", @@ -10528,7 +10290,6 @@ "class-utils": { "version": "0.3.6", "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", - "dev": true, "requires": { "arr-union": "^3.1.0", "define-property": "^0.2.5", @@ -10539,7 +10300,6 @@ "define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "requires": { "is-descriptor": "^0.1.0" } @@ -10547,7 +10307,6 @@ "is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -10555,7 +10314,6 @@ "is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -10563,7 +10321,6 @@ "is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, "requires": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -10572,15 +10329,13 @@ "dependencies": { "kind-of": { "version": "5.1.0", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" } } }, "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, @@ -10599,7 +10354,6 @@ "cliui": { "version": "2.1.0", "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", - "dev": true, "requires": { "center-align": "^0.1.1", "right-align": "^0.1.1", @@ -10608,15 +10362,13 @@ "dependencies": { "wordwrap": { "version": "0.0.2", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", - "dev": true + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=" } } }, "clone": { "version": "1.0.4", - "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", - "dev": true + "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=" }, "co": { "version": "4.6.0", @@ -10632,7 +10384,6 @@ "collection-visit": { "version": "1.0.0", "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", - "dev": true, "requires": { "map-visit": "^1.0.0", "object-visit": "^1.0.0" @@ -10723,8 +10474,7 @@ }, "component-emitter": { "version": "1.3.0", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", - "dev": true + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" }, "compressible": { "version": "2.0.18", @@ -10791,13 +10541,11 @@ }, "console-browserify": { "version": "1.2.0", - "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==", - "dev": true + "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==" }, "constants-browserify": { "version": "1.0.0", - "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", - "dev": true + "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=" }, "content-disposition": { "version": "0.5.4", @@ -10850,8 +10598,7 @@ }, "copy-descriptor": { "version": "0.1.1", - "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", - "dev": true + "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" }, "core-js": { "version": "2.6.12", @@ -10899,7 +10646,6 @@ "crypto-browserify": { "version": "3.3.0", "integrity": "sha1-ufx1u0oO1h3PHNXa6W6zDJw+UGw=", - "dev": true, "requires": { "browserify-aes": "0.4.0", "pbkdf2-compat": "2.0.1", @@ -11017,13 +10763,11 @@ }, "decamelize": { "version": "1.2.0", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, "decode-uri-component": { "version": "0.2.0", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", - "dev": true + "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" }, "deep-diff": { "version": "0.3.4", @@ -11038,7 +10782,6 @@ "define-property": { "version": "2.0.2", "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", - "dev": true, "requires": { "is-descriptor": "^1.0.2", "isobject": "^3.0.1" @@ -11046,8 +10789,7 @@ "dependencies": { "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, @@ -11157,8 +10899,7 @@ }, "domain-browser": { "version": "1.2.0", - "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==", - "dev": true + "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==" }, "domelementtype": { "version": "1.3.1", @@ -11234,8 +10975,7 @@ }, "emojis-list": { "version": "2.1.0", - "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", - "dev": true + "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=" }, "encodeurl": { "version": "1.0.2", @@ -11259,7 +10999,6 @@ "enhanced-resolve": { "version": "0.9.1", "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=", - "dev": true, "requires": { "graceful-fs": "^4.1.2", "memory-fs": "^0.2.0", @@ -11268,8 +11007,7 @@ "dependencies": { "memory-fs": { "version": "0.2.0", - "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=", - "dev": true + "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=" } } }, @@ -11365,8 +11103,7 @@ }, "events": { "version": "1.1.1", - "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", - "dev": true + "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=" }, "eventsource": { "version": "1.1.0", @@ -11498,7 +11235,6 @@ "extend-shallow": { "version": "3.0.2", "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "dev": true, "requires": { "assign-symbols": "^1.0.0", "is-extendable": "^1.0.1" @@ -11507,7 +11243,6 @@ "is-extendable": { "version": "1.0.1", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, "requires": { "is-plain-object": "^2.0.4" } @@ -11724,7 +11459,6 @@ "fragment-cache": { "version": "0.2.1", "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", - "dev": true, "requires": { "map-cache": "^0.2.2" } @@ -11826,8 +11560,7 @@ }, "get-value": { "version": "2.0.6", - "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", - "dev": true + "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=" }, "getpass": { "version": "0.1.7", @@ -11921,13 +11654,11 @@ }, "has-flag": { "version": "1.0.0", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" }, "has-value": { "version": "1.0.0", "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", - "dev": true, "requires": { "get-value": "^2.0.6", "has-values": "^1.0.0", @@ -11936,15 +11667,13 @@ "dependencies": { "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, "has-values": { "version": "1.0.0", "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", - "dev": true, "requires": { "is-number": "^3.0.0", "kind-of": "^4.0.0" @@ -11953,7 +11682,6 @@ "is-number": { "version": "3.0.0", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, "requires": { "kind-of": "^3.0.2" }, @@ -11961,7 +11689,6 @@ "kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "requires": { "is-buffer": "^1.1.5" } @@ -11971,7 +11698,6 @@ "kind-of": { "version": "4.0.0", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", - "dev": true, "requires": { "is-buffer": "^1.1.5" } @@ -12110,8 +11836,7 @@ }, "https-browserify": { "version": "0.0.1", - "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=", - "dev": true + "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=" }, "iconv-lite": { "version": "0.6.3", @@ -12122,8 +11847,7 @@ }, "ieee754": { "version": "1.2.1", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" }, "iferr": { "version": "0.1.5", @@ -12169,8 +11893,7 @@ }, "indexof": { "version": "0.0.1", - "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", - "dev": true + "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=" }, "inflight": { "version": "1.0.6", @@ -12186,8 +11909,7 @@ }, "interpret": { "version": "0.6.6", - "integrity": "sha1-/s16GOfOXKar+5U+H4YhOknxYls=", - "dev": true + "integrity": "sha1-/s16GOfOXKar+5U+H4YhOknxYls=" }, "invariant": { "version": "2.2.4", @@ -12209,15 +11931,13 @@ "is-accessor-descriptor": { "version": "1.0.0", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, "requires": { "kind-of": "^6.0.0" }, "dependencies": { "kind-of": { "version": "6.0.3", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" } } }, @@ -12228,7 +11948,6 @@ "is-binary-path": { "version": "1.0.1", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true, "requires": { "binary-extensions": "^1.0.0" } @@ -12247,22 +11966,19 @@ "is-data-descriptor": { "version": "1.0.0", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, "requires": { "kind-of": "^6.0.0" }, "dependencies": { "kind-of": { "version": "6.0.3", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" } } }, "is-descriptor": { "version": "1.0.2", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, "requires": { "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", @@ -12271,8 +11987,7 @@ "dependencies": { "kind-of": { "version": "6.0.3", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" } } }, @@ -12321,15 +12036,13 @@ "is-plain-object": { "version": "2.0.4", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, "requires": { "isobject": "^3.0.1" }, "dependencies": { "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, @@ -12356,8 +12069,7 @@ }, "is-windows": { "version": "1.0.2", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", - "dev": true + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" }, "isarray": { "version": "1.0.0", @@ -12664,8 +12376,7 @@ }, "lazy-cache": { "version": "1.0.4", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", - "dev": true + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=" }, "less": { "version": "2.7.3", @@ -12852,7 +12563,6 @@ "loader-utils": { "version": "0.2.17", "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", - "dev": true, "requires": { "big.js": "^3.1.3", "emojis-list": "^2.0.0", @@ -12986,8 +12696,7 @@ }, "longest": { "version": "1.0.1", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=" }, "loose-envify": { "version": "1.4.0", @@ -13027,13 +12736,11 @@ }, "map-cache": { "version": "0.2.2", - "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", - "dev": true + "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" }, "map-visit": { "version": "1.0.0", "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", - "dev": true, "requires": { "object-visit": "^1.0.0" } @@ -13055,7 +12762,6 @@ "memory-fs": { "version": "0.3.0", "integrity": "sha1-e8xrYp46Q+hx1+Kaymrop/FcuyA=", - "dev": true, "requires": { "errno": "^0.1.3", "readable-stream": "^2.0.1" @@ -13064,7 +12770,6 @@ "readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -13078,7 +12783,6 @@ "string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -13167,7 +12871,6 @@ "mixin-deep": { "version": "1.3.2", "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", - "dev": true, "requires": { "for-in": "^1.0.2", "is-extendable": "^1.0.1" @@ -13176,7 +12879,6 @@ "is-extendable": { "version": "1.0.1", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, "requires": { "is-plain-object": "^2.0.4" } @@ -13214,7 +12916,6 @@ "nanomatch": { "version": "1.2.13", "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", - "dev": true, "requires": { "arr-diff": "^4.0.0", "array-unique": "^0.3.2", @@ -13231,18 +12932,15 @@ "dependencies": { "arr-diff": { "version": "4.0.0", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", - "dev": true + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" }, "array-unique": { "version": "0.3.2", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" }, "kind-of": { "version": "6.0.3", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" } } }, @@ -13290,7 +12988,6 @@ "node-libs-browser": { "version": "0.7.0", "integrity": "sha1-PicsCBnjCJNeJmdECNevDhSRuDs=", - "dev": true, "requires": { "assert": "^1.1.1", "browserify-zlib": "^0.1.4", @@ -13319,13 +13016,11 @@ "dependencies": { "punycode": { "version": "1.4.1", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" }, "readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -13339,7 +13034,6 @@ "string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -13348,8 +13042,7 @@ }, "string_decoder": { "version": "0.10.31", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" } } }, @@ -13430,7 +13123,6 @@ "object-copy": { "version": "0.1.0", "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", - "dev": true, "requires": { "copy-descriptor": "^0.1.0", "define-property": "^0.2.5", @@ -13440,7 +13132,6 @@ "define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "requires": { "is-descriptor": "^0.1.0" } @@ -13448,7 +13139,6 @@ "is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -13456,7 +13146,6 @@ "is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -13464,7 +13153,6 @@ "is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, "requires": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -13473,8 +13161,7 @@ "dependencies": { "kind-of": { "version": "5.1.0", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" } } } @@ -13483,15 +13170,13 @@ "object-visit": { "version": "1.0.1", "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", - "dev": true, "requires": { "isobject": "^3.0.0" }, "dependencies": { "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, @@ -13506,15 +13191,13 @@ "object.pick": { "version": "1.3.0", "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", - "dev": true, "requires": { "isobject": "^3.0.1" }, "dependencies": { "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, @@ -13546,7 +13229,6 @@ "optimist": { "version": "0.6.1", "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "dev": true, "requires": { "minimist": "~0.0.1", "wordwrap": "~0.0.2" @@ -13554,13 +13236,11 @@ "dependencies": { "minimist": { "version": "0.0.10", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", - "dev": true + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" }, "wordwrap": { "version": "0.0.3", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", - "dev": true + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" } } }, @@ -13594,8 +13274,7 @@ }, "os-browserify": { "version": "0.2.1", - "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=", - "dev": true + "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=" }, "os-homedir": { "version": "1.0.2", @@ -13688,13 +13367,11 @@ }, "pascalcase": { "version": "0.1.1", - "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", - "dev": true + "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=" }, "path-browserify": { "version": "0.0.0", - "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", - "dev": true + "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=" }, "path-exists": { "version": "2.1.0", @@ -13727,8 +13404,7 @@ }, "pbkdf2-compat": { "version": "2.0.1", - "integrity": "sha1-tuDI+plJTZTgURV1gCpZpcFC8og=", - "dev": true + "integrity": "sha1-tuDI+plJTZTgURV1gCpZpcFC8og=" }, "performance-now": { "version": "2.1.0", @@ -13764,8 +13440,7 @@ }, "posix-character-classes": { "version": "0.1.1", - "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", - "dev": true + "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "postcss": { "version": "4.1.16", @@ -14058,8 +13733,7 @@ }, "process": { "version": "0.11.10", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", - "dev": true + "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=" }, "process-nextick-args": { "version": "2.0.1", @@ -14161,13 +13835,11 @@ }, "querystring": { "version": "0.2.0", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", - "dev": true + "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=" }, "querystring-es3": { "version": "0.2.1", - "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", - "dev": true + "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=" }, "querystringify": { "version": "2.2.0", @@ -14254,7 +13926,8 @@ }, "react-addons-update": { "version": "15.3.2", - "integrity": "sha1-tjhcTbHl3zcYJeBhWwQ2DtlEMP4=" + "integrity": "sha1-tjhcTbHl3zcYJeBhWwQ2DtlEMP4=", + "requires": {} }, "react-bootstrap": { "version": "0.32.4", @@ -14356,7 +14029,8 @@ }, "react-filtered-multiselect": { "version": "0.4.2", - "integrity": "sha1-gZaHX4nl/3zt8JFoQrFWz2hPgSE=" + "integrity": "sha1-gZaHX4nl/3zt8JFoQrFWz2hPgSE=", + "requires": {} }, "react-highlighter": { "version": "0.4.3", @@ -14371,7 +14045,8 @@ "react-hot-api": { "version": "0.4.7", "integrity": "sha1-p+IqVtJS4Rq9k2a2EmTPRJLFgXE=", - "dev": true + "dev": true, + "requires": {} }, "react-hot-loader": { "version": "1.3.1", @@ -14461,7 +14136,8 @@ "react-numeric-input": { "version": "2.0.9", "integrity": "sha1-ro4awpiOi8yMS7PLEHuy2DutTlo=", - "dev": true + "dev": true, + "requires": {} }, "react-onclickoutside": { "version": "5.11.1", @@ -14601,7 +14277,6 @@ "readdirp": { "version": "2.2.1", "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", - "dev": true, "requires": { "graceful-fs": "^4.1.11", "micromatch": "^3.1.10", @@ -14610,18 +14285,15 @@ "dependencies": { "arr-diff": { "version": "4.0.0", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", - "dev": true + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" }, "array-unique": { "version": "0.3.2", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" }, "braces": { "version": "2.3.2", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, "requires": { "arr-flatten": "^1.1.0", "array-unique": "^0.3.2", @@ -14638,7 +14310,6 @@ "extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "requires": { "is-extendable": "^0.1.0" } @@ -14648,7 +14319,6 @@ "expand-brackets": { "version": "2.1.4", "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "dev": true, "requires": { "debug": "^2.3.3", "define-property": "^0.2.5", @@ -14662,7 +14332,6 @@ "define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "requires": { "is-descriptor": "^0.1.0" } @@ -14670,7 +14339,6 @@ "extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "requires": { "is-extendable": "^0.1.0" } @@ -14678,7 +14346,6 @@ "is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, "requires": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -14687,15 +14354,13 @@ }, "kind-of": { "version": "5.1.0", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" } } }, "extglob": { "version": "2.0.4", "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "dev": true, "requires": { "array-unique": "^0.3.2", "define-property": "^1.0.0", @@ -14710,7 +14375,6 @@ "define-property": { "version": "1.0.0", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, "requires": { "is-descriptor": "^1.0.0" } @@ -14718,7 +14382,6 @@ "extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "requires": { "is-extendable": "^0.1.0" } @@ -14728,7 +14391,6 @@ "fill-range": { "version": "4.0.0", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, "requires": { "extend-shallow": "^2.0.1", "is-number": "^3.0.0", @@ -14739,7 +14401,6 @@ "extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "requires": { "is-extendable": "^0.1.0" } @@ -14749,7 +14410,6 @@ "is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, "requires": { "kind-of": "^3.0.2" }, @@ -14757,7 +14417,6 @@ "kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "requires": { "is-buffer": "^1.1.5" } @@ -14767,7 +14426,6 @@ "is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, "requires": { "kind-of": "^3.0.2" }, @@ -14775,7 +14433,6 @@ "kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "requires": { "is-buffer": "^1.1.5" } @@ -14785,7 +14442,6 @@ "is-number": { "version": "3.0.0", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, "requires": { "kind-of": "^3.0.2" }, @@ -14793,7 +14449,6 @@ "kind-of": { "version": "3.2.2", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "requires": { "is-buffer": "^1.1.5" } @@ -14802,18 +14457,15 @@ }, "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" }, "kind-of": { "version": "6.0.3", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" }, "micromatch": { "version": "3.1.10", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "dev": true, "requires": { "arr-diff": "^4.0.0", "array-unique": "^0.3.2", @@ -14833,7 +14485,6 @@ "readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -14847,7 +14498,6 @@ "string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -14939,7 +14589,6 @@ "regex-not": { "version": "1.0.2", "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", - "dev": true, "requires": { "extend-shallow": "^3.0.2", "safe-regex": "^1.1.0" @@ -15046,18 +14695,15 @@ }, "resolve-url": { "version": "0.2.1", - "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", - "dev": true + "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" }, "ret": { "version": "0.1.15", - "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", - "dev": true + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" }, "right-align": { "version": "0.1.3", "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", - "dev": true, "requires": { "align-text": "^0.1.1" } @@ -15085,8 +14731,7 @@ }, "ripemd160": { "version": "0.2.0", - "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=", - "dev": true + "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=" }, "run-queue": { "version": "1.0.3", @@ -15102,7 +14747,6 @@ "safe-regex": { "version": "1.1.0", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", - "dev": true, "requires": { "ret": "~0.1.10" } @@ -15229,7 +14873,6 @@ "set-value": { "version": "2.0.1", "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", - "dev": true, "requires": { "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", @@ -15240,7 +14883,6 @@ "extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "requires": { "is-extendable": "^0.1.0" } @@ -15258,8 +14900,7 @@ }, "sha.js": { "version": "2.2.6", - "integrity": "sha1-F93t3F9yL7ZlAWWIlUYZd4ZzFbo=", - "dev": true + "integrity": "sha1-F93t3F9yL7ZlAWWIlUYZd4ZzFbo=" }, "shallowequal": { "version": "1.1.0", @@ -15272,7 +14913,6 @@ "snapdragon": { "version": "0.8.2", "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", - "dev": true, "requires": { "base": "^0.11.1", "debug": "^2.2.0", @@ -15287,7 +14927,6 @@ "define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "requires": { "is-descriptor": "^0.1.0" } @@ -15295,7 +14934,6 @@ "extend-shallow": { "version": "2.0.1", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "requires": { "is-extendable": "^0.1.0" } @@ -15303,7 +14941,6 @@ "is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -15311,7 +14948,6 @@ "is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -15319,7 +14955,6 @@ "is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, "requires": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -15328,8 +14963,7 @@ "dependencies": { "kind-of": { "version": "5.1.0", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" } } } @@ -15338,7 +14972,6 @@ "snapdragon-node": { "version": "2.1.1", "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", - "dev": true, "requires": { "define-property": "^1.0.0", "isobject": "^3.0.0", @@ -15348,22 +14981,19 @@ "define-property": { "version": "1.0.0", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, "requires": { "is-descriptor": "^1.0.0" } }, "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, "snapdragon-util": { "version": "3.0.1", "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", - "dev": true, "requires": { "kind-of": "^3.2.0" } @@ -15432,8 +15062,7 @@ }, "source-list-map": { "version": "0.1.8", - "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=", - "dev": true + "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=" }, "source-map": { "version": "0.5.7", @@ -15442,7 +15071,6 @@ "source-map-resolve": { "version": "0.5.3", "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", - "dev": true, "requires": { "atob": "^2.1.2", "decode-uri-component": "^0.2.0", @@ -15460,8 +15088,7 @@ }, "source-map-url": { "version": "0.4.1", - "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==", - "dev": true + "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==" }, "spdx-correct": { "version": "3.1.1", @@ -15490,7 +15117,6 @@ "split-string": { "version": "3.1.0", "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", - "dev": true, "requires": { "extend-shallow": "^3.0.0" } @@ -15526,7 +15152,6 @@ "static-extend": { "version": "0.1.2", "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", - "dev": true, "requires": { "define-property": "^0.2.5", "object-copy": "^0.1.0" @@ -15535,7 +15160,6 @@ "define-property": { "version": "0.2.5", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "requires": { "is-descriptor": "^0.1.0" } @@ -15543,7 +15167,6 @@ "is-accessor-descriptor": { "version": "0.1.6", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -15551,7 +15174,6 @@ "is-data-descriptor": { "version": "0.1.4", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -15559,7 +15181,6 @@ "is-descriptor": { "version": "0.1.6", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, "requires": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -15568,8 +15189,7 @@ "dependencies": { "kind-of": { "version": "5.1.0", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" } } } @@ -15583,7 +15203,6 @@ "stream-browserify": { "version": "2.0.2", "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", - "dev": true, "requires": { "inherits": "~2.0.1", "readable-stream": "^2.0.2" @@ -15592,7 +15211,6 @@ "readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -15606,7 +15224,6 @@ "string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -15629,7 +15246,6 @@ "stream-http": { "version": "2.8.3", "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", - "dev": true, "requires": { "builtin-status-codes": "^3.0.0", "inherits": "^2.0.1", @@ -15641,7 +15257,6 @@ "readable-stream": { "version": "2.3.7", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -15655,7 +15270,6 @@ "string_decoder": { "version": "1.1.1", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -15734,8 +15348,7 @@ }, "tapable": { "version": "0.1.10", - "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=", - "dev": true + "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=" }, "test-exclude": { "version": "4.2.3", @@ -15791,7 +15404,6 @@ "timers-browserify": { "version": "2.0.12", "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==", - "dev": true, "requires": { "setimmediate": "^1.0.4" } @@ -15803,8 +15415,7 @@ }, "to-arraybuffer": { "version": "1.0.1", - "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", - "dev": true + "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=" }, "to-fast-properties": { "version": "1.0.3", @@ -15813,7 +15424,6 @@ "to-object-path": { "version": "0.3.0", "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", - "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -15821,7 +15431,6 @@ "to-regex": { "version": "3.0.2", "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", - "dev": true, "requires": { "define-property": "^2.0.2", "extend-shallow": "^3.0.2", @@ -15832,7 +15441,6 @@ "to-regex-range": { "version": "2.1.1", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true, "requires": { "is-number": "^3.0.0", "repeat-string": "^1.6.1" @@ -15841,7 +15449,6 @@ "is-number": { "version": "3.0.0", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, "requires": { "kind-of": "^3.0.2" } @@ -15873,8 +15480,7 @@ }, "tty-browserify": { "version": "0.0.0", - "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", - "dev": true + "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=" }, "tunnel-agent": { "version": "0.6.0", @@ -15936,8 +15542,7 @@ }, "uglify-to-browserify": { "version": "1.0.2", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", - "dev": true + "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=" }, "uglifyjs-webpack-plugin": { "version": "1.3.0", @@ -16003,7 +15608,6 @@ "union-value": { "version": "1.0.1", "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", - "dev": true, "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", @@ -16048,7 +15652,6 @@ "unset-value": { "version": "1.0.0", "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", - "dev": true, "requires": { "has-value": "^0.3.1", "isobject": "^3.0.0" @@ -16057,7 +15660,6 @@ "has-value": { "version": "0.3.1", "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", - "dev": true, "requires": { "get-value": "^2.0.3", "has-values": "^0.1.4", @@ -16067,7 +15669,6 @@ "isobject": { "version": "2.1.0", "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true, "requires": { "isarray": "1.0.0" } @@ -16076,13 +15677,11 @@ }, "has-values": { "version": "0.1.4", - "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", - "dev": true + "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=" }, "isobject": { "version": "3.0.1", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, @@ -16095,13 +15694,11 @@ }, "urix": { "version": "0.1.0", - "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", - "dev": true + "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=" }, "url": { "version": "0.11.0", "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", - "dev": true, "requires": { "punycode": "1.3.2", "querystring": "0.2.0" @@ -16109,8 +15706,7 @@ "dependencies": { "punycode": { "version": "1.3.2", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", - "dev": true + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" } } }, @@ -16125,21 +15721,18 @@ }, "use": { "version": "3.1.1", - "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", - "dev": true + "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" }, "util": { "version": "0.10.4", "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", - "dev": true, "requires": { "inherits": "2.0.3" }, "dependencies": { "inherits": { "version": "2.0.3", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" } } }, @@ -16183,7 +15776,6 @@ "vm-browserify": { "version": "0.0.4", "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", - "dev": true, "requires": { "indexof": "0.0.1" } @@ -16211,7 +15803,6 @@ "watchpack": { "version": "0.2.9", "integrity": "sha1-Yuqkq15bo1/fwBgnVibjwPXj+ws=", - "dev": true, "requires": { "async": "^0.9.0", "chokidar": "^1.0.0", @@ -16220,15 +15811,13 @@ "dependencies": { "async": { "version": "0.9.2", - "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", - "dev": true + "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=" } } }, "webpack": { "version": "1.15.0", "integrity": "sha1-T/MfU9sDM55VFkqdRo7gMklo/pg=", - "dev": true, "requires": { "acorn": "^3.0.0", "async": "^1.3.0", @@ -16249,13 +15838,11 @@ "dependencies": { "acorn": { "version": "3.3.0", - "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", - "dev": true + "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=" }, "supports-color": { "version": "3.2.3", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, "requires": { "has-flag": "^1.0.0" } @@ -16263,7 +15850,6 @@ "uglify-js": { "version": "2.7.5", "integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=", - "dev": true, "requires": { "async": "~0.2.6", "source-map": "~0.5.1", @@ -16273,8 +15859,7 @@ "dependencies": { "async": { "version": "0.2.10", - "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=", - "dev": true + "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=" } } } @@ -16283,7 +15868,6 @@ "webpack-core": { "version": "0.6.9", "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=", - "dev": true, "requires": { "source-list-map": "~0.1.7", "source-map": "~0.4.1" @@ -16292,7 +15876,6 @@ "source-map": { "version": "0.4.4", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, "requires": { "amdefine": ">=0.0.4" } @@ -16430,8 +16013,7 @@ }, "window-size": { "version": "0.1.0", - "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", - "dev": true + "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=" }, "wordwrap": { "version": "1.0.0", @@ -16492,7 +16074,6 @@ "yargs": { "version": "3.10.0", "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "dev": true, "requires": { "camelcase": "^1.0.2", "cliui": "^2.1.0", diff --git a/amp/TEMPLATE/reamp/package.json b/amp/TEMPLATE/reamp/package.json index dff1065c408..0fc971240f7 100644 --- a/amp/TEMPLATE/reamp/package.json +++ b/amp/TEMPLATE/reamp/package.json @@ -23,7 +23,7 @@ "author": "Alexei Savca", "license": "inherit", "devDependencies": { - "amp-ui": "github:devgateway/amp-ui#AMP-30478/fix-download-resource", + "amp-ui": "github:devgateway/amp-ui#task/AMP-30515/HideTotals", "babel-core": "^6.26.3", "babel-jest": "^6.0.1", "babel-loader": "^6.3.2", From 29bd72dceb89803484b283d968f84203fdf46291 Mon Sep 17 00:00:00 2001 From: Julian de Anquin Date: Mon, 3 Apr 2023 16:25:35 -0300 Subject: [PATCH 056/135] AMP-30530 consider when there is only one missed event --- .../endpoints/datafreeze/DataFreezeUtil.java | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/datafreeze/DataFreezeUtil.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/datafreeze/DataFreezeUtil.java index 09d884c7789..6f68a3264a6 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/datafreeze/DataFreezeUtil.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/datafreeze/DataFreezeUtil.java @@ -90,7 +90,7 @@ private static Query createHibernateQuery(String queryString) { } public static List getDataFreeEventsList(Integer offset, Integer count, String orderBy, - String sort, Integer total) { + String sort, Integer total) { Integer maxResults = count == null ? DataFreezeConstants.DEFAULT_RECORDS_PER_PAGE : count; Integer startAt = (offset == null || offset > total) ? DataFreezeConstants.DEFAULT_OFFSET : offset; String orderByColumn = (orderBy == null) ? DataFreezeConstants.DEFAULT_SORT_COLUMN : orderBy; @@ -133,7 +133,7 @@ public void execute(Connection conn) throws SQLException { } public static void freezeActivitiesForFreezingDate(AmpDataFreezeSettings currentFreezingEvent, - Set activitiesId) { + Set activitiesId) { SimpleDateFormat fullDateNoHourFormatter = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat yearFormatter = new SimpleDateFormat("yyyy"); final String fullDate = fullDateNoHourFormatter.format(currentFreezingEvent.getFreezingDate()) + " 23:59:59"; @@ -171,7 +171,7 @@ public static void unfreezeAll() { /** * Return a freezing event if today is the freezing date - * + * * @return */ public static AmpDataFreezeSettings getCurrentFreezingEvent() { @@ -188,13 +188,18 @@ private static Long getLastNonExecutedFreezingEvent() { PersistenceManager.getSession().doWork(new Work() { public void execute(Connection conn) throws SQLException { - String todaysFreezingEventQuery = "SELECT max(id) FROM amp_data_freeze_settings " - + " WHERE CURRENT_DATE >=(freezing_date::date + coalesce(grace_period, 0)) " - + " AND executed = FALSE AND enabled = TRUE " - + " AND (freezing_date::date + coalesce(grace_period, 0)) = " - + " (SELECT min((freezing_date::date + coalesce(grace_period, 0))) " - + " FROM amp_data_freeze_settings WHERE executed = FALSE AND enabled = TRUE " - + " and CURRENT_DATE <=(freezing_date::date + coalesce(grace_period, 0)))"; + String todaysFreezingEventQuery = "SELECT max(id)" + + " FROM amp_data_freeze_settings" + + " WHERE CURRENT_DATE >= (freezing_date::date + coalesce(grace_period, 0))" + + " AND executed = FALSE" + + " AND enabled = TRUE" + + " AND (freezing_date::date + coalesce(grace_period, 0)) =" + + " coalesce((SELECT min((freezing_date::date + coalesce(grace_period, 0)))" + + " FROM amp_data_freeze_settings" + + " WHERE executed = FALSE" + + " AND enabled = TRUE" + + " and CURRENT_DATE <= (freezing_date::date + coalesce(grace_period, 0)))," + + " (freezing_date::date + coalesce(grace_period, 0)))"; RsInfo rsi = SQLUtils.rawRunQuery(conn, todaysFreezingEventQuery, null); if (rsi.rs.next()) { freezingEventId.value = rsi.rs.getLong(1); @@ -225,7 +230,7 @@ public static List getEnabledDataFreezeEvents( /** * Get list of active users and assigned to workspaces - * + * * @return List users */ public static List getUsers() { @@ -235,11 +240,11 @@ public static List getUsers() { + "where user.banned = false"; Query query = session.createQuery(teamMembersQuery); List teamMembers = query.list(); - + Set users = teamMembers.stream() .map(AmpTeamMember::getUser) .collect(Collectors.toSet()); - + return new ArrayList(users); } From e77153e7628e038a9d28651a6c6d30d4187fd30e Mon Sep 17 00:00:00 2001 From: Damian Rychter Date: Mon, 3 Apr 2023 17:44:10 -0300 Subject: [PATCH 057/135] Adding commit hash --- amp/TEMPLATE/reamp/package-lock.json | 16 +++++++++------- amp/TEMPLATE/reamp/package.json | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/amp/TEMPLATE/reamp/package-lock.json b/amp/TEMPLATE/reamp/package-lock.json index f927501f0a8..e6d58c0efd1 100644 --- a/amp/TEMPLATE/reamp/package-lock.json +++ b/amp/TEMPLATE/reamp/package-lock.json @@ -21,7 +21,7 @@ "uglifyjs-webpack-plugin": "^1.3.0" }, "devDependencies": { - "amp-ui": "github:devgateway/amp-ui#task/AMP-30515/HideTotals", + "amp-ui": "github:devgateway/amp-ui#6cc7203f2266ffcdff8753604b7312f43fcbfa3f", "babel-core": "^6.26.3", "babel-jest": "^6.0.1", "babel-loader": "^6.3.2", @@ -233,12 +233,13 @@ }, "node_modules/amp-ui": { "version": "2.1.1", - "resolved": "git+ssh://git@github.com/devgateway/amp-ui.git#288d4b6980f0940613a8c52cbd911bd936662f29", + "resolved": "git+ssh://git@github.com/devgateway/amp-ui.git#6cc7203f2266ffcdff8753604b7312f43fcbfa3f", + "integrity": "sha512-YOGOH12oU1YCKcC3Hq7hzx3tEeZSzWClEtf+SL4tRAvXztx5/s7utuAv10zxJFCYgG12mfeeA1XpUaOtzf8kfw==", "dev": true, "license": "MIT", "dependencies": { "docx": "^4.7.1", - "file-saver": "git+ssh://github.com/devgateway/FileSaver.js", + "file-saver": "github:devgateway/FileSaver.js", "fs": "0.0.1-security", "he": "^1.2.0", "moment": "^2.18.1", @@ -8933,12 +8934,13 @@ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, "amp-ui": { - "version": "git+ssh://git@github.com/devgateway/amp-ui.git#288d4b6980f0940613a8c52cbd911bd936662f29", + "version": "git+ssh://git@github.com/devgateway/amp-ui.git#6cc7203f2266ffcdff8753604b7312f43fcbfa3f", + "integrity": "sha512-YOGOH12oU1YCKcC3Hq7hzx3tEeZSzWClEtf+SL4tRAvXztx5/s7utuAv10zxJFCYgG12mfeeA1XpUaOtzf8kfw==", "dev": true, - "from": "amp-ui@github:devgateway/amp-ui#task/AMP-30515/HideTotals", + "from": "amp-ui@github:devgateway/amp-ui#6cc7203f2266ffcdff8753604b7312f43fcbfa3f", "requires": { "docx": "^4.7.1", - "file-saver": "git+ssh://github.com/devgateway/FileSaver.js", + "file-saver": "github:devgateway/FileSaver.js", "fs": "0.0.1-security", "he": "^1.2.0", "moment": "^2.18.1", @@ -11317,7 +11319,7 @@ "file-saver": { "version": "git+ssh://git@github.com/devgateway/FileSaver.js.git#20b5a235d8ca3b174b8c5f51dfdff11f9a00cccb", "dev": true, - "from": "file-saver@git+ssh://github.com/devgateway/FileSaver.js" + "from": "file-saver@github:devgateway/FileSaver.js" }, "filename-regex": { "version": "2.0.1", diff --git a/amp/TEMPLATE/reamp/package.json b/amp/TEMPLATE/reamp/package.json index 0fc971240f7..955c0ef66cd 100644 --- a/amp/TEMPLATE/reamp/package.json +++ b/amp/TEMPLATE/reamp/package.json @@ -23,7 +23,7 @@ "author": "Alexei Savca", "license": "inherit", "devDependencies": { - "amp-ui": "github:devgateway/amp-ui#task/AMP-30515/HideTotals", + "amp-ui": "github:devgateway/amp-ui#6cc7203f2266ffcdff8753604b7312f43fcbfa3f", "babel-core": "^6.26.3", "babel-jest": "^6.0.1", "babel-loader": "^6.3.2", From 96e2630af97cb8134759446f8e93e9896e479a37 Mon Sep 17 00:00:00 2001 From: Damian Rychter Date: Mon, 3 Apr 2023 19:47:03 -0300 Subject: [PATCH 058/135] Point to proper branch --- amp/TEMPLATE/reamp/package-lock.json | 12 ++++++------ amp/TEMPLATE/reamp/package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/amp/TEMPLATE/reamp/package-lock.json b/amp/TEMPLATE/reamp/package-lock.json index e6d58c0efd1..ad3f6e0a35b 100644 --- a/amp/TEMPLATE/reamp/package-lock.json +++ b/amp/TEMPLATE/reamp/package-lock.json @@ -21,7 +21,7 @@ "uglifyjs-webpack-plugin": "^1.3.0" }, "devDependencies": { - "amp-ui": "github:devgateway/amp-ui#6cc7203f2266ffcdff8753604b7312f43fcbfa3f", + "amp-ui": "github:devgateway/amp-ui#cb40615f5b073fd8aa44836409efa4b246d02b0c", "babel-core": "^6.26.3", "babel-jest": "^6.0.1", "babel-loader": "^6.3.2", @@ -233,8 +233,8 @@ }, "node_modules/amp-ui": { "version": "2.1.1", - "resolved": "git+ssh://git@github.com/devgateway/amp-ui.git#6cc7203f2266ffcdff8753604b7312f43fcbfa3f", - "integrity": "sha512-YOGOH12oU1YCKcC3Hq7hzx3tEeZSzWClEtf+SL4tRAvXztx5/s7utuAv10zxJFCYgG12mfeeA1XpUaOtzf8kfw==", + "resolved": "git+ssh://git@github.com/devgateway/amp-ui.git#cb40615f5b073fd8aa44836409efa4b246d02b0c", + "integrity": "sha512-/klkYzvYMh3reaayL9kCFNMnfBnnv7pl8NBTIkgKSQq47+j3KhMiqll64G7aMFb9Ck5c48qAM8qwXKRhkvlR7A==", "dev": true, "license": "MIT", "dependencies": { @@ -8934,10 +8934,10 @@ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, "amp-ui": { - "version": "git+ssh://git@github.com/devgateway/amp-ui.git#6cc7203f2266ffcdff8753604b7312f43fcbfa3f", - "integrity": "sha512-YOGOH12oU1YCKcC3Hq7hzx3tEeZSzWClEtf+SL4tRAvXztx5/s7utuAv10zxJFCYgG12mfeeA1XpUaOtzf8kfw==", + "version": "git+ssh://git@github.com/devgateway/amp-ui.git#cb40615f5b073fd8aa44836409efa4b246d02b0c", + "integrity": "sha512-/klkYzvYMh3reaayL9kCFNMnfBnnv7pl8NBTIkgKSQq47+j3KhMiqll64G7aMFb9Ck5c48qAM8qwXKRhkvlR7A==", "dev": true, - "from": "amp-ui@github:devgateway/amp-ui#6cc7203f2266ffcdff8753604b7312f43fcbfa3f", + "from": "amp-ui@github:devgateway/amp-ui#cb40615f5b073fd8aa44836409efa4b246d02b0c", "requires": { "docx": "^4.7.1", "file-saver": "github:devgateway/FileSaver.js", diff --git a/amp/TEMPLATE/reamp/package.json b/amp/TEMPLATE/reamp/package.json index 955c0ef66cd..7f842dc9443 100644 --- a/amp/TEMPLATE/reamp/package.json +++ b/amp/TEMPLATE/reamp/package.json @@ -23,7 +23,7 @@ "author": "Alexei Savca", "license": "inherit", "devDependencies": { - "amp-ui": "github:devgateway/amp-ui#6cc7203f2266ffcdff8753604b7312f43fcbfa3f", + "amp-ui": "github:devgateway/amp-ui#cb40615f5b073fd8aa44836409efa4b246d02b0c", "babel-core": "^6.26.3", "babel-jest": "^6.0.1", "babel-loader": "^6.3.2", From 78a0ade9b8f5a19fc822b9f5a36637dc2311d64b Mon Sep 17 00:00:00 2001 From: Damian Rychter Date: Tue, 4 Apr 2023 10:54:48 -0300 Subject: [PATCH 059/135] AMP-30531: Date picker in data freeze manager admin --- .../components/DataFreezeEventEdit.jsx | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/amp/TEMPLATE/reamp/modules/admin/data-freeze-manager/components/DataFreezeEventEdit.jsx b/amp/TEMPLATE/reamp/modules/admin/data-freeze-manager/components/DataFreezeEventEdit.jsx index b7a76e3bc33..3873b0ee883 100644 --- a/amp/TEMPLATE/reamp/modules/admin/data-freeze-manager/components/DataFreezeEventEdit.jsx +++ b/amp/TEMPLATE/reamp/modules/admin/data-freeze-manager/components/DataFreezeEventEdit.jsx @@ -58,7 +58,10 @@ class DataFreezeEventEdit extends Component { let currentRecord = this.props.dataFreezeEvent; currentRecord.freezingDate = moment(date, this.getDisplayDateFormat()).format(Constants.EP_DATE_FORMAT); this.setState({ - currentRecord: currentRecord + currentRecord: currentRecord, + showDatePicker: { + freezingDate: false + } }); } @@ -66,7 +69,10 @@ class DataFreezeEventEdit extends Component { let currentRecord = this.props.dataFreezeEvent; currentRecord.openPeriodStart = moment(date, this.getDisplayDateFormat()).format(Constants.EP_DATE_FORMAT); this.setState({ - currentRecord: currentRecord + currentRecord: currentRecord, + showDatePicker: { + openPeriodStart: false + } }); } @@ -74,7 +80,10 @@ class DataFreezeEventEdit extends Component { let currentRecord = this.props.dataFreezeEvent; currentRecord.openPeriodEnd = moment(date, this.getDisplayDateFormat()).format(Constants.EP_DATE_FORMAT); this.setState({ - currentRecord: currentRecord + currentRecord: currentRecord, + showDatePicker: { + openPeriodEnd: false + } }); } From 0ef373882515e9545e231a83f3da54575f0ade5f Mon Sep 17 00:00:00 2001 From: timothygachengo Date: Tue, 4 Apr 2023 17:48:39 +0300 Subject: [PATCH 060/135] AMP-30489 added default selection of ws data to be fetched and added the selection to the wsForm --- .../module/aim/action/WorkspaceManager.java | 15 +++++++++ .../module/aim/form/WorkspaceForm.java | 14 ++++++++- .../form/helpers/WorkspaceDataSelection.java | 22 +++++++++++++ amp/repository/aim/view/workspaceManager.jsp | 31 ++++++++++++++----- 4 files changed, 74 insertions(+), 8 deletions(-) create mode 100644 amp/WEB-INF/src/org/digijava/module/aim/form/helpers/WorkspaceDataSelection.java diff --git a/amp/WEB-INF/src/org/digijava/module/aim/action/WorkspaceManager.java b/amp/WEB-INF/src/org/digijava/module/aim/action/WorkspaceManager.java index 7952f3b9fdf..422d7c55ace 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/action/WorkspaceManager.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/action/WorkspaceManager.java @@ -17,6 +17,7 @@ import org.digijava.kernel.request.TLSUtils; import org.digijava.module.aim.dbentity.AmpTeam; import org.digijava.module.aim.form.WorkspaceForm; +import org.digijava.module.aim.form.helpers.WorkspaceDataSelection; import org.digijava.module.aim.util.TeamUtil; import org.digijava.module.search.util.SearchUtil; import org.hibernate.Hibernate; @@ -41,6 +42,20 @@ public ActionForward execute(ActionMapping mapping, ActionForm form,HttpServletR Collection workspaces = new ArrayList(); WorkspaceForm wsForm = (WorkspaceForm) form; + ArrayList workspaceDataSelections = new ArrayList<>(); + + WorkspaceDataSelection members = new WorkspaceDataSelection(); + members.setLabel("Members"); + members.setValue("0"); + workspaceDataSelections.add(members); + + WorkspaceDataSelection activities = new WorkspaceDataSelection(); + activities.setLabel("Activities"); + activities.setValue("1"); + workspaceDataSelections.add(activities); + + wsForm.setWorkspaceDataSelections(workspaceDataSelections); + if (request.getParameter("reset") != null && request.getParameter("reset").equalsIgnoreCase("true")) { wsForm.setKeyword(null); diff --git a/amp/WEB-INF/src/org/digijava/module/aim/form/WorkspaceForm.java b/amp/WEB-INF/src/org/digijava/module/aim/form/WorkspaceForm.java index a06b3fecaeb..00d3d0d3fd1 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/form/WorkspaceForm.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/form/WorkspaceForm.java @@ -1,9 +1,11 @@ package org.digijava.module.aim.form; import java.util.Collection; +import java.util.List; import org.apache.struts.action.ActionForm; import org.digijava.module.aim.dbentity.AmpTeam; +import org.digijava.module.aim.form.helpers.WorkspaceDataSelection; public class WorkspaceForm extends ActionForm { @@ -14,6 +16,8 @@ public class WorkspaceForm extends ActionForm { private int page; private String workspaceType="all"; + + private List workspaceDataSelections; private int numPerPage=-1; @@ -23,6 +27,7 @@ public class WorkspaceForm extends ActionForm { private Integer currentPage; private Long selectedWs; + public Integer getCurrentPage() { return currentPage; } @@ -123,5 +128,12 @@ public Long getWorkspaceGroup() { return workspaceGroup; } - + + public List getWorkspaceDataSelections() { + return workspaceDataSelections; + } + + public void setWorkspaceDataSelections(List workspaceDataSelections) { + this.workspaceDataSelections = workspaceDataSelections; + } } diff --git a/amp/WEB-INF/src/org/digijava/module/aim/form/helpers/WorkspaceDataSelection.java b/amp/WEB-INF/src/org/digijava/module/aim/form/helpers/WorkspaceDataSelection.java new file mode 100644 index 00000000000..e62457b809c --- /dev/null +++ b/amp/WEB-INF/src/org/digijava/module/aim/form/helpers/WorkspaceDataSelection.java @@ -0,0 +1,22 @@ +package org.digijava.module.aim.form.helpers; + +public class WorkspaceDataSelection { + private String label; + private String value; + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/amp/repository/aim/view/workspaceManager.jsp b/amp/repository/aim/view/workspaceManager.jsp index b3d1412d1b4..e90106c681e 100644 --- a/amp/repository/aim/view/workspaceManager.jsp +++ b/amp/repository/aim/view/workspaceManager.jsp @@ -166,6 +166,17 @@ + - + + \ No newline at end of file From e31a85a49ae8e643d42e7135463622d4cf5e0eca Mon Sep 17 00:00:00 2001 From: Damian Rychter Date: Thu, 6 Apr 2023 16:16:11 -0300 Subject: [PATCH 066/135] AMP-30533 Create a new instance to deploy AMP servers --- Jenkinsfile | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a6ea507ffe2..f36a86b93d9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -49,9 +49,20 @@ def updateGitHubCommitStatus(context, message, state) { def codeVersion def countries +def environment stage('Build') { + timeout(15) { + milestone() + environment = input( + message: "Server to deploy", + parameters: [choice(choices: ["${env.AMP_STAGING_HOSTNAME}", "${env.AMP_DE_HOSTNAME}"], name: 'environment')]) + milestone() + } + + println "Using environment: ${environment}" + node { checkout scm @@ -60,7 +71,7 @@ stage('Build') { println "AMP Version: ${codeVersion}" countries = sh(returnStdout: true, - script: "ssh ${env.AMP_STAGING_HOSTNAME} 'cd /opt/amp_dbs && amp-db ls ${codeVersion} | sort'") + script: "ssh ${environment} 'cd /opt/amp_dbs && amp-db ls ${codeVersion} | sort'") .trim() if (countries == "") { println "There are no database backups compatible with ${codeVersion}" @@ -76,7 +87,15 @@ stage('Build') { milestone() } - ampUrl = "http://amp-${country}-${tag}.stg.ampsite.net/" + println "Let set amp url based on ${environment}" + + if ("${environment}".toLowerCase().contains("ampdevde")) { + ampUrl = "http://amp-${country}-${tag}.de.ampsite.net/" + } else { + ampUrl = "http://amp-${country}-${tag}.stg.ampsite.net/" + } + + println "amp url is ${ampUrl}" node { checkout scm @@ -123,10 +142,10 @@ stage('Deploy') { node { try { // Find latest database version compatible with ${codeVersion} - dbVersion = sh(returnStdout: true, script: "ssh ${env.AMP_STAGING_HOSTNAME} 'cd /opt/amp_dbs && amp-db find ${codeVersion} ${country}'").trim() + dbVersion = sh(returnStdout: true, script: "ssh ${environment} 'cd /opt/amp_dbs && amp-db find ${codeVersion} ${country}'").trim() // Deploy AMP - sh "ssh ${env.AMP_STAGING_HOSTNAME} 'amp-up2 ${tag} ${country} ${dbVersion} ${pgVersion}'" + sh "ssh ${environment} 'amp-up2 ${tag} ${country} ${dbVersion} ${pgVersion}'" slackSend(channel: 'amp-ci', color: 'good', message: "Deploy AMP - Success\nDeployed ${changePretty} will be ready for testing at ${ampUrl} in about 3 minutes") @@ -151,7 +170,7 @@ stage('Deploy again') { } node { try { - sh "ssh ${env.AMP_STAGING_HOSTNAME} 'amp-up2 ${tag} ${country} ${dbVersion} ${pgVersion}'" + sh "ssh ${environment} 'amp-up2 ${tag} ${country} ${dbVersion} ${pgVersion}'" slackSend(channel: 'amp-ci', color: 'good', message: "Deploy AMP - Success\nDeployed ${changePretty} will be ready for testing at ${ampUrl} in about 3 minutes") From 53958318a59adc3a4c955a670f55ffc90bcffd2b Mon Sep 17 00:00:00 2001 From: Damian Rychter Date: Wed, 12 Apr 2023 16:29:39 -0300 Subject: [PATCH 067/135] AMP-30474 Issue- togo offline - line ministry rank --- .../annotations/interchange/ActivityFieldsConstants.java | 1 + .../digijava/module/aim/dbentity/AmpActivityFields.java | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/amp/WEB-INF/src/org/digijava/module/aim/annotations/interchange/ActivityFieldsConstants.java b/amp/WEB-INF/src/org/digijava/module/aim/annotations/interchange/ActivityFieldsConstants.java index 76eb8b1718e..e34831cbff0 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/annotations/interchange/ActivityFieldsConstants.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/annotations/interchange/ActivityFieldsConstants.java @@ -85,6 +85,7 @@ public class ActivityFieldsConstants { public static final String IATI_IDENTIFIER = "IATI Identifier"; public static final String UUID = "UUID"; + public static final String LINE_MINISTRY_RANK ="^[1-5]$"; public static final class Locations { private Locations() { diff --git a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpActivityFields.java b/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpActivityFields.java index a5fc4e52585..4fec8c376b6 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpActivityFields.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpActivityFields.java @@ -33,6 +33,7 @@ import org.digijava.kernel.validators.activity.RegionLocationValidator; import org.digijava.kernel.validators.activity.TreeCollectionValidator; import org.digijava.kernel.validators.activity.UniqueActivityTitleValidator; +import org.digijava.kernel.validators.common.RegexValidator; import org.digijava.kernel.validators.common.TotalPercentageValidator; import org.digijava.kernel.validators.common.RequiredValidator; import org.digijava.kernel.validators.common.SizeValidator; @@ -712,7 +713,12 @@ public abstract class AmpActivityFields extends Permissible implements Comparabl @VersionableCollection(fieldTitle = "GPI Surveys") protected Set gpiSurvey; - @Interchangeable(fieldTitle = "Line Ministry Rank", importable = true, fmPath = "/Activity Form/Planning/Line Ministry Rank") + @Interchangeable(fieldTitle = "Line Ministry Rank", importable = true, fmPath = "/Activity Form/Planning/Line Ministry Rank", + interValidators = { + @InterchangeableValidator( + value = RegexValidator.class, + attributes = "regex=" + ActivityFieldsConstants.LINE_MINISTRY_RANK) + }) @VersionableFieldSimple(fieldTitle = "Line Ministry Rank") protected Integer lineMinRank; From ecb8dd2575a37dbe8753a190e6b9254d27f6f5fa Mon Sep 17 00:00:00 2001 From: Damian Rychter Date: Thu, 13 Apr 2023 11:22:34 -0300 Subject: [PATCH 068/135] AMP-30316 Remove Analytical Report Table and references --- .../aim/dbentity/AmpAnalyticalReport.hbm.xml | 15 ------- .../aim/dbentity/AmpAnalyticalReport.java | 45 ------------------- .../module/aim/util/TeamMemberUtil.java | 10 ----- amp/repository/aim/module-config.xml | 3 -- ...AMP-30316-remove-amp-analytical-report.xml | 15 +++++++ 5 files changed, 15 insertions(+), 73 deletions(-) delete mode 100644 amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpAnalyticalReport.hbm.xml delete mode 100644 amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpAnalyticalReport.java create mode 100644 amp/xmlpatches/3.5.05.1/AMP-30316-remove-amp-analytical-report.xml diff --git a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpAnalyticalReport.hbm.xml b/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpAnalyticalReport.hbm.xml deleted file mode 100644 index d74fe695339..00000000000 --- a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpAnalyticalReport.hbm.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - amp_analytical_report_seq - - - - - - - \ No newline at end of file diff --git a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpAnalyticalReport.java b/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpAnalyticalReport.java deleted file mode 100644 index 9167c2b6529..00000000000 --- a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpAnalyticalReport.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * AmpTeam.java - * Created: 03-Sep-2004 - */ - -package org.digijava.module.aim.dbentity; - -import java.io.Serializable; - -public class AmpAnalyticalReport implements Serializable { - - private static final long serialVersionUID = 1143719618673288389L; - - private Long id; - private String data; - private String name; - private AmpTeamMember owner; - - public Long getId() { - return id; - } - public void setId(Long id) { - this.id = id; - } - public String getData() { - return data; - } - public void setData(String data) { - this.data = data; - } - public AmpTeamMember getOwner() { - return owner; - } - public void setOwner(AmpTeamMember owner) { - this.owner = owner; - } - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - -} - diff --git a/amp/WEB-INF/src/org/digijava/module/aim/util/TeamMemberUtil.java b/amp/WEB-INF/src/org/digijava/module/aim/util/TeamMemberUtil.java index a3b5e298b02..772996db191 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/util/TeamMemberUtil.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/util/TeamMemberUtil.java @@ -33,7 +33,6 @@ import org.digijava.kernel.util.UserUtils; import org.digijava.module.aim.dbentity.AmpActivity; import org.digijava.module.aim.dbentity.AmpActivityVersion; -import org.digijava.module.aim.dbentity.AmpAnalyticalReport; import org.digijava.module.aim.dbentity.AmpComments; import org.digijava.module.aim.dbentity.AmpContact; import org.digijava.module.aim.dbentity.AmpDesktopTabSelection; @@ -1182,15 +1181,6 @@ public static void removeTeamMembers(Long id[]) { session.saveOrUpdate(comm); } - qryStr = "select atr from " + AmpAnalyticalReport.class.getName() + " atr " - + " where (atr.owner=:memberId) "; - qry = session.createQuery(qryStr).setLong("memberId", amId); - List ampAnalyticalReports = qry.list(); - if (ampAnalyticalReports != null && ampAnalyticalReports.size() > 0) { - for (AmpAnalyticalReport ampAnRep : ampAnalyticalReports) { - session.delete(ampAnRep); - } - } qryStr = "delete AmpDesktopTabSelection dts where dts.owner=:memberId"; qry = session.createQuery(qryStr).setLong("memberId", amId); qry.executeUpdate(); diff --git a/amp/repository/aim/module-config.xml b/amp/repository/aim/module-config.xml index d0fa6f972f4..1e353866729 100644 --- a/amp/repository/aim/module-config.xml +++ b/amp/repository/aim/module-config.xml @@ -233,9 +233,6 @@ org.digijava.module.aim.dbentity.GPISetup org.digijava.module.aim.dbentity.GPIDefaultFilters - - org.digijava.module.aim.dbentity.AmpAnalyticalReport - org.digijava.module.aim.dbentity.AmpAidEffectivenessIndicator org.digijava.module.aim.dbentity.AmpAidEffectivenessIndicatorOption diff --git a/amp/xmlpatches/3.5.05.1/AMP-30316-remove-amp-analytical-report.xml b/amp/xmlpatches/3.5.05.1/AMP-30316-remove-amp-analytical-report.xml new file mode 100644 index 00000000000..91ed6b062e2 --- /dev/null +++ b/amp/xmlpatches/3.5.05.1/AMP-30316-remove-amp-analytical-report.xml @@ -0,0 +1,15 @@ + + + AMP-30316 + Remove amp analitycal report table + drychter + + + + \ No newline at end of file From 692a9ca9584ad1399fd2959a349879312932f3fc Mon Sep 17 00:00:00 2001 From: Damian Rychter Date: Mon, 17 Apr 2023 16:06:05 -0300 Subject: [PATCH 069/135] GGW-16 ETL Process - Expose org_code to the organizations endpoints --- .../common/valueproviders/OrganisationValueProvider.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/valueproviders/OrganisationValueProvider.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/valueproviders/OrganisationValueProvider.java index b0ad6dceacc..f3fc4095114 100644 --- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/valueproviders/OrganisationValueProvider.java +++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/valueproviders/OrganisationValueProvider.java @@ -27,6 +27,9 @@ public Object getExtraInfo(AmpOrganisation organisation) { if (organisation.getCountry() != null && organisation.getCountry().getTemplate() != null) { builder.put("template", organisation.getCountry().getTemplate().getId()); } + if (organisation.getOrgCode() != null){ + builder.put("organization_code", organisation.getOrgCode()); + } return builder.build(); } } From 979198a51364d513b2c82a89d965ce2214ef594c Mon Sep 17 00:00:00 2001 From: Damian Rychter Date: Mon, 17 Apr 2023 12:34:59 -0300 Subject: [PATCH 070/135] AMP-30539 Issue- exception in user management connected to verified organization --- amp/repository/um/view/viewEditUser.jsp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/amp/repository/um/view/viewEditUser.jsp b/amp/repository/um/view/viewEditUser.jsp index 012b697e809..114adca969c 100644 --- a/amp/repository/um/view/viewEditUser.jsp +++ b/amp/repository/um/view/viewEditUser.jsp @@ -69,6 +69,9 @@ function goAction(value){ return false; } } + if (!confirm("Are you sure you want to perform this action?. Confirming the deletion the assignment will be deleted")) { + return false + } } if(submitForm==true){ document.getElementById("event").value=value; @@ -437,11 +440,11 @@ function validateUserInfo(){
    - + - +
    - + - +
    - + - +
    - - -
    -     -     + + + +
    +     +     +     		diff --git a/amp/repository/aim/view/editOrganisationFromWorkspace.jsp b/amp/repository/aim/view/editOrganisationFromWorkspace.jsp index 2938c56bc74..4b3c53c5d9b 100644 --- a/amp/repository/aim/view/editOrganisationFromWorkspace.jsp +++ b/amp/repository/aim/view/editOrganisationFromWorkspace.jsp @@ -985,7 +985,7 @@ initContactScript(); - +
    - -
    - - -
    - - - - + - + - - + + - @@ -377,7 +384,7 @@ - + - +
    - -
      - -
    • - - +
      Account information / about you
      + + + + - - +

      + + + + +
      + + + + You have been granted the right to access these + applications and the information contained in them to facilitate + your official business. Your accounts and passwords are your + responsibility. Do not share them with anyone. - - - - - -
      + + + + + + + + - -
      + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      All fields marked with an * are required. - Please use a valid e-mail address.
       
      * - First Name  * - Last Name
      * - E-mail Address -  * - Repeat Email Address
      * - Password - -  * - Repeat Password
      - - Use different email for email notifications - -   - - -
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + +
      + +
        + +
      • + + + +
        • +         +
      +       + +
      All fields marked with an * are required. + Please use a valid e-mail address.
       
      * + First Name * + Last Name
      * + E-mail Address + * + Repeat Email Address
      * + Password + + * + Repeat Password
      + + Use different email for email notifications + +   + + + - + - -
      * Notification Email - + -
      -
      * - Country of Residence - - - -  Mailing Address
      * - Organization Type - -- - Select a type - -- - -
      * - Organization Group - -- - Select a group - -- - - - -
      * - Organization Name - - -- - Select an organization - -- - - - -
      Your language settings - - -
         - Submit - - - - - Reset - - -
       
      Your language settings + + +
         + Submit + + + + + Reset + + +
       
      +
      		  - - - - - - - - - - -
       
      - - You are signing-in to one or more secure applications for - - official business. You have been granted the right to access these - - applications and the information contained in them to facilitate - - your official business. Your accounts and passwords are your - - responsibility. Do not share them with anyone. - -
      -
      -
       
      -
      -
      -       + - From 3c75c74b106b2a3d8de09bf7734933ba73c07d7d Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Mon, 21 Aug 2023 20:57:05 +0300 Subject: [PATCH 116/135] GGW-72 fixed user registration design issues --- amp/TEMPLATE/ampTemplate/css_2/amp.css | 2 +- amp/repository/aim/view/userRegistration.jsp | 51 +++++++++++++------- 2 files changed, 34 insertions(+), 19 deletions(-) diff --git a/amp/TEMPLATE/ampTemplate/css_2/amp.css b/amp/TEMPLATE/ampTemplate/css_2/amp.css index 134a235fde6..312b192ecd1 100644 --- a/amp/TEMPLATE/ampTemplate/css_2/amp.css +++ b/amp/TEMPLATE/ampTemplate/css_2/amp.css @@ -532,7 +532,7 @@ div.adminicon{float:right;} /*-----rafy-----*/ -div.reg_form_container{width:1000px; text-align: left;} +div.reg_form_container{width:auto; text-align: left; margin-left: -50px;} div.reg_form_container table {margin:0 auto; } /* Modify the input boxes - timothymugo */ div.reg_form_container input,div.reg_form_container form input, div.reg_form_container form select{border:1px solid #e6e9ed;height:32px; font-size: 12px; font-weight: 500; width: 280px; padding: 5px 20px; border-radius: 5px;} diff --git a/amp/repository/aim/view/userRegistration.jsp b/amp/repository/aim/view/userRegistration.jsp index d19b03ed12c..442c0519722 100644 --- a/amp/repository/aim/view/userRegistration.jsp +++ b/amp/repository/aim/view/userRegistration.jsp @@ -274,21 +274,29 @@
    All fields marked with an * are required. Please use a valid e-mail address.
      
    * First Name * - Last Name +
    + * + Last Name +
    +
    + +
    +
    * @@ -359,7 +367,6 @@
    * @@ -393,7 +400,7 @@