diff --git a/.gitlab-ci/deploy b/.gitlab-ci/deploy
index 4d35912f457b7f83da00c671ff0835a5a7f073eb..ae2df47577effcb46c2173875decd8fb56688bda 100755
--- a/.gitlab-ci/deploy
+++ b/.gitlab-ci/deploy
@@ -1,6 +1,6 @@
#!/bin/bash
-scp ./.rhel-prod/install_cert dbrepo.ossdip.at:
-scp ./.rhel-prod/docker-compose.yml dbrepo.ossdip.at:
-ssh dbrepo.ossdip.at "docker-compose down"
-ssh dbrepo.ossdip.at "ENV=${ENV} ./install_cert"
-ssh dbrepo.ossdip.at "ENV=${ENV} docker-compose up -d"
\ No newline at end of file
+#scp ./.rhel-prod/install_cert dbrepo.ossdip.at:
+#scp ./.rhel-prod/docker-compose.yml dbrepo.ossdip.at:
+#ssh dbrepo.ossdip.at "docker-compose down"
+#ssh dbrepo.ossdip.at "ENV=${ENV} ./install_cert"
+#ssh dbrepo.ossdip.at "ENV=${ENV} docker-compose up -d"
\ No newline at end of file
diff --git a/.gitlab-ci/frontend/install_cert b/.gitlab-ci/frontend/install_cert
deleted file mode 100755
index c455ebd8091c932a4736d2d5892742246132e554..0000000000000000000000000000000000000000
--- a/.gitlab-ci/frontend/install_cert
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-CA_PATH="/etc/letsencrypt/live/dbrepo.ossdip.at"
-CERT_PATH="./fda-ui/.prod/"
-USER="rocky"
-
-if [ "$ENV" != "prod" ]; then
- echo "WARN: environment must be prod"
- exit 0
-fi
-
-sudo certbot certonly --standalone --preferred-challenges http -d dbrepo.ossdip.at \
- -m martin.weise@tuwien.ac.at --agree-tos --keep-until-expiring
-
-sudo cp "${CA_PATH}/cert.pem" "${CERT_PATH}"
-sudo cp "${CA_PATH}/privkey.pem" "${CERT_PATH}"
-
-mv ./fda-ui/secure.conf ./fda-ui/.prod/default.conf
-
-mkdir -p "${CERT_PATH}"
-sudo chown -R "${USER}:docker" "${CERT_PATH}"
-
-ls -la "${CERT_PATH}"
diff --git a/.rhel-prod/fda-authentication-service/install_cert b/.rhel-prod/fda-authentication-service/install_cert
new file mode 100755
index 0000000000000000000000000000000000000000..b0d07efa1ddf61d5f02f76ff257bd2cf44e39352
--- /dev/null
+++ b/.rhel-prod/fda-authentication-service/install_cert
@@ -0,0 +1,38 @@
+#!/bin/bash
+TMP_CERT_LOCATION="/root/keys/cert.p12"
+TMP_SAML_LOCATION="/root/keys/saml.p12"
+KEY_STORE_LOCATION="/tmp/dbrepo.jks"
+KEY_STORE_PASS="dbrepo"
+CERT_LOCATION="/etc/letsencrypt/live/dbrepo.ossdip.at"
+SAML_KEY="/root/keys/saml_sign.key"
+SAML_PUB="/root/keys/saml_sign.cer"
+
+# REQUEST
+sudo certbot certonly --standalone --preferred-challenges http -d dbrepo.ossdip.at \
+ -m martin.weise@tuwien.ac.at --agree-tos --keep-until-expiring
+
+# CONVERT PKCS12
+sudo openssl pkcs12 -export -out "${TMP_SAML_LOCATION}" -in "${SAML_PUB}" \
+ -inkey "${SAML_KEY}" -passout "pass:${KEY_STORE_PASS}"
+
+# CONVERT PKCS12
+sudo openssl pkcs12 -export -out "${TMP_CERT_LOCATION}" -in "${CERT_LOCATION}/cert.pem" \
+ -inkey "${CERT_LOCATION}/privkey.pem" -passout "pass:${KEY_STORE_PASS}"
+
+# FIX PERMISSIONS
+sudo chmod 644 "${TMP_CERT_LOCATION}"
+sudo chmod 644 "${TMP_SAML_LOCATION}"
+
+# IMPORT
+sudo keytool -noprompt -importkeystore -deststorepass "${KEY_STORE_PASS}" -destkeypass "${KEY_STORE_PASS}" \
+ -destkeystore "${KEY_STORE_LOCATION}" -srckeystore "${TMP_CERT_LOCATION}" -srcstoretype PKCS12 \
+ -srcstorepass "${KEY_STORE_PASS}" -alias 1 -destalias ssl
+
+# IMPORT
+sudo keytool -noprompt -importkeystore -deststorepass "${KEY_STORE_PASS}" -destkeypass "${KEY_STORE_PASS}" \
+ -destkeystore "${KEY_STORE_LOCATION}" -srckeystore "${TMP_SAML_LOCATION}" -srcstoretype PKCS12 \
+ -srcstorepass "${KEY_STORE_PASS}" -alias 1 -destalias saml
+
+# TRUST LET'S ENCRYPT
+sudo keytool -noprompt -import -alias letsencrypt -keystore "${KEY_STORE_LOCATION}" \
+ -file "${CERT_LOCATION}/chain.pem"
\ No newline at end of file
diff --git a/.rhel-prod/fda-ui/install_cert b/.rhel-prod/fda-ui/install_cert
new file mode 100755
index 0000000000000000000000000000000000000000..d733f7ff986bdfc1b517311da32bfde059524ee1
--- /dev/null
+++ b/.rhel-prod/fda-ui/install_cert
@@ -0,0 +1,13 @@
+#!/bin/bash
+CA_PATH="/etc/letsencrypt/live/dbrepo.ossdip.at"
+
+sudo certbot certonly --standalone --preferred-challenges http -d dbrepo.ossdip.at \
+ -m martin.weise@tuwien.ac.at --agree-tos --keep-until-expiring
+
+KEY=$(sudo sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g' "${CA_PATH}/privkey.pem")
+CERT=$(sudo sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g' "${CA_PATH}/cert.pem")
+
+cat << EOF > .env
+UI_KEY="${KEY}"
+UI_CERT="${CERT}"
+EOF
\ No newline at end of file
diff --git a/.rhel-prod/hosts b/.rhel-prod/hosts
new file mode 100644
index 0000000000000000000000000000000000000000..40da214c6af6d90f416cca86829a26ae06edec66
--- /dev/null
+++ b/.rhel-prod/hosts
@@ -0,0 +1,7 @@
+# FDA USERDB
+172.28.0.2 fda-userdb-weather-aus
+172.28.0.3 fda-userdb-infection
+172.28.0.4 fda-userdb-air
+172.28.0.5 fda-userdb-u01
+172.28.0.6 fda-userdb-u02
+172.28.0.7 fda-userdb-u03
\ No newline at end of file
diff --git a/.rhel-prod/install_cert b/.rhel-prod/install_cert
deleted file mode 100755
index 0d13b68c7a4a26c533833f8f075bcb0f73b63427..0000000000000000000000000000000000000000
--- a/.rhel-prod/install_cert
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-CERT_STORE_LOCATION="/tmp/cert.p12"
-KEY_STORE_LOCATION="/tmp/dbrepo.jks"
-KEY_STORE_PASS="dbrepo"
-CERT_LOCATION="/etc/letsencrypt/live/dbrepo.ossdip.at"
-
-# REQUEST
-sudo certbot certonly --standalone --preferred-challenges http -d dbrepo.ossdip.at \
- -m martin.weise@tuwien.ac.at --agree-tos --keep-until-expiring
-
-# CONVERT PKCS12
-sudo openssl pkcs12 -export -out "${CERT_STORE_LOCATION}" -in "${CERT_LOCATION}/cert.pem" \
- -inkey "${CERT_LOCATION}/privkey.pem" -passout "pass:${KEY_STORE_PASS}"
-
-# FIX PERMISSIONS
-sudo chmod 644 "${CERT_STORE_LOCATION}"
-
-# IMPORT
-keytool -importkeystore -deststorepass "${KEY_STORE_PASS}" -destkeypass "${KEY_STORE_PASS}" \
- -destkeystore "${KEY_STORE_LOCATION}" -srckeystore "${CERT_STORE_LOCATION}" -srcstoretype PKCS12 \
- -srcstorepass "${KEY_STORE_PASS}" -alias 1
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 00d3f7589130b6fd6065df759d1480abe47befd2..30021123705d4f6920a497bc3f4fdefffe886286 100644
--- a/Makefile
+++ b/Makefile
@@ -3,13 +3,14 @@ REGISTRY=docker.ossdip.at
all:
config-backend:
- ./.rhel-prod/install_cert
+ ./.rhel-prod/fda-authentication-service/install_cert
config-registry:
./.rhel-registry/install_cert
config-frontend:
- ./.gitlab-ci/frontend/install_cert
+ ./.rhel-prod/fda-ui/install_cert
+ docker-compose -f docker-compose.prod.yml config
config-docker:
docker image pull -q postgres:13.4-alpine || true > /dev/null
@@ -23,28 +24,28 @@ build-backend-metadata:
mvn -f ./fda-metadata-db/pom.xml clean install
build-backend-authentication:
- mvn -f ./fda-authentication-service/pom.xml -q clean package -DskipTests > /dev/null
+ mvn -f ./fda-authentication-service/pom.xml clean package -DskipTests
build-backend-citation:
- mvn -f ./fda-citation-service/pom.xml -q clean package -DskipTests > /dev/null
+ mvn -f ./fda-citation-service/pom.xml clean package -DskipTests
build-backend-container:
- mvn -f ./fda-container-service/pom.xml -q clean package -DskipTests > /dev/null
+ mvn -f ./fda-container-service/pom.xml clean package -DskipTests
build-backend-database:
- mvn -f ./fda-database-service/pom.xml -q clean package -DskipTests > /dev/null
+ mvn -f ./fda-database-service/pom.xml clean package -DskipTests
build-backend-discovery:
- mvn -f ./fda-discovery-service/pom.xml -q clean package -DskipTests > /dev/null
+ mvn -f ./fda-discovery-service/pom.xml clean package -DskipTests
build-backend-gateway:
- mvn -f ./fda-gateway-service/pom.xml -q clean package -DskipTests > /dev/null
+ mvn -f ./fda-gateway-service/pom.xml clean package -DskipTests
build-backend-query:
- mvn -f ./fda-query-service/pom.xml -q clean package -DskipTests > /dev/null
+ mvn -f ./fda-query-service/pom.xml clean package -DskipTests
build-backend-table:
- mvn -f ./fda-table-service/pom.xml -q clean package -DskipTests > /dev/null
+ mvn -f ./fda-table-service/pom.xml clean package -DskipTests
build-backend: build-backend-metadata build-backend-authentication build-backend-citation build-backend-container build-backend-database build-backend-discovery build-backend-gateway build-backend-query build-backend-table
@@ -52,12 +53,18 @@ build-docker: config-docker
docker-compose build fda-metadata-db
docker-compose build
+build-docker-sandbox: config-docker
+ docker-compose -f docker-compose.prod.yml build fda-metadata-db
+ docker-compose -f docker-compose.prod.yml build
+
build-frontend:
npm --prefix ./fda-ui install
npm --prefix ./fda-ui run build
build: clean build-backend build-frontend build-docker
+build-sandbox: clean build-backend build-frontend build-docker-sandbox
+
test-backend: test-backend-auth test-backend-citation test-backend-container test-backend-database test-backend-discovery test-backend-gateway test-backend-query test-backend-table
test-backend-auth:
@@ -100,7 +107,7 @@ run-frontend:
run:
docker-compose up -d
-run-sandbox:
+run-sandbox: config-frontend
docker-compose -f docker-compose.prod.yml up -d
deploy-registry: config-registry
@@ -169,7 +176,7 @@ teardown:
re-deploy: teardown deploy-staging
deploy-stable: registry-stable
- ENV=prod NGINX_PORT=443 ./.gitlab-ci/deploy
+ ./.gitlab-ci/deploy
deploy-staging: registry-staging
- ENV=prod NGINX_PORT=443 ./.gitlab-ci/deploy
+ ./.gitlab-ci/deploy
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 5b5a37ffb8653f474a68c219674769776dc88405..ecf98a13c6466e75440427b8d63769dd1daae44e 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -34,12 +34,12 @@ services:
- fda-public
volumes:
- fda-metadata-db-data:/var/lib/postgresql/data
- ports:
- - "5432:5432"
environment:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: fda
+ logging:
+ driver: json-file
fda-discovery-service:
restart: on-failure
@@ -51,8 +51,8 @@ services:
- fda-public
environment:
SPRING_PROFILES_ACTIVE: docker
- ports:
- - "9090:9090"
+ logging:
+ driver: json-file
fda-gateway-service:
restart: on-failure
@@ -66,8 +66,6 @@ services:
- fda-gateway-service
environment:
SPRING_PROFILES_ACTIVE: docker
- ports:
- - "9095:9095"
depends_on:
fda-container-service:
condition: service_healthy
@@ -91,8 +89,6 @@ services:
- fda-public
environment:
SPRING_PROFILES_ACTIVE: docker,seeder,sandbox
- ports:
- - "9092:9092"
volumes:
- /var/run/docker.sock:/var/run/docker.sock
depends_on:
@@ -117,8 +113,6 @@ services:
- fda-public
environment:
SPRING_PROFILES_ACTIVE: docker,seeder,sandbox
- ports:
- - "9091:9091"
volumes:
- /var/run/docker.sock:/var/run/docker.sock
depends_on:
@@ -129,27 +123,27 @@ services:
logging:
driver: json-file
-# fda-authentication-service:
-# restart: on-failure
-# container_name: fda-authentication-service
-# hostname: fda-authentication-service
-# build: ./fda-authentication-service
-# image: fda-authentication-service
-# networks:
-# - fda-public
-# volumes:
-# - /tmp:/tmp
-# environment:
-# SERVER_NAME: dbrepo.local
-# SPRING_PROFILES_ACTIVE: docker
-# KEY_STORE_PASSWORD: ${KEY_STORE_PASSWORD}
-# ports:
-# - "9097:9097"
-# depends_on:
-# fda-discovery-service:
-# condition: service_healthy
-# logging:
-# driver: json-file
+ fda-authentication-service:
+ restart: on-failure
+ container_name: fda-authentication-service
+ hostname: fda-authentication-service
+ build: ./fda-authentication-service
+ image: fda-authentication-service
+ networks:
+ - fda-public
+ volumes:
+ - /tmp:/tmp
+ environment:
+ SERVER_NAME: dbrepo.ossdip.at
+ SPRING_PROFILES_ACTIVE: sandbox
+ KEY_STORE_PASSWORD: ${KEY_STORE_PASSWORD}
+ ports:
+ - "9097:9097"
+ depends_on:
+ fda-discovery-service:
+ condition: service_healthy
+ logging:
+ driver: json-file
fda-query-service:
restart: on-failure
@@ -161,9 +155,7 @@ services:
- fda-public
- fda-userdb
environment:
- SPRING_PROFILES_ACTIVE: docker
- ports:
- - "9093:9093"
+ SPRING_PROFILES_ACTIVE: docker,seeder,sandbox
volumes:
- /tmp:/tmp
depends_on:
@@ -171,6 +163,8 @@ services:
condition: service_healthy
fda-container-service:
condition: service_healthy
+ fda-table-service:
+ condition: service_healthy
fda-metadata-db:
condition: service_healthy
logging:
@@ -186,10 +180,8 @@ services:
- fda-public
- fda-userdb
environment:
- SPRING_PROFILES_ACTIVE: docker
+ SPRING_PROFILES_ACTIVE: docker,seeder,sandbox
multipart.location: /tmp
- ports:
- - "9094:9094"
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- /tmp:/tmp
@@ -202,6 +194,10 @@ services:
condition: service_healthy
fda-database-service:
condition: service_healthy
+ fda-search-service:
+ condition: service_started
+ logging:
+ driver: json-file
# fda-citation-service:
# restart: on-failure
@@ -236,8 +232,6 @@ services:
command: sh -c "/wait && flask run" # docker-compose should not test the implementation
environment:
EUREKA_SERVER: http://fda-discovery-service:9090/eureka/
- ports:
- - "5000:5000"
volumes:
- /tmp:/tmp
- /var/run/docker.sock:/var/run/docker.sock
@@ -257,17 +251,17 @@ services:
image: fda-broker-service
networks:
- fda-public
- ports:
- - "5672:5672"
- - "15672:15672"
volumes:
- fda-broker-service-data:/var/lib/rabbitmq/
+ logging:
+ driver: json-file
fda-search-service:
restart: always
container_name: fda-search-service
hostname: fda-search-service
image: elasticsearch:7.13.4
+ command: ["elasticsearch"]
networks:
- fda-public
environment:
@@ -277,11 +271,8 @@ services:
depends_on:
fda-discovery-service:
condition: service_healthy
- fda-table-service:
- condition: service_healthy
- ports:
- - "9200:9200"
- - "9600:9600"
+ logging:
+ driver: json-file
fda-ui:
restart: on-failure
@@ -301,4 +292,7 @@ services:
environment:
HOST: 0.0.0.0
API: http://fda-gateway-service:9095
- SECURE: https
+ KEY: "${UI_KEY}"
+ CERT: "${UI_CERT}"
+ logging:
+ driver: json-file
diff --git a/docker-compose.yml b/docker-compose.yml
index e2214ac2a2f97b026b5b2d924e16bf9aba61db30..f42ad174c0041b3e1f50847243bbc1ff9b7a7c15 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,6 +40,8 @@ services:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: fda
+ logging:
+ driver: json-file
fda-discovery-service:
restart: on-failure
@@ -53,6 +55,8 @@ services:
SPRING_PROFILES_ACTIVE: docker
ports:
- "9090:9090"
+ logging:
+ driver: json-file
fda-gateway-service:
restart: on-failure
@@ -71,6 +75,8 @@ services:
depends_on:
fda-container-service:
condition: service_healthy
+ fda-authentication-service:
+ condition: service_healthy
fda-database-service:
condition: service_healthy
fda-table-service:
@@ -129,27 +135,27 @@ services:
logging:
driver: json-file
-# fda-authentication-service:
-# restart: on-failure
-# container_name: fda-authentication-service
-# hostname: fda-authentication-service
-# build: ./fda-authentication-service
-# image: fda-authentication-service
-# networks:
-# - fda-public
-# volumes:
-# - /tmp:/tmp
-# environment:
-# SERVER_NAME: dbrepo.local
-# SPRING_PROFILES_ACTIVE: docker
-# KEY_STORE_PASSWORD: ${KEY_STORE_PASSWORD}
-# ports:
-# - "9097:9097"
-# depends_on:
-# fda-discovery-service:
-# condition: service_healthy
-# logging:
-# driver: json-file
+ fda-authentication-service:
+ restart: on-failure
+ container_name: fda-authentication-service
+ hostname: fda-authentication-service
+ build: ./fda-authentication-service
+ image: fda-authentication-service
+ networks:
+ - fda-public
+ volumes:
+ - /tmp:/tmp
+ environment:
+ SERVER_NAME: dbrepo.local
+ SPRING_PROFILES_ACTIVE: docker
+ KEY_STORE_PASSWORD: ${KEY_STORE_PASSWORD:-dbrepo}
+ ports:
+ - "9097:9097"
+ depends_on:
+ fda-discovery-service:
+ condition: service_healthy
+ logging:
+ driver: json-file
fda-query-service:
restart: on-failure
@@ -161,7 +167,7 @@ services:
- fda-public
- fda-userdb
environment:
- SPRING_PROFILES_ACTIVE: docker
+ SPRING_PROFILES_ACTIVE: docker,seeder
ports:
- "9093:9093"
volumes:
@@ -171,6 +177,8 @@ services:
condition: service_healthy
fda-container-service:
condition: service_healthy
+ fda-table-service:
+ condition: service_healthy
fda-metadata-db:
condition: service_healthy
logging:
@@ -186,7 +194,7 @@ services:
- fda-public
- fda-userdb
environment:
- SPRING_PROFILES_ACTIVE: docker
+ SPRING_PROFILES_ACTIVE: docker,seeder
multipart.location: /tmp
ports:
- "9094:9094"
@@ -204,6 +212,8 @@ services:
condition: service_healthy
fda-search-service:
condition: service_started
+ logging:
+ driver: json-file
# fda-citation-service:
# restart: on-failure
@@ -264,6 +274,8 @@ services:
- "15672:15672"
volumes:
- fda-broker-service-data:/var/lib/rabbitmq/
+ logging:
+ driver: json-file
fda-search-service:
restart: always
@@ -301,6 +313,10 @@ services:
depends_on:
fda-gateway-service:
condition: service_healthy
+ fda-discovery-service:
+ condition: service_healthy
environment:
HOST: 0.0.0.0
API: http://fda-gateway-service:9095
+ logging:
+ driver: json-file
diff --git a/fda-authentication-service/Dockerfile b/fda-authentication-service/Dockerfile
index 43605f434eb13de8f638218c7ffc7ad16b3ec1d7..33a2c8dc931d037b7eb49b6c7bdfa758aef384aa 100644
--- a/fda-authentication-service/Dockerfile
+++ b/fda-authentication-service/Dockerfile
@@ -15,8 +15,6 @@ COPY ./rest-service ./rest-service
COPY ./services ./services
COPY ./report ./report
-ARG CI_JOB_STAGE
-
# Make sure it compiles
RUN mvn -q clean package -DskipTests > /dev/null
@@ -25,11 +23,13 @@ FROM openjdk:11-jre-slim as runtime
VOLUME /tmp
-COPY --from=build ./rest-service/target/rest-service-*.jar ./rest-service.jar
COPY ./service_ready /usr/bin
+RUN chmod +x /usr/bin/service_ready
HEALTHCHECK --interval=10s --timeout=3s --retries=6 CMD service_ready
-EXPOSE 9091
+COPY --from=build ./rest-service/target/rest-service-*.jar ./rest-service.jar
+
+EXPOSE 9097
ENTRYPOINT ["java", "-jar", "./rest-service.jar"]
diff --git a/fda-authentication-service/README.md b/fda-authentication-service/README.md
index 94b71d2f46c71cb10dce42c1265895949889fe74..41b35d9b8f46e6d188f9460f52c9ddf0f864017a 100644
--- a/fda-authentication-service/README.md
+++ b/fda-authentication-service/README.md
@@ -20,7 +20,7 @@ set KEY_STORE_PASSWORD "..."
The key store is a secure container that contains the SSL/TLS certificate:
-1. Let's Encrypt private key for `dbrepo.ossdip.at` with alias `1`
+1. Let's Encrypt private key for `dbrepo.ossdip.at` with alias `ssl`
## Development
diff --git a/fda-authentication-service/pom.xml b/fda-authentication-service/pom.xml
index c5d0c26a1c948db651b74c7bbf95d24a02a0ea2f..8454163a11d8bdf01a1eb2bf68802e93f67a8ec2 100644
--- a/fda-authentication-service/pom.xml
+++ b/fda-authentication-service/pom.xml
@@ -110,6 +110,12 @@
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.version}</version>
</dependency>
+ <!-- DataSource -->
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<!-- IDE -->
<dependency>
<groupId>org.projectlombok</groupId>
diff --git a/fda-authentication-service/rest-service/src/main/java/at/tuwien/FdaAuthenticationServiceApplication.java b/fda-authentication-service/rest-service/src/main/java/at/tuwien/FdaAuthenticationServiceApplication.java
index 9ee4a655b6ef187a92caba9d225d3788e0563de2..887619c39e6ad37370f2da112b13758d950696eb 100644
--- a/fda-authentication-service/rest-service/src/main/java/at/tuwien/FdaAuthenticationServiceApplication.java
+++ b/fda-authentication-service/rest-service/src/main/java/at/tuwien/FdaAuthenticationServiceApplication.java
@@ -10,8 +10,7 @@ import springfox.documentation.oas.annotations.EnableOpenApi;
@EnableOpenApi
@EnableWebSecurity
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class,
- DataSourceTransactionManagerAutoConfiguration.class, HibernateJpaAutoConfiguration.class})
+@SpringBootApplication
public class FdaAuthenticationServiceApplication {
public static void main(String[] args) {
diff --git a/fda-authentication-service/services/src/main/java/at/tuwien/config/ReadyConfig.java b/fda-authentication-service/rest-service/src/main/java/at/tuwien/config/ReadyConfig.java
similarity index 93%
rename from fda-authentication-service/services/src/main/java/at/tuwien/config/ReadyConfig.java
rename to fda-authentication-service/rest-service/src/main/java/at/tuwien/config/ReadyConfig.java
index 0bee3b961edd4ca456f0243c8eede630a4a54716..2250fa50884df3f47b0b063975aea74f06203f80 100644
--- a/fda-authentication-service/services/src/main/java/at/tuwien/config/ReadyConfig.java
+++ b/fda-authentication-service/rest-service/src/main/java/at/tuwien/config/ReadyConfig.java
@@ -1,6 +1,7 @@
package at.tuwien.config;
import com.google.common.io.Files;
+import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.context.annotation.Configuration;
@@ -9,6 +10,7 @@ import org.springframework.context.event.EventListener;
import java.io.File;
import java.io.IOException;
+@Log4j2
@Configuration
public class ReadyConfig {
diff --git a/fda-authentication-service/rest-service/src/main/java/at/tuwien/config/SamlConfig.java b/fda-authentication-service/rest-service/src/main/java/at/tuwien/config/SamlConfig.java
index 378fa0dc92c56cc6e224661cd17e5b47a62f5a74..84697cc27010339fc2bd617f832b910ad6b053d0 100644
--- a/fda-authentication-service/rest-service/src/main/java/at/tuwien/config/SamlConfig.java
+++ b/fda-authentication-service/rest-service/src/main/java/at/tuwien/config/SamlConfig.java
@@ -3,7 +3,7 @@ package at.tuwien.config;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
import org.apache.velocity.app.VelocityEngine;
-import org.opensaml.saml2.metadata.provider.FilesystemMetadataProvider;
+import org.opensaml.saml2.metadata.provider.HTTPMetadataProvider;
import org.opensaml.saml2.metadata.provider.MetadataProvider;
import org.opensaml.saml2.metadata.provider.MetadataProviderException;
import org.opensaml.xml.parse.StaticBasicParserPool;
@@ -19,6 +19,7 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.saml.*;
import org.springframework.security.saml.context.SAMLContextProvider;
+import org.springframework.security.saml.context.SAMLContextProviderImpl;
import org.springframework.security.saml.context.SAMLContextProviderLB;
import org.springframework.security.saml.key.JKSKeyManager;
import org.springframework.security.saml.key.KeyManager;
@@ -38,8 +39,6 @@ import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuc
import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
-import java.io.File;
-import java.io.IOException;
import java.util.*;
@Configuration
@@ -50,6 +49,12 @@ public class SamlConfig extends WebSecurityConfigurerAdapter {
@Value("${fda.idp.metadata}")
private String idpProviderMetadata;
+ @Value("${fda.idp.entity-id}")
+ private String idpEntityId;
+
+ @Value("${fda.saml.signkey}")
+ private String samlSignKey;
+
@Value("${fda.base-url}")
private String baseUrl;
@@ -135,15 +140,25 @@ public class SamlConfig extends WebSecurityConfigurerAdapter {
@Bean
public SAMLEntryPoint samlEntryPoint() {
final SAMLEntryPoint samlEntryPoint = new SAMLEntryPoint();
+ samlEntryPoint.setSamlLogger(samlLogger());
+ samlEntryPoint.setContextProvider(samlContextProvider());
+ samlEntryPoint.setWebSSOprofile(webSSOprofile());
samlEntryPoint.setDefaultProfileOptions(defaultWebSSOProfileOptions());
return samlEntryPoint;
}
+ @Bean
+ public SAMLContextProvider samlContextProvider() {
+ return new SAMLContextProviderImpl();
+ }
+
@Bean
public ExtendedMetadata extendedMetadata() {
final ExtendedMetadata extendedMetadata = new ExtendedMetadata();
extendedMetadata.setIdpDiscoveryEnabled(true);
- extendedMetadata.setSignMetadata(false);
+ extendedMetadata.setSignMetadata(true);
+ extendedMetadata.setSigningKey(samlSignKey);
+// extendedMetadata.setEncryptionKey(samlSignKey);
return extendedMetadata;
}
@@ -153,11 +168,11 @@ public class SamlConfig extends WebSecurityConfigurerAdapter {
}
@Bean
- public ExtendedMetadataDelegate extendedMetadataProvider() throws MetadataProviderException, IOException {
- ExtendedMetadataDelegate extendedMetadataDelegate = new ExtendedMetadataDelegate(pivotalTestMetadataProvider(),
+ public ExtendedMetadataDelegate extendedMetadataProvider() throws MetadataProviderException {
+ ExtendedMetadataDelegate extendedMetadataDelegate = new ExtendedMetadataDelegate(metadataProvider(),
extendedMetadata());
extendedMetadataDelegate.setMetadataTrustCheck(true);
- extendedMetadataDelegate.setMetadataRequireSignature(false);
+ extendedMetadataDelegate.setMetadataRequireSignature(true);
return extendedMetadataDelegate;
}
@@ -173,6 +188,11 @@ public class SamlConfig extends WebSecurityConfigurerAdapter {
return new MetadataDisplayFilter();
}
+ @Bean
+ public Timer timer() {
+ return new Timer();
+ }
+
@Bean
public SAMLProcessingFilter samlWebSSOProcessingFilter() throws Exception {
final SAMLProcessingFilter samlWebSSOProcessingFilter = new SAMLProcessingFilter();
@@ -232,14 +252,14 @@ public class SamlConfig extends WebSecurityConfigurerAdapter {
@Override
protected void configure(HttpSecurity http) throws Exception {
http.requiresChannel()
- .anyRequest().requiresSecure();
+ .anyRequest()
+ .requiresSecure();
http.httpBasic()
.authenticationEntryPoint(samlEntryPoint());
http.csrf()
.disable();
http.addFilterBefore(metadataGeneratorFilter(), ChannelProcessingFilter.class)
.addFilterAfter(samlFilter(), BasicAuthenticationFilter.class);
- /* allow metadata and saml stuff */
http.authorizeRequests()
.antMatchers("/saml/**").permitAll()
.antMatchers("/health").permitAll()
@@ -248,11 +268,8 @@ public class SamlConfig extends WebSecurityConfigurerAdapter {
}
@Bean
- public MetadataProvider pivotalTestMetadataProvider() throws MetadataProviderException, IOException {
- final DefaultResourceLoader loader = new DefaultResourceLoader();
- final Resource storeFile = loader.getResource("classpath:saml/sp_metadata.xml");
- final File tuMetadata = storeFile.getFile();
- final FilesystemMetadataProvider provider = new FilesystemMetadataProvider(tuMetadata);
+ public MetadataProvider metadataProvider() throws MetadataProviderException {
+ final HTTPMetadataProvider provider = new HTTPMetadataProvider(timer(), httpClient(), idpProviderMetadata);
provider.setParserPool(parserPool());
return provider;
}
@@ -260,7 +277,7 @@ public class SamlConfig extends WebSecurityConfigurerAdapter {
@Bean
public MetadataGenerator metadataGenerator() {
final MetadataGenerator metadataGenerator = new MetadataGenerator();
- metadataGenerator.setEntityId("at:tuwien");
+ metadataGenerator.setEntityId(idpEntityId);
metadataGenerator.setRequestSigned(false);
metadataGenerator.setExtendedMetadata(extendedMetadata());
metadataGenerator.setIncludeDiscoveryExtension(false);
@@ -275,6 +292,8 @@ public class SamlConfig extends WebSecurityConfigurerAdapter {
final SAMLContextProviderLB contextProvider = new SAMLContextProviderLB();
contextProvider.setScheme("https");
contextProvider.setServerName(serverName + ":" + serverPort);
+ contextProvider.setServerPort(Integer.parseInt(serverPort));
+ contextProvider.setIncludeServerPortInRequestURL(false);
contextProvider.setContextPath("/");
return contextProvider;
}
diff --git a/fda-authentication-service/rest-service/src/main/java/at/tuwien/endpoints/AuthenticationEndpoint.java b/fda-authentication-service/rest-service/src/main/java/at/tuwien/endpoints/AuthenticationEndpoint.java
index 6f18b89c8ae13ab63952a205c51f52dba23694d1..30a2f5f41b1fef1f909ff6e8c261c2fa19295a09 100644
--- a/fda-authentication-service/rest-service/src/main/java/at/tuwien/endpoints/AuthenticationEndpoint.java
+++ b/fda-authentication-service/rest-service/src/main/java/at/tuwien/endpoints/AuthenticationEndpoint.java
@@ -5,16 +5,17 @@ import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
-@RestController("/api/auth")
@Log4j2
+@RestController
+@CrossOrigin(origins = "*")
public class AuthenticationEndpoint {
- @GetMapping("/")
+ @GetMapping("/api/auth")
public String index() {
return "Index";
}
- @GetMapping("/info")
+ @GetMapping("/api/auth/info")
public ResponseEntity<Object> info(Authentication authentication) {
return ResponseEntity.ok(authentication.getName());
}
diff --git a/fda-authentication-service/rest-service/src/main/resources/application-docker.yml b/fda-authentication-service/rest-service/src/main/resources/application-docker.yml
index 15fc96eb8cc647830eb920c46bd030895d0b26f7..5a724a57eeccd2c35f5ffda725864a60726d8724 100644
--- a/fda-authentication-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-authentication-service/rest-service/src/main/resources/application-docker.yml
@@ -1,42 +1,26 @@
spring:
main.banner-mode: off
datasource:
- url: jdbc:postgresql://fda-metadata-db:5432/fda
- driver-class-name: org.postgresql.Driver
- username: postgres
- password: postgres
+ url: jdbc:h2:mem:testdb
+ driver-class-name: org.h2.Driver
+ username: sa
+ password: sa
jpa:
show-sql: false
- database-platform: org.hibernate.dialect.PostgreSQLDialect
+ database-platform: org.hibernate.dialect.H2Dialect
hibernate:
- ddl-auto: validate
+ ddl-auto: create-drop
open-in-view: false
application:
name: fda-authentication-service
cloud:
- discovery.enabled: false
loadbalancer.ribbon.enabled: false
- security:
- saml2:
- relyingparty:
- registration:
- tu-saml:
- identityprovider:
- entity-id: at:tuwien
-# signing.credentials:
-# - certificate-location:
-# private-key-location:
- verification.credentials:
- - certificate-location: classpath:ssl/tu.cer
- singlesignon.url: https://idp.zid.tuwien.ac.at/simplesaml/saml2/idp/SSOService.php
- singlesignon.sign-request: false
server:
port: 9097
- name: ${SERVER_NAME}
ssl:
enabled: true
key-alias: 1
- key-store: classpath:ssl/dbrepo.jks
+ key-store: classpath:saml/dbrepo.jks
key-store-password: ${KEY_STORE_PASSWORD}
key-store-type: jks
logging:
@@ -49,5 +33,8 @@ eureka:
client.serviceUrl.defaultZone: http://fda-discovery-service:9090/eureka/
fda:
ready.path: /ready
- idp.metadata: https://idp.zid.tuwien.ac.at/saml2
- base-url: https://dbrepo.ossdip.at:9097
\ No newline at end of file
+ idp:
+ entity-id: "at:tuwien"
+ metadata: https://idp.zid.tuwien.ac.at/saml2
+ saml.signkey: saml
+ base-url: https://fda-authentication-service
\ No newline at end of file
diff --git a/fda-authentication-service/rest-service/src/main/resources/application-sandbox.yml b/fda-authentication-service/rest-service/src/main/resources/application-sandbox.yml
new file mode 100644
index 0000000000000000000000000000000000000000..9974f0be9a258e1ee8493dbb5d591e989644130a
--- /dev/null
+++ b/fda-authentication-service/rest-service/src/main/resources/application-sandbox.yml
@@ -0,0 +1,40 @@
+spring:
+ main.banner-mode: off
+ datasource:
+ url: jdbc:h2:mem:testdb
+ driver-class-name: org.h2.Driver
+ username: sa
+ password: sa
+ jpa:
+ show-sql: false
+ database-platform: org.hibernate.dialect.H2Dialect
+ hibernate:
+ ddl-auto: create-drop
+ open-in-view: false
+ application:
+ name: fda-authentication-service
+ cloud:
+ loadbalancer.ribbon.enabled: false
+server:
+ port: 9097
+ ssl:
+ enabled: true
+ key-alias: ssl
+ key-store: file:/tmp/dbrepo.jks
+ key-store-password: "${KEY_STORE_PASSWORD}"
+ key-store-type: jks
+logging:
+ pattern.console: "%d %highlight(%-5level) %msg%n"
+ level:
+ root: debug
+ at.tuwien.: debug
+eureka:
+ instance.hostname: fda-authentication-service
+ client.serviceUrl.defaultZone: http://fda-discovery-service:9090/eureka/
+fda:
+ ready.path: /ready
+ idp:
+ entity-id: "at:tuwien"
+ metadata: https://idp.zid.tuwien.ac.at/saml2
+ saml.signkey: saml
+ base-url: https://dbrepo.ossdip.at:9097
\ No newline at end of file
diff --git a/fda-authentication-service/rest-service/src/main/resources/application.yml b/fda-authentication-service/rest-service/src/main/resources/application.yml
deleted file mode 100644
index f6a6585597cd4cc19d8984a222089dd02235cab2..0000000000000000000000000000000000000000
--- a/fda-authentication-service/rest-service/src/main/resources/application.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-spring:
- main.banner-mode: off
- datasource:
- url: jdbc:postgresql://localhost:5432/fda
- driver-class-name: org.postgresql.Driver
- username: postgres
- password: postgres
- jpa:
- show-sql: false
- database-platform: org.hibernate.dialect.PostgreSQLDialect
- hibernate:
- ddl-auto: validate
- open-in-view: false
- application:
- name: fda-authentication-service
- cloud:
- discovery.enabled: false
- loadbalancer.ribbon.enabled: false
- security:
- saml2:
- relyingparty:
- registration:
- tu-saml:
- identityprovider:
- entity-id: at:tuwien
-# signing.credentials:
-# - certificate-location:
-# private-key-location:
- verification.credentials:
- - certificate-location: classpath:ssl/tu.cer
- singlesignon.url: https://idp.zid.tuwien.ac.at/simplesaml/saml2/idp/SSOService.php
- singlesignon.sign-request: true
-server:
- port: 9097
- name: ${SERVER_NAME}
- ssl:
- enabled: true
- key-alias: 1
- key-store: classpath:ssl/dbrepo.jks
- key-store-password: ${KEY_STORE_PASSWORD}
- key-store-type: jks
-logging:
- pattern.console: "%d %highlight(%-5level) %msg%n"
- level:
- root: warn
- at.tuwien.: debug
-eureka:
- instance.hostname: fda-authentication-service
- client.serviceUrl.defaultZone: http://localhost:9090/eureka/
-fda:
- ready.path: /ready
- idp.metadata: https://idp.zid.tuwien.ac.at/saml2
- base-url: https://dbrepo.ossdip.at:9097
\ No newline at end of file
diff --git a/fda-authentication-service/rest-service/src/main/resources/bin/install_selfsigned_cert b/fda-authentication-service/rest-service/src/main/resources/bin/gen_jks
similarity index 57%
rename from fda-authentication-service/rest-service/src/main/resources/bin/install_selfsigned_cert
rename to fda-authentication-service/rest-service/src/main/resources/bin/gen_jks
index 5a71e6a934428d5d7df90d8d6765169bde63a2d8..fca13b90d893a54dc0d8d52adc355a831858cc43 100755
--- a/fda-authentication-service/rest-service/src/main/resources/bin/install_selfsigned_cert
+++ b/fda-authentication-service/rest-service/src/main/resources/bin/gen_jks
@@ -27,17 +27,3 @@ keytool -importkeystore -srckeystore "${KEY_STORE_LOCATION}" -destkeystore "${JK
-deststoretype jks -srcstorepass "${KEY_STORE_PASS}" -deststorepass "${KEY_STORE_PASS}" \
-srcalias "${KEY_STORE_ALIAS}" -destalias "${KEY_STORE_ALIAS}" -srckeypass "${SSL_PASS}" \
-destkeypass "${SSL_PASS}"
-
-# COMBINE CERTIFICATE AND PRIVATE KEY
-echo "Import SAML keys ..."
-openssl pkcs12 -export -out "${SAML_STORE_LOCATION}" -in "${SAML_CERTIFICATE}" -inkey "${SAML_KEY}" \
- -passout "pass:${SAML_PASS}"
-keytool -importkeystore -srckeystore "${SAML_STORE_LOCATION}" -destkeystore "${JKS_LOCATION}" -srcstoretype PKCS12 \
- -trustcacerts -noprompt -deststoretype jks -srcstorepass "${KEY_STORE_PASS}" -deststorepass "${KEY_STORE_PASS}" \
- -srcalias "1" -destalias "${SAML_ALIAS}" -srckeypass "${SAML_PASS}" \
- -destkeypass "${SAML_PASS}"
-
-# IMPORT TU WIEN CERTIFICATE
-echo "Import TU certificate ..."
-keytool -importcert -trustcacerts -noprompt -keystore "${JKS_LOCATION}" -storepass "${KEY_STORE_PASS}" \
- -alias "${TU_ALIAS}" -file ./fda-authentication-service/rest-service/src/main/resources/saml/tu.cer
diff --git a/fda-authentication-service/rest-service/src/main/resources/bin/install_saml_keys b/fda-authentication-service/rest-service/src/main/resources/bin/install_saml_keys
deleted file mode 100755
index 2ee83f9cfd11ea8a5ab700d17b49e94e0feeaf1c..0000000000000000000000000000000000000000
--- a/fda-authentication-service/rest-service/src/main/resources/bin/install_saml_keys
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-SIGN_KEYS_LOCATION="./rest-service/src/main/resources/saml"
-
-# CREATE SIGNING KEYS
-openssl req -newkey rsa:4096 -new \
- -subj "/C=AT/ST=Vienna/L=Vienna/O=TU Wien/OU=Zentrum für Forschungsdatenmanagement/CN=FAIR Data Austria" \
- -nodes -x509 -days 3650 -keyout "${SIGN_KEYS_LOCATION}/saml_sign_priv.key" \
- -out "${SIGN_KEYS_LOCATION}/saml_sign_public.cer"
\ No newline at end of file
diff --git a/fda-authentication-service/rest-service/src/main/resources/saml/dbrepo.jks b/fda-authentication-service/rest-service/src/main/resources/saml/dbrepo.jks
old mode 100755
new mode 100644
index d848a46d328b43aaf0c6f062ac9eaccfd54764bf..bb805a7500861f15467fb38c22b86aad74e715e6
Binary files a/fda-authentication-service/rest-service/src/main/resources/saml/dbrepo.jks and b/fda-authentication-service/rest-service/src/main/resources/saml/dbrepo.jks differ
diff --git a/fda-authentication-service/rest-service/src/main/resources/saml/idp_metadata.xml b/fda-authentication-service/rest-service/src/main/resources/saml/idp_metadata.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cd9ccaf93c9291574495a67caa62422f4a1779f2
--- /dev/null
+++ b/fda-authentication-service/rest-service/src/main/resources/saml/idp_metadata.xml
@@ -0,0 +1,29 @@
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.zid.tuwien.ac.at/saml2">
+ <script/>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tuwien.ac.at</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDnTCCAoWgAwIBAgIJALst+VObcXe1MA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDTALBgNVBAcMBFdpZW4xEDAOBgNVBAoMB1RVIFdpZW4xDDAKBgNVBAsMA1pJRDEWMBQGA1UEAwwNc2ltcGxlU0FNTHBocDAeFw0xNDA0MDkwOTMxMjRaFw0yNDA0MDgwOTMxMjRaMGUxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDTALBgNVBAcMBFdpZW4xEDAOBgNVBAoMB1RVIFdpZW4xDDAKBgNVBAsMA1pJRDEWMBQGA1UEAwwNc2ltcGxlU0FNTHBocDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANz8s2nk5tAVH9uCgpR6CCSQN3G9zHLRPaZq0SA7LE8tzbSiBFeOM6JuN4Er3P81pwDPzeIN6Qfmi5Fi5/mdBr2jiNZxH2anwhf6GpRqA6ckP2c3+1fj5vJPX557XdBpf/SlbcS4H0dCQTFZwPmQN1cbvZ5nPg2jT+GiLJv5X2ugfviG2eaM9HTMuWbwSrGMqM3gJz/GYq6mp6llRJ7PgM6/jY4dLcBQ64Xu+8yr2SJ2bDKyJwfYZIUqcyPhjJOcgj10EnZbJAPzSDDQ2yjBC5btBrO6yIGDwZm4lEJ4JshFDHLNbbiK78R5WlZD7gO+vaeT1069wl3ptGHT86dLQXUCAwEAAaNQME4wHQYDVR0OBBYEFJ5pkC4zjbtkq5dUo7N+GfDLam4AMB8GA1UdIwQYMBaAFJ5pkC4zjbtkq5dUo7N+GfDLam4AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADIEncg+saezDSlvcsXvA8ZTd40/pKX2zbvWAU6PlVlT9zmkBMBevrxlodh5bSCrfRQyjsd8GaJGLfiZf+KuXmd9xj35J9Gz10VlZf6Pp+8scjayFesDnfMoA/GvywJUqZBMAvsa9LrSsA5c07NOiwcyWtXnS11zz3NFtX06OynAAmvlJHklSWhsJIBV+i5IYMfV7jzYOI8wmulTRWK3Pycr6PLM1wQD7Pf8xl8nuxyQ8tPG+4gzUeHW9LkJNflNOa1Bb+XMAIj1ZiwQyLWOuo6n2u5reN24gU0jMi/Vy4dhn5oU6Ve86nwITKKm/S+EOM8k5b+uOzI3g939xkINDpc=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDnTCCAoWgAwIBAgIJALst+VObcXe1MA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDTALBgNVBAcMBFdpZW4xEDAOBgNVBAoMB1RVIFdpZW4xDDAKBgNVBAsMA1pJRDEWMBQGA1UEAwwNc2ltcGxlU0FNTHBocDAeFw0xNDA0MDkwOTMxMjRaFw0yNDA0MDgwOTMxMjRaMGUxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDTALBgNVBAcMBFdpZW4xEDAOBgNVBAoMB1RVIFdpZW4xDDAKBgNVBAsMA1pJRDEWMBQGA1UEAwwNc2ltcGxlU0FNTHBocDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANz8s2nk5tAVH9uCgpR6CCSQN3G9zHLRPaZq0SA7LE8tzbSiBFeOM6JuN4Er3P81pwDPzeIN6Qfmi5Fi5/mdBr2jiNZxH2anwhf6GpRqA6ckP2c3+1fj5vJPX557XdBpf/SlbcS4H0dCQTFZwPmQN1cbvZ5nPg2jT+GiLJv5X2ugfviG2eaM9HTMuWbwSrGMqM3gJz/GYq6mp6llRJ7PgM6/jY4dLcBQ64Xu+8yr2SJ2bDKyJwfYZIUqcyPhjJOcgj10EnZbJAPzSDDQ2yjBC5btBrO6yIGDwZm4lEJ4JshFDHLNbbiK78R5WlZD7gO+vaeT1069wl3ptGHT86dLQXUCAwEAAaNQME4wHQYDVR0OBBYEFJ5pkC4zjbtkq5dUo7N+GfDLam4AMB8GA1UdIwQYMBaAFJ5pkC4zjbtkq5dUo7N+GfDLam4AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADIEncg+saezDSlvcsXvA8ZTd40/pKX2zbvWAU6PlVlT9zmkBMBevrxlodh5bSCrfRQyjsd8GaJGLfiZf+KuXmd9xj35J9Gz10VlZf6Pp+8scjayFesDnfMoA/GvywJUqZBMAvsa9LrSsA5c07NOiwcyWtXnS11zz3NFtX06OynAAmvlJHklSWhsJIBV+i5IYMfV7jzYOI8wmulTRWK3Pycr6PLM1wQD7Pf8xl8nuxyQ8tPG+4gzUeHW9LkJNflNOa1Bb+XMAIj1ZiwQyLWOuo6n2u5reN24gU0jMi/Vy4dhn5oU6Ve86nwITKKm/S+EOM8k5b+uOzI3g939xkINDpc=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.zid.tuwien.ac.at/simplesaml/saml2/idp/SingleLogoutService.php"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.zid.tuwien.ac.at/simplesaml/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Administrator</md:GivenName>
+ <md:EmailAddress>mailto:login-admin@tuwien.ac.at</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
\ No newline at end of file
diff --git a/fda-authentication-service/rest-service/src/main/resources/securityContext.txt b/fda-authentication-service/rest-service/src/main/resources/securityContext.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5a4f5251f4e7f49a0947d751613644ba2315b9ca
--- /dev/null
+++ b/fda-authentication-service/rest-service/src/main/resources/securityContext.txt
@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:security="http://www.springframework.org/schema/security"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+ http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
+
+ <!-- Enable auto-wiring -->
+ <context:annotation-config/>
+ <context:component-scan base-package="org.springframework.security.saml"/>
+
+ <!-- Unsecured pages -->
+ <security:http security="none" pattern="/saml/web/**"/>
+ <security:http security="none" pattern="/logout.jsp"/>
+ <security:http security="none" pattern="/favicon.ico"/>
+
+ <!-- Secured pages -->
+ <security:http entry-point-ref="samlEntryPoint">
+ <security:intercept-url pattern="/**" access="IS_AUTHENTICATED_FULLY"/>
+ <security:custom-filter before="FIRST" ref="metadataGeneratorFilter"/>
+ <security:custom-filter after="BASIC_AUTH_FILTER" ref="samlFilter"/>
+ </security:http>
+
+ <bean id="samlFilter" class="org.springframework.security.web.FilterChainProxy">
+ <security:filter-chain-map request-matcher="ant">
+ <security:filter-chain pattern="/saml/login/**" filters="samlEntryPoint"/>
+ <security:filter-chain pattern="/saml/logout/**" filters="samlLogoutFilter"/>
+ <security:filter-chain pattern="/saml/metadata/**" filters="metadataDisplayFilter"/>
+ <security:filter-chain pattern="/saml/SSO/**" filters="samlWebSSOProcessingFilter"/>
+ <security:filter-chain pattern="/saml/SSOHoK/**" filters="samlWebSSOHoKProcessingFilter"/>
+ <security:filter-chain pattern="/saml/SingleLogout/**" filters="samlLogoutProcessingFilter"/>
+ <security:filter-chain pattern="/saml/discovery/**" filters="samlIDPDiscovery"/>
+ </security:filter-chain-map>
+ </bean>
+
+ <!-- Handler deciding where to redirect user after successful login -->
+ <bean id="successRedirectHandler"
+ class="org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler">
+ <property name="defaultTargetUrl" value="/"/>
+ </bean>
+ <!--
+ Use the following for interpreting RelayState coming from unsolicited response as redirect URL:
+ <bean id="successRedirectHandler" class="org.springframework.security.saml.SAMLRelayStateSuccessHandler">
+ <property name="defaultTargetUrl" value="/" />
+ </bean>
+ -->
+
+ <!-- Handler for successful logout -->
+ <bean id="successLogoutHandler"
+ class="org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler">
+ <property name="defaultTargetUrl" value="/logout.jsp"/>
+ </bean>
+
+ <!-- Register authentication manager with SAML provider -->
+ <security:authentication-manager alias="authenticationManager">
+ <security:authentication-provider ref="samlAuthenticationProvider"/>
+ </security:authentication-manager>
+
+ <!-- Logger for SAML messages and events -->
+ <bean id="samlLogger" class="org.springframework.security.saml.log.SAMLDefaultLogger"/>
+
+ <!-- Entry point to initialize authentication, default values taken from properties file -->
+ <bean id="samlEntryPoint" class="org.springframework.security.saml.SAMLEntryPoint">
+ <property name="defaultProfileOptions">
+ <bean class="org.springframework.security.saml.websso.WebSSOProfileOptions">
+ <property name="includeScoping" value="false"/>
+ </bean>
+ </property>
+ </bean>
+
+ <!-- IDP Discovery Service -->
+ <bean id="samlIDPDiscovery" class="org.springframework.security.saml.SAMLDiscovery">
+ <property name="idpSelectionPath" value="/WEB-INF/security/idpSelection.jsp"/>
+ </bean>
+
+ <!-- Filter automatically generates default SP metadata -->
+ <bean id="metadataGeneratorFilter" class="org.springframework.security.saml.metadata.MetadataGeneratorFilter">
+ <constructor-arg>
+ <bean class="org.springframework.security.saml.metadata.MetadataGenerator">
+ <property name="requestSigned" value="false"/>
+ </bean>
+ </constructor-arg>
+ </bean>
+
+ <!-- The filter is waiting for connections on URL suffixed with filterSuffix and presents SP metadata there -->
+ <bean id="metadataDisplayFilter" class="org.springframework.security.saml.metadata.MetadataDisplayFilter"/>
+
+ <!-- IDP Metadata configuration - paths to metadata of IDPs in circle of trust is here -->
+ <!-- Do no forget to call iniitalize method on providers -->
+ <bean id="metadata" class="org.springframework.security.saml.metadata.CachingMetadataManager">
+ <constructor-arg>
+ <list>
+<!-- <bean class="org.springframework.security.saml.metadata.ExtendedMetadataDelegate">-->
+<!-- <constructor-arg>-->
+<!-- <bean class="org.opensaml.saml2.metadata.provider.FilesystemMetadataProvider">-->
+<!-- <constructor-arg>-->
+<!-- <value type="java.io.File">classpath:saml/idp_metadata.xml</value>-->
+<!-- </constructor-arg>-->
+<!-- <property name="parserPool" ref="parserPool"/>-->
+<!-- </bean>-->
+<!-- </constructor-arg>-->
+<!-- <constructor-arg>-->
+<!-- <bean class="org.springframework.security.saml.metadata.ExtendedMetadata">-->
+<!-- </bean>-->
+<!-- </constructor-arg>-->
+<!-- </bean>-->
+ <bean class="org.opensaml.saml2.metadata.provider.HTTPMetadataProvider">
+ <constructor-arg>
+ <value type="java.lang.String">https://idp.zid.tuwien.ac.at/saml2</value>
+ </constructor-arg>
+ <constructor-arg>
+ <value type="int">5000</value>
+ </constructor-arg>
+ <property name="parserPool" ref="parserPool"/>
+ </bean>
+ </list>
+ </constructor-arg>
+ <!-- OPTIONAL used when one of the metadata files contains information about this service provider -->
+ <!-- <property name="hostedSPName" value=""/> -->
+ <!-- OPTIONAL property: can tell the system which IDP should be used for authenticating user by default. -->
+ <!-- <property name="defaultIDP" value="http://localhost:8080/opensso"/> -->
+ </bean>
+
+ <!-- SAML Authentication Provider responsible for validating of received SAML messages -->
+ <bean id="samlAuthenticationProvider" class="org.springframework.security.saml.SAMLAuthenticationProvider">
+ <!-- OPTIONAL property: can be used to store/load user data after login -->
+ <!--
+ <property name="userDetails" ref="bean" />
+ -->
+ </bean>
+
+ <!-- Provider of default SAML Context -->
+ <bean id="contextProvider" class="org.springframework.security.saml.context.SAMLContextProviderImpl"/>
+
+ <!-- Processing filter for WebSSO profile messages -->
+ <bean id="samlWebSSOProcessingFilter" class="org.springframework.security.saml.SAMLProcessingFilter">
+ <property name="authenticationManager" ref="authenticationManager"/>
+ <property name="authenticationSuccessHandler" ref="successRedirectHandler"/>
+ </bean>
+
+ <!-- Processing filter for WebSSO Holder-of-Key profile -->
+ <bean id="samlWebSSOHoKProcessingFilter" class="org.springframework.security.saml.SAMLWebSSOHoKProcessingFilter">
+ <property name="authenticationManager" ref="authenticationManager"/>
+ <property name="authenticationSuccessHandler" ref="successRedirectHandler"/>
+ </bean>
+
+ <!-- Logout handler terminating local session -->
+ <bean id="logoutHandler"
+ class="org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler">
+ <property name="invalidateHttpSession" value="false"/>
+ </bean>
+
+ <!-- Override default logout processing filter with the one processing SAML messages -->
+ <bean id="samlLogoutFilter" class="org.springframework.security.saml.SAMLLogoutFilter">
+ <constructor-arg ref="successLogoutHandler"/>
+ <constructor-arg ref="logoutHandler"/>
+ <constructor-arg ref="logoutHandler"/>
+ </bean>
+
+ <!-- Filter processing incoming logout messages -->
+ <!-- First argument determines URL user will be redirected to after successful global logout -->
+ <bean id="samlLogoutProcessingFilter" class="org.springframework.security.saml.SAMLLogoutProcessingFilter">
+ <constructor-arg ref="successLogoutHandler"/>
+ <constructor-arg ref="logoutHandler"/>
+ </bean>
+
+ <!-- Class loading incoming SAML messages from httpRequest stream -->
+ <bean id="processor" class="org.springframework.security.saml.processor.SAMLProcessorImpl">
+ <constructor-arg>
+ <list>
+ <ref bean="redirectBinding"/>
+ <ref bean="postBinding"/>
+ <ref bean="artifactBinding"/>
+ <ref bean="soapBinding"/>
+ <ref bean="paosBinding"/>
+ </list>
+ </constructor-arg>
+ </bean>
+
+ <!-- SAML 2.0 WebSSO Assertion Consumer -->
+ <bean id="webSSOprofileConsumer" class="org.springframework.security.saml.websso.WebSSOProfileConsumerImpl"/>
+
+ <!-- SAML 2.0 Holder-of-Key WebSSO Assertion Consumer -->
+ <bean id="hokWebSSOprofileConsumer" class="org.springframework.security.saml.websso.WebSSOProfileConsumerHoKImpl"/>
+
+ <!-- SAML 2.0 Web SSO profile -->
+ <bean id="webSSOprofile" class="org.springframework.security.saml.websso.WebSSOProfileImpl"/>
+
+ <!-- SAML 2.0 Holder-of-Key Web SSO profile -->
+ <bean id="hokWebSSOProfile" class="org.springframework.security.saml.websso.WebSSOProfileConsumerHoKImpl"/>
+
+ <!-- SAML 2.0 ECP profile -->
+ <bean id="ecpprofile" class="org.springframework.security.saml.websso.WebSSOProfileECPImpl"/>
+
+ <!-- SAML 2.0 Logout Profile -->
+ <bean id="logoutprofile" class="org.springframework.security.saml.websso.SingleLogoutProfileImpl"/>
+
+ <!-- Bindings, encoders and decoders used for creating and parsing messages -->
+ <bean id="postBinding" class="org.springframework.security.saml.processor.HTTPPostBinding">
+ <constructor-arg ref="parserPool"/>
+ <constructor-arg ref="velocityEngine"/>
+ </bean>
+
+ <bean id="redirectBinding" class="org.springframework.security.saml.processor.HTTPRedirectDeflateBinding">
+ <constructor-arg ref="parserPool"/>
+ </bean>
+
+ <bean id="artifactBinding" class="org.springframework.security.saml.processor.HTTPArtifactBinding">
+ <constructor-arg ref="parserPool"/>
+ <constructor-arg ref="velocityEngine"/>
+ <constructor-arg>
+ <bean class="org.springframework.security.saml.websso.ArtifactResolutionProfileImpl">
+ <constructor-arg>
+ <bean class="org.apache.commons.httpclient.HttpClient"/>
+ </constructor-arg>
+ <property name="processor">
+ <bean id="soapProcessor" class="org.springframework.security.saml.processor.SAMLProcessorImpl">
+ <constructor-arg ref="soapBinding"/>
+ </bean>
+ </property>
+ </bean>
+ </constructor-arg>
+ </bean>
+
+ <bean id="soapBinding" class="org.springframework.security.saml.processor.HTTPSOAP11Binding">
+ <constructor-arg ref="parserPool"/>
+ </bean>
+
+ <bean id="paosBinding" class="org.springframework.security.saml.processor.HTTPPAOS11Binding">
+ <constructor-arg ref="parserPool"/>
+ </bean>
+
+ <!-- Initialization of OpenSAML library-->
+ <bean class="org.springframework.security.saml.SAMLBootstrap"/>
+
+ <!-- Initialization of the velocity engine -->
+ <bean id="velocityEngine" class="org.springframework.security.saml.util.VelocityFactory"
+ factory-method="getEngine"/>
+
+ <!-- XML parser pool needed for OpenSAML parsing -->
+ <bean id="parserPool" class="org.opensaml.xml.parse.StaticBasicParserPool" scope="singleton"
+ init-method="initialize"/>
+ <bean id="parserPoolHolder" class="org.springframework.security.saml.parser.ParserPoolHolder" scope="singleton"/>
+
+</beans>
\ No newline at end of file
diff --git a/fda-authentication-service/rest-service/src/main/resources/ssl/dbrepo.jks b/fda-authentication-service/rest-service/src/main/resources/ssl/dbrepo.jks
deleted file mode 100644
index 3d3d4410f97145f2d9c0ba1752981ca01dca0137..0000000000000000000000000000000000000000
Binary files a/fda-authentication-service/rest-service/src/main/resources/ssl/dbrepo.jks and /dev/null differ
diff --git a/fda-authentication-service/services/src/main/java/at/tuwien/service/SamlUserDetailsService.java b/fda-authentication-service/services/src/main/java/at/tuwien/service/SamlUserDetailsService.java
deleted file mode 100644
index 874fe51d64dced70e8dbf00759f70e3c3d2cefa3..0000000000000000000000000000000000000000
--- a/fda-authentication-service/services/src/main/java/at/tuwien/service/SamlUserDetailsService.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package at.tuwien.service;
-
-import lombok.extern.log4j.Log4j2;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.security.saml.SAMLCredential;
-import org.springframework.security.saml.userdetails.SAMLUserDetailsService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Log4j2
-@Service
-public class SamlUserDetailsService implements SAMLUserDetailsService {
-
- @Override
- public Object loadUserBySAML(SAMLCredential credential) throws UsernameNotFoundException {
- String id = credential.getNameID().getValue();
- /* right now we only support users */
- return new User(id, "empty", true, true, true, true, List.of(new SimpleGrantedAuthority("ROLE_USER")));
- }
-}
diff --git a/fda-citation-service/Dockerfile b/fda-citation-service/Dockerfile
index 76774bc545deb7567a07d10c148ae5f97e862c34..c33450b0d1b676a8f5671f7ca1b2591cf7d631de 100644
--- a/fda-citation-service/Dockerfile
+++ b/fda-citation-service/Dockerfile
@@ -15,8 +15,6 @@ COPY ./rest-service ./rest-service
COPY ./services ./services
COPY ./report ./report
-ARG CI_JOB_STAGE
-
# Make sure it compiles
RUN mvn -q clean package -DskipTests > /dev/null
diff --git a/fda-citation-service/rest-service/src/main/java/at/tuwien/endpoints/FileEndpoint.java b/fda-citation-service/rest-service/src/main/java/at/tuwien/endpoints/FileEndpoint.java
deleted file mode 100644
index 6c3603322796f90a87d3022dc1f51091e123e3fe..0000000000000000000000000000000000000000
--- a/fda-citation-service/rest-service/src/main/java/at/tuwien/endpoints/FileEndpoint.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package at.tuwien.endpoints;
-
-import at.tuwien.api.database.deposit.files.FileDto;
-import at.tuwien.exception.*;
-import at.tuwien.mapper.FileMapper;
-import at.tuwien.service.FileService;
-import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Log4j2
-@CrossOrigin(origins = "*")
-@RestController
-@RequestMapping("/api/database/{id}/cite/file")
-public class FileEndpoint {
-
- private final FileMapper fileMapper;
- private final FileService fileService;
-
- @Autowired
- public FileEndpoint(FileMapper fileMapper, FileService fileService) {
- this.fileMapper = fileMapper;
- this.fileService = fileService;
- }
-
- @GetMapping
- public List<FileDto> listAll(@Valid @PathVariable("id") Long databaseId) {
- return fileService.listResources()
- .stream()
- .map(fileMapper::fileToFileDto)
- .collect(Collectors.toList());
- }
-
- @GetMapping("/{queryId}")
- public FileDto find(@Valid @PathVariable("id") Long databaseId,
- @Valid @PathVariable("queryId") Long queryId)
- throws RemoteApiException, RemoteNotFoundException, RemoteAuthenticationException,
- RemoteUnavailableException, QueryNotFoundException, MetadataDatabaseNotFoundException {
- return fileMapper.fileToFileDto(fileService.findResource(databaseId, queryId));
- }
-
- @PostMapping("/{queryId}")
- public FileDto create(@Valid @PathVariable("id") Long databaseId,
- @Valid @PathVariable("queryId") Long queryId)
- throws RemoteApiException, RemoteNotFoundException, RemoteAuthenticationException,
- RemoteUnavailableException, QueryNotFoundException, RemoteDatabaseException, TableServiceException,
- RemoteFileException, MetadataDatabaseNotFoundException {
- return fileMapper.fileToFileDto(fileService.createResource(databaseId, queryId));
- }
-
- @PutMapping("/{queryId}")
- public FileDto update(@Valid @PathVariable("id") Long databaseId,
- @Valid @PathVariable("queryId") Long queryId) {
- return null;
- }
-
- @DeleteMapping("/{queryId}")
- public FileDto delete(@Valid @PathVariable("id") Long databaseId,
- @Valid @PathVariable("queryId") Long queryId) {
- return null;
- }
-}
diff --git a/fda-citation-service/rest-service/src/main/java/at/tuwien/endpoints/MetadataEndpoint.java b/fda-citation-service/rest-service/src/main/java/at/tuwien/endpoints/MetadataEndpoint.java
index 50bbb6d949b0f7c4124666133563081c7a2c5f23..fa213b69a08162afaebc2ced6ecf1706443caeae 100644
--- a/fda-citation-service/rest-service/src/main/java/at/tuwien/endpoints/MetadataEndpoint.java
+++ b/fda-citation-service/rest-service/src/main/java/at/tuwien/endpoints/MetadataEndpoint.java
@@ -2,17 +2,12 @@ package at.tuwien.endpoints;
import at.tuwien.api.database.deposit.DepositChangeRequestDto;
import at.tuwien.api.database.query.QueryDto;
-import at.tuwien.exception.*;
-import at.tuwien.mapper.QueryMapper;
-import at.tuwien.service.MetadataService;
import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
-import java.util.stream.Collectors;
@Log4j2
@CrossOrigin(origins = "*")
@@ -20,67 +15,44 @@ import java.util.stream.Collectors;
@RequestMapping("/api/database/{id}/cite/metadata")
public class MetadataEndpoint {
- private final QueryMapper queryMapper;
- private final MetadataService metadataService;
-
- @Autowired
- public MetadataEndpoint(QueryMapper queryMapper, MetadataService metadataService) {
- this.queryMapper = queryMapper;
- this.metadataService = metadataService;
- }
-
@GetMapping
@Transactional
- public List<QueryDto> findAll(@Valid @PathVariable("id") Long databaseId) throws MetadataDatabaseNotFoundException {
- return metadataService.listCitations(databaseId)
- .stream()
- .map(queryMapper::queryToQueryDto)
- .collect(Collectors.toList());
+ public List<QueryDto> findAll(@Valid @PathVariable("id") Long databaseId) {
+ return null;
}
@PostMapping("/{queryId}")
@Transactional
public QueryDto create(@Valid @PathVariable("id") Long databaseId,
- @Valid @PathVariable("queryId") Long queryId) throws RemoteApiException,
- RemoteAuthenticationException, MetadataDatabaseNotFoundException, RemoteUnavailableException,
- RemoteNotFoundException {
- return queryMapper.queryToQueryDto(metadataService.storeCitation(databaseId, queryId));
+ @Valid @PathVariable("queryId") Long queryId) {
+ return null;
}
@GetMapping("/{queryId}")
@Transactional
public QueryDto find(@Valid @PathVariable("id") Long databaseId,
- @Valid @RequestParam("queryId") Long queryId)
- throws MetadataDatabaseNotFoundException, RemoteApiException, RemoteNotFoundException,
- RemoteAuthenticationException, RemoteUnavailableException, QueryNotFoundException {
- return queryMapper.queryToQueryDto(metadataService.findCitation(databaseId, queryId));
+ @Valid @RequestParam("queryId") Long queryId) {
+ return null;
}
@PutMapping("/{queryId}")
@Transactional
public QueryDto update(@Valid @PathVariable("id") Long databaseId,
@Valid @PathVariable("queryId") Long queryId,
- @Valid @RequestBody DepositChangeRequestDto data)
- throws RemoteApiException, RemoteNotFoundException, RemoteAuthenticationException,
- RemoteUnavailableException, QueryNotFoundException, MetadataDatabaseNotFoundException {
- return queryMapper.queryToQueryDto(metadataService.updateCitation(databaseId, queryId, data));
+ @Valid @RequestBody DepositChangeRequestDto data) {
+ return null;
}
@DeleteMapping("/{queryId}")
@Transactional
public void delete(@Valid @PathVariable("id") Long databaseId,
- @Valid @PathVariable("queryId") Long queryId) throws MetadataDatabaseNotFoundException,
- RemoteApiException, RemoteAuthenticationException, RemoteNotFoundException, RemoteUnavailableException,
- QueryNotFoundException {
- metadataService.deleteCitation(databaseId, queryId);
+ @Valid @PathVariable("queryId") Long queryId) {
}
@PostMapping("/{queryId}/publish")
@Transactional
public QueryDto publish(@Valid @PathVariable("id") Long databaseId,
- @Valid @PathVariable("queryId") Long queryId) throws RemoteApiException,
- RemoteAuthenticationException, MetadataDatabaseNotFoundException, RemoteUnavailableException,
- RemoteNotFoundException, QueryNotFoundException {
- return queryMapper.queryToQueryDto(metadataService.publishCitation(databaseId, queryId));
+ @Valid @PathVariable("queryId") Long queryId) {
+ return null;
}
}
diff --git a/fda-citation-service/rest-service/src/main/resources/application.yml b/fda-citation-service/rest-service/src/main/resources/application.yml
index 5432c8633212e8e617bc1684e92ec3e4218e4915..37ac6c912dc6b67a1576363534b0f15cae891e19 100644
--- a/fda-citation-service/rest-service/src/main/resources/application.yml
+++ b/fda-citation-service/rest-service/src/main/resources/application.yml
@@ -21,7 +21,6 @@ logging:
level:
root: warn
at.tuwien.: debug
- at.tuwien.service.: trace
eureka:
instance.hostname: fda-citation-service
client.serviceUrl.defaultZone: http://localhost:9090/eureka/
diff --git a/fda-citation-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java b/fda-citation-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java
index c8d35af3d29e7dfb1a7b23e71dbe3f58a2b30e41..d87f35d29236e259da5fe24eb6f69f8668536f97 100644
--- a/fda-citation-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java
+++ b/fda-citation-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java
@@ -1,10 +1,6 @@
package at.tuwien;
import at.tuwien.api.database.deposit.DepositChangeRequestDto;
-import at.tuwien.api.database.deposit.DepositDto;
-import at.tuwien.api.database.deposit.DepositTzDto;
-import at.tuwien.api.database.deposit.files.FileDto;
-import at.tuwien.api.database.deposit.files.FileLinksDto;
import at.tuwien.api.database.deposit.metadata.CreatorDto;
import at.tuwien.api.database.deposit.metadata.LicenseTypeDto;
import at.tuwien.api.database.deposit.metadata.MetadataDto;
@@ -16,7 +12,6 @@ import at.tuwien.entities.container.image.ContainerImage;
import at.tuwien.entities.container.image.ContainerImageEnvironmentItem;
import at.tuwien.entities.container.image.ContainerImageEnvironmentItemType;
import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.query.File;
import at.tuwien.entities.database.query.Query;
import at.tuwien.entities.database.table.Table;
import org.apache.commons.lang.RandomStringUtils;
@@ -88,24 +83,6 @@ public abstract class BaseUnitTest {
public final static String METADATA_1_DESCRIPTION = "The dataset contains 1000 records of ...";
public final static CreatorDto[] METADATA_1_CREATORS = new CreatorDto[]{CREATOR_1, CREATOR_2};
- public final static Long FILE_1_ID = 1L;
- public final static Long FILE_1_DB_ID = 1L;
- public final static Long FILE_1_QID = QUERY_1_ID;
- public final static String FILE_1_NAME = "testdata-othername.csv";
- public final static String FILE_1_REF_ID = "6b3df619-eb55-427a-8ee2-9bef7c1ae189";
- public final static String FILE_1_CHECKSUM = "d393c7fa1240c18473133793f7901aaa";
- public final static Long FILE_1_SIZE = 34614L;
-
- public final static File FILE_1 = File.builder()
- .id(FILE_1_ID)
- .fqid(FILE_1_QID)
- .fdbid(FILE_1_DB_ID)
- .refId(FILE_1_REF_ID)
- .build();
-
- public final static String FILE_1_LINKS_DOWNLOAD = "http://localhost:5500/file/" + FILE_1_ID + "/download";
- public final static String FILE_1_LINKS_SELF = "http://localhost:5500/file/" + FILE_1_ID;
-
public final static Query QUERY_1 = Query.builder()
.id(QUERY_1_ID)
.qdbid(DATABASE_1_ID)
@@ -113,24 +90,9 @@ public abstract class BaseUnitTest {
.query(QUERY_1_QUERY)
.queryNormalized(QUERY_1_QUERY_NORMALIZED)
.executionTimestamp(QUERY_1_EXECUTION_TIMESTAMP)
- .files(List.of(FILE_1))
- .depositId(DEPOSIT_1_ID)
.qdbid(DATABASE_1_ID)
.build();
- public final static Long FILE_2_ID = 2L;
- public final static Long FILE_2_DB_ID = 1L;
- public final static String FILE_2_NAME = "testdata-weather.csv";
- public final static String FILE_2_REF_ID = "78729cbb-37ea-441a-94ae-c40ff021b09d";
- public final static String FILE_2_CHECKSUM = "a65cf8b8719b1a65db4f361eeec18457";
- public final static Long FILE_2_SIZE = 14094055L;
-
- public final static File FILE_2 = File.builder()
- .id(FILE_2_ID)
- .fdbid(FILE_2_DB_ID)
- .refId(FILE_2_REF_ID)
- .build();
-
public final static Long DEPOSIT_2_ID = 2L;
public final static String DEPOSIT_2_TITLE = "Test Document " + RandomStringUtils.randomAlphanumeric(10);
public final static String DEPOSIT_2_DESCRIPTION = "Test Description " + RandomStringUtils.randomAlphanumeric(100);
@@ -223,36 +185,6 @@ public abstract class BaseUnitTest {
.uploadType(METADATA_1_UPLOAD_TYPE)
.build();
- public final static FileLinksDto FILE_1_LINKS = FileLinksDto.builder()
- .download(FILE_1_LINKS_DOWNLOAD)
- .self(FILE_1_LINKS_SELF)
- .build();
-
- public final static FileDto FILE_1_DTO = FileDto.builder()
- .id(FILE_1_ID)
- .refId(FILE_1_REF_ID)
- .fqid(QUERY_1_ID)
- .fdbid(DATABASE_1_ID)
- .build();
-
- public final static FileDto FILE_2_DTO = FileDto.builder()
- .id(FILE_2_ID)
- .refId(FILE_2_REF_ID)
- .fqid(QUERY_1_ID)
- .fdbid(DATABASE_1_ID)
- .build();
-
- public final static DepositTzDto DEPOSIT_1 = DepositTzDto.builder()
- .id(DEPOSIT_1_ID)
- .created(DEPOSIT_1_CREATED)
- .modified(DEPOSIT_1_MODIFIED)
- .title(DEPOSIT_1_TITLE)
- .state(DEPOSIT_1_STATE)
- .submitted(DEPOSIT_1_SUBMITTED)
- .recordId(DEPOSIT_1_RECORD_ID)
- .files(List.of(FILE_1_DTO, FILE_2_DTO))
- .build();
-
public final static ExecuteQueryDto QUERY_1_EXECUTE = ExecuteQueryDto.builder()
.query(QUERY_1_QUERY)
.title(QUERY_1_TITLE)
diff --git a/fda-authentication-service/rest-service/src/main/resources/ssl/.gitkeep b/fda-citation-service/rest-service/~
similarity index 100%
rename from fda-authentication-service/rest-service/src/main/resources/ssl/.gitkeep
rename to fda-citation-service/rest-service/~
diff --git a/fda-citation-service/services/src/main/java/at/tuwien/mapper/FileMapper.java b/fda-citation-service/services/src/main/java/at/tuwien/mapper/FileMapper.java
deleted file mode 100644
index 32bf59a0e72faedf7b67d186b5711860a1543aa0..0000000000000000000000000000000000000000
--- a/fda-citation-service/services/src/main/java/at/tuwien/mapper/FileMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package at.tuwien.mapper;
-
-import at.tuwien.api.database.deposit.files.FileDto;
-import at.tuwien.api.database.query.QueryDto;
-import at.tuwien.entities.database.query.File;
-import at.tuwien.entities.database.query.Query;
-import org.mapstruct.Mapper;
-
-@Mapper(componentModel = "spring")
-public interface FileMapper {
-
- File fileDtoToFile(FileDto data);
-
- FileDto fileToFileDto(File data);
-
-}
diff --git a/fda-citation-service/services/src/main/java/at/tuwien/mapper/QueryMapper.java b/fda-citation-service/services/src/main/java/at/tuwien/mapper/QueryMapper.java
deleted file mode 100644
index fd00ba0470b45e064e27fd7e5eddf2125eec1b01..0000000000000000000000000000000000000000
--- a/fda-citation-service/services/src/main/java/at/tuwien/mapper/QueryMapper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package at.tuwien.mapper;
-
-import at.tuwien.api.database.query.QueryDto;
-import at.tuwien.entities.database.query.Query;
-import org.mapstruct.Mapper;
-
-@Mapper(componentModel = "spring")
-public interface QueryMapper {
-
- Query queryDtoToQuery(QueryDto data);
-
- QueryDto queryToQueryDto(Query data);
-
-}
diff --git a/fda-citation-service/services/src/main/java/at/tuwien/mapper/ZenodoMapper.java b/fda-citation-service/services/src/main/java/at/tuwien/mapper/ZenodoMapper.java
deleted file mode 100644
index ef23f7c034ad4e370e0a5df6241ec82580d84aa7..0000000000000000000000000000000000000000
--- a/fda-citation-service/services/src/main/java/at/tuwien/mapper/ZenodoMapper.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package at.tuwien.mapper;
-
-import at.tuwien.api.database.deposit.DepositDto;
-import at.tuwien.api.database.deposit.DepositTzDto;
-import at.tuwien.api.database.query.QueryDto;
-import at.tuwien.entities.database.query.Query;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.Mappings;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.client.MultipartBodyBuilder;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.util.List;
-
-@Mapper(componentModel = "spring")
-public interface ZenodoMapper {
-
- default MultiValueMap<String, HttpEntity<?>> resourceToHttpEntity(String name, MultipartFile resource) throws IOException {
- final HttpHeaders headers = new HttpHeaders();
- headers.setAccept(List.of(MediaType.APPLICATION_JSON));
- headers.setContentType(MediaType.MULTIPART_FORM_DATA);
- final HttpHeaders parts = new HttpHeaders();
- parts.setContentType(MediaType.TEXT_PLAIN);
- final ByteArrayResource byteArrayResource = new ByteArrayResource(resource.getBytes()) {
- @Override
- public String getFilename() {
- return name;
- }
- };
- MultipartBodyBuilder bodyBuilder = new MultipartBodyBuilder();
- bodyBuilder.part("file", byteArrayResource);
- bodyBuilder.part("name", name);
- return bodyBuilder.build();
- }
-
- @Mappings({
- @Mapping(source = "metadata.prereserveDoi.doi", target = "doi"),
- @Mapping(source = "id", target = "depositId"),
- @Mapping(ignore = true, target = "id")
- })
- Query depositTzDtoToQuery(DepositTzDto data);
-
- default Instant localDateTimeToInstant(LocalDateTime data) {
- return data.toInstant(ZoneOffset.UTC);
- }
-
- @Mappings({
- @Mapping(source = "created", target = "executionTimestamp"),
- @Mapping(source = "metadata.prereserveDoi.doi", target = "doi"),
- @Mapping(source = "recordId", target = "depositId"),
- })
- QueryDto depositChangeResponseDtoToQueryDto(DepositDto data);
-
-}
diff --git a/fda-citation-service/services/src/main/java/at/tuwien/repository/jpa/FileRepository.java b/fda-citation-service/services/src/main/java/at/tuwien/repository/jpa/FileRepository.java
deleted file mode 100644
index f73c1d2aa2cc16c0bb43908f07a56cefc389d6dc..0000000000000000000000000000000000000000
--- a/fda-citation-service/services/src/main/java/at/tuwien/repository/jpa/FileRepository.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package at.tuwien.repository.jpa;
-
-import at.tuwien.entities.database.query.File;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface FileRepository extends JpaRepository<File, Long> {
-}
diff --git a/fda-citation-service/services/src/main/java/at/tuwien/service/FileService.java b/fda-citation-service/services/src/main/java/at/tuwien/service/FileService.java
deleted file mode 100644
index 1f3c06722b1fce4a1dda750c425cd85e0749aadf..0000000000000000000000000000000000000000
--- a/fda-citation-service/services/src/main/java/at/tuwien/service/FileService.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package at.tuwien.service;
-
-import at.tuwien.entities.database.query.File;
-import at.tuwien.exception.*;
-import org.springframework.stereotype.Service;
-
-import javax.transaction.Transactional;
-import java.util.List;
-
-@Service
-public interface FileService {
-
- /**
- * Upload a new file to a remote server for a given database-table id pair and metadata
- *
- * @param databaseId The database-table id paid
- * @param queryId The query id
- * @return The new file
- * @throws RemoteAuthenticationException Token invalid
- * @throws RemoteApiException Something other went wrong
- * @throws RemoteNotFoundException The deposit id was not found on the remote server
- * @throws RemoteUnavailableException The remote server is not reachable
- * @throws QueryNotFoundException The deposit was not found on the metadata database
- */
- @Transactional
- File createResource(Long databaseId, Long queryId)
- throws RemoteAuthenticationException, RemoteApiException, RemoteNotFoundException,
- RemoteUnavailableException, QueryNotFoundException, RemoteDatabaseException, TableServiceException, RemoteFileException, MetadataDatabaseNotFoundException;
-
- /**
- * List all files known to a deposit number (through the database-table id pair)
- *
- * @return The list of files
- */
- @Transactional
- List<File> listResources();
-
- /**
- * Find a file for a deposit (through the database-table id pair) by id
- *
- * @param databaseId The database-table id pair
- * @param queryId The query id
- * @return The file
- * @throws QueryNotFoundException The deposit was not found on the metadata database
- * @throws RemoteAuthenticationException Token invalid
- * @throws RemoteNotFoundException The deposit id was not found on the remote server
- * @throws RemoteUnavailableException The remote server is not reachable
- * @throws RemoteApiException Something other went wrong
- */
- @Transactional
- File findResource(Long databaseId, Long queryId)
- throws RemoteAuthenticationException, RemoteNotFoundException,
- RemoteApiException, RemoteUnavailableException, QueryNotFoundException, MetadataDatabaseNotFoundException;
-
- /**
- * Delete a file based on the database-table id pair by id
- *
- * @param databaseId The database-table id pair
- * @param queryId The query id
- * @throws QueryNotFoundException The deposit was not found on the metadata database
- * @throws RemoteAuthenticationException Token invalid
- * @throws RemoteNotFoundException The deposit id was not found on the remote server
- * @throws RemoteUnavailableException The remote server is not reachable
- * @throws RemoteApiException Something other went wrong
- */
- @Transactional
- void deleteResource(Long databaseId, Long queryId) throws RemoteAuthenticationException,
- RemoteNotFoundException, RemoteApiException, RemoteUnavailableException, QueryNotFoundException, MetadataDatabaseNotFoundException;
-}
diff --git a/fda-citation-service/services/src/main/java/at/tuwien/service/MetadataService.java b/fda-citation-service/services/src/main/java/at/tuwien/service/MetadataService.java
deleted file mode 100644
index 4af992837debdc97f8c0cba7adb105cf846fb98a..0000000000000000000000000000000000000000
--- a/fda-citation-service/services/src/main/java/at/tuwien/service/MetadataService.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package at.tuwien.service;
-
-import at.tuwien.api.database.deposit.DepositChangeRequestDto;
-import at.tuwien.api.database.deposit.record.RecordDto;
-import at.tuwien.entities.database.query.Query;
-import at.tuwien.exception.*;
-import org.springframework.stereotype.Service;
-
-import javax.transaction.Transactional;
-import java.util.List;
-
-@Service
-public interface MetadataService {
-
- /**
- * List all deposits (e.g. datasets) available
- *
- * @param databaseId The database-table id pair
- * @return The deposists
- */
- List<Query> listCitations(Long databaseId) throws MetadataDatabaseNotFoundException;
-
- /**
- * Create a new deposit
- *
- * @param databaseId The database-table id pair
- * @param queryId The query id
- * @return The created deposit
- * @throws RemoteAuthenticationException Token invalid
- * @throws RemoteApiException Something other went wrong
- * @throws RemoteUnavailableException The remote server is not available
- */
- Query storeCitation(Long databaseId, Long queryId) throws RemoteAuthenticationException,
- RemoteApiException, MetadataDatabaseNotFoundException, RemoteUnavailableException, RemoteNotFoundException;
-
- /**
- * Update a deposit with new metadata for a given id
- *
- * @param databaseId The database-table id pair
- * @param queryId The query id
- * @param data The new metadata
- * @return The updated deposit
- * @throws RemoteAuthenticationException Token invalid
- * @throws RemoteApiException Something other went wrong
- * @throws RemoteNotFoundException The deposit id was not found on the remote server
- * @throws RemoteUnavailableException The remote server is not available
- */
- Query updateCitation(Long databaseId, Long queryId,
- DepositChangeRequestDto data) throws RemoteAuthenticationException, RemoteApiException,
- RemoteNotFoundException, RemoteUnavailableException, QueryNotFoundException, MetadataDatabaseNotFoundException;
-
- /**
- * Find a deposit by database-table id pair
- *
- * @param databaseId The database-table id pair
- * @param queryId The query id
- * @return The deposit
- * @throws RemoteAuthenticationException Token invalid
- * @throws RemoteApiException Something other went wrong
- * @throws RemoteNotFoundException The deposit id was not found on the remote server
- * @throws MetadataDatabaseNotFoundException The deposit id was not found in the metadata database
- * @throws RemoteUnavailableException The remote server is not available
- */
- Query findCitation(Long databaseId, Long queryId)
- throws RemoteAuthenticationException, RemoteApiException, RemoteNotFoundException,
- MetadataDatabaseNotFoundException, RemoteUnavailableException, QueryNotFoundException;
-
- /**
- * Fetches a record by depositId
- *
- * @param depositId The depositId (e.g. 956194)
- * @return The record
- * @throws RemoteAuthenticationException
- * @throws RemoteApiException
- * @throws RemoteNotFoundException
- * @throws QueryNotFoundException
- * @throws RemoteUnavailableException
- * @throws MetadataDatabaseNotFoundException
- */
- @Transactional
- RecordDto fetchRemoteRecord(Long depositId)
- throws RemoteAuthenticationException, RemoteApiException, RemoteNotFoundException,
- QueryNotFoundException, RemoteUnavailableException, MetadataDatabaseNotFoundException;
-
- /**
- * Delete a deposit from a given id
- *
- * @param databaseId The database-table id pair
- * @param queryId The query id
- * @throws RemoteAuthenticationException Token invalid
- * @throws RemoteApiException Something other went wrong
- * @throws MetadataDatabaseNotFoundException The deposit id was not found in the metadata database
- * @throws RemoteUnavailableException The remote server is not available
- * @throws RemoteNotFoundException The deposit was not found on the remote server
- */
- void deleteCitation(Long databaseId, Long queryId) throws RemoteAuthenticationException,
- RemoteApiException, MetadataDatabaseNotFoundException, RemoteUnavailableException, RemoteNotFoundException,
- QueryNotFoundException;
-
- /**
- * Publishes a deposit with database-table id pair
- *
- * @param databaseId The database-table id pair
- * @param queryId The query id
- * @return The deposit
- * @throws RemoteAuthenticationException Token invalid
- * @throws RemoteApiException Something other went wrong
- * @throws MetadataDatabaseNotFoundException The deposit id was not found in the metadata database
- * @throws RemoteUnavailableException The remote server is not available
- * @throws RemoteNotFoundException The deposit was not found on the remote server
- */
- Query publishCitation(Long databaseId, Long queryId) throws RemoteAuthenticationException,
- RemoteApiException, MetadataDatabaseNotFoundException, RemoteUnavailableException, RemoteNotFoundException,
- QueryNotFoundException;
-}
diff --git a/fda-container-service/Dockerfile b/fda-container-service/Dockerfile
index fef48057aadb4e586c9fa3de336fba011d31f7d5..dee2b4fff087fbf8419ab04f03d534ecd52c43a6 100644
--- a/fda-container-service/Dockerfile
+++ b/fda-container-service/Dockerfile
@@ -15,8 +15,6 @@ COPY ./rest-service ./rest-service
COPY ./services ./services
COPY ./report ./report
-ARG CI_JOB_STAGE
-
# Make sure it compiles
RUN mvn -q clean package -DskipTests > /dev/null
diff --git a/fda-container-service/services/src/main/java/at/tuwien/seeder/ContainerSeeder.java b/fda-container-service/services/src/main/java/at/tuwien/seeder/ContainerSeeder.java
index 1c851f594bcbb0a92c435a76f9903f52ae011aad..3544865b86a055a366ce4b3b5706d350a152665f 100644
--- a/fda-container-service/services/src/main/java/at/tuwien/seeder/ContainerSeeder.java
+++ b/fda-container-service/services/src/main/java/at/tuwien/seeder/ContainerSeeder.java
@@ -12,19 +12,22 @@ import org.springframework.stereotype.Component;
public class ContainerSeeder implements Seeder {
private final static Long CONTAINER_1_ID = 1L;
- public final static String CONTAINER_1_NAME = "fda-userdb-wetter-aus";
+ public final static String CONTAINER_1_NAME = "Weather AUS";
private final static String CONTAINER_1_REPOSITORY = "mariadb";
private final static String CONTAINER_1_TAG = "10.5";
+ private final static String CONTAINER_1_IP = "172.28.0.2";
private final static Long CONTAINER_2_ID = 2L;
- public final static String CONTAINER_2_NAME = "fda-userdb-infection";
+ public final static String CONTAINER_2_NAME = "Infection";
private final static String CONTAINER_2_REPOSITORY = "mariadb";
private final static String CONTAINER_2_TAG = "10.5";
+ private final static String CONTAINER_2_IP = "172.28.0.3";
private final static Long CONTAINER_3_ID = 3L;
- public final static String CONTAINER_3_NAME = "fda-userdb-air";
+ public final static String CONTAINER_3_NAME = "Air";
private final static String CONTAINER_3_REPOSITORY = "mariadb";
private final static String CONTAINER_3_TAG = "10.5";
+ private final static String CONTAINER_3_IP = "172.28.0.4";
private final static ContainerCreateRequestDto CONTAINER_1_CREATE_REQ = ContainerCreateRequestDto.builder()
.name(CONTAINER_1_NAME)
diff --git a/fda-database-service/Dockerfile b/fda-database-service/Dockerfile
index 15fc6fd353487cf2137305b56369527425aaca91..d904bc64f51825b80de0360a56ea97af2832c5dd 100644
--- a/fda-database-service/Dockerfile
+++ b/fda-database-service/Dockerfile
@@ -15,8 +15,6 @@ COPY ./rest-service ./rest-service
COPY ./services ./services
COPY ./report ./report
-ARG CI_JOB_STAGE
-
# Make sure it compiles
RUN mvn -q clean package -DskipTests > /dev/null
diff --git a/fda-database-service/rest-service/src/main/resources/application-docker.yml b/fda-database-service/rest-service/src/main/resources/application-docker.yml
index 2964756534fe98991fdd294e69b59e3f3fcd9c34..007f62c3aab7ace2fe81c9b7208198c36aba7ee4 100644
--- a/fda-database-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-database-service/rest-service/src/main/resources/application-docker.yml
@@ -29,4 +29,5 @@ eureka:
instance.hostname: fda-database-service
client.serviceUrl.defaultZone: http://fda-discovery-service:9090/eureka/
fda:
- elastic.endpoint: fda-search-service:9200
\ No newline at end of file
+ elastic.endpoint: fda-search-service:9200
+ ready.path: /ready
\ No newline at end of file
diff --git a/fda-database-service/rest-service/src/main/resources/application.yml b/fda-database-service/rest-service/src/main/resources/application.yml
index 94713bd861b2d8fd416886d91959bad30d24dd7a..99e9373d500e273b3fbb9c371c9513496ea1f1da 100644
--- a/fda-database-service/rest-service/src/main/resources/application.yml
+++ b/fda-database-service/rest-service/src/main/resources/application.yml
@@ -29,4 +29,5 @@ eureka:
instance.hostname: fda-database-service
client.serviceUrl.defaultZone: http://localhost:9090/eureka/
fda:
- elastic.endpoint: localhost:9200
\ No newline at end of file
+ elastic.endpoint: localhost:9200
+ ready.path: ./ready
\ No newline at end of file
diff --git a/fda-database-service/rest-service/src/test/java/at/tuwien/service/AmqpServiceUnitTest.java b/fda-database-service/rest-service/src/test/java/at/tuwien/service/AmqpServiceIntegrationTest.java
similarity index 98%
rename from fda-database-service/rest-service/src/test/java/at/tuwien/service/AmqpServiceUnitTest.java
rename to fda-database-service/rest-service/src/test/java/at/tuwien/service/AmqpServiceIntegrationTest.java
index 93b26305ec2629d04e31e5efa5ebc0dc676974c7..1387a2440f5331500f8f732782476294493f84f8 100644
--- a/fda-database-service/rest-service/src/test/java/at/tuwien/service/AmqpServiceUnitTest.java
+++ b/fda-database-service/rest-service/src/test/java/at/tuwien/service/AmqpServiceIntegrationTest.java
@@ -26,7 +26,7 @@ import java.io.IOException;
@Log4j2
@SpringBootTest
@ExtendWith(SpringExtension.class)
-public class AmqpServiceUnitTest extends BaseUnitTest {
+public class AmqpServiceIntegrationTest extends BaseUnitTest {
private static final String AMQP_EXCHANGE = "fda";
diff --git a/fda-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java b/fda-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
index bfb87d7eba150f1a646293cf92bc66abaa538bb7..80685dec1767697a718f6438dfa119364175ba5c 100644
--- a/fda-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
+++ b/fda-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
@@ -226,23 +226,6 @@ public class DatabaseServiceIntegrationTest extends BaseUnitTest {
assertTrue(context.meta().getSchemas().size() > 0);
}
- @Test
- public void create_mariadb_succeeds() throws ImageNotSupportedException, ContainerNotFoundException,
- DatabaseMalformedException, InterruptedException, AmqpException {
- createContainer2(true);
- final DatabaseCreateDto request = DatabaseCreateDto.builder()
- .containerId(CONTAINER_2_ID)
- .name(DATABASE_2_NAME)
- .isPublic(DATABASE_2_PUBLIC)
- .build();
-
- /* test */
- final Database response = databaseService.create(request);
- assertEquals(DATABASE_2_NAME, response.getName());
- assertEquals(DATABASE_2_PUBLIC, response.getIsPublic());
- assertEquals(CONTAINER_2_ID, response.getContainer().getId());
- }
-
@Test
public void create_notFound_fails() {
final DatabaseCreateDto request = DatabaseCreateDto.builder()
diff --git a/fda-database-service/services/src/main/java/at/tuwien/config/ReadyConfig.java b/fda-database-service/services/src/main/java/at/tuwien/config/ReadyConfig.java
index 7b3b31152b7c32368985f9f528c0eeb0882e872f..0d897dca0e4d1b5a91297201e0c8f2beb3fa20ab 100644
--- a/fda-database-service/services/src/main/java/at/tuwien/config/ReadyConfig.java
+++ b/fda-database-service/services/src/main/java/at/tuwien/config/ReadyConfig.java
@@ -1,19 +1,35 @@
package at.tuwien.config;
import com.google.common.io.Files;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.event.EventListener;
+import org.springframework.core.env.Environment;
import java.io.File;
import java.io.IOException;
+import java.util.Arrays;
@Configuration
public class ReadyConfig {
+ @Value("${fda.ready.path}")
+ private String readyPath;
+
+ private final Environment environment;
+
+ @Autowired
+ public ReadyConfig(Environment environment) {
+ this.environment = environment;
+ }
+
@EventListener(ApplicationReadyEvent.class)
public void init() throws IOException {
- Files.touch(new File("/ready"));
+ if (Arrays.asList(environment.getActiveProfiles()).contains("seeder")) {
+ Files.touch(new File(readyPath));
+ }
}
}
diff --git a/fda-database-service/services/src/main/java/at/tuwien/seeder/DatabaseSeeder.java b/fda-database-service/services/src/main/java/at/tuwien/seeder/DatabaseSeeder.java
index 30eb555322dfba1c6b7538aee87ead88bc537800..3a4f4a08a2e2284e32d652b428f6b99b28d41777 100644
--- a/fda-database-service/services/src/main/java/at/tuwien/seeder/DatabaseSeeder.java
+++ b/fda-database-service/services/src/main/java/at/tuwien/seeder/DatabaseSeeder.java
@@ -24,12 +24,12 @@ public class DatabaseSeeder implements Seeder {
private final static Long DATABASE_2_ID = 2L;
- private final static String DATABASE_2_NAME = "Novel Coronavirus (COVID-19) Cases Data";
+ private final static String DATABASE_2_NAME = "Novel Coronavirus (COVID19) Cases Data";
private final static String DATABASE_2_DESCRIPTION = "Novel Corona Virus (COVID-19) epidemiological data since 22 January 2020. The data is compiled by the Johns Hopkins University Center for Systems Science and Engineering (JHU CCSE) from various sources including the World Health Organization (WHO), DXY.cn, BNO News, National Health Commission of the People’s Republic of China (NHC), China CDC (CCDC), Hong Kong Department of Health, Macau Government, Taiwan CDC, US CDC, Government of Canada, Australia Government Department of Health, European Centre for Disease Prevention and Control (ECDC), Ministry of Health Singapore (MOH), and others. JHU CCSE maintains the data on the 2019 Novel Coronavirus COVID-19 (2019-nCoV) Data Repository on Github.";
private final static Boolean DATABASE_2_PUBLIC = false;
private final static Long DATABASE_3_ID = 3L;
- private final static String DATABASE_3_NAME = "Air Quality in Lower Austria 2019-2021";
+ private final static String DATABASE_3_NAME = "Air Quality in Lower Austria 2019 to 2021";
private final static String DATABASE_3_DESCRIPTION = "Openair quality measurements between 2019-01-01 and 2021-01-01 in Wiener Neustadt, Lower Austria, Austria with a low-cost sensor.";
private final static Boolean DATABASE_3_PUBLIC = false;
diff --git a/fda-database-service/services/src/main/java/at/tuwien/seeder/Seeder.java b/fda-database-service/services/src/main/java/at/tuwien/seeder/Seeder.java
index f534434b0ff8353f574d2f876e442fe986b47bb9..445737f1d818be99651faf2e7b813c98f082be7d 100644
--- a/fda-database-service/services/src/main/java/at/tuwien/seeder/Seeder.java
+++ b/fda-database-service/services/src/main/java/at/tuwien/seeder/Seeder.java
@@ -6,9 +6,11 @@ import at.tuwien.exception.DatabaseMalformedException;
import at.tuwien.exception.ImageNotSupportedException;
import org.springframework.stereotype.Component;
+import java.io.IOException;
+
@Component
public interface Seeder {
- void seed() throws ImageNotSupportedException, AmqpException, ContainerNotFoundException, DatabaseMalformedException;
+ void seed() throws ImageNotSupportedException, AmqpException, ContainerNotFoundException, IOException;
}
diff --git a/fda-database-service/services/src/main/java/at/tuwien/seeder/ServiceSeeder.java b/fda-database-service/services/src/main/java/at/tuwien/seeder/ServiceSeeder.java
index 7a28ee2262c5eb8a4352f472cc46a5b71f469a09..2a28a941c464770040b1e2dd1766cf0c6be8b4f5 100644
--- a/fda-database-service/services/src/main/java/at/tuwien/seeder/ServiceSeeder.java
+++ b/fda-database-service/services/src/main/java/at/tuwien/seeder/ServiceSeeder.java
@@ -4,13 +4,17 @@ import at.tuwien.exception.AmqpException;
import at.tuwien.exception.ContainerNotFoundException;
import at.tuwien.exception.DatabaseMalformedException;
import at.tuwien.exception.ImageNotSupportedException;
+import com.google.common.io.Files;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Profile;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
+import java.io.File;
+import java.io.IOException;
import java.util.Arrays;
@Slf4j
@@ -18,6 +22,9 @@ import java.util.Arrays;
@Profile("seeder")
public class ServiceSeeder implements Seeder {
+ @Value("${fda.ready.path}")
+ private String readyPath;
+
private final DatabaseSeeder databaseSeeder;
private final Environment environment;
@@ -29,11 +36,12 @@ public class ServiceSeeder implements Seeder {
@Override
@PostConstruct
- public void seed() throws ImageNotSupportedException, AmqpException, ContainerNotFoundException,
- DatabaseMalformedException {
+ public void seed() throws ImageNotSupportedException, AmqpException, ContainerNotFoundException, IOException {
if (Arrays.asList(environment.getActiveProfiles()).contains("sandbox")) {
databaseSeeder.seed();
}
+ log.info("Seeding completed, service is ready");
+ Files.touch(new File(readyPath));
}
}
diff --git a/fda-database-service/services/src/main/java/at/tuwien/service/DatabaseService.java b/fda-database-service/services/src/main/java/at/tuwien/service/DatabaseService.java
index 042606a77ee331efd4fa3cbd633a8e4a1418d2af..ec66483a945e7088854e63b1de7ca1df0b2dffeb 100644
--- a/fda-database-service/services/src/main/java/at/tuwien/service/DatabaseService.java
+++ b/fda-database-service/services/src/main/java/at/tuwien/service/DatabaseService.java
@@ -105,6 +105,10 @@ public class DatabaseService extends JdbcConnector {
@Transactional
public Database create(DatabaseCreateDto createDto) throws ImageNotSupportedException, ContainerNotFoundException,
DatabaseMalformedException, AmqpException {
+ if (createDto.getName().contains("-")) {
+ log.error("Database name cannot contain -");
+ throw new DatabaseMalformedException("Database name cannot contain -");
+ }
final Optional<Container> containerResponse = containerRepository.findById(createDto.getContainerId());
if (containerResponse.isEmpty()) {
log.warn("Container with id {} does not exist", createDto.getContainerId());
diff --git a/fda-discovery-service/Dockerfile b/fda-discovery-service/Dockerfile
index 54df4e5baadb603b233a0b234550bc27c5f816e3..4394f693e9454136317b3047bb2dbf6cae42febf 100644
--- a/fda-discovery-service/Dockerfile
+++ b/fda-discovery-service/Dockerfile
@@ -9,8 +9,6 @@ RUN mvn -fn -B dependency:go-offline > /dev/null
COPY ./discovery ./discovery
COPY ./report ./report
-ARG CI_JOB_STAGE
-
# Make sure it compiles
RUN mvn -q clean package -DskipTests > /dev/null
diff --git a/fda-gateway-service/Dockerfile b/fda-gateway-service/Dockerfile
index dcdbda7b9c40bc2b38e826c31966c554298124ac..5a28e0e216445d5bb8d3b80785545611a407748c 100644
--- a/fda-gateway-service/Dockerfile
+++ b/fda-gateway-service/Dockerfile
@@ -9,8 +9,6 @@ RUN mvn -fn -B dependency:go-offline > /dev/null
COPY ./gateway ./gateway
COPY ./report ./report
-ARG CI_JOB_STAGE
-
# Make sure it compiles
RUN mvn -q clean package -DskipTests > /dev/null
diff --git a/fda-gateway-service/gateway/src/main/java/at/tuwien/gatewayservice/config/GatewayConfig.java b/fda-gateway-service/gateway/src/main/java/at/tuwien/gatewayservice/config/GatewayConfig.java
index 70fe42bb69cdca146bacaa307b7d4200118703c7..b9949ac4d8c5b0402274d336bfffbf4ab142f3c5 100644
--- a/fda-gateway-service/gateway/src/main/java/at/tuwien/gatewayservice/config/GatewayConfig.java
+++ b/fda-gateway-service/gateway/src/main/java/at/tuwien/gatewayservice/config/GatewayConfig.java
@@ -16,11 +16,6 @@ public class GatewayConfig {
.method("POST", "GET", "PUT", "DELETE")
.and()
.uri("lb://fda-analyse-service"))
- .route("fda-authentication-service", r -> r.path("/api/auth/**")
- .and()
- .method("POST", "GET")
- .and()
- .uri("lb://fda-authentication-service"))
.route("fda-container-service", r -> r.path("/api/container/**",
"/api/image/**")
.and()
diff --git a/fda-metadata-db/Dockerfile b/fda-metadata-db/Dockerfile
index be221c1de54829109496f958a468fc2dafb1f60e..5bde8a89c6be222ad8a434973dbba703508f1c5c 100644
--- a/fda-metadata-db/Dockerfile
+++ b/fda-metadata-db/Dockerfile
@@ -9,8 +9,6 @@ RUN mvn -fn -B dependency:go-offline > /dev/null
COPY ./api ./api
COPY ./entities ./entities
-ARG CI_JOB_STAGE
-
# Make sure it compiles
RUN mvn -q clean package -DskipTests > /dev/null
diff --git a/fda-metadata-db/api/src/main/java/at/tuwien/api/database/query/ExecuteQueryDto.java b/fda-metadata-db/api/src/main/java/at/tuwien/api/database/query/ExecuteQueryDto.java
index ec0289793d46912567624717f9c5ac265e7b1035..175e6fea9fac542be0ef1520b04af4f3d14fc266 100644
--- a/fda-metadata-db/api/src/main/java/at/tuwien/api/database/query/ExecuteQueryDto.java
+++ b/fda-metadata-db/api/src/main/java/at/tuwien/api/database/query/ExecuteQueryDto.java
@@ -1,7 +1,10 @@
package at.tuwien.api.database.query;
+import io.swagger.annotations.ApiModelProperty;
import lombok.*;
+import javax.validation.constraints.NotBlank;
+
@Getter
@Setter
@Builder
@@ -9,8 +12,17 @@ import lombok.*;
@NoArgsConstructor
public class ExecuteQueryDto {
+ @NotBlank
+ @ApiModelProperty(name = "query title", example = "Weather in Alberta", required = true)
private String title;
+ @NotBlank
+ @ApiModelProperty(name = "query description", example = "Data from 2018-2021 considering only values > 0",
+ required = true)
+ private String description;
+
+ @NotBlank
+ @ApiModelProperty(name = "query raw", example = "select * from table", required = true)
private String query;
}
diff --git a/fda-metadata-db/api/src/main/java/at/tuwien/api/database/query/QueryBriefDto.java b/fda-metadata-db/api/src/main/java/at/tuwien/api/database/query/QueryBriefDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..b5b6770013b764c16a0c4f2b9bde710264a2853b
--- /dev/null
+++ b/fda-metadata-db/api/src/main/java/at/tuwien/api/database/query/QueryBriefDto.java
@@ -0,0 +1,51 @@
+package at.tuwien.api.database.query;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.Instant;
+
+
+@Data
+@Getter
+@Setter
+@Builder
+public class QueryBriefDto {
+
+ @NotNull
+ private Long id;
+
+ @ApiModelProperty(name = "query execution time", example = "2021-11-28T12:00:01.000")
+ private Instant executionTimestamp;
+
+ @NotBlank
+ @ApiModelProperty(name = "query hash", example = "sha256:62e2f583cee1e7879eb32afa191a05f2f7ca8af5c4218997638553b85f94389c")
+ private String queryHash;
+
+ @NotBlank
+ @ApiModelProperty(name = "query raw", example = "select * from table")
+ private String query;
+
+ @NotBlank
+ @ApiModelProperty(name = "query title", example = "Select all weather events for 2012")
+ private String title;
+
+ @NotBlank
+ @ApiModelProperty(name = "query description", example = "Returns a list of measurements for the year 2012")
+ private String description;
+
+ @ApiModelProperty(name = "doi", example = "Digital Object Identifier")
+ private String doi;
+
+ @NotNull
+ private Instant created;
+
+ @NotNull
+ private Instant lastModified;
+}
diff --git a/fda-metadata-db/api/src/main/java/at/tuwien/api/database/query/QueryDto.java b/fda-metadata-db/api/src/main/java/at/tuwien/api/database/query/QueryDto.java
index 004094b4d46c19edc7e3770ebd677410b0d8bca5..933bff449a0191d725c706c5564a596ef9563a29 100644
--- a/fda-metadata-db/api/src/main/java/at/tuwien/api/database/query/QueryDto.java
+++ b/fda-metadata-db/api/src/main/java/at/tuwien/api/database/query/QueryDto.java
@@ -3,12 +3,11 @@ package at.tuwien.api.database.query;
import at.tuwien.api.database.deposit.files.FileDto;
import at.tuwien.api.database.table.TableDto;
import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
import lombok.*;
-import javax.persistence.Column;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
-import java.sql.Timestamp;
import java.time.Instant;
import java.util.List;
@@ -29,11 +28,18 @@ public class QueryDto {
private Instant executionTimestamp;
@NotBlank
+ @ApiModelProperty(name = "query raw", example = "select * from table")
private String query;
@NotBlank
+ @ApiModelProperty(name = "query title", example = "Select all weather events for 2012")
private String title;
+ @NotBlank
+ @ApiModelProperty(name = "query description", example = "Returns a list of measurements for the year 2012")
+ private String description;
+
+ @ApiModelProperty(name = "doi", example = "Digital Object Identifier")
private String doi;
@JsonProperty("deposit_id")
@@ -44,6 +50,7 @@ public class QueryDto {
private TableDto table;
@JsonProperty("query_normalized")
+ @ApiModelProperty(name = "query normalized", example = "select id, name from table")
private String queryNormalized;
@JsonProperty("query_hash")
diff --git a/fda-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableInsertDto.java b/fda-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableInsertDto.java
index 25ca9e6421c3231421764d6df6bf3633f135a5d7..d6d25cfa43c0b26dce231e420c2837ddd61c69d2 100644
--- a/fda-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableInsertDto.java
+++ b/fda-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableInsertDto.java
@@ -15,17 +15,23 @@ import javax.validation.constraints.NotNull;
@NoArgsConstructor
public class TableInsertDto {
- @ApiModelProperty(name = "null element", example = "NA")
- private String nullElement;
+ @ApiModelProperty(name = "null element", example = "NA", required = true)
+ private String nullElement = null;
- @ApiModelProperty(name = "delimiting character", example = ";")
+ @ApiModelProperty(name = "delimiting character", example = ",", required = true)
private Character delimiter = ',';
- @ApiModelProperty(name = "skip the first line", example = "false")
+ @ApiModelProperty(name = "skip the first line", example = "false", required = true)
private Boolean skipHeader = false;
+ @ApiModelProperty(name = "element for true", example = "1")
+ private String trueElement = "1";
+
+ @ApiModelProperty(name = "element for false", example = "0")
+ private String falseElement = "0";
+
@NotBlank
- @ApiModelProperty(name = "csv file location")
+ @ApiModelProperty(name = "csv file location", required = true)
private String csvLocation;
}
diff --git a/fda-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/ColumnCreateDto.java b/fda-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/ColumnCreateDto.java
index 1faebd9a308818598daeb520a0b81900e4c553f9..f37bf89f11dc7109cd4cab2f5acd21b70e9e1bff 100644
--- a/fda-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/ColumnCreateDto.java
+++ b/fda-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/ColumnCreateDto.java
@@ -26,6 +26,10 @@ public class ColumnCreateDto {
@ApiModelProperty(name = "column type", example = "STRING")
private ColumnTypeDto type;
+ @NotNull
+ @ApiModelProperty(name = "column is autogenerated", example = "false")
+ private Boolean autoGenerated;
+
@NotNull
@ApiModelProperty(name = "null value", example = "false")
private Boolean nullAllowed;
diff --git a/fda-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java b/fda-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java
index f2c1886845944ce911ba2c1e9a26e34263ae64e0..ccd204a37686935f88a9e9f199c3180678911689 100644
--- a/fda-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java
+++ b/fda-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java
@@ -15,27 +15,31 @@ import javax.validation.constraints.NotNull;
public class ColumnDto {
@NotBlank
- @ApiModelProperty(name = "name", example = "Date")
+ @ApiModelProperty(name = "name", example = "Date", required = true)
private String name;
@NotBlank
- @ApiModelProperty(name = "internal name", example = "mdb_date")
+ @ApiModelProperty(name = "internal name", example = "mdb_date", required = true)
private String internalName;
@NotNull
- @ApiModelProperty(name = "primary key", example = "true")
+ @ApiModelProperty(name = "column autogenerated", example = "false")
+ private Boolean autoGenerated;
+
+ @NotNull
+ @ApiModelProperty(name = "primary key", example = "true", required = true)
private Boolean isPrimaryKey;
@NotNull
- @ApiModelProperty(name = "type", example = "STRING")
+ @ApiModelProperty(name = "type", example = "STRING", required = true)
private ColumnTypeDto columnType;
@NotNull
- @ApiModelProperty(name = "unique", example = "true")
+ @ApiModelProperty(name = "unique", example = "true", required = true)
private Boolean unique;
@NotNull
- @ApiModelProperty(name = "null allowed", example = "true")
+ @ApiModelProperty(name = "null allowed", example = "true", required = true)
private Boolean isNullAllowed;
@ApiModelProperty(name = "check constraint", example = "Price Limit > 0", hidden = true)
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/query/File.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/query/File.java
deleted file mode 100644
index 61198b7c414c8ed1a489aeea66e88d208a239385..0000000000000000000000000000000000000000
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/query/File.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package at.tuwien.entities.database.query;
-
-import lombok.*;
-import org.hibernate.annotations.GenericGenerator;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
-import javax.persistence.*;
-import java.time.Instant;
-
-@Data
-@Entity
-@Builder
-@ToString
-@AllArgsConstructor
-@NoArgsConstructor
-@IdClass(FileKey.class)
-@EntityListeners(AuditingEntityListener.class)
-@javax.persistence.Table(name = "mdb_files")
-public class File {
-
- @Id
- @EqualsAndHashCode.Include
- @GeneratedValue(generator = "files-sequence")
- @GenericGenerator(
- name = "files-sequence",
- strategy = "enhanced-sequence",
- parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_files_seq")
- )
- private Long id;
-
- @Id
- @EqualsAndHashCode.Include
- private Long fqid;
-
- @Id
- @EqualsAndHashCode.Include
- private Long fdbid;
-
- @Column(name = "ref_id", nullable = false)
- private String refId;
-
- @ToString.Exclude
- @JoinColumns({
- @JoinColumn(name = "fdbid", referencedColumnName = "qdbid", insertable = false, updatable = false),
- @JoinColumn(name = "fqid", referencedColumnName = "id", insertable = false, updatable = false)
- })
- @ManyToOne(fetch = FetchType.LAZY)
- private Query query;
-
- @Column(nullable = false, updatable = false)
- @CreatedDate
- private Instant created;
-
- @Column
- @LastModifiedDate
- private Instant lastModified;
-
-}
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/query/FileKey.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/query/FileKey.java
deleted file mode 100644
index ec7bddb7f3a07cbc5bd32febfb983212fd3a41bc..0000000000000000000000000000000000000000
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/query/FileKey.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package at.tuwien.entities.database.query;
-
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-@EqualsAndHashCode
-public class FileKey implements Serializable {
-
- private Long id;
-
- private Long fdbid;
-
- private Long fqid;
-
-}
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/query/Query.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/query/Query.java
index 00f941b0c35a9bb750dd46411f22962cef68fc93..97ff8380a0cfb41db56e436f4cd23abd2d15f101 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/query/Query.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/query/Query.java
@@ -37,6 +37,11 @@ public class Query {
@ToString.Include
private Long qdbid;
+ @Id
+ @EqualsAndHashCode.Include
+ @ToString.Include
+ private Long qtid;
+
@Column
private String doi;
@@ -47,13 +52,10 @@ public class Query {
private String query;
@Column
- private String queryNormalized;
-
- @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "query")
- private List<File> files;
+ private String description;
- @Column(name = "deposit_id", unique = true)
- private Long depositId;
+ @Column
+ private String queryNormalized;
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
@JoinColumns({
@@ -61,6 +63,13 @@ public class Query {
})
private Database database;
+ @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+ @JoinColumns({
+ @JoinColumn(name = "qdbid", referencedColumnName = "tdbid", insertable = false, updatable = false),
+ @JoinColumn(name = "qtid", referencedColumnName = "id", insertable = false, updatable = false)
+ })
+ private at.tuwien.entities.database.table.Table table;
+
@Column
private Instant executionTimestamp;
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/query/QueryKey.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/query/QueryKey.java
index a4bfa7e1c2a7b8417aebb09ed48004610d7a54ac..4778734e1805eee32960d7c7c91273c09ddbd8a4 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/query/QueryKey.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/query/QueryKey.java
@@ -10,4 +10,6 @@ public class QueryKey implements Serializable {
private Long id;
private Long qdbid;
+
+ private Long qtid;
}
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/Table.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/Table.java
index 2387da8345640c2068417dc1d7eadf830a7ca6b7..5870972cbf7517cbe1084c3ed8e0bdb701ea5792 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/Table.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/Table.java
@@ -23,7 +23,7 @@ import java.util.List;
@NoArgsConstructor
@Document(indexName = "tblindex", createIndex = false)
@IdClass(TableKey.class)
-@ToString(onlyExplicitlyIncluded = true)
+@ToString
@EntityListeners(AuditingEntityListener.class)
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
@javax.persistence.Table(name = "mdb_tables")
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java
index 3c1bdfc14ea7973a26a02b1c7219c1f58999effd..100c47828526a1d8f7eb06ba1efeb85e5a94303a 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java
@@ -1,6 +1,5 @@
package at.tuwien.entities.database.table.columns;
-import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.table.Table;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
@@ -10,7 +9,6 @@ import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.*;
-import java.io.Serializable;
import java.time.Instant;
import java.util.List;
@@ -20,7 +18,7 @@ import java.util.List;
@AllArgsConstructor
@NoArgsConstructor
@IdClass(TableColumnKey.class)
-@ToString(onlyExplicitlyIncluded = true)
+@ToString
@EntityListeners(AuditingEntityListener.class)
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
@javax.persistence.Table(name = "mdb_columns")
@@ -28,7 +26,6 @@ public class TableColumn {
@Id
@EqualsAndHashCode.Include
- @ToString.Include
@GeneratedValue(generator = "column-sequence")
@GenericGenerator(
name = "column-sequence",
@@ -39,12 +36,10 @@ public class TableColumn {
@Id
@EqualsAndHashCode.Include
- @ToString.Include
private Long tid;
@Id
@EqualsAndHashCode.Include
- @ToString.Include
private Long cdbid;
/**
@@ -59,36 +54,31 @@ public class TableColumn {
})
private Table table;
- @ToString.Include
@Column(nullable = false, name = "cname")
private String name;
- @ToString.Include
+ @ApiModelProperty(name = "column is autogenerated", example = "false")
+ private Boolean autoGenerated;
+
@Column(nullable = false)
private String internalName;
- @ToString.Include
@Column(nullable = false)
private Boolean isPrimaryKey;
- @ToString.Include
@Column(nullable = false, name = "datatype")
@Enumerated(EnumType.STRING)
private TableColumnType columnType;
- @ToString.Include
@Column(nullable = false)
private Boolean isNullAllowed;
- @ToString.Include
@Column
private Boolean isUnique;
- @ToString.Include
@Column
private String checkExpression;
- @ToString.Include
@ElementCollection
@CollectionTable(name = "mdb_columns_enums", joinColumns = {
@JoinColumn(name = "id", insertable = false, updatable = false),
@@ -97,15 +87,12 @@ public class TableColumn {
})
private List<String> enumValues;
- @ToString.Include
@Column(nullable = false)
private Integer ordinalPosition;
- @ToString.Include
@Column
private String foreignKey;
- @ToString.Include
@Column(name = "reference_table")
private String references;
diff --git a/fda-metadata-db/initi.sh b/fda-metadata-db/initi.sh
index f1c2b6f2f7581a5a25e83da812ab27cac76ceb0f..3105c3c65b691052f2ef152bb31cb0eacf2f29b0 100644
--- a/fda-metadata-db/initi.sh
+++ b/fda-metadata-db/initi.sh
@@ -22,13 +22,6 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-E
NO MAXVALUE
CACHE 1;
- CREATE SEQUENCE public.mdb_files_seq
- START WITH 1
- INCREMENT BY 1
- NO MINVALUE
- NO MAXVALUE
- CACHE 1;
-
CREATE TABLE public.mdb_image_environment_item (
id bigint NOT NULL DEFAULT nextval('mdb_image_environment_item_seq'),
created timestamp without time zone NOT NULL,
@@ -197,12 +190,14 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-E
CREATE TABLE IF NOT EXISTS mdb_queries (
ID bigint NOT NULL DEFAULT nextval('mdb_queries_seq'),
+ qdbid bigint NOT NULL,
+ qtid bigint NOT NULL,
execution_timestamp timestamp without time zone,
deposit_id bigint NULL UNIQUE,
- qdbid bigint NOT NULL,
title character varying(255) NULL,
doi character varying(255),
query TEXT NULL,
+ description TEXT NULL,
query_normalized TEXT NULL,
query_hash character varying(255) NULL,
result_hash character varying(255) NULL,
@@ -210,31 +205,21 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-E
created timestamp without time zone NOT NULL,
last_modified timestamp without time zone,
FOREIGN KEY (qdbid) REFERENCES mdb_DATABASES(ID),
- PRIMARY KEY(qdbid, ID)
+ FOREIGN KEY (qdbid, qtid) REFERENCES mdb_TABLES(tDBID, ID),
+ PRIMARY KEY (qdbid, qtid, ID)
);
- CREATE TABLE IF NOT EXISTS mdb_files (
- id bigint DEFAULT nextval('mdb_files_seq'),
- fdbid bigint NOT NULL,
- fqid bigint NOT NULL,
- ref_id varchar(255) NOT NULL,
- created timestamp without time zone NOT NULL,
- last_modified timestamp without time zone,
- FOREIGN KEY (fdbid) REFERENCES mdb_DATABASES(ID),
- FOREIGN KEY (fdbid, fqid) REFERENCES mdb_queries(qdbid, ID),
- PRIMARY KEY (fdbid, fqid, id)
- );
-
CREATE TABLE IF NOT EXISTS mdb_COLUMNS (
ID bigint DEFAULT nextval('mdb_columns_seq'),
cDBID bigint,
tID bigint,
- cName VARCHAR(50),
- internal_name VARCHAR(50) NOT NULL,
+ cName VARCHAR(100),
+ internal_name VARCHAR(100) NOT NULL,
Datatype VARCHAR(50),
ordinal_position INTEGER,
is_primary_key BOOLEAN,
is_unique BOOLEAN,
+ auto_generated BOOLEAN DEFAULT false,
is_null_allowed BOOLEAN,
foreign_key VARCHAR(255),
reference_table VARCHAR(255),
diff --git a/fda-query-service/Dockerfile b/fda-query-service/Dockerfile
index aff9fe1a8add7f7a42c6c400a963b8ec974767d4..a1b52c191cf31d48d9ecd4bb4202a34742e4b88a 100644
--- a/fda-query-service/Dockerfile
+++ b/fda-query-service/Dockerfile
@@ -15,8 +15,6 @@ COPY ./rest-service ./rest-service
COPY ./services ./services
COPY ./report ./report
-ARG CI_JOB_STAGE
-
# Make sure it compiles
RUN mvn -q clean package -DskipTests > /dev/null
diff --git a/fda-query-service/rest-service/src/main/java/at/tuwien/config/ReadyConfig.java b/fda-query-service/rest-service/src/main/java/at/tuwien/config/ReadyConfig.java
index 0bee3b961edd4ca456f0243c8eede630a4a54716..e159e258762573a5cffe77911c4450e74194d016 100644
--- a/fda-query-service/rest-service/src/main/java/at/tuwien/config/ReadyConfig.java
+++ b/fda-query-service/rest-service/src/main/java/at/tuwien/config/ReadyConfig.java
@@ -1,13 +1,16 @@
package at.tuwien.config;
import com.google.common.io.Files;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.event.EventListener;
+import org.springframework.core.env.Environment;
import java.io.File;
import java.io.IOException;
+import java.util.Arrays;
@Configuration
public class ReadyConfig {
@@ -15,9 +18,18 @@ public class ReadyConfig {
@Value("${fda.ready.path}")
private String readyPath;
+ private final Environment environment;
+
+ @Autowired
+ public ReadyConfig(Environment environment) {
+ this.environment = environment;
+ }
+
@EventListener(ApplicationReadyEvent.class)
public void init() throws IOException {
- Files.touch(new File(readyPath));
+ if (!Arrays.asList(environment.getActiveProfiles()).contains("sandbox")) {
+ Files.touch(new File(readyPath));
+ }
}
}
diff --git a/fda-query-service/rest-service/src/main/java/at/tuwien/endpoint/QueryEndpoint.java b/fda-query-service/rest-service/src/main/java/at/tuwien/endpoint/QueryEndpoint.java
index 51668573f1d0ba9926e934901368ff99dcec070e..2a05b42bd69438613bb5881b0bdf6f9b6a429624 100644
--- a/fda-query-service/rest-service/src/main/java/at/tuwien/endpoint/QueryEndpoint.java
+++ b/fda-query-service/rest-service/src/main/java/at/tuwien/endpoint/QueryEndpoint.java
@@ -1,5 +1,6 @@
package at.tuwien.endpoint;
+import at.tuwien.api.database.query.QueryBriefDto;
import at.tuwien.api.database.query.QueryDto;
import at.tuwien.entities.database.query.Query;
import at.tuwien.exception.*;
@@ -37,11 +38,11 @@ public class QueryEndpoint {
@ApiResponse(code = 404, message = "The database does not exist."),
})
@Transactional
- public ResponseEntity<List<QueryDto>> findAll(@PathVariable("id") Long databaseId)
+ public ResponseEntity<List<QueryBriefDto>> findAll(@PathVariable("id") Long databaseId)
throws DatabaseNotFoundException {
final List<Query> queries = queryService.findAll(databaseId);
return ResponseEntity.ok(queries.stream()
- .map(queryMapper::queryToQueryDto)
+ .map(queryMapper::queryToQueryBriefDto)
.collect(Collectors.toList()));
}
diff --git a/fda-query-service/rest-service/src/main/java/at/tuwien/endpoint/QueryStoreEndpoint.java b/fda-query-service/rest-service/src/main/java/at/tuwien/endpoint/QueryStoreEndpoint.java
index 6442f80422b9a3f372963d54be89f4c6b35c7233..53ab66aa716d796dce62781cad58021c602f6738 100644
--- a/fda-query-service/rest-service/src/main/java/at/tuwien/endpoint/QueryStoreEndpoint.java
+++ b/fda-query-service/rest-service/src/main/java/at/tuwien/endpoint/QueryStoreEndpoint.java
@@ -56,7 +56,7 @@ public class QueryStoreEndpoint {
@PathVariable Long tableId,
@RequestBody ExecuteQueryDto data)
throws QueryStoreException, DatabaseConnectionException, QueryMalformedException, DatabaseNotFoundException,
- ImageNotSupportedException {
+ ImageNotSupportedException, TableNotFoundException {
return ResponseEntity.ok(querystoreService.execute(databaseId, tableId, data));
}
@@ -67,12 +67,13 @@ public class QueryStoreEndpoint {
@ApiResponse(code = 404, message = "The database does not exist."),
@ApiResponse(code = 405, message = "The container is not running."),
@ApiResponse(code = 409, message = "The container image is not supported."),})
- public ResponseEntity<QueryResultDto> save(@PathVariable("id") Long databaseId,
- @PathVariable Long tableId,
- @RequestBody ExecuteQueryDto data)
+ public ResponseEntity<QueryDto> save(@PathVariable("id") Long databaseId,
+ @PathVariable Long tableId,
+ @RequestBody ExecuteQueryDto data)
throws DatabaseNotFoundException, ImageNotSupportedException, QueryStoreException,
- DatabaseConnectionException, QueryMalformedException {
- return ResponseEntity.ok(querystoreService.save(databaseId, tableId, data));
+ DatabaseConnectionException, QueryMalformedException, TableNotFoundException {
+ return ResponseEntity.ok(queryMapper.queryToQueryDto(
+ querystoreService.saveWithoutExecution(databaseId, tableId, data)));
}
@PutMapping("/table/{tableId}/execute/{queryId}")
diff --git a/fda-query-service/rest-service/src/main/resources/application-docker.yml b/fda-query-service/rest-service/src/main/resources/application-docker.yml
index 68acda1c0805cef0c14a8bd3411f0cecd59550d8..948e2c066ec7d7876b4722ae0d7f429ae26aaa8c 100644
--- a/fda-query-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-query-service/rest-service/src/main/resources/application-docker.yml
@@ -20,7 +20,7 @@ logging:
pattern.console: "%d %highlight(%-5level) %msg%n"
level:
root: warn
- at.tuwien.: trace
+ at.tuwien.: debug
eureka:
instance.hostname: fda-query-service
client.serviceUrl.defaultZone: http://fda-discovery-service:9090/eureka/
diff --git a/fda-query-service/services/src/main/java/at/tuwien/exception/TableNotFoundException.java b/fda-query-service/services/src/main/java/at/tuwien/exception/TableNotFoundException.java
new file mode 100644
index 0000000000000000000000000000000000000000..89fa3ed467e76998431c2b366bceb83804824f38
--- /dev/null
+++ b/fda-query-service/services/src/main/java/at/tuwien/exception/TableNotFoundException.java
@@ -0,0 +1,21 @@
+package at.tuwien.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(code = HttpStatus.NOT_FOUND)
+public class TableNotFoundException extends Exception {
+
+ public TableNotFoundException(String msg) {
+ super(msg);
+ }
+
+ public TableNotFoundException(String msg, Throwable thr) {
+ super(msg, thr);
+ }
+
+ public TableNotFoundException(Throwable thr) {
+ super(thr);
+ }
+
+}
diff --git a/fda-query-service/services/src/main/java/at/tuwien/mapper/QueryMapper.java b/fda-query-service/services/src/main/java/at/tuwien/mapper/QueryMapper.java
index 820e177fc3f8132f5a368ab6f924d0d222f21e67..3bac11bb193e586cab669f80fff2d4fb619a26da 100644
--- a/fda-query-service/services/src/main/java/at/tuwien/mapper/QueryMapper.java
+++ b/fda-query-service/services/src/main/java/at/tuwien/mapper/QueryMapper.java
@@ -1,6 +1,7 @@
package at.tuwien.mapper;
import at.tuwien.api.database.query.ExecuteQueryDto;
+import at.tuwien.api.database.query.QueryBriefDto;
import at.tuwien.api.database.query.QueryDto;
import at.tuwien.api.database.query.QueryResultDto;
import at.tuwien.entities.database.query.Query;
@@ -11,6 +12,7 @@ import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
import org.mapstruct.Named;
+import java.sql.Timestamp;
import java.time.Instant;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
@@ -20,16 +22,16 @@ import java.util.stream.Collectors;
@Mapper(componentModel = "spring")
public interface QueryMapper {
- QueryResultDto queryToQueryResultDto(Query data);
-
- Query executeQueryDtoToQuery(ExecuteQueryDto data);
-
+ @Mappings({})
Query queryDtotoQuery(QueryDto data);
+ @Mappings({})
QueryDto queryToQueryDto(Query data);
+ @Mappings({})
+ QueryBriefDto queryToQueryBriefDto(Query data);
+
@Mappings({
- @Mapping(source = "query", target = "query"),
@Mapping(source = "query", target = "queryNormalized")
})
QueryDto executeQueryDtoToQueryDto(ExecuteQueryDto data);
diff --git a/fda-query-service/services/src/main/java/at/tuwien/mapper/TableMapper.java b/fda-query-service/services/src/main/java/at/tuwien/mapper/TableMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..fdde19def1cf0081c8e8b34e94e4e513181de661
--- /dev/null
+++ b/fda-query-service/services/src/main/java/at/tuwien/mapper/TableMapper.java
@@ -0,0 +1,14 @@
+package at.tuwien.mapper;
+
+import at.tuwien.api.database.table.TableDto;
+import at.tuwien.entities.database.table.Table;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mappings;
+
+@Mapper(componentModel = "spring")
+public interface TableMapper {
+
+ @Mappings({})
+ TableDto tableToTableDto(Table data);
+
+}
diff --git a/fda-query-service/services/src/main/java/at/tuwien/seeder/QuerySeeder.java b/fda-query-service/services/src/main/java/at/tuwien/seeder/QuerySeeder.java
new file mode 100644
index 0000000000000000000000000000000000000000..c35163764f14ce90e0e8cdadf88584352bf5819d
--- /dev/null
+++ b/fda-query-service/services/src/main/java/at/tuwien/seeder/QuerySeeder.java
@@ -0,0 +1,81 @@
+package at.tuwien.seeder;
+
+import at.tuwien.api.database.query.ExecuteQueryDto;
+import at.tuwien.exception.*;
+import at.tuwien.service.QueryStoreService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+@Slf4j
+@Component
+public class QuerySeeder implements Seeder {
+
+ private final static Long TABLE_1_ID = 1L;
+ private final static Long DATABASE_1_ID = 1L;
+
+ private final static Long QUERY_1_ID = 1L;
+ private final static String QUERY_1_TITLE = "Days with rain in Albury";
+ private final static String QUERY_1_DESCRIPTION = "All rain data for Albury";
+ private final static String QUERY_1_QUERY = "SELECT date, location, mintemp, maxtemp, rainfall, raintomorrow FROM rain_in_australia WHERE rainfall > 0 ORDER BY date ASC";
+
+ private final static Long TABLE_2_ID = 2L;
+ private final static Long DATABASE_2_ID = 2L;
+
+ private final static Long QUERY_2_ID = 2L;
+ private final static String QUERY_2_TITLE = "Most COVID-19 cases per population";
+ private final static String QUERY_2_DESCRIPTION = "Minimized dataset";
+ private final static String QUERY_2_QUERY = "SELECT geoId, countriesandterritories, cumulative_number_for_14_days_of_covid_19_cases_per_100000 FROM infection_covid19 ORDER BY Cumulative_number_for_14_days_of_COVID_19_cases_per_100000 DESC";
+
+ private final static Long QUERY_3_ID = 3L;
+ private final static String QUERY_3_TITLE = "Countries with COVID-19 reports";
+ private final static String QUERY_3_DESCRIPTION = "Minimized dataset";
+ private final static String QUERY_3_QUERY = "SELECT countriesandterritories FROM infection_covid19 GROUP BY countriesandterritories";
+
+ private final static Long TABLE_3_ID = 3L;
+ private final static Long DATABASE_3_ID = 3L;
+
+ private final static Long QUERY_4_ID = 4L;
+ private final static String QUERY_4_TITLE = "Air quality in Lower Austria";
+ private final static String QUERY_4_DESCRIPTION = "Minimized dataset";
+ private final static String QUERY_4_QUERY = "SELECT country_code, city, location, coordinates, pollutant, source_name, unit, last_updated, country_label FROM air_quality_at WHERE city = \"Niederösterreich\"";
+
+ private final ExecuteQueryDto QUERY_EXECUTE_1 = ExecuteQueryDto.builder()
+ .query(QUERY_1_QUERY)
+ .title(QUERY_1_TITLE)
+ .build();
+
+ private final ExecuteQueryDto QUERY_EXECUTE_2 = ExecuteQueryDto.builder()
+ .query(QUERY_2_QUERY)
+ .title(QUERY_2_TITLE)
+ .build();
+
+ private final ExecuteQueryDto QUERY_EXECUTE_3 = ExecuteQueryDto.builder()
+ .query(QUERY_3_QUERY)
+ .title(QUERY_3_TITLE)
+ .build();
+
+ private final ExecuteQueryDto QUERY_EXECUTE_4 = ExecuteQueryDto.builder()
+ .query(QUERY_4_QUERY)
+ .title(QUERY_4_TITLE)
+ .build();
+
+ private final QueryStoreService queryStoreService;
+
+ @Autowired
+ public QuerySeeder(QueryStoreService queryStoreService) {
+ this.queryStoreService = queryStoreService;
+ }
+
+ @Override
+ @Transactional
+ public void seed() throws QueryStoreException, DatabaseConnectionException, QueryMalformedException,
+ DatabaseNotFoundException, ImageNotSupportedException, TableNotFoundException {
+ log.debug("seeded query {}", queryStoreService.saveWithoutExecution(DATABASE_1_ID, TABLE_1_ID, QUERY_EXECUTE_1));
+ log.debug("seeded query {}", queryStoreService.saveWithoutExecution(DATABASE_2_ID, TABLE_2_ID, QUERY_EXECUTE_2));
+ log.debug("seeded query {}", queryStoreService.saveWithoutExecution(DATABASE_2_ID, TABLE_2_ID, QUERY_EXECUTE_3));
+ log.debug("seeded query {}", queryStoreService.saveWithoutExecution(DATABASE_3_ID, TABLE_3_ID, QUERY_EXECUTE_4));
+ }
+
+}
diff --git a/fda-query-service/services/src/main/java/at/tuwien/seeder/Seeder.java b/fda-query-service/services/src/main/java/at/tuwien/seeder/Seeder.java
new file mode 100644
index 0000000000000000000000000000000000000000..4b9ac28991a838632de8dc0799547c4eb0985765
--- /dev/null
+++ b/fda-query-service/services/src/main/java/at/tuwien/seeder/Seeder.java
@@ -0,0 +1,13 @@
+package at.tuwien.seeder;
+
+import at.tuwien.exception.*;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+
+@Component
+public interface Seeder {
+
+ void seed() throws IOException, QueryStoreException, DatabaseConnectionException, QueryMalformedException, DatabaseNotFoundException, ImageNotSupportedException, TableNotFoundException;
+
+}
diff --git a/fda-query-service/services/src/main/java/at/tuwien/seeder/ServiceSeeder.java b/fda-query-service/services/src/main/java/at/tuwien/seeder/ServiceSeeder.java
new file mode 100644
index 0000000000000000000000000000000000000000..f68749315bc993f133f4e8071da846c7c93fe2ef
--- /dev/null
+++ b/fda-query-service/services/src/main/java/at/tuwien/seeder/ServiceSeeder.java
@@ -0,0 +1,47 @@
+package at.tuwien.seeder;
+
+import at.tuwien.exception.*;
+import com.google.common.io.Files;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Profile;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.PostConstruct;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+
+@Slf4j
+@Component
+@Profile("seeder")
+public class ServiceSeeder implements Seeder {
+
+ @Value("${fda.ready.path}")
+ private String readyPath;
+
+ private final QuerySeeder querySeeder;
+ private final Environment environment;
+
+ @Autowired
+ public ServiceSeeder(QuerySeeder querySeeder, Environment environment) {
+ this.querySeeder = querySeeder;
+ this.environment = environment;
+ }
+
+ @Override
+ @Transactional
+ @PostConstruct
+ public void seed() throws IOException, QueryStoreException, DatabaseConnectionException, QueryMalformedException,
+ DatabaseNotFoundException, ImageNotSupportedException, TableNotFoundException {
+ if (Arrays.asList(environment.getActiveProfiles()).contains("sandbox")) {
+ querySeeder.seed();
+ }
+ log.info("Seeding completed, service is ready");
+ Files.touch(new File(readyPath));
+ }
+
+}
diff --git a/fda-query-service/services/src/main/java/at/tuwien/service/JdbcConnector.java b/fda-query-service/services/src/main/java/at/tuwien/service/JdbcConnector.java
index 44590f5aa4d045f7b0bdc72fcc7f3f76f254e329..e1c96547573fbdd716ec3c86f0ff8345950fe6a0 100644
--- a/fda-query-service/services/src/main/java/at/tuwien/service/JdbcConnector.java
+++ b/fda-query-service/services/src/main/java/at/tuwien/service/JdbcConnector.java
@@ -2,6 +2,7 @@ package at.tuwien.service;
import at.tuwien.entities.database.Database;
+import at.tuwien.entities.database.table.Table;
import at.tuwien.exception.ImageNotSupportedException;
import at.tuwien.mapper.ImageMapper;
import lombok.extern.log4j.Log4j2;
@@ -11,8 +12,12 @@ import org.jooq.*;
import org.jooq.impl.DSL;
import org.springframework.beans.factory.annotation.Autowired;
+import java.math.BigInteger;
import java.sql.*;
+import static org.jooq.impl.DSL.name;
+import static org.jooq.impl.DSL.sequence;
+
@Log4j2
public abstract class JdbcConnector {
@@ -25,9 +30,23 @@ public abstract class JdbcConnector {
protected DSLContext open(Database database) throws SQLException, ImageNotSupportedException {
final String url = "jdbc:" + database.getContainer().getImage().getJdbcMethod() + "://" + database.getContainer().getInternalName() + "/" + database.getInternalName();
- log.trace("Attempt to connect to '{}'", url);
final Connection connection = DriverManager.getConnection(url, imageMapper.containerImageToProperties(database.getContainer().getImage()));
return DSL.using(connection, SQLDialect.valueOf(database.getContainer().getImage().getDialect()));
}
+ /**
+ * Retrieve the next id from the sequence of a database
+ *
+ * @param database The database.
+ * @return The next id.
+ * @throws SQLException
+ * @throws ImageNotSupportedException
+ */
+ protected BigInteger nextSequence(Database database) throws SQLException, ImageNotSupportedException {
+ final DSLContext context = open(database);
+ final Field<BigInteger> id = sequence(name(QueryStoreService.QUERYSTORE_SEQ_NAME))
+ .nextval();
+ return context.select(id).fetchOne(id);
+ }
+
}
diff --git a/fda-query-service/services/src/main/java/at/tuwien/service/QueryService.java b/fda-query-service/services/src/main/java/at/tuwien/service/QueryService.java
index 180b751b582faa615de2a1c549b87dcf08df27e6..01dcce99577c08fe80a154212c9c91559ba25c4a 100644
--- a/fda-query-service/services/src/main/java/at/tuwien/service/QueryService.java
+++ b/fda-query-service/services/src/main/java/at/tuwien/service/QueryService.java
@@ -1,16 +1,21 @@
package at.tuwien.service;
+import at.tuwien.api.database.query.ExecuteQueryDto;
+import at.tuwien.api.database.query.QueryDto;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.query.Query;
import at.tuwien.exception.*;
import at.tuwien.mapper.ImageMapper;
+import at.tuwien.mapper.QueryMapper;
import at.tuwien.repository.jpa.DatabaseRepository;
import at.tuwien.repository.jpa.QueryRepository;
import lombok.extern.log4j.Log4j2;
+import org.jooq.DSLContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.sql.SQLException;
import java.util.List;
import java.util.Optional;
@@ -18,26 +23,24 @@ import java.util.Optional;
@Service
public class QueryService extends JdbcConnector {
+ private final QueryMapper queryMapper;
private final QueryRepository queryRepository;
private final DatabaseRepository databaseRepository;
@Autowired
- public QueryService(ImageMapper imageMapper, QueryRepository queryRepository,
+ public QueryService(ImageMapper imageMapper, QueryMapper queryMapper, QueryRepository queryRepository,
DatabaseRepository databaseRepository) {
super(imageMapper);
+ this.queryMapper = queryMapper;
this.queryRepository = queryRepository;
this.databaseRepository = databaseRepository;
}
+ @Deprecated
@Transactional
public List<Query> findAll(Long databaseId) throws DatabaseNotFoundException {
- final Optional<Database> database = databaseRepository.findById(databaseId);
- if (database.isEmpty()) {
- throw new DatabaseNotFoundException("Database not found in the metadata database");
- }
- final List<Query> queries = database.get()
- .getQueries();
- return queries;
+ final Database database = findDatabase(databaseId);
+ return database.getQueries();
}
@Transactional
@@ -52,4 +55,19 @@ public class QueryService extends JdbcConnector {
}
return query.get();
}
+
+ /**
+ * Finds the database by id in the metadata database.
+ *
+ * @param id The database id.
+ * @return The database.
+ * @throws DatabaseNotFoundException When not found.
+ */
+ protected Database findDatabase(Long id) throws DatabaseNotFoundException {
+ final Optional<Database> database = databaseRepository.findById(id);
+ if (database.isEmpty()) {
+ throw new DatabaseNotFoundException("Database not found in the metadata database");
+ }
+ return database.get();
+ }
}
\ No newline at end of file
diff --git a/fda-query-service/services/src/main/java/at/tuwien/service/QueryStoreService.java b/fda-query-service/services/src/main/java/at/tuwien/service/QueryStoreService.java
index d7f9c8d996cd958bd6d0339ce28a1f2aa32339b0..e8cf5e17eb72f5df481e7f8402772a62f1c7474b 100644
--- a/fda-query-service/services/src/main/java/at/tuwien/service/QueryStoreService.java
+++ b/fda-query-service/services/src/main/java/at/tuwien/service/QueryStoreService.java
@@ -3,6 +3,7 @@ package at.tuwien.service;
import at.tuwien.api.database.query.ExecuteQueryDto;
import at.tuwien.api.database.query.QueryDto;
import at.tuwien.api.database.query.QueryResultDto;
+import at.tuwien.api.database.table.TableDto;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.query.Query;
import at.tuwien.entities.database.table.Table;
@@ -10,8 +11,10 @@ import at.tuwien.entities.database.table.columns.TableColumn;
import at.tuwien.exception.*;
import at.tuwien.mapper.ImageMapper;
import at.tuwien.mapper.QueryMapper;
+import at.tuwien.mapper.TableMapper;
import at.tuwien.repository.jpa.DatabaseRepository;
import at.tuwien.repository.jpa.QueryRepository;
+import at.tuwien.repository.jpa.TableRepository;
import lombok.extern.log4j.Log4j2;
import net.sf.jsqlparser.JSQLParserException;
import net.sf.jsqlparser.expression.Expression;
@@ -19,13 +22,16 @@ import net.sf.jsqlparser.parser.CCJSqlParserManager;
import net.sf.jsqlparser.statement.Statement;
import net.sf.jsqlparser.statement.select.*;
import net.sf.jsqlparser.statement.select.Select;
+import org.apache.commons.codec.digest.DigestUtils;
import org.jooq.*;
+import org.jooq.exception.DataAccessException;
import org.junit.jupiter.params.shadow.com.univocity.parsers.common.DataProcessingException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.io.StringReader;
+import java.math.BigInteger;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.time.Instant;
@@ -43,19 +49,24 @@ import static org.jooq.impl.SQLDataType.*;
@Service
public class QueryStoreService extends JdbcConnector {
- private final static String QUERYSTORENAME = "mdb_querystore";
+ public final static String QUERYSTORE_NAME = "userdb_querystore";
+ public final static String QUERYSTORE_SEQ_NAME = "seq_querystore_id";
private final DatabaseRepository databaseRepository;
private final QueryRepository queryRepository;
+ private final TableRepository tableRepository;
+ private final TableMapper tableMapper;
private final QueryMapper queryMapper;
@Autowired
public QueryStoreService(ImageMapper imageMapper, QueryMapper queryMapper, DatabaseRepository databaseRepository,
- QueryRepository queryRepository) {
+ QueryRepository queryRepository, TableRepository tableRepository, TableMapper tableMapper) {
super(imageMapper);
this.databaseRepository = databaseRepository;
this.queryMapper = queryMapper;
this.queryRepository = queryRepository;
+ this.tableRepository = tableRepository;
+ this.tableMapper = tableMapper;
}
@Transactional
@@ -75,7 +86,7 @@ public class QueryStoreService extends JdbcConnector {
.fetch()
.toString());
return queryMapper.recordListToQueryList(context
- .selectFrom(QUERYSTORENAME)
+ .selectFrom(QUERYSTORE_NAME)
.orderBy(field("execution_timestamp"))
.fetch());
}
@@ -93,9 +104,16 @@ public class QueryStoreService extends JdbcConnector {
log.trace("select query {}", context.selectQuery()
.fetch()
.toString());
- final List<org.jooq.Record> records = context
- .selectFrom(QUERYSTORENAME).where(condition("id = " + queryId))
- .fetch();
+ List<org.jooq.Record> records;
+ try {
+ records = context
+ .selectFrom(QUERYSTORE_NAME)
+ .where(condition("id = " + queryId))
+ .fetch();
+ } catch (DataAccessException e) {
+ log.error("Failed to select records: {}", e.getMessage());
+ throw new QueryStoreException("Failed to select records", e);
+ }
if (records.size() != 1) {
throw new QueryStoreException("Failed to get query from querystore");
}
@@ -123,9 +141,9 @@ public class QueryStoreService extends JdbcConnector {
/* create database in container */
try {
final DSLContext context = open(database);
- context.createSequence("seq_id")
+ context.createSequence(QUERYSTORE_SEQ_NAME)
.execute();
- context.createTable(QUERYSTORENAME)
+ context.createTable(QUERYSTORE_NAME)
.column("id", BIGINT)
.column("doi", VARCHAR(255).nullable(false))
.column("title", VARCHAR(255).nullable(false))
@@ -146,7 +164,17 @@ public class QueryStoreService extends JdbcConnector {
}
}
- public QueryDto saveQuery(Database database, QueryDto query, QueryResultDto queryResult)
+ /**
+ * Saves a query result for a database
+ *
+ * @param database The database.
+ * @param query The query.
+ * @param queryResult The query result.
+ * @return The query with result.
+ * @throws ImageNotSupportedException When not MariaDB.
+ * @throws QueryStoreException When the query store is not found.
+ */
+ public QueryDto persistQueryResult(Database database, QueryDto query, QueryResultDto queryResult)
throws ImageNotSupportedException, QueryStoreException {
// TODO map in mapper next iteration
query.setExecutionTimestamp(Instant.now());
@@ -156,7 +184,8 @@ public class QueryStoreService extends JdbcConnector {
query.setResultNumber(0L);
try {
final DSLContext context = open(database);
- int success = context.insertInto(table(QUERYSTORENAME))
+ final BigInteger idVal = nextSequence(database);
+ int success = context.insertInto(table(QUERYSTORE_NAME))
.columns(field("id"),
field("doi"),
field("title"),
@@ -165,9 +194,9 @@ public class QueryStoreService extends JdbcConnector {
field("execution_timestamp"),
field("result_hash"),
field("result_number"))
- .values(sequence("seq_id").nextval(), "doi/" + query.getId(), query.getTitle(), query.getQuery(),
+ .values(idVal, "doi/" + idVal, query.getTitle(), query.getQuery(),
query.getQueryHash(), LocalDateTime.ofInstant(query.getExecutionTimestamp(),
- ZoneId.of("Europe/Vienna")), "" + queryResult.hashCode(),
+ ZoneId.of("Europe/Vienna")), getResultHash(queryResult),
queryResult.getResult().size())
.execute();
log.info("Saved query into query store id {}", query.getId());
@@ -188,6 +217,16 @@ public class QueryStoreService extends JdbcConnector {
return query;
}
+ /**
+ * Retrieve the result hash
+ *
+ * @param result The result.
+ * @return The hash.
+ */
+ private String getResultHash(QueryResultDto result) {
+ return "sha256:" + DigestUtils.sha256Hex(result.getResult().toString());
+ }
+
@Deprecated
private boolean checkValidity(String query) {
String queryparts[] = query.toLowerCase().split("from");
@@ -198,10 +237,25 @@ public class QueryStoreService extends JdbcConnector {
return false;
}
+ /**
+ * Executes a query on a database and table.
+ *
+ * @param databaseId The database.
+ * @param tableId The table.
+ * @param data The query data.
+ * @return The query result.
+ * @throws ImageNotSupportedException
+ * @throws DatabaseNotFoundException
+ * @throws QueryStoreException
+ * @throws DatabaseConnectionException
+ * @throws QueryMalformedException
+ * @throws TableNotFoundException
+ */
@Transactional
public QueryResultDto execute(Long databaseId, Long tableId, ExecuteQueryDto data) throws ImageNotSupportedException,
- DatabaseNotFoundException, QueryStoreException, DatabaseConnectionException, QueryMalformedException {
+ DatabaseNotFoundException, QueryStoreException, DatabaseConnectionException, QueryMalformedException, TableNotFoundException {
final Database database = findDatabase(databaseId);
+ final Table table = findTable(database, tableId);
if (database.getContainer().getImage().getDialect().equals("MARIADB")) {
if (!exists(database)) {
create(databaseId);
@@ -214,12 +268,12 @@ public class QueryStoreService extends JdbcConnector {
log.error("Failed to connect to the remote database: {}", e.getMessage());
throw new DatabaseConnectionException("Failed to connect to the remote database", e);
}
- final QueryDto query = queryMapper.executeQueryDtoToQueryDto(data);
- final QueryResultDto queryResultDto = executeQueryOnContext(context, query, database);
+ final QueryDto queryDto = queryMapper.executeQueryDtoToQueryDto(data);
+ final QueryResultDto queryResultDto = executeQueryOnContext(context, queryDto, database);
log.trace("Result of the query is: \n {}", queryResultDto.getResult());
/* save some metadata */
- final Query metaQuery = queryMapper.queryDtotoQuery(query);
+ final Query metaQuery = queryMapper.queryDtotoQuery(queryDto);
metaQuery.setExecutionTimestamp(null);
metaQuery.setTitle(data.getTitle());
metaQuery.setQdbid(databaseId);
@@ -227,19 +281,24 @@ public class QueryStoreService extends JdbcConnector {
log.info("Saved executed query in metadata database id {}", res.getId());
/* save the query in the store */
- final QueryDto out = saveQuery(database, query, queryResultDto);
+ final QueryDto out = persistQueryResult(database, queryDto, queryResultDto);
queryResultDto.setId(out.getId());
log.info("Saved executed query in query store {}", out.getId());
log.debug("query store {}", out);
return queryResultDto;
}
- private QueryDto parse(QueryDto query, Database database) throws JSQLParserException, QueryMalformedException {
+ private Query parse(QueryDto query, Database database) throws QueryMalformedException {
query.setExecutionTimestamp(query.getExecutionTimestamp());
+ Statement statement;
final CCJSqlParserManager parserRealSql = new CCJSqlParserManager();
- final Statement statement = parserRealSql.parse(new StringReader(query.getQuery()));
+ try {
+ statement = parserRealSql.parse(new StringReader(query.getQuery()));
+ } catch (JSQLParserException e) {
+ log.error("Could not parse statement");
+ throw new QueryMalformedException("Could not parse statement", e);
+ }
log.trace("given query {}", query.getQuery());
-
if (statement instanceof net.sf.jsqlparser.statement.select.Select) {
final net.sf.jsqlparser.statement.select.Select selectStatement = (Select) statement;
final PlainSelect select = (PlainSelect) selectStatement.getSelectBody();
@@ -271,7 +330,7 @@ public class QueryStoreService extends JdbcConnector {
}
if (error) {
log.error("Table {} does not exist in remote database", item.toString());
- throw new JSQLParserException("Table does not exist in remote database");
+ throw new QueryMalformedException("Table does not exist in remote database");
}
}
@@ -298,7 +357,7 @@ public class QueryStoreService extends JdbcConnector {
}
if (i) {
log.error("Column {} does not exist", s);
- throw new JSQLParserException("Column does not exist");
+ throw new QueryMalformedException("Column does not exist");
}
}
//TODO Future work
@@ -306,7 +365,7 @@ public class QueryStoreService extends JdbcConnector {
Expression where = select.getWhere();
log.debug("where clause: {}", where);
}
- return query;
+ return queryMapper.queryDtotoQuery(query);
} else {
log.error("Provided query is not a select statement, currently we only support 'select' statements");
throw new QueryMalformedException("Provided query is not a select statement");
@@ -314,41 +373,57 @@ public class QueryStoreService extends JdbcConnector {
}
+ /**
+ * Saves a query without executing it for a database-table tuple.
+ *
+ * @param databaseId The database-table tuple.
+ * @param tableId The database-table tuple.
+ * @param data The query data.
+ * @return The query entity.
+ * @throws ImageNotSupportedException
+ * @throws DatabaseNotFoundException
+ * @throws QueryStoreException
+ * @throws DatabaseConnectionException
+ * @throws QueryMalformedException
+ */
@Transactional
- public QueryResultDto save(Long databaseId, Long tableId, ExecuteQueryDto data) throws ImageNotSupportedException,
+ public Query saveWithoutExecution(Long databaseId, Long tableId, ExecuteQueryDto data) throws ImageNotSupportedException,
DatabaseNotFoundException, QueryStoreException, DatabaseConnectionException,
- QueryMalformedException {
+ QueryMalformedException, TableNotFoundException {
final Database database = findDatabase(databaseId);
+ final Table table = findTable(database, tableId);
if (database.getContainer().getImage().getDialect().equals("MARIADB")) {
if (!exists(database)) {
create(databaseId);
}
}
- final QueryDto query = queryMapper.executeQueryDtoToQueryDto(data);
+ final QueryDto queryDto = queryMapper.executeQueryDtoToQueryDto(data);
final DSLContext context;
try {
context = open(database);
} catch (SQLException e) {
throw new QueryMalformedException("Could not connect to the remote container database", e);
}
- final QueryResultDto queryResultDto = executeQueryOnContext(context, query, database);
+ final QueryResultDto queryResultDto = executeQueryOnContext(context, queryDto, database);
log.trace("Result of the query is: \n {}", queryResultDto.getResult());
/* save some metadata */
- final Query metaQuery = queryMapper.queryDtotoQuery(query);
+ final Query metaQuery = queryMapper.queryDtotoQuery(queryDto);
metaQuery.setExecutionTimestamp(null);
metaQuery.setTitle(data.getTitle());
metaQuery.setQdbid(databaseId);
+ metaQuery.setQtid(tableId);
+ metaQuery.setTable(table);
final Query res = queryRepository.save(metaQuery);
log.info("Saved query in metadata database id {}", res.getId());
// Save the query in the store
- final QueryDto out = saveQuery(database, query, queryResultDto);
- queryResultDto.setId(out.getId());
- log.info("Saved query in query store {}", out.getId());
- log.debug("Save query {}", out);
+// final QueryDto out = saveQuery(database, query, queryResultDto);
+// queryResultDto.setId(out.getId());
+// log.info("Saved query in query store {}", out.getId());
+// log.debug("Save query {}", out);
// return queryStoreService.findLast(database.getId(), query); // FIXME mw: why query last entry when we set it in the line above?
- return queryResultDto;
+ return res;
}
/**
@@ -417,9 +492,9 @@ public class QueryStoreService extends JdbcConnector {
/**
* Find a database in the metadata database by id
*
- * @param id The id
- * @return The database
- * @throws DatabaseNotFoundException The database is not found
+ * @param id The id.
+ * @return The database.
+ * @throws DatabaseNotFoundException The database is not found.
*/
@Transactional
protected Database findDatabase(Long id) throws DatabaseNotFoundException {
@@ -431,6 +506,24 @@ public class QueryStoreService extends JdbcConnector {
return database.get();
}
+ /**
+ * Find a table in the metadata database by database and id
+ *
+ * @param database The database.
+ * @param id The id.
+ * @return The table.
+ * @throws TableNotFoundException The table is not found.
+ */
+ @Transactional
+ protected Table findTable(Database database, Long id) throws TableNotFoundException {
+ final Optional<Table> table = tableRepository.findByDatabaseAndId(database, id);
+ if (table.isEmpty()) {
+ log.error("Table with id {} not found in metadata database", id);
+ throw new TableNotFoundException("Table not found in metadata database");
+ }
+ return table.get();
+ }
+
/**
* Checks if a database exists in a remote container
*
@@ -449,7 +542,7 @@ public class QueryStoreService extends JdbcConnector {
}
return context.select(count())
.from("information_schema.tables")
- .where("table_name like '" + QUERYSTORENAME + "'")
+ .where("table_name like '" + QUERYSTORE_NAME + "'")
.fetchOne(0, int.class) == 1;
}
@@ -467,18 +560,13 @@ public class QueryStoreService extends JdbcConnector {
throws QueryMalformedException {
final StringBuilder parsedQuery = new StringBuilder();
final String q;
- try {
- q = parse(query, database).getQuery();
- if (q.charAt(q.length() - 1) == ';') {
- parsedQuery.append(q.substring(0, q.length() - 2));
- } else {
- parsedQuery.append(q);
- }
- parsedQuery.append(";");
- } catch (JSQLParserException e) {
- log.error("The manual mapped query is malformed: {}", e.getMessage());
- throw new QueryMalformedException("The manual mapped query is malformed", e);
+ q = parse(query, database).getQuery();
+ if (q.charAt(q.length() - 1) == ';') {
+ parsedQuery.append(q.substring(0, q.length() - 2));
+ } else {
+ parsedQuery.append(q);
}
+ parsedQuery.append(";");
final List<org.jooq.Record> result = context.resultQuery(parsedQuery.toString())
.fetch();
return queryMapper.recordListToQueryResultDto(result, query.getId());
diff --git a/fda-table-service/Dockerfile b/fda-table-service/Dockerfile
index 37f0c347670855b08e1b50ba8149e3f887709b8e..d4639d29949880c4d44c9cadaa3baa1d7c1a4a9c 100644
--- a/fda-table-service/Dockerfile
+++ b/fda-table-service/Dockerfile
@@ -15,8 +15,6 @@ COPY ./rest-service ./rest-service
COPY ./services ./services
COPY ./report ./report
-ARG CI_JOB_STAGE
-
# Make sure it compiles
RUN mvn -q clean package -DskipTests > /dev/null
diff --git a/fda-table-service/pom.xml b/fda-table-service/pom.xml
index 03a31fdfbf3528023564ddb70f6127fbaffb94e9..f99ca04ee75a6cd05cc5f7a08af5ad4fe136b470 100644
--- a/fda-table-service/pom.xml
+++ b/fda-table-service/pom.xml
@@ -34,6 +34,7 @@
<opencsv.version>5.4</opencsv.version>
<super-csv.version>2.4.0</super-csv.version>
<btrace-client.version>2.2.0</btrace-client.version>
+ <unleash.version>5.0.1</unleash.version>
</properties>
<dependencies>
diff --git a/fda-table-service/rest-service/src/main/resources/application-docker.yml b/fda-table-service/rest-service/src/main/resources/application-docker.yml
index 3af598b5a002fb0ccc62e37e7e5f09abfeae7ef5..8c2bac3f34daccb54ce5689e286422b1791ba955 100644
--- a/fda-table-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-table-service/rest-service/src/main/resources/application-docker.yml
@@ -31,7 +31,8 @@ eureka:
fda:
mapping.path: /root
table.path: /root
+ ready.path: /ready
elastic.endpoint: fda-search-service:9200
-zenodo:
- endpoint: https://sandbox.zenodo.org/
- api_key: "${ZENODO_API_KEY}"
\ No newline at end of file
+unleash:
+ api.url: https://gitlab.phaidra.org/api/v4/feature_flags/unleash/450
+ instance.id: "${INSTANCE_ID}"
\ No newline at end of file
diff --git a/fda-table-service/rest-service/src/main/resources/application.yml b/fda-table-service/rest-service/src/main/resources/application.yml
index e6e74dec02d72744c6dbe5064c85ea8227e307b4..4a5620ad1196703e2358109ded6eee8061d2b49b 100644
--- a/fda-table-service/rest-service/src/main/resources/application.yml
+++ b/fda-table-service/rest-service/src/main/resources/application.yml
@@ -14,7 +14,7 @@ spring:
application:
name: fda-table-service
rabbitmq:
- host: fda-broker-service
+ host: localhost
username: guest
password: guest
cloud:
@@ -25,14 +25,14 @@ logging:
level:
root: warn
at.tuwien.: debug
- at.tuwien.service.: trace
eureka:
instance.hostname: fda-table-service
client.serviceUrl.defaultZone: http://localhost:9090/eureka/
fda:
mapping.path: rest-service/src/main/resources
table.path: rest-service/src/main/java/at/tuwien/userdb
+ ready.path: ./ready
elastic.endpoint: fda-search-service:9200
-zenodo:
- endpoint: https://sandbox.zenodo.org/
- api_key: "${ZENODO_API_KEY}"
\ No newline at end of file
+unleash:
+ api.url: https://gitlab.phaidra.org/api/v4/feature_flags/unleash/450
+ instance.id: "${INSTANCE_ID}"
\ No newline at end of file
diff --git a/fda-table-service/rest-service/src/main/resources/seed/air-small.csv b/fda-table-service/rest-service/src/main/resources/seed/air-small.csv
new file mode 100644
index 0000000000000000000000000000000000000000..9065f7b6c3290301846bcebabb82dc867fcebd22
--- /dev/null
+++ b/fda-table-service/rest-service/src/main/resources/seed/air-small.csv
@@ -0,0 +1,847 @@
+Country Code;City;Location;Coordinates;Pollutant;Source Name;Unit;Value;Last Updated;Country Label
+AT;Oberösterreich;AT4S406;48.1649999995,14.035556;O3;EEA Austria;µg/m³;22.989;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S108;48.5311111095,14.5747222222;PM2.5;EEA Austria;µg/m³;5.02799987;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31413;48.0838888884,16.3302777778;PM10;EEA Austria;µg/m³;27.0;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT52300;47.6911111106,13.1080555556;PM10;EEA Austria;µg/m³;27.13999938;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31401;48.0861110995,16.3022222;PM10;EEA Austria;µg/m³;26.0;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60197;46.7783333328,15.5405555556;PM10;EEA Austria;µg/m³;22.54843521;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S415;48.3233329995,14.2977778;CO;EEA Austria;µg/m³;473.01501;2020-12-30T19:00:00+01:00;Austria
+AT;Niederösterreich;AT0PIL1;48.7211111095,15.94222222;O3;EEA Austria;µg/m³;42.463;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT0PIL1;48.7211111095,15.94222222;SO2;EEA Austria;µg/m³;3.48500013;2021-11-25T10:00:00+01:00;Austria
+AT;Vorarlberg;AT80503;47.5291999995,9.9267;O3;EEA Austria;µg/m³;80.823;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2KA21;46.6255599995,14.31806;NO2;EEA Austria;µg/m³;27.57500076;2021-11-25T09:00:00+01:00;Austria
+AT;Burgenland;AT10001;47.8399999995,16.52806;O3;EEA Austria;µg/m³;41.954;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31402;48.1249999995,16.331388;NO2;EEA Austria;µg/m³;7.6491599;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9KEND;48.2049999995,16.30975;NO2;EEA Austria;µg/m³;17.09185218;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30403;48.3922222195,16.522666622;O3;EEA Austria;µg/m³;40.108;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30201;47.9591669995,16.205833;PM2.5;EEA Austria;µg/m³;18.5;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30201;47.9591669995,16.205833;PM10;EEA Austria;µg/m³;23.0;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT900KE;48.1567079995,16.476051;NO2;EEA Austria;µg/m³;13.55650711;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60118;47.1783333328,14.6766666667;PM10;EEA Austria;µg/m³;25.10455703;2021-11-25T10:00:00+01:00;Austria
+AT;Vorarlberg;AT82801;47.1288639995,10.034324;O3;EEA Austria;µg/m³;15.662;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9LIES;48.1412499995,16.30127778;PM2.5;EEA Austria;µg/m³;24.49799919;2021-11-25T10:00:00+01:00;Austria
+AT;Austria;Wien Belgradplatz;48.1750111647,16.3630823948;NO2;EEA Austria;µg/m³;19.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Graz Don Bosco;47.0555746975,15.4177852213;SO2;EEA Austria;µg/m³;5.0;2016-12-12T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S416;48.2744444435,14.3147222;O3;EEA Austria;µg/m³;21.406;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S416;48.2744444435,14.3147222;CO;EEA Austria;µg/m³;257.45499;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60177;47.5654389995,14.244676;SO2;EEA Austria;µg/m³;1.8263725;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT90A23;48.2030599995,16.43455;CO;EEA Austria;µg/m³;278.97101;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31401;48.0861110995,16.3022222;O3;EEA Austria;µg/m³;35.618;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S173;48.2788888884,14.3658333333;PM10;EEA Austria;µg/m³;24.33149909;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2KA71;46.6266166661,14.2991444444;SO2;EEA Austria;µg/m³;2.00999999;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32701;48.1449999995,16.4744444444;O3;EEA Austria;µg/m³;43.5;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60164;47.0556109995,15.416603;NO2;EEA Austria;µg/m³;42.72278594;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT90LOB;48.1620694439,16.5256138889;O3;EEA Austria;µg/m³;41.805;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32501;48.4086099995,15.619166;SO2;EEA Austria;µg/m³;3.29999995;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32301;48.2124999995,15.634167;SO2;EEA Austria;µg/m³;0.25;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30104;48.1783333328,14.5486111111;PM2.5;EEA Austria;µg/m³;20.0;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT51200;47.8172222217,13.0308333333;NO2;EEA Austria;µg/m³;27.15451812;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT51066;47.8055555995,13.043333;O3;EEA Austria;µg/m³;10.476;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72223;47.2395527995,11.390653;PM10;EEA Austria;µg/m³;36.55750274;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30065;48.1958349995,16.143612;O3;EEA Austria;µg/m³;31.428;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30403;48.3922222195,16.522666622;NO2;EEA Austria;µg/m³;7.84038877;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60179;47.2828599995,15.971852;PM10;EEA Austria;µg/m³;35.29496765;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT90LAA;48.1610363884,16.3929202778;O3;EEA Austria;µg/m³;6.053;2020-12-10T19:00:00+01:00;Austria
+AT;Tirol;AT72822;47.3499916995,11.6945417;NO2;EEA Austria;µg/m³;2.89699983;2021-04-24T13:00:00+02:00;Austria
+AT;Niederösterreich;AT31904;48.2763888884,15.935;PM10;EEA Austria;µg/m³;20.0;2020-12-04T09:00:00+01:00;Austria
+AT;Amt der Steierm�rkischen Landesregierung;Liezen Alte Gasse 8;47.5672222217,14.2436111111;O3;EEA Austria;µg/m³;0.0;2017-07-20T21:00:00+02:00;Austria
+AT;Austria;Graz Mitte Gries;47.0691596333,15.4317091082;PM10;EEA Austria;µg/m³;60.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Spittal a.d.Drau Oktoberstrasse;46.8016611483,13.4955701764;O3;EEA Austria;µg/m³;2.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Kendlerstraße;48.2055535272,16.3105309507;NO2;EEA Austria;µg/m³;15.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Graz Nord;47.0955241068,15.4141919602;NO2;EEA Austria;µg/m³;73.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Hartberg Zentrum;47.2827572544,15.9719559201;O3;EEA Austria;µg/m³;28.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Bockberg;46.8730674222,15.4950403358;PM10;EEA Austria;µg/m³;7.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Tulln Leopoldgasse;48.3313633254,16.0594518288;NO2;EEA Austria;µg/m³;22.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Streithofen im Tullnerfeld;48.2766884716,15.9361131403;O3;EEA Austria;µg/m³;43.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Dornbirn Stadtstraße;47.4108196241,9.7442055499;NO2;EEA Austria;µg/m³;63.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Judenburg;47.1794241894,14.6774835957;PM10;EEA Austria;µg/m³;4.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Voitsberg Mühlgasse;47.0449858386,15.1499974351;O3;EEA Austria;µg/m³;18.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Grundlsee;47.616684105,13.7966854596;O3;EEA Austria;µg/m³;59.0;2016-12-12T10:00:00+01:00;Austria
+AT;Steiermark;AT0KLH1;46.7527527862,15.9566845603;O3;EEA Austria;µg/m³;70.0;2016-12-12T10:00:00+01:00;Austria
+AT;Wien;AT90A23;48.2030599995,16.43455;SO2;EEA Austria;µg/m³;5.25805234;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S173;48.2788888884,14.3658333333;CO;EEA Austria;µg/m³;247.32001;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30599;48.3082222195,16.3279444;NO2;EEA Austria;µg/m³;25.62468528;2021-11-25T10:00:00+01:00;Austria
+AT;Burgenland;AT10001;47.8399999995,16.52806;SO2;EEA Austria;µg/m³;1.11399996;2021-11-25T09:00:00+01:00;Austria
+AT;Niederösterreich;AT30902;48.3852769995,16.182222;PM10;EEA Austria;µg/m³;26.5;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9BELG;48.174353055,16.3614172222;PM2.5;EEA Austria;µg/m³;24.54750061;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT55032;47.1258333328,13.8083333333;NO2;EEA Austria;µg/m³;27.15451812;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9STAD;48.2263608328,16.458345;PM2.5;EEA Austria;µg/m³;24.38949966;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60185;46.7674999995,15.956111;O3;EEA Austria;µg/m³;29.123;2021-11-25T10:00:00+01:00;Austria
+AT;Burgenland;AT0ILL1;47.7702799995,16.76639;O3;EEA Austria;µg/m³;38.512;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60191;47.135555555,15.3236111111;SO2;EEA Austria;µg/m³;0.40024849;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60179;47.2828599995,15.971852;SO2;EEA Austria;µg/m³;2.23193955;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60179;47.2828599995,15.971852;NO2;EEA Austria;µg/m³;21.55222129;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT52100;47.6669999995,13.106;NO2;EEA Austria;µg/m³;18.93167114;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2M121;46.5569299995,13.70541;SO2;EEA Austria;µg/m³;4.04500007;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31902;48.3311111106,15.9036111111;NO2;EEA Austria;µg/m³;14.62901782;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31902;48.3311111106,15.9036111111;PM2.5;EEA Austria;µg/m³;21.5;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT90LAA;48.1610363884,16.3929202778;PM2.5;EEA Austria;µg/m³;21.0550003;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60106;47.0633299995,15.086667;SO2;EEA Austria;µg/m³;1.0255295;2021-11-25T09:00:00+01:00;Austria
+AT;Oberösterreich;AT4S409;48.0494444439,14.4427777778;O3;EEA Austria;µg/m³;26.627;2021-11-25T08:00:00+01:00;Austria
+AT;Amt der Ober�sterreichischen Landesregierung;Lenzing Winterstrasse;47.9719443995,13.60083333;SO2;EEA Austria;µg/m³;1.22000002;2017-07-20T21:00:00+02:00;Austria
+AT;Amt der Steierm�rkischen Landesregierung;Weiz Birkfelder Stra�e;47.2172239995,15.628333;O3;EEA Austria;µg/m³;0.0;2017-07-20T21:00:00+02:00;Austria
+AT;Austria;Hallein B159;47.6830699731,13.1019284189;NO2;EEA Austria;µg/m³;89.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Höchst Gemeindeamt;47.4588843935,9.64027047153;NO2;EEA Austria;µg/m³;63.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Annaberg - Joachimsberg;47.8552663493,15.3219349805;O3;EEA Austria;µg/m³;57.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Linz Kleinmünchen;48.2544432597,14.3108811283;NO2;EEA Austria;µg/m³;23.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Voitsberg Mühlgasse;47.0449858386,15.1499974351;PM10;EEA Austria;µg/m³;38.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Kramsach Angerberg;47.4591880767,11.9105826891;O3;EEA Austria;µg/m³;14.0;2016-12-12T10:00:00+01:00;Austria
+AT;Oberösterreich;AT0ZOE2;47.8386110995,14.441388889;PM2.5;EEA Austria;µg/m³;1.47000002;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S416;48.2744444435,14.3147222;PM10;EEA Austria;µg/m³;32.07699966;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30202;48.1061110995,15.919444444;NO2;EEA Austria;µg/m³;8.60530471;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72227;47.2780699995,11.512497;PM10;EEA Austria;µg/m³;59.83450317;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60178;47.2157029995,15.628392;PM10;EEA Austria;µg/m³;80.20129394;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT0ENK1;48.3917199995,13.67114;PM10;EEA Austria;µg/m³;17.44499969;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32701;48.1449999995,16.4744444444;NO2;EEA Austria;µg/m³;10.13513755;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60195;46.8138888884,15.2127777778;NO2;EEA Austria;µg/m³;11.72082805;2021-11-24T15:00:00+01:00;Austria
+AT;Burgenland;AT10003;48.1094443995,17.0713889;O3;EEA Austria;µg/m³;24.165;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60172;47.0692399995,15.431945;NO2;EEA Austria;µg/m³;38.17704772;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT0VOR1;46.6786111106,12.9744444444;CO;EEA Austria;µg/m³;157.72201;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60107;47.0447222217,15.1527777778;NO2;EEA Austria;µg/m³;30.50779724;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30301;48.1436119995,16.959444;O3;EEA Austria;µg/m³;35.519;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2WO35;46.7083329995,14.891667;SO2;EEA Austria;µg/m³;2.30999994;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32301;48.2124999995,15.634167;O3;EEA Austria;µg/m³;10.077;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60156;47.3480599995,15.882222;SO2;EEA Austria;µg/m³;1.87870848;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S156;48.2577777772,13.0397222222;NO2;EEA Austria;µg/m³;11.31000041;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT0SON1;47.0541666995,12.957777778;NO2;EEA Austria;µg/m³;0.32700157;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2VL52;46.6953999995,13.91449;O3;EEA Austria;µg/m³;88.84;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT90MBA;48.1883724995,16.3000202778;NO2;EEA Austria;µg/m³;40.42866516;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9JAEG;48.2701583328,16.2972633333;SO2;EEA Austria;µg/m³;4.51885604;2017-07-20T21:00:00+02:00;Austria
+AT;Kärnten;AT2WO15;46.8349999995,14.8436111111;PM2.5;EEA Austria;µg/m³;23.36000061;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2WO15;46.8349999995,14.8436111111;PM10;EEA Austria;µg/m³;27.97999954;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60036;47.0670111106,15.4936888889;PM10;EEA Austria;µg/m³;24.72444152;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60139;47.0694429995,15.404388;NO2;EEA Austria;µg/m³;37.55379486;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT52100;47.6669999995,13.106;O3;EEA Austria;µg/m³;28.435;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9LIES;48.1412499995,16.30127778;PM10;EEA Austria;µg/m³;29.61500167;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60106;47.0633299995,15.086667;PM10;EEA Austria;µg/m³;35.00807952;2021-11-25T09:00:00+01:00;Austria
+AT;Steiermark;AT60137;47.0591699995,15.016667;O3;EEA Austria;µg/m³;47.413;2021-11-25T03:00:00+01:00;Austria
+AT;Austria;Heiterwang;47.447768382,10.7442101242;PM10;EEA Austria;µg/m³;9.0;2016-12-12T09:00:00+01:00;Austria
+AT;Austria;Krems;48.4094197901,15.6202654864;NO2;EEA Austria;µg/m³;16.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Leoben Zentrum;47.3830302082,15.0899899742;NO2;EEA Austria;µg/m³;54.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Vösendorf;48.1250261927,16.3316413599;CO;EEA Austria;µg/m³;210.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Gänserndorf;48.3347076441,16.7305831776;PM10;EEA Austria;µg/m³;9.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Vöcklabruck;48.0011129974,13.6680467109;NO2;EEA Austria;µg/m³;12.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Graz Don Bosco;47.0555746975,15.4177852213;NO2;EEA Austria;µg/m³;81.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Steyr;48.0508581903,14.4405978553;SO2;EEA Austria;µg/m³;3.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Steyr;48.0508581903,14.4405978553;PM10;EEA Austria;µg/m³;12.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;St. Veit a.d.Glan Hauptbahnhof;46.7702910806,14.3658580236;PM10;EEA Austria;µg/m³;28.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Zederhaus A10;47.1541397801,13.5050024869;NO2;EEA Austria;µg/m³;13.0;2016-12-12T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S108;48.5311111095,14.5747222222;NO2;EEA Austria;µg/m³;9.0;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S173;48.2788888884,14.3658333333;SO2;EEA Austria;µg/m³;2.99;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT0ENK1;48.3917199995,13.67114;SO2;EEA Austria;µg/m³;1.23000001;2021-11-25T10:00:00+01:00;Austria
+AT;Burgenland;AT10003;48.1094443995,17.0713889;PM10;EEA Austria;µg/m³;39.56355285;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT90TAB;48.2167394439,16.3809180556;PM10;EEA Austria;µg/m³;30.51300048;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT0VOR1;46.6786111106,12.9744444444;SO2;EEA Austria;µg/m³;0.39971005;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT0VOR1;46.6786111106,12.9744444444;NO2;EEA Austria;µg/m³;4.62774181;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72123;47.3056221995,11.3759972;O3;EEA Austria;µg/m³;91.761;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30104;48.1783333328,14.5486111111;NO2;EEA Austria;µg/m³;25.5290718;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2F202;46.8419999995,14.529;PM10;EEA Austria;µg/m³;13.53499984;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9GAUD;48.1871469439,16.3393311111;NO2;EEA Austria;µg/m³;24.78996467;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9GAUD;48.1871469439,16.3393311111;PM2.5;EEA Austria;µg/m³;23.15999984;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31204;48.2133333328,15.1972222222;O3;EEA Austria;µg/m³;7.084;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9KEND;48.2049999995,16.30975;PM2.5;EEA Austria;µg/m³;22.96150016;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT90MBA;48.1883724995,16.3000202778;CO;EEA Austria;µg/m³;350.49301;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31901;48.3294449995,16.0625;PM10;EEA Austria;µg/m³;36.0;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72315;47.2169471995,10.7357167;PM10;EEA Austria;µg/m³;16.43400001;2021-11-25T10:00:00+01:00;Austria
+AT;Burgenland;AT10002;47.3394099995,16.20808;O3;EEA Austria;µg/m³;21.955;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32604;48.0451111106,14.7722777778;PM10;EEA Austria;µg/m³;18.0;2021-11-25T09:00:00+01:00;Austria
+AT;Steiermark;AT60137;47.0591699995,15.016667;NO2;EEA Austria;µg/m³;5.68814897;2021-11-25T03:00:00+01:00;Austria
+AT;Austria;Graz West;47.0697103009,15.404130829;PM10;EEA Austria;µg/m³;64.0;2016-12-07T19:00:00+01:00;Austria
+AT;Austria;Wolkersdorf;48.3922433173,16.5222638632;O3;EEA Austria;µg/m³;37.0;2016-12-12T09:00:00+01:00;Austria
+AT;Austria;Leoben Donawitz;47.3760957723,15.0775033917;SO2;EEA Austria;µg/m³;3.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Krems;48.4094197901,15.6202654864;PM10;EEA Austria;µg/m³;6.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Liesing;48.1380365608,16.2966968953;PM10;EEA Austria;µg/m³;10.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Kufstein Praxmarerstraße;47.5863981913,12.1736094043;NO2;EEA Austria;µg/m³;58.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Kundl A12;47.4689050125,11.9583730622;NO2;EEA Austria;µg/m³;68.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Gratwein;47.1422262873,15.3255282417;SO2;EEA Austria;µg/m³;3.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Lustenau Wiesenrain;47.4108196241,9.65275705398;NO2;EEA Austria;µg/m³;45.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Steyr;48.0508581903,14.4405978553;O3;EEA Austria;µg/m³;43.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Graz Süd Tiergartenweg;47.0419250831,15.4341345595;O3;EEA Austria;µg/m³;2.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Streithofen im Tullnerfeld;48.2766884716,15.9361131403;NO2;EEA Austria;µg/m³;13.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Amstetten;48.1202888808,14.879155377;O3;EEA Austria;µg/m³;39.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Kematen;48.0449729792,14.7722558582;O3;EEA Austria;µg/m³;52.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Fürstenfeld;47.0469446299,16.0789452705;PM10;EEA Austria;µg/m³;28.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Arnoldstein Gailitz Waldsiedlungsstraße;46.558898771,13.7049674691;PM10;EEA Austria;µg/m³;15.0;2016-12-12T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S217;48.2094444439,14.4369444444;NO2;EEA Austria;µg/m³;19.25499916;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60197;46.7783333328,15.5405555556;PM2.5;EEA Austria;µg/m³;25.84607887;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60195;46.8138888884,15.2127777778;O3;EEA Austria;µg/m³;8.322;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60196;47.0402777772,14.33;O3;EEA Austria;µg/m³;87.918;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31406;48.0833333328,16.3372222222;PM10;EEA Austria;µg/m³;29.5;2021-11-25T10:00:00+01:00;Austria
+AT;Burgenland;AT10001;47.8399999995,16.52806;PM10;EEA Austria;µg/m³;26.56755065;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60142;47.375555555,15.0745;SO2;EEA Austria;µg/m³;0.39574649;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60142;47.375555555,15.0745;PM10;EEA Austria;µg/m³;46.22690963;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72821;47.3487739995,11.692028;NO2;EEA Austria;µg/m³;47.94100189;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60157;47.6305599995,13.796667;O3;EEA Austria;µg/m³;54.828;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72552;47.5818082995,12.1724111;NO2;EEA Austria;µg/m³;33.84799957;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31901;48.3294449995,16.0625;O3;EEA Austria;µg/m³;8.381;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60198;47.0472219995,16.078888;PM10;EEA Austria;µg/m³;34.6105957;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9JAEG;48.2701583328,16.2972633333;NO2;EEA Austria;µg/m³;10.35456943;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60171;47.0594439995,15.466666;PM10;EEA Austria;µg/m³;38.28440856;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2M121;46.5569299995,13.70541;PM10;EEA Austria;µg/m³;14.52999973;2021-11-25T10:00:00+01:00;Austria
+AT;Amt der Steierm�rkischen Landesregierung;Liezen Alte Gasse 8;47.5672222217,14.2436111111;SO2;EEA Austria;µg/m³;0.0;2017-07-20T21:00:00+02:00;Austria
+AT;Austria;Wien Kaiserebersdorf;48.1569167138,16.4755514684;NO2;EEA Austria;µg/m³;19.0;2016-12-12T09:00:00+01:00;Austria
+AT;Austria;Wolfsberg Hauptschule;46.8352867658,14.8442109124;NO2;EEA Austria;µg/m³;52.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wolfsberg Hauptschule;46.8352867658,14.8442109124;O3;EEA Austria;µg/m³;4.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Köflach;47.0616944664,15.0792101908;NO2;EEA Austria;µg/m³;48.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Lustenau Zollamt;47.4325180089,9.64943328743;NO2;EEA Austria;µg/m³;77.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Klosterneuburg Wisentgasse;48.3013740999,16.3046919014;SO2;EEA Austria;µg/m³;3.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;St. Pölten - Europaplatz;48.2099836519,15.6111026705;CO;EEA Austria;µg/m³;250.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;St. Pölten - Eybnerstraße;48.2114203668,15.6316740905;SO2;EEA Austria;µg/m³;3.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Klagenfurt Völkermarkterstrasse;46.6200155505,14.3169896722;PM10;EEA Austria;µg/m³;36.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Imst Inntalautobahn A12;47.2169621447,10.7355862975;PM10;EEA Austria;µg/m³;50.0;2016-12-12T10:00:00+01:00;Austria
+AT;Steiermark;AT60178;47.2157029995,15.628392;NO2;EEA Austria;µg/m³;28.3265438;2021-11-25T10:00:00+01:00;Austria
+AT;Vorarlberg;AT80503;47.5291999995,9.9267;NO2;EEA Austria;µg/m³;5.78399991;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30701;48.5288888884,15.9427777778;PM10;EEA Austria;µg/m³;30.0;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32302;48.2012999995,15.6204;PM10;EEA Austria;µg/m³;33.0;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT90TAB;48.2167394439,16.3809180556;PM2.5;EEA Austria;µg/m³;24.88100051;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S431;48.3027777772,14.2827777778;CO;EEA Austria;µg/m³;239.23499;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60156;47.3480599995,15.882222;O3;EEA Austria;µg/m³;47.408;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30302;48.0502779995,16.675278;NO2;EEA Austria;µg/m³;4.58949613;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S156;48.2577777772,13.0397222222;PM10;EEA Austria;µg/m³;25.97299957;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72519;47.4285527995,11.8718028;PM10;EEA Austria;µg/m³;25.87849998;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72519;47.4285527995,11.8718028;SO2;EEA Austria;µg/m³;0.98050004;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT900ZA;48.2489929995,16.357079;SO2;EEA Austria;µg/m³;3.75394344;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S407;48.0008333328,13.6675;SO2;EEA Austria;µg/m³;0.94499999;2021-11-25T10:00:00+01:00;Austria
+AT;Austria;Wörgl;47.4891833281,12.0675183692;NO2;EEA Austria;µg/m³;61.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Gratwein;47.1422262873,15.3255282417;NO2;EEA Austria;µg/m³;46.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Stixneusiedl;48.0508581903,16.6766842605;NO2;EEA Austria;µg/m³;11.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Klein St. Paul - Pemberg;46.8419233416,14.5289022477;PM10;EEA Austria;µg/m³;1.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Tamsweg - Untere Postgasse;47.1258485147,13.8069262539;O3;EEA Austria;µg/m³;66.0;2016-12-12T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30202;48.1061110995,15.919444444;SO2;EEA Austria;µg/m³;2.0999999;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT90A23;48.2030599995,16.43455;PM2.5;EEA Austria;µg/m³;24.90050125;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30502;48.8786110995,15.04666667;SO2;EEA Austria;µg/m³;1.79999995;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60178;47.2157029995,15.628392;PM2.5;EEA Austria;µg/m³;23.9495697;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT0ENK1;48.3917199995,13.67114;PM2.5;EEA Austria;µg/m³;15.27000045;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S415;48.3233329995,14.2977778;SO2;EEA Austria;µg/m³;1.88999986;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60142;47.375555555,15.0745;NO2;EEA Austria;µg/m³;29.61927413;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2WO35;46.7083329995,14.891667;NO2;EEA Austria;µg/m³;11.8249998;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72538;47.4587169995,11.90995;O3;EEA Austria;µg/m³;6.358;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32301;48.2124999995,15.634167;PM2.5;EEA Austria;µg/m³;24.5;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60151;46.8713888884,15.4958333333;PM10;EEA Austria;µg/m³;18.24235916;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60185;46.7674999995,15.956111;NO2;EEA Austria;µg/m³;5.14998817;2017-07-20T21:00:00+02:00;Austria
+AT;Steiermark;AT60156;47.3480599995,15.882222;PM10;EEA Austria;µg/m³;13.06016349;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9KEND;48.2049999995,16.30975;PM10;EEA Austria;µg/m³;29.66699981;2021-11-25T10:00:00+01:00;Austria
+AT;Burgenland;AT10002;47.3394099995,16.20808;PM10;EEA Austria;µg/m³;38.16345214;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60141;47.3588888884,15.1036111111;PM10;EEA Austria;µg/m³;32.20630645;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT90AKC;48.2195169995,16.345552;PM2.5;EEA Austria;µg/m³;24.61149978;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S125;47.7161111106,13.6322222222;O3;EEA Austria;µg/m³;29.385;2021-11-25T09:00:00+01:00;Austria
+AT;Niederösterreich;AT30201;47.9591669995,16.205833;NO2;EEA Austria;µg/m³;13.00357246;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9LIES;48.1412499995,16.30127778;NO2;EEA Austria;µg/m³;15.19256591;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31904;48.2763888884,15.935;SO2;EEA Austria;µg/m³;6.0;2020-12-04T09:00:00+01:00;Austria
+AT;Austria;Wien Stephansplatz;48.2089060893,16.3738621782;O3;EEA Austria;µg/m³;45.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Kaiserebersdorf;48.1569167138,16.4755514684;PM10;EEA Austria;µg/m³;8.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Kaiserebersdorf;48.1569167138,16.4755514684;SO2;EEA Austria;µg/m³;4.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Hallein B159;47.6830699731,13.1019284189;CO;EEA Austria;µg/m³;826.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Lobau - Grundwasserwerk;48.1624895263,16.5266656081;PM10;EEA Austria;µg/m³;11.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Laaer Berg;48.1614109647,16.3928166307;O3;EEA Austria;µg/m³;38.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Hochwurzen;47.3583297239,13.633371741;O3;EEA Austria;µg/m³;72.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wald am Arlberg;47.1278043348,10.0469378006;O3;EEA Austria;µg/m³;46.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Gaudenzdorf;48.1877693063,16.3405346812;PM10;EEA Austria;µg/m³;11.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Villach Tirolerbrücke;46.61113012,13.8411520662;PM10;EEA Austria;µg/m³;31.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Linz Römerberg;48.3030472699,14.2830333544;CO;EEA Austria;µg/m³;310.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Tulln Leopoldgasse;48.3313633254,16.0594518288;PM10;EEA Austria;µg/m³;10.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Amstetten;48.1202888808,14.879155377;PM10;EEA Austria;µg/m³;6.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Bad Ischl;47.7166845556,13.6328327518;PM10;EEA Austria;µg/m³;14.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Bad Ischl;47.7166845556,13.6328327518;O3;EEA Austria;µg/m³;18.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Tamsweg - Untere Postgasse;47.1258485147,13.8069262539;NO2;EEA Austria;µg/m³;9.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Illmitz;47.7700243274,16.7664259574;PM10;EEA Austria;µg/m³;3.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Graz Ost Petersgasse;47.0594302338,15.4661145836;NO2;EEA Austria;µg/m³;83.0;2016-12-12T10:00:00+01:00;Austria
+AT;Oberösterreich;AT0ZOE2;47.8386110995,14.441388889;SO2;EEA Austria;µg/m³;0.365;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S406;48.1649999995,14.035556;NO2;EEA Austria;µg/m³;18.71500015;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32401;47.8141666695,16.255;NO2;EEA Austria;µg/m³;16.15885162;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30603;48.0861111105,16.433333333;PM10;EEA Austria;µg/m³;29.0;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S173;48.2788888884,14.3658333333;PM2.5;EEA Austria;µg/m³;21.88999938;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S415;48.3233329995,14.2977778;PM2.5;EEA Austria;µg/m³;22.77199935;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60190;46.6519499995,15.36778;O3;EEA Austria;µg/m³;23.943;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2KA21;46.6255599995,14.31806;PM10;EEA Austria;µg/m³;27.95999908;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60142;47.375555555,15.0745;CO;EEA Austria;µg/m³;3393.48888;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30902;48.3852769995,16.182222;NO2;EEA Austria;µg/m³;19.50535774;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72550;47.4689166995,11.958036;NO2;EEA Austria;µg/m³;23.31299972;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT52055;47.6502777995,13.232778;O3;EEA Austria;µg/m³;63.255;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32301;48.2124999995,15.634167;PM10;EEA Austria;µg/m³;31.5;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9STAD;48.2263608328,16.458345;NO2;EEA Austria;µg/m³;9.61480045;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60185;46.7674999995,15.956111;SO2;EEA Austria;µg/m³;1.91980147;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72223;47.2395527995,11.390653;NO2;EEA Austria;µg/m³;59.060997;2021-11-25T10:00:00+01:00;Austria
+AT;Burgenland;AT0ILL1;47.7702799995,16.76639;SO2;EEA Austria;µg/m³;3.67466783;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72530;47.4885582995,12.066633;O3;EEA Austria;µg/m³;5.554;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31701;48.3702779995,15.543611;O3;EEA Austria;µg/m³;33.723;2021-11-25T10:00:00+01:00;Austria
+AT;Amt der Salzburger Landesregierung;Zederhaus A10;47.1540699995,13.50508;NO2;EEA Austria;µg/m³;15.87200737;2017-07-20T21:00:00+02:00;Austria
+AT;Amt der Nieder�sterreichischen Landesregierung;Mannsw�rth bei Schwechat, Danubiastra�e/A4;48.1449999995,16.51111;PM10;EEA Austria;µg/m³;30.0;2017-07-20T21:00:00+02:00;Austria
+AT;Austria;Vomp A12 Inntalautobahn;47.3491401391,11.6931005588;NO2;EEA Austria;µg/m³;86.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Spittal a.d.Drau Oktoberstrasse;46.8016611483,13.4955701764;PM10;EEA Austria;µg/m³;26.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien AKH;48.2191420188,16.3458347414;PM10;EEA Austria;µg/m³;10.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Tulln Leopoldgasse;48.3313633254,16.0594518288;SO2;EEA Austria;µg/m³;3.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Fürstenfeld;47.0469446299,16.0789452705;NO2;EEA Austria;µg/m³;53.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Hainburg;48.1439111305,16.9610908795;PM10;EEA Austria;µg/m³;7.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;St. Koloman Kleinhorn;47.6505835144,13.2333519449;O3;EEA Austria;µg/m³;69.0;2016-12-12T09:00:00+01:00;Austria
+AT;Steiermark;AT0KLH1;46.7527527862,15.9566845603;NO2;EEA Austria;µg/m³;11.9422512;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S108;48.5311111095,14.5747222222;O3;EEA Austria;µg/m³;55.873;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60180;47.4094429995,15.253333;SO2;EEA Austria;µg/m³;2.99498939;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60180;47.4094429995,15.253333;PM10;EEA Austria;µg/m³;33.82774353;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2SP18;46.8013888884,13.4938888889;NO2;EEA Austria;µg/m³;21.48999977;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2WO35;46.7083329995,14.891667;O3;EEA Austria;µg/m³;8.965;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2F202;46.8419999995,14.529;SO2;EEA Austria;µg/m³;0.45000001;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60135;47.113055555,15.3391666667;SO2;EEA Austria;µg/m³;2.06841135;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT51200;47.8172222217,13.0308333333;O3;EEA Austria;µg/m³;12.172;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT51200;47.8172222217,13.0308333333;PM10;EEA Austria;µg/m³;20.02000045;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31204;48.2133333328,15.1972222222;NO2;EEA Austria;µg/m³;23.32993698;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30065;48.1958349995,16.143612;NO2;EEA Austria;µg/m³;33.08261489;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31901;48.3294449995,16.0625;SO2;EEA Austria;µg/m³;3.5999999;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9SCHA;48.2353699995,16.301563;PM10;EEA Austria;µg/m³;29.98049926;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60106;47.0633299995,15.086667;NO2;EEA Austria;µg/m³;33.08716583;2021-11-25T09:00:00+01:00;Austria
+AT;Austria;Krems;48.4094197901,15.6202654864;O3;EEA Austria;µg/m³;41.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Stadlau;48.2280593769,16.4605496031;PM10;EEA Austria;µg/m³;9.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Knittelfeld Parkstraße;47.2102499891,14.8244479762;NO2;EEA Austria;µg/m³;60.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Lienz Amlacherkreuzung;46.8280347551,12.7655991765;NO2;EEA Austria;µg/m³;108.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Innsbruck Reichenau;47.2716650145,11.4177669242;PM10;EEA Austria;µg/m³;53.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Bockberg;46.8730674222,15.4950403358;NO2;EEA Austria;µg/m³;9.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Steyr;48.0508581903,14.4405978553;NO2;EEA Austria;µg/m³;11.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Klein St. Paul - Pemberg;46.8419233416,14.5289022477;SO2;EEA Austria;µg/m³;1.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Klagenfurt Kreuzbergl;46.6297014767,14.2891418984;O3;EEA Austria;µg/m³;5.0;2016-12-12T10:00:00+01:00;Austria
+AT;Salzburg;AT51000;47.7974999995,13.0536111111;NO2;EEA Austria;µg/m³;29.92733764;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72110;47.2626193995,11.3923611;CO;EEA Austria;µg/m³;424.57598;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60172;47.0692399995,15.431945;CO;EEA Austria;µg/m³;464.81949;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60164;47.0556109995,15.416603;CO;EEA Austria;µg/m³;493.4895;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60170;47.0416679995,15.433056;CO;EEA Austria;µg/m³;462.41647;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30101;48.1202777795,14.878333;NO2;EEA Austria;µg/m³;14.15094566;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT55032;47.1258333328,13.8083333333;O3;EEA Austria;µg/m³;14.866;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30302;48.0502779995,16.675278;PM10;EEA Austria;µg/m³;28.5;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT90FLO;48.2610859995,16.396954;NO2;EEA Austria;µg/m³;21.52281951;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31703;48.3533333295,15.74694444;NO2;EEA Austria;µg/m³;35.09052276;2020-12-30T19:00:00+01:00;Austria
+AT;Austria;St. Georgen im Lavanttal - Herzogberg;46.7080504923,14.891911454;PM10;EEA Austria;µg/m³;22.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Liesing;48.1380365608,16.2966968953;NO2;EEA Austria;µg/m³;12.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Belgradplatz;48.1750111647,16.3630823948;PM10;EEA Austria;µg/m³;10.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Haunsberg;47.9727944888,13.0158698147;NO2;EEA Austria;µg/m³;9.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Graz Süd Tiergartenweg;47.0419250831,15.4341345595;SO2;EEA Austria;µg/m³;5.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Brixlegg Innweg;47.430816498,11.8727636156;PM10;EEA Austria;µg/m³;19.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Graz Lustbühel;47.0669569059,15.4936030313;O3;EEA Austria;µg/m³;27.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Peggau;47.2058561181,15.346997977;PM10;EEA Austria;µg/m³;16.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Hainburg;48.1439111305,16.9610908795;SO2;EEA Austria;µg/m³;1.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Arnoldstein Gailitz Waldsiedlungsstraße;46.558898771,13.7049674691;SO2;EEA Austria;µg/m³;2.0;2016-12-12T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S404;48.2252777995,14.23888889;O3;EEA Austria;µg/m³;23.763;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S406;48.1649999995,14.035556;PM10;EEA Austria;µg/m³;25.67899894;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S217;48.2094444439,14.4369444444;PM10;EEA Austria;µg/m³;30.05949974;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S108;48.5311111095,14.5747222222;SO2;EEA Austria;µg/m³;1.35500001;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT0VOR1;46.6786111106,12.9744444444;O3;EEA Austria;µg/m³;36.457;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT54057;47.3513869995,13.205556;NO2;EEA Austria;µg/m³;35.9510498;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30101;48.1202777795,14.878333;O3;EEA Austria;µg/m³;23.845;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2VI12;46.6124999995,13.841389;PM10;EEA Austria;µg/m³;19.039999;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S156;48.2577777772,13.0397222222;O3;EEA Austria;µg/m³;26.854;2021-11-25T09:00:00+01:00;Austria
+AT;Salzburg;AT51066;47.8055555995,13.043333;CO;EEA Austria;µg/m³;273.54002;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT90AKC;48.2195169995,16.345552;NO2;EEA Austria;µg/m³;19.52830123;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9SCHA;48.2353699995,16.301563;PM2.5;EEA Austria;µg/m³;24.39350128;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72106;47.2712899995,11.4169445;NO2;EEA Austria;µg/m³;65.40449523;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72910;46.8277319995,12.765622;NO2;EEA Austria;µg/m³;58.67799758;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31701;48.3702779995,15.543611;NO2;EEA Austria;µg/m³;13.00357246;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30801;48.7244443995,15.5002778;SO2;EEA Austria;µg/m³;2.25;2021-11-25T09:00:00+01:00;Austria
+AT;Austria;Wien Stephansplatz;48.2089060893,16.3738621782;SO2;EEA Austria;µg/m³;3.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Salzburg Lehen Martinstraße;47.8180618127,13.0299733646;PM10;EEA Austria;µg/m³;12.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Hallein B159;47.6830699731,13.1019284189;SO2;EEA Austria;µg/m³;5.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Leoben Zentrum;47.3830302082,15.0899899742;PM10;EEA Austria;µg/m³;16.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Lienz Tristacher See Straße;46.8191835181,12.7658686711;O3;EEA Austria;µg/m³;48.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Hermannskogel;48.2711280763,16.2989426835;NO2;EEA Austria;µg/m³;10.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Gaudenzdorf;48.1877693063,16.3405346812;NO2;EEA Austria;µg/m³;18.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Innsbruck Zentrum Fallmerayerstr.;47.2630699774,11.3930632539;SO2;EEA Austria;µg/m³;8.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Klein St. Paul - Pemberg;46.8419233416,14.5289022477;O3;EEA Austria;µg/m³;68.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Klagenfurt Völkermarkterstrasse;46.6200155505,14.3169896722;CO;EEA Austria;µg/m³;893.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Kematen;48.0449729792,14.7722558582;NO2;EEA Austria;µg/m³;10.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Judenburg;47.1794241894,14.6774835957;NO2;EEA Austria;µg/m³;18.0;2016-12-12T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31413;48.0838888884,16.3302777778;PM2.5;EEA Austria;µg/m³;24.0;2021-11-25T08:00:00+01:00;Austria
+AT;Niederösterreich;AT30603;48.0861111105,16.433333333;O3;EEA Austria;µg/m³;40.108;2021-11-25T10:00:00+01:00;Austria
+AT;Burgenland;AT10001;47.8399999995,16.52806;CO;EEA Austria;µg/m³;253.09997;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31402;48.1249999995,16.331388;CO;EEA Austria;µg/m³;279.35999;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60151;46.8713888884,15.4958333333;O3;EEA Austria;µg/m³;4.783;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9STEF;48.2081499995,16.3732536111;SO2;EEA Austria;µg/m³;1.1513915;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2F202;46.8419999995,14.529;NO2;EEA Austria;µg/m³;17.38500022;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60198;47.0472219995,16.078888;NO2;EEA Austria;µg/m³;13.42834949;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2WO15;46.8349999995,14.8436111111;O3;EEA Austria;µg/m³;4.615;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT90FLO;48.2610859995,16.396954;PM2.5;EEA Austria;µg/m³;25.11050033;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT90AKC;48.2195169995,16.345552;PM10;EEA Austria;µg/m³;44.92199707;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S407;48.0008333328,13.6675;PM10;EEA Austria;µg/m³;18.20349884;2021-11-25T10:00:00+01:00;Austria
+AT;Gemeinde Wien, MA22 Umweltschutz;Rinnb�ckstra�e - A23;48.1841441661,16.4065972222;CO;EEA Austria;µg/m³;0.0;2017-03-29T18:00:00+02:00;Austria
+AT;Austria;Bad Vöslau - Gainfarn;47.9599829273,16.2069551984;O3;EEA Austria;µg/m³;51.0;2016-12-12T09:00:00+01:00;Austria
+AT;Austria;Graz Mitte Gries;47.0691596333,15.4317091082;CO;EEA Austria;µg/m³;794.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Stadlau;48.2280593769,16.4605496031;NO2;EEA Austria;µg/m³;24.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Graz Don Bosco;47.0555746975,15.4177852213;PM10;EEA Austria;µg/m³;41.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Vorhegg bei Kötschach-Mauthen;46.6797075496,12.9719421973;SO2;EEA Austria;µg/m³;0.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Graz Ost Petersgasse;47.0594302338,15.4661145836;PM10;EEA Austria;µg/m³;51.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Eisenstadt Laschoberstraße;47.840013907,16.5266656081;NO2;EEA Austria;µg/m³;20.0;2016-12-12T09:00:00+01:00;Austria
+AT;Oberösterreich;AT4S404;48.2252777995,14.23888889;PM2.5;EEA Austria;µg/m³;21.31150054;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S217;48.2094444439,14.4369444444;PM2.5;EEA Austria;µg/m³;21.25049972;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60178;47.2157029995,15.628392;O3;EEA Austria;µg/m³;10.308;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31301;48.5786110995,16.5805556;PM10;EEA Austria;µg/m³;25.5;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT56072;47.3266399995,12.795124;O3;EEA Austria;µg/m³;17.161;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60170;47.0416679995,15.433056;NO2;EEA Austria;µg/m³;35.93342971;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60170;47.0416679995,15.433056;O3;EEA Austria;µg/m³;6.131;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60119;47.2103699995,14.8252777778;NO2;EEA Austria;µg/m³;30.20467758;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60145;47.4458333328,15.29032;PM10;EEA Austria;µg/m³;37.42861175;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2WO15;46.8349999995,14.8436111111;NO2;EEA Austria;µg/m³;25.0;2021-11-25T10:00:00+01:00;Austria
+AT;Vorarlberg;AT80709;47.4596877772,9.64055333333;NO2;EEA Austria;µg/m³;26.90699768;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT52000;47.6830555995,13.1;CO;EEA Austria;µg/m³;430.68;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31703;48.3533333295,15.74694444;SO2;EEA Austria;µg/m³;3.0;2017-07-20T21:00:00+02:00;Austria
+AT;Niederösterreich;AT31904;48.2763888884,15.935;NO2;EEA Austria;µg/m³;8.03161811;2020-12-04T10:00:00+01:00;Austria
+AT;Austria;Heiterwang;47.447768382,10.7442101242;O3;EEA Austria;µg/m³;10.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Krems;48.4094197901,15.6202654864;SO2;EEA Austria;µg/m³;1.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Taborstrasse;48.2180646489,16.3819470158;NO2;EEA Austria;µg/m³;20.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wörgl;47.4891833281,12.0675183692;PM10;EEA Austria;µg/m³;22.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Floridsdorf Gerichtsgasse;48.26084274,16.396948881;NO2;EEA Austria;µg/m³;21.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Hartberg Zentrum;47.2827572544,15.9719559201;SO2;EEA Austria;µg/m³;2.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Feldkirch Bärenkreuzung;47.2388622693,9.59670218025;PM10;EEA Austria;µg/m³;41.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;St. Pölten - Eybnerstraße;48.2114203668,15.6316740905;NO2;EEA Austria;µg/m³;18.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Streithofen im Tullnerfeld;48.2766884716,15.9361131403;SO2;EEA Austria;µg/m³;0.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Imst Inntalautobahn A12;47.2169621447,10.7355862975;NO2;EEA Austria;µg/m³;89.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Judendorf Süd;47.1194304748,15.3552624776;NO2;EEA Austria;µg/m³;83.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Voitsberg Mühlgasse;47.0449858386,15.1499974351;NO2;EEA Austria;µg/m³;53.0;2016-12-12T10:00:00+01:00;Austria
+AT;Tirol;AT72227;47.2780699995,11.512497;NO2;EEA Austria;µg/m³;59.41899871;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31502;47.6699999995,15.8547222;NO2;EEA Austria;µg/m³;7.6491599;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2KA71;46.6266166661,14.2991444444;PM10;EEA Austria;µg/m³;21.24499893;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32701;48.1449999995,16.4744444444;PM10;EEA Austria;µg/m³;25.5;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72110;47.2626193995,11.3923611;PM10;EEA Austria;µg/m³;42.85700225;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2SP18;46.8013888884,13.4938888889;O3;EEA Austria;µg/m³;7.99;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60107;47.0447222217,15.1527777778;PM2.5;EEA Austria;µg/m³;18.45733642;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9STAD;48.2263608328,16.458345;SO2;EEA Austria;µg/m³;2.40793371;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2F202;46.8419999995,14.529;O3;EEA Austria;µg/m³;134.48;2017-07-20T21:00:00+02:00;Austria
+AT;Steiermark;AT60135;47.113055555,15.3391666667;NO2;EEA Austria;µg/m³;26.98596382;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9GAUD;48.1871469439,16.3393311111;PM10;EEA Austria;µg/m³;31.20450019;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT51066;47.8055555995,13.043333;PM10;EEA Austria;µg/m³;21.98999977;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31901;48.3294449995,16.0625;NO2;EEA Austria;µg/m³;24.19046783;2021-11-25T10:00:00+01:00;Austria
+AT;Burgenland;AT0ILL1;47.7702799995,16.76639;PM10;EEA Austria;µg/m³;27.29499816;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2SP10;46.9349999995,13.195833;O3;EEA Austria;µg/m³;20.145;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT900KE;48.1567079995,16.476051;SO2;EEA Austria;µg/m³;10.18554496;2021-11-25T10:00:00+01:00;Austria
+AT;Vorarlberg;AT82801;47.1288639995,10.034324;NO2;EEA Austria;µg/m³;49.41500091;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30801;48.7244443995,15.5002778;O3;EEA Austria;µg/m³;37.714;2021-11-25T09:00:00+01:00;Austria
+AT;Amt der Steierm�rkischen Landesregierung;Liezen Alte Gasse 8;47.5672222217,14.2436111111;PM10;EEA Austria;µg/m³;0.0;2017-07-20T21:00:00+02:00;Austria
+AT;Austria;Pöchlarn;48.2130366229,15.2072201187;O3;EEA Austria;µg/m³;54.0;2016-12-11T19:00:00+01:00;Austria
+AT;Austria;Wolfsberg Hauptschule;46.8352867658,14.8442109124;PM10;EEA Austria;µg/m³;39.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Taborstrasse;48.2180646489,16.3819470158;PM10;EEA Austria;µg/m³;11.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Gänserndorf;48.3347076441,16.7305831776;NO2;EEA Austria;µg/m³;15.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wörgl;47.4891833281,12.0675183692;O3;EEA Austria;µg/m³;1.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Köflach;47.0616944664,15.0792101908;PM10;EEA Austria;µg/m³;54.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Köflach;47.0616944664,15.0792101908;SO2;EEA Austria;µg/m³;2.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Floridsdorf Gerichtsgasse;48.26084274,16.396948881;PM10;EEA Austria;µg/m³;8.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Bludenz Herrengasse;47.1560945598,9.82720988215;O3;EEA Austria;µg/m³;5.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Linz Römerberg;48.3030472699,14.2830333544;NO2;EEA Austria;µg/m³;37.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;St. Pölten - Europaplatz;48.2099836519,15.6111026705;PM10;EEA Austria;µg/m³;9.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Judenburg;47.1794241894,14.6774835957;O3;EEA Austria;µg/m³;53.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Fürstenfeld;47.0469446299,16.0789452705;O3;EEA Austria;µg/m³;18.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Hainburg;48.1439111305,16.9610908795;NO2;EEA Austria;µg/m³;17.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Eisenstadt Laschoberstraße;47.840013907,16.5266656081;O3;EEA Austria;µg/m³;44.0;2016-12-12T09:00:00+01:00;Austria
+AT;Steiermark;AT0KLH1;46.7527527862,15.9566845603;PM10;EEA Austria;µg/m³;22.17499923;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S415;48.3233329995,14.2977778;PM10;EEA Austria;µg/m³;33.46350097;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32501;48.4086099995,15.619166;NO2;EEA Austria;µg/m³;27.34574699;2021-11-25T10:00:00+01:00;Austria
+AT;Vorarlberg;AT82708;47.1564829995,9.822944;O3;EEA Austria;µg/m³;2.093;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9STEF;48.2081499995,16.3732536111;O3;EEA Austria;µg/m³;41.969;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30601;48.3022229995,16.320833;NO2;EEA Austria;µg/m³;13.86410236;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30302;48.0502779995,16.675278;SO2;EEA Austria;µg/m³;3.6999998;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30401;48.3347199995,16.729445;O3;EEA Austria;µg/m³;29.034;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30401;48.3347199995,16.729445;SO2;EEA Austria;µg/m³;5.85000038;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60145;47.4458333328,15.29032;NO2;EEA Austria;µg/m³;34.87999725;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72710;47.4475971995,10.7441167;O3;EEA Austria;µg/m³;12.112;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60179;47.2828599995,15.971852;O3;EEA Austria;µg/m³;9.286;2021-11-25T10:00:00+01:00;Austria
+AT;Burgenland;AT10002;47.3394099995,16.20808;NO2;EEA Austria;µg/m³;14.18830013;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60143;47.3824999995,15.0891666667;PM10;EEA Austria;µg/m³;36.76680755;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S125;47.7161111106,13.6322222222;PM2.5;EEA Austria;µg/m³;6.71049976;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S407;48.0008333328,13.6675;NO2;EEA Austria;µg/m³;14.92500019;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60136;47.1202777772,15.3511111111;PM10;EEA Austria;µg/m³;32.13611221;2021-11-25T10:00:00+01:00;Austria
+AT;Amt der Salzburger Landesregierung;Zederhaus A10;47.1540699995,13.50508;O3;EEA Austria;µg/m³;84.606;2017-07-20T21:00:00+02:00;Austria
+AT;Austria;St. Georgen im Lavanttal - Herzogberg;46.7080504923,14.891911454;O3;EEA Austria;µg/m³;11.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Vösendorf;48.1250261927,16.3316413599;NO2;EEA Austria;µg/m³;19.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Stockerau West;48.3883062254,16.2145010468;PM10;EEA Austria;µg/m³;11.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Knittelfeld Parkstraße;47.2102499891,14.8244479762;SO2;EEA Austria;µg/m³;2.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Hietzinger Kai;48.1889072022,16.3019969555;NO2;EEA Austria;µg/m³;28.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Graz Nord;47.0955241068,15.4141919602;PM10;EEA Austria;µg/m³;47.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Oberschützen;47.3041428648,16.1930313115;PM10;EEA Austria;µg/m³;12.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Innsbruck Zentrum Fallmerayerstr.;47.2630699774,11.3930632539;PM10;EEA Austria;µg/m³;43.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Bockberg;46.8730674222,15.4950403358;SO2;EEA Austria;µg/m³;2.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Stixneusiedl;48.0508581903,16.6766842605;SO2;EEA Austria;µg/m³;2.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Straßengel Kirche;47.1125225764,15.3399911177;NO2;EEA Austria;µg/m³;16.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Amstetten;48.1202888808,14.879155377;NO2;EEA Austria;µg/m³;16.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Klagenfurt Völkermarkterstrasse;46.6200155505,14.3169896722;NO2;EEA Austria;µg/m³;55.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Tamsweg - Untere Postgasse;47.1258485147,13.8069262539;PM10;EEA Austria;µg/m³;2.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Illmitz;47.7700243274,16.7664259574;NO2;EEA Austria;µg/m³;7.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Salzburg Mirabellplatz;47.8061169392,13.0461430397;NO2;EEA Austria;µg/m³;31.0;2016-12-12T10:00:00+01:00;Austria
+AT;Oberösterreich;AT0ZOE2;47.8386110995,14.441388889;O3;EEA Austria;µg/m³;45.336;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S406;48.1649999995,14.035556;CO;EEA Austria;µg/m³;269.93501;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60194;47.6047222217,15.6730555556;O3;EEA Austria;µg/m³;1.377;2021-11-25T07:00:00+01:00;Austria
+AT;Steiermark;AT60177;47.5654389995,14.244676;PM10;EEA Austria;µg/m³;41.6532936;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31413;48.0838888884,16.3302777778;NO2;EEA Austria;µg/m³;17.68868255;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT51000;47.7974999995,13.0536111111;PM10;EEA Austria;µg/m³;25.65999984;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT51000;47.7974999995,13.0536111111;CO;EEA Austria;µg/m³;378.30001;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31301;48.5786110995,16.5805556;SO2;EEA Austria;µg/m³;6.5;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S431;48.3027777772,14.2827777778;PM2.5;EEA Austria;µg/m³;21.19200134;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60189;47.3602777772,13.6394444444;O3;EEA Austria;µg/m³;88.375;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30301;48.1436119995,16.959444;NO2;EEA Austria;µg/m³;9.56145;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT90LOB;48.1620694439,16.5256138889;NO2;EEA Austria;µg/m³;7.20110845;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30104;48.1783333328,14.5486111111;O3;EEA Austria;µg/m³;11.274;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2SP10;46.9349999995,13.195833;NO2;EEA Austria;µg/m³;24.97000122;2021-11-25T09:00:00+01:00;Austria
+AT;Steiermark;AT60138;47.0943611106,15.4151111111;SO2;EEA Austria;µg/m³;0.202596;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT900ZA;48.2489929995,16.357079;O3;EEA Austria;µg/m³;41.029;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72705;47.4698369995,10.682283;O3;EEA Austria;µg/m³;23.811;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT900KE;48.1567079995,16.476051;PM2.5;EEA Austria;µg/m³;22.01799964;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72113;47.2699027995,11.3746611;O3;EEA Austria;µg/m³;15.423;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72910;46.8277319995,12.765622;PM10;EEA Austria;µg/m³;58.44999694;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32604;48.0451111106,14.7722777778;NO2;EEA Austria;µg/m³;11.09128189;2021-11-25T09:00:00+01:00;Austria
+AT;Niederösterreich;AT30407;48.2366666661,16.6369444444;SO2;EEA Austria;µg/m³;5.55000019;2021-11-25T08:00:00+01:00;Austria
+AT;Amt der K�rntner Landesregierung;Klagenfurt A2 Nordumfahrung 2;46.6530555551,14.2661111111;NO2;EEA Austria;µg/m³;0.0;2017-06-30T14:00:00+02:00;Austria
+AT;Amt der K�rntner Landesregierung;Klagenfurt A2 Nordumfahrung;46.6527679756,14.2689298045;NO2;EEA Austria;µg/m³;0.0;2017-02-24T11:00:00+01:00;Austria
+AT;Austria;Wien Hohe Warte - Zentralanstalt für Meteorologie und Geodyn;48.2491795354,16.3577823346;NO2;EEA Austria;µg/m³;12.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Stephansplatz;48.2089060893,16.3738621782;NO2;EEA Austria;µg/m³;19.0;2016-12-12T09:00:00+01:00;Austria
+AT;Austria;Sonnblick;47.0544730645,12.9583776365;CO;EEA Austria;µg/m³;155.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Schafberg;48.2358383532,16.3030749338;SO2;EEA Austria;µg/m³;4.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Graz Nord;47.0955241068,15.4141919602;SO2;EEA Austria;µg/m³;3.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Kapfenberg;47.445581349,15.2903142825;PM10;EEA Austria;µg/m³;7.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Graz Süd Tiergartenweg;47.0419250831,15.4341345595;PM10;EEA Austria;µg/m³;58.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Streithofen im Tullnerfeld;48.2766884716,15.9361131403;PM10;EEA Austria;µg/m³;8.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Zederhaus A10;47.1541397801,13.5050024869;PM10;EEA Austria;µg/m³;9.0;2016-12-12T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30202;48.1061110995,15.919444444;O3;EEA Austria;µg/m³;49.586;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31502;47.6699999995,15.8547222;O3;EEA Austria;µg/m³;49.986;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S173;48.2788888884,14.3658333333;NO2;EEA Austria;µg/m³;12.69499969;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT0ENK1;48.3917199995,13.67114;O3;EEA Austria;µg/m³;24.993;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32701;48.1449999995,16.4744444444;SO2;EEA Austria;µg/m³;4.65000009;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT0PIL1;48.7211111095,15.94222222;NO2;EEA Austria;µg/m³;12.9653263;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT0PIL1;48.7211111095,15.94222222;PM10;EEA Austria;µg/m³;25.21500015;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60164;47.0556109995,15.416603;PM10;EEA Austria;µg/m³;48.28813552;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9BELG;48.174353055,16.3614172222;PM10;EEA Austria;µg/m³;30.85049819;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT90LOB;48.1620694439,16.5256138889;PM2.5;EEA Austria;µg/m³;25.18350028;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72530;47.4885582995,12.066633;NO2;EEA Austria;µg/m³;30.52550125;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60138;47.0943611106,15.4151111111;NO2;EEA Austria;µg/m³;35.23033142;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72912;46.8191110995,12.766025;O3;EEA Austria;µg/m³;7.28;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60136;47.1202777772,15.3511111111;SO2;EEA Austria;µg/m³;1.24200046;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31102;47.8619444395,15.32194444;O3;EEA Austria;µg/m³;67.745;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S409;48.0494444439,14.4427777778;NO2;EEA Austria;µg/m³;14.625;2021-11-25T08:00:00+01:00;Austria
+AT;Amt der K�rntner Landesregierung;St. Veit a. d. Glan Hauptbahnhof;46.7711109995,14.3658333333;PM10;EEA Austria;µg/m³;0.0;2017-05-11T21:00:00+02:00;Austria
+AT;Austria;Purkersdorf;48.2072298357,16.175603995;O3;EEA Austria;µg/m³;45.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Leoben Donawitz;47.3760957723,15.0775033917;NO2;EEA Austria;µg/m³;23.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;St. Johann im Pongau;47.3488966847,13.2058634973;O3;EEA Austria;µg/m³;4.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Innsbruck Reichenau;47.2716650145,11.4177669242;NO2;EEA Austria;µg/m³;80.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Oberschützen;47.3041428648,16.1930313115;NO2;EEA Austria;µg/m³;26.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Masenberg;47.3480445852,15.8819447286;NO2;EEA Austria;µg/m³;2.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Graz Don Bosco;47.0555746975,15.4177852213;CO;EEA Austria;µg/m³;709.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Braunau Zentrum;48.25833089,13.0400344958;PM10;EEA Austria;µg/m³;14.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Zederhaus A10;47.1541397801,13.5050024869;O3;EEA Austria;µg/m³;64.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Salzburg Mirabellplatz;47.8061169392,13.0461430397;CO;EEA Austria;µg/m³;210.0;2016-12-12T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S406;48.1649999995,14.035556;SO2;EEA Austria;µg/m³;1.06999993;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60180;47.4094429995,15.253333;NO2;EEA Austria;µg/m³;27.05497741;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT0ENK1;48.3917199995,13.67114;NO2;EEA Austria;µg/m³;14.73419475;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32701;48.1449999995,16.4744444444;PM2.5;EEA Austria;µg/m³;22.5;2021-11-25T08:00:00+01:00;Austria
+AT;Niederösterreich;AT31301;48.5786110995,16.5805556;O3;EEA Austria;µg/m³;38.512;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60114;47.1924999995,14.753333;NO2;EEA Austria;µg/m³;32.20061111;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60172;47.0692399995,15.431945;PM10;EEA Austria;µg/m³;38.4175682;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32302;48.2012999995,15.6204;NO2;EEA Austria;µg/m³;29.54487991;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2KA21;46.6255599995,14.31806;PM2.5;EEA Austria;µg/m³;20.39500045;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT90TAB;48.2167394439,16.3809180556;CO;EEA Austria;µg/m³;301.28449;2021-11-25T09:00:00+01:00;Austria
+AT;Salzburg;AT54057;47.3513869995,13.205556;O3;EEA Austria;µg/m³;6.685;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32501;48.4086099995,15.619166;PM10;EEA Austria;µg/m³;36.0;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72538;47.4587169995,11.90995;NO2;EEA Austria;µg/m³;27.04249954;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32301;48.2124999995,15.634167;NO2;EEA Austria;µg/m³;24.66854095;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2KA61;46.6524999995,14.2661111111;NO2;EEA Austria;µg/m³;25.75499916;2021-11-25T10:00:00+01:00;Austria
+AT;Vorarlberg;AT80706;47.4101639995,9.653713;NO2;EEA Austria;µg/m³;0.0;2017-07-20T21:00:00+02:00;Austria
+AT;Salzburg;AT53055;47.9366669995,13.0158333;O3;EEA Austria;µg/m³;23.546;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60141;47.3588888884,15.1036111111;NO2;EEA Austria;µg/m³;31.98110389;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60118;47.1783333328,14.6766666667;O3;EEA Austria;µg/m³;10.68;2021-11-25T10:00:00+01:00;Austria
+AT;Amt der Ober�sterreichischen Landesregierung;Lenzing Winterstrasse;47.9719443995,13.60083333;PM10;EEA Austria;µg/m³;0.0;2017-03-29T18:00:00+02:00;Austria
+AT;Austria;Obervellach Schulzentrum;46.9355467514,13.1955328715;PM10;EEA Austria;µg/m³;2.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Hohe Warte - Zentralanstalt für Meteorologie und Geodyn;48.2491795354,16.3577823346;O3;EEA Austria;µg/m³;53.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Purkersdorf;48.2072298357,16.175603995;NO2;EEA Austria;µg/m³;15.0;2016-12-12T09:00:00+01:00;Austria
+AT;Austria;Wien Schafberg;48.2358383532,16.3030749338;PM10;EEA Austria;µg/m³;9.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Laaer Berg;48.1614109647,16.3928166307;PM10;EEA Austria;µg/m³;8.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Stockerau West;48.3883062254,16.2145010468;NO2;EEA Austria;µg/m³;25.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Gänserndorf;48.3347076441,16.7305831776;SO2;EEA Austria;µg/m³;3.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Kapfenberg;47.445581349,15.2903142825;NO2;EEA Austria;µg/m³;32.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Dunkelsteinerwald;48.3711226232,15.5466934646;O3;EEA Austria;µg/m³;42.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Brixlegg Innweg;47.430816498,11.8727636156;SO2;EEA Austria;µg/m³;2.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Straßengel Kirche;47.1125225764,15.3399911177;SO2;EEA Austria;µg/m³;3.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;St. Pölten - Eybnerstraße;48.2114203668,15.6316740905;PM10;EEA Austria;µg/m³;11.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Braunau Zentrum;48.25833089,13.0400344958;NO2;EEA Austria;µg/m³;24.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Kematen;48.0449729792,14.7722558582;PM10;EEA Austria;µg/m³;9.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Graz Lustbühel;47.0669569059,15.4936030313;PM10;EEA Austria;µg/m³;4.0;2016-12-12T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32401;47.8141666695,16.255;PM10;EEA Austria;µg/m³;23.0;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S416;48.2744444435,14.3147222;NO2;EEA Austria;µg/m³;22.60499954;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT90A23;48.2030599995,16.43455;NO2;EEA Austria;µg/m³;21.4759674;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31401;48.0861110995,16.3022222;NO2;EEA Austria;µg/m³;16.35007858;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60197;46.7783333328,15.5405555556;NO2;EEA Austria;µg/m³;17.09434509;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S184;48.3061194439,14.2975027778;PM2.5;EEA Austria;µg/m³;21.331501;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32101;47.6083333295,16.29305556;O3;EEA Austria;µg/m³;49.886;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60170;47.0416679995,15.433056;SO2;EEA Austria;µg/m³;0.201376;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2WO35;46.7083329995,14.891667;PM10;EEA Austria;µg/m³;20.94499969;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60119;47.2103699995,14.8252777778;PM10;EEA Austria;µg/m³;47.68820953;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60185;46.7674999995,15.956111;PM10;EEA Austria;µg/m³;18.789999;2017-07-20T21:00:00+02:00;Austria
+AT;Oberösterreich;AT4S156;48.2577777772,13.0397222222;PM2.5;EEA Austria;µg/m³;22.22750091;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT0SON1;47.0541666995,12.957777778;O3;EEA Austria;µg/m³;93.596;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72710;47.4475971995,10.7441167;PM10;EEA Austria;µg/m³;22.22800064;2021-11-25T10:00:00+01:00;Austria
+AT;Burgenland;AT0ILL1;47.7702799995,16.76639;CO;EEA Austria;µg/m³;283.43403;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60150;47.405555555,15.3608333333;O3;EEA Austria;µg/m³;86.227;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60018;47.0758333328,15.4375;O3;EEA Austria;µg/m³;0.0;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT900KE;48.1567079995,16.476051;PM10;EEA Austria;µg/m³;26.51049995;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72910;46.8277319995,12.765622;CO;EEA Austria;µg/m³;753.90702;2021-11-25T10:00:00+01:00;Austria
+AT;Amt der K�rntner Landesregierung;St. Andr� i. L. Volksschule;46.7638889995,14.8222222;PM10;EEA Austria;µg/m³;23.75;2017-07-20T21:00:00+02:00;Austria
+AT;Austria;Obervellach Schulzentrum;46.9355467514,13.1955328715;NO2;EEA Austria;µg/m³;7.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Leoben Donawitz;47.3760957723,15.0775033917;CO;EEA Austria;µg/m³;167.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Salzburg Lehen Martinstraße;47.8180618127,13.0299733646;NO2;EEA Austria;µg/m³;26.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;St. Georgen im Lavanttal - Herzogberg;46.7080504923,14.891911454;SO2;EEA Austria;µg/m³;1.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Vomp an der Leiten;47.3469490085,11.6916632543;NO2;EEA Austria;µg/m³;63.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Linz Römerberg;48.3030472699,14.2830333544;PM10;EEA Austria;µg/m³;18.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Graz Süd Tiergartenweg;47.0419250831,15.4341345595;CO;EEA Austria;µg/m³;817.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Stixneusiedl;48.0508581903,16.6766842605;PM10;EEA Austria;µg/m³;6.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;St. Valentin A1;48.1799830247,14.545610912;NO2;EEA Austria;µg/m³;15.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Braunau Zentrum;48.25833089,13.0400344958;O3;EEA Austria;µg/m³;34.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Braunau Zentrum;48.25833089,13.0400344958;SO2;EEA Austria;µg/m³;0.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Illmitz;47.7700243274,16.7664259574;O3;EEA Austria;µg/m³;55.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Gärberbach - Brennerautobahn;47.2400210767,11.3908174657;NO2;EEA Austria;µg/m³;70.0;2016-12-12T10:00:00+01:00;Austria
+AT;Oberösterreich;AT0ZOE2;47.8386110995,14.441388889;PM10;EEA Austria;µg/m³;1.52999997;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S404;48.2252777995,14.23888889;NO2;EEA Austria;µg/m³;16.01000022;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30103;48.1797222195,14.86666667;SO2;EEA Austria;µg/m³;0.39999997;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT52300;47.6911111106,13.1080555556;NO2;EEA Austria;µg/m³;24.28608322;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31401;48.0861110995,16.3022222;SO2;EEA Austria;µg/m³;2.0;2021-11-25T06:00:00+01:00;Austria
+AT;Oberösterreich;AT4S184;48.3061194439,14.2975027778;NO2;EEA Austria;µg/m³;22.16999816;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60190;46.6519499995,15.36778;SO2;EEA Austria;µg/m³;0.22769048;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2SP18;46.8013888884,13.4938888889;PM10;EEA Austria;µg/m³;16.61499977;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2M226;46.6102777772,14.3983333333;PM10;EEA Austria;µg/m³;26.07500076;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT55032;47.1258333328,13.8083333333;PM10;EEA Austria;µg/m³;33.51000213;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9STAD;48.2263608328,16.458345;PM10;EEA Austria;µg/m³;29.29249954;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT51200;47.8172222217,13.0308333333;SO2;EEA Austria;µg/m³;3.33091735;2021-11-25T10:00:00+01:00;Austria
+AT;Burgenland;AT0ILL1;47.7702799995,16.76639;NO2;EEA Austria;µg/m³;10.73750877;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT90FLO;48.2610859995,16.396954;PM10;EEA Austria;µg/m³;30.53150177;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S407;48.0008333328,13.6675;PM2.5;EEA Austria;µg/m³;17.33399963;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S409;48.0494444439,14.4427777778;PM10;EEA Austria;µg/m³;21.08250045;2021-11-25T08:00:00+01:00;Austria
+AT;Amt der Steierm�rkischen Landesregierung;Peggau;47.2063888884,15.3458333333;NO2;EEA Austria;µg/m³;7.33251619;2017-07-20T21:00:00+02:00;Austria
+AT;Austria;Leoben Göß;47.3594250643,15.0988832955;NO2;EEA Austria;µg/m³;54.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Taborstrasse;48.2180646489,16.3819470158;CO;EEA Austria;µg/m³;233.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Knittelfeld Parkstraße;47.2102499891,14.8244479762;PM10;EEA Austria;µg/m³;15.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Hallein Winterstall;47.6669200154,13.1058810061;O3;EEA Austria;µg/m³;40.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Höfen Lärchbichl;47.4699980554,10.6822263696;O3;EEA Austria;µg/m³;32.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Villach Tirolerbrücke;46.61113012,13.8411520662;NO2;EEA Austria;µg/m³;59.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Klosterneuburg Wisentgasse;48.3013740999,16.3046919014;NO2;EEA Austria;µg/m³;9.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Masenberg;47.3480445852,15.8819447286;SO2;EEA Austria;µg/m³;0.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Innsbruck Zentrum Fallmerayerstr.;47.2630699774,11.3930632539;NO2;EEA Austria;µg/m³;83.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Vorhegg bei Kötschach-Mauthen;46.6797075496,12.9719421973;O3;EEA Austria;µg/m³;80.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Vorhegg bei Kötschach-Mauthen;46.6797075496,12.9719421973;CO;EEA Austria;µg/m³;152.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Feldkirch Bärenkreuzung;47.2388622693,9.59670218025;NO2;EEA Austria;µg/m³;77.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;St. Pölten - Europaplatz;48.2099836519,15.6111026705;NO2;EEA Austria;µg/m³;32.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Klein St. Paul - Pemberg;46.8419233416,14.5289022477;NO2;EEA Austria;µg/m³;4.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Arnoldstein Gailitz Waldsiedlungsstraße;46.558898771,13.7049674691;O3;EEA Austria;µg/m³;12.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Eisenstadt Laschoberstraße;47.840013907,16.5266656081;SO2;EEA Austria;µg/m³;4.0;2016-12-12T09:00:00+01:00;Austria
+AT;Oberösterreich;AT4S108;48.5311111095,14.5747222222;PM10;EEA Austria;µg/m³;6.96199989;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30103;48.1797222195,14.86666667;O3;EEA Austria;µg/m³;36.816;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT90A23;48.2030599995,16.43455;PM10;EEA Austria;µg/m³;31.7765007;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2KA71;46.6266166661,14.2991444444;O3;EEA Austria;µg/m³;4.46;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT56072;47.3266399995,12.795124;NO2;EEA Austria;µg/m³;28.68434906;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60114;47.1924999995,14.753333;PM10;EEA Austria;µg/m³;32.80039978;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2KA21;46.6255599995,14.31806;CO;EEA Austria;µg/m³;376.68499;2021-11-25T10:00:00+01:00;Austria
+AT;Burgenland;AT10001;47.8399999995,16.52806;PM2.5;EEA Austria;µg/m³;20.20555114;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30101;48.1202777795,14.878333;PM10;EEA Austria;µg/m³;29.5;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30301;48.1436119995,16.959444;SO2;EEA Austria;µg/m³;7.4499998;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30301;48.1436119995,16.959444;PM10;EEA Austria;µg/m³;27.0;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60151;46.8713888884,15.4958333333;SO2;EEA Austria;µg/m³;8.16933059;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30104;48.1783333328,14.5486111111;PM10;EEA Austria;µg/m³;26.5;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60119;47.2103699995,14.8252777778;SO2;EEA Austria;µg/m³;1.19570147;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT0SON1;47.0541666995,12.957777778;CO;EEA Austria;µg/m³;141.42599;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60198;47.0472219995,16.078888;O3;EEA Austria;µg/m³;16.12;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60171;47.0594439995,15.466666;NO2;EEA Austria;µg/m³;37.41499328;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S125;47.7161111106,13.6322222222;NO2;EEA Austria;µg/m³;20.24000167;2021-11-25T09:00:00+01:00;Austria
+AT;Tirol;AT72912;46.8191110995,12.766025;NO2;EEA Austria;µg/m³;28.38700103;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30407;48.2366666661,16.6369444444;NO2;EEA Austria;µg/m³;5.73686981;2021-11-25T08:00:00+01:00;Austria
+AT;Amt der Ober�sterreichischen Landesregierung;Lenzing Winterstrasse;47.9719443995,13.60083333;NO2;EEA Austria;µg/m³;6.26000022;2017-07-20T21:00:00+02:00;Austria
+AT;Amt der Steierm�rkischen Landesregierung;Liezen Alte Gasse 8;47.5672222217,14.2436111111;NO2;EEA Austria;µg/m³;0.0;2017-07-20T21:00:00+02:00;Austria
+AT;Austria;Ebenthal Zell;46.6083531239,14.3986465315;PM10;EEA Austria;µg/m³;56.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Vomp an der Leiten;47.3469490085,11.6916632543;PM10;EEA Austria;µg/m³;46.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Stadlau;48.2280593769,16.4605496031;SO2;EEA Austria;µg/m³;5.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Schafberg;48.2358383532,16.3030749338;NO2;EEA Austria;µg/m³;9.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Masenberg;47.3480445852,15.8819447286;PM10;EEA Austria;µg/m³;5.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Innsbruck Zentrum Fallmerayerstr.;47.2630699774,11.3930632539;CO;EEA Austria;µg/m³;1037.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Bockberg;46.8730674222,15.4950403358;O3;EEA Austria;µg/m³;70.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Haunsberg;47.9727944888,13.0158698147;O3;EEA Austria;µg/m³;51.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Zwentendorf;48.3283174157,15.9091636818;SO2;EEA Austria;µg/m³;2.0;2016-12-12T10:00:00+01:00;Austria
+AT;Steiermark;AT60194;47.6047222217,15.6730555556;NO2;EEA Austria;µg/m³;31.03306388;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60177;47.5654389995,14.244676;O3;EEA Austria;µg/m³;14.185;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60177;47.5654389995,14.244676;NO2;EEA Austria;µg/m³;25.08161163;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32702;48.1508039008,16.5116637428;PM10;EEA Austria;µg/m³;31.0;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30599;48.3082222195,16.3279444;PM10;EEA Austria;µg/m³;29.0;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31406;48.0833333328,16.3372222222;NO2;EEA Austria;µg/m³;8.41407585;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30701;48.5288888884,15.9427777778;O3;EEA Austria;µg/m³;13.768;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72110;47.2626193995,11.3923611;SO2;EEA Austria;µg/m³;3.38700008;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT0VOR1;46.6786111106,12.9744444444;PM10;EEA Austria;µg/m³;-2.615;2021-11-25T10:00:00+01:00;Austria
+AT;Burgenland;AT10001;47.8399999995,16.52806;NO2;EEA Austria;µg/m³;7.69040012;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60170;47.0416679995,15.433056;PM10;EEA Austria;µg/m³;46.98701477;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72821;47.3487739995,11.692028;PM10;EEA Austria;µg/m³;26.87250137;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2KA41;46.6293599995,14.28931;O3;EEA Austria;µg/m³;5.05;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30401;48.3347199995,16.729445;NO2;EEA Austria;µg/m³;12.04742622;2021-11-25T10:00:00+01:00;Austria
+AT;Vorarlberg;AT80706;47.4101639995,9.653713;O3;EEA Austria;µg/m³;8.765;2021-11-25T10:00:00+01:00;Austria
+AT;Burgenland;AT0ILL1;47.7702799995,16.76639;PM2.5;EEA Austria;µg/m³;23.71999931;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2SP10;46.9349999995,13.195833;PM10;EEA Austria;µg/m³;15.28999996;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S125;47.7161111106,13.6322222222;PM10;EEA Austria;µg/m³;13.0284996;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30201;47.9591669995,16.205833;O3;EEA Austria;µg/m³;44.698;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72113;47.2699027995,11.3746611;NO2;EEA Austria;µg/m³;39.34300231;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT52000;47.6830555995,13.1;NO2;EEA Austria;µg/m³;33.27384185;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S409;48.0494444439,14.4427777778;PM2.5;EEA Austria;µg/m³;19.97850036;2021-11-25T08:00:00+01:00;Austria
+AT;Amt der Ober�sterreichischen Landesregierung;Lenzing Winterstrasse;47.9719443995,13.60083333;O3;EEA Austria;µg/m³;89.485;2017-07-20T21:00:00+02:00;Austria
+AT;Amt der Steierm�rkischen Landesregierung;Peggau;47.2063888884,15.3458333333;PM10;EEA Austria;µg/m³;11.61318397;2017-07-20T21:00:00+02:00;Austria
+AT;Amt der Steierm�rkischen Landesregierung;Weiz Birkfelder Stra�e;47.2172239995,15.628333;PM10;EEA Austria;µg/m³;0.0;2017-07-20T21:00:00+02:00;Austria
+AT;Austria;Graz West;47.0697103009,15.404130829;NO2;EEA Austria;µg/m³;63.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wolkersdorf;48.3922433173,16.5222638632;NO2;EEA Austria;µg/m³;14.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Hohe Warte - Zentralanstalt für Meteorologie und Geodyn;48.2491795354,16.3577823346;SO2;EEA Austria;µg/m³;3.0;2016-12-12T09:00:00+01:00;Austria
+AT;Austria;Vomp A12 Inntalautobahn;47.3491401391,11.6931005588;PM10;EEA Austria;µg/m³;54.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Kendlerstraße;48.2055535272,16.3105309507;PM10;EEA Austria;µg/m³;10.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Hietzinger Kai;48.1889072022,16.3019969555;CO;EEA Austria;µg/m³;221.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Innsbruck Reichenau;47.2716650145,11.4177669242;O3;EEA Austria;µg/m³;1.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Innsbruck Sadrach;47.2711164368,11.3666527845;O3;EEA Austria;µg/m³;3.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Masenberg;47.3480445852,15.8819447286;O3;EEA Austria;µg/m³;66.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Innsbruck Nordkette;47.30609212,11.3780613887;O3;EEA Austria;µg/m³;78.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Dunkelsteinerwald;48.3711226232,15.5466934646;SO2;EEA Austria;µg/m³;4.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Bad Ischl;47.7166845556,13.6328327518;NO2;EEA Austria;µg/m³;39.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Salzburg Mirabellplatz;47.8061169392,13.0461430397;O3;EEA Austria;µg/m³;42.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Zwentendorf;48.3283174157,15.9091636818;NO2;EEA Austria;µg/m³;12.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Hainburg;48.1439111305,16.9610908795;O3;EEA Austria;µg/m³;39.0;2016-12-12T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30502;48.8786110995,15.04666667;NO2;EEA Austria;µg/m³;5.64125537;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32302;48.2012999995,15.6204;CO;EEA Austria;µg/m³;395.75999;2021-11-25T10:00:00+01:00;Austria
+AT;Vorarlberg;AT80807;47.4100322217,9.74344083333;NO2;EEA Austria;µg/m³;25.79199981;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30101;48.1202777795,14.878333;PM2.5;EEA Austria;µg/m³;24.5;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT90LOB;48.1620694439,16.5256138889;PM10;EEA Austria;µg/m³;30.01000022;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30302;48.0502779995,16.675278;O3;EEA Austria;µg/m³;37.913;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT51066;47.8055555995,13.043333;NO2;EEA Austria;µg/m³;30.40540885;2021-11-25T10:00:00+01:00;Austria
+AT;Vorarlberg;AT80710;47.4324908328,9.65048222222;NO2;EEA Austria;µg/m³;39.24599838;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72530;47.4885582995,12.066633;PM10;EEA Austria;µg/m³;42.29199981;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60139;47.0694429995,15.404388;PM10;EEA Austria;µg/m³;42.26108932;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72106;47.2712899995,11.4169445;PM10;EEA Austria;µg/m³;43.84199905;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT52000;47.6830555995,13.1;SO2;EEA Austria;µg/m³;4.13033723;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31902;48.3311111106,15.9036111111;SO2;EEA Austria;µg/m³;2.0;2017-07-20T21:00:00+02:00;Austria
+AT;Wien;AT90LAA;48.1610363884,16.3929202778;PM10;EEA Austria;µg/m³;25.60300064;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S409;48.0494444439,14.4427777778;SO2;EEA Austria;µg/m³;1.63000011;2021-11-25T08:00:00+01:00;Austria
+AT;Niederösterreich;AT31904;48.2763888884,15.935;O3;EEA Austria;µg/m³;35.02;2020-12-04T07:00:00+01:00;Austria
+AT;Austria;Leoben Donawitz;47.3760957723,15.0775033917;PM10;EEA Austria;µg/m³;3.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Oberschützen;47.3041428648,16.1930313115;O3;EEA Austria;µg/m³;19.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Hartberg Zentrum;47.2827572544,15.9719559201;NO2;EEA Austria;µg/m³;46.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Hartberg Zentrum;47.2827572544,15.9719559201;PM10;EEA Austria;µg/m³;19.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Vorhegg bei Kötschach-Mauthen;46.6797075496,12.9719421973;NO2;EEA Austria;µg/m³;2.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Graz Schlossberg;47.0772355217,15.4386261359;O3;EEA Austria;µg/m³;18.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Judendorf Süd;47.1194304748,15.3552624776;PM10;EEA Austria;µg/m³;55.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Illmitz;47.7700243274,16.7664259574;CO;EEA Austria;µg/m³;162.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Peggau;47.2058561181,15.346997977;NO2;EEA Austria;µg/m³;6.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Eisenstadt Laschoberstraße;47.840013907,16.5266656081;CO;EEA Austria;µg/m³;237.0;2016-12-12T08:00:00+01:00;Austria
+AT;Austria;Eisenstadt Laschoberstraße;47.840013907,16.5266656081;PM10;EEA Austria;µg/m³;6.0;2016-12-12T09:00:00+01:00;Austria
+AT;Oberösterreich;AT4S404;48.2252777995,14.23888889;PM10;EEA Austria;µg/m³;23.52400016;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31502;47.6699999995,15.8547222;SO2;EEA Austria;µg/m³;1.15000009;2021-11-25T10:00:00+01:00;Austria
+AT;Burgenland;AT10003;48.1094443995,17.0713889;SO2;EEA Austria;µg/m³;3.65509986;2021-11-25T10:00:00+01:00;Austria
+AT;Vorarlberg;AT81919;47.2394449995,9.597696;NO2;EEA Austria;µg/m³;36.81800079;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT90TAB;48.2167394439,16.3809180556;NO2;EEA Austria;µg/m³;31.65412712;2021-11-25T09:00:00+01:00;Austria
+AT;Steiermark;AT60107;47.0447222217,15.1527777778;O3;EEA Austria;µg/m³;3.334;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30301;48.1436119995,16.959444;PM2.5;EEA Austria;µg/m³;24.0;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30601;48.3022229995,16.320833;SO2;EEA Austria;µg/m³;6.0;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9JAEG;48.2701583328,16.2972633333;O3;EEA Austria;µg/m³;43.64;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72710;47.4475971995,10.7441167;NO2;EEA Austria;µg/m³;37.73550415;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT53055;47.9366669995,13.0158333;NO2;EEA Austria;µg/m³;8.41407585;2021-11-25T10:00:00+01:00;Austria
+AT;Salzburg;AT52000;47.6830555995,13.1;PM10;EEA Austria;µg/m³;29.35000038;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60118;47.1783333328,14.6766666667;NO2;EEA Austria;µg/m³;27.93404579;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2M121;46.5569299995,13.70541;O3;EEA Austria;µg/m³;10.208;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72822;47.3499916995,11.6945417;PM10;EEA Austria;µg/m³;9.89150047;2021-04-24T13:00:00+02:00;Austria
+AT;Austria;Pöchlarn;48.2130366229,15.2072201187;NO2;EEA Austria;µg/m³;16.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Bad Vöslau - Gainfarn;47.9599829273,16.2069551984;PM10;EEA Austria;µg/m³;7.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wolfsberg Hauptschule;46.8352867658,14.8442109124;SO2;EEA Austria;µg/m³;3.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Salzburg Lehen Martinstraße;47.8180618127,13.0299733646;SO2;EEA Austria;µg/m³;1.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Salzburg Lehen Martinstraße;47.8180618127,13.0299733646;O3;EEA Austria;µg/m³;43.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Hallein B159;47.6830699731,13.1019284189;PM10;EEA Austria;µg/m³;22.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Leoben Zentrum;47.3830302082,15.0899899742;O3;EEA Austria;µg/m³;14.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;St. Johann im Pongau;47.3488966847,13.2058634973;NO2;EEA Austria;µg/m³;52.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Hermannskogel;48.2711280763,16.2989426835;SO2;EEA Austria;µg/m³;3.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Lustenau Wiesenrain;47.4108196241,9.65275705398;O3;EEA Austria;µg/m³;1.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Klosterneuburg Wisentgasse;48.3013740999,16.3046919014;O3;EEA Austria;µg/m³;44.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Tulln Leopoldgasse;48.3313633254,16.0594518288;O3;EEA Austria;µg/m³;29.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Stixneusiedl;48.0508581903,16.6766842605;O3;EEA Austria;µg/m³;44.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Feldkirch Bärenkreuzung;47.2388622693,9.59670218025;CO;EEA Austria;µg/m³;976.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Judendorf Süd;47.1194304748,15.3552624776;SO2;EEA Austria;µg/m³;4.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Rennfeld;47.4049832385,15.3608320323;O3;EEA Austria;µg/m³;63.0;2016-12-12T10:00:00+01:00;Austria
+AT;Oberösterreich;AT0ZOE2;47.8386110995,14.441388889;NO2;EEA Austria;µg/m³;1.33860301;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT0KLH1;46.7527527862,15.9566845603;SO2;EEA Austria;µg/m³;1.0;2016-12-12T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S404;48.2252777995,14.23888889;SO2;EEA Austria;µg/m³;0.66999995;2017-07-20T21:00:00+02:00;Austria
+AT;Oberösterreich;AT4S217;48.2094444439,14.4369444444;CO;EEA Austria;µg/m³;240.13999;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31401;48.0861110995,16.3022222;CO;EEA Austria;µg/m³;320.1;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30502;48.8786110995,15.04666667;PM10;EEA Austria;µg/m³;20.0;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30502;48.8786110995,15.04666667;O3;EEA Austria;µg/m³;43.5;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32702;48.1508039008,16.5116637428;NO2;EEA Austria;µg/m³;17.4018383;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S431;48.3027777772,14.2827777778;NO2;EEA Austria;µg/m³;27.40000152;2021-11-25T09:00:00+01:00;Austria
+AT;Oberösterreich;AT4S431;48.3027777772,14.2827777778;PM10;EEA Austria;µg/m³;26.45199966;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60107;47.0447222217,15.1527777778;PM10;EEA Austria;µg/m³;37.10074615;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2VI12;46.6124999995,13.841389;NO2;EEA Austria;µg/m³;20.78000068;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9BELG;48.174353055,16.3614172222;NO2;EEA Austria;µg/m³;21.30099296;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72552;47.5818082995,12.1724111;PM10;EEA Austria;µg/m³;20.75300025;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32501;48.4086099995,15.619166;O3;EEA Austria;µg/m³;22.648;2021-11-25T10:00:00+01:00;Austria
+AT;Vorarlberg;AT82708;47.1564829995,9.822944;NO2;EEA Austria;µg/m³;0.0;2017-07-20T21:00:00+02:00;Austria
+AT;Oberösterreich;AT4S156;48.2577777772,13.0397222222;SO2;EEA Austria;µg/m³;1.81999993;2021-11-25T09:00:00+01:00;Austria
+AT;Steiermark;AT60191;47.135555555,15.3236111111;NO2;EEA Austria;µg/m³;19.36056137;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60191;47.135555555,15.3236111111;PM10;EEA Austria;µg/m³;15.84077453;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72315;47.2169471995,10.7357167;NO2;EEA Austria;µg/m³;43.63549804;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT900ZA;48.2489929995,16.357079;NO2;EEA Austria;µg/m³;16.43775367;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30407;48.2366666661,16.6369444444;PM2.5;EEA Austria;µg/m³;20.5;2021-11-25T08:00:00+01:00;Austria
+AT;Amt der Steierm�rkischen Landesregierung;Weiz Birkfelder Stra�e;47.2172239995,15.628333;NO2;EEA Austria;µg/m³;0.0;2017-07-20T21:00:00+02:00;Austria
+AT;Amt der Nieder�sterreichischen Landesregierung;Mannsw�rth bei Schwechat, Danubiastra�e/A4;48.1449999995,16.51111;NO2;EEA Austria;µg/m³;38.62825775;2017-07-20T21:00:00+02:00;Austria
+AT;Austria;St. Georgen im Lavanttal - Herzogberg;46.7080504923,14.891911454;NO2;EEA Austria;µg/m³;14.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Spittal a.d.Drau Oktoberstrasse;46.8016611483,13.4955701764;NO2;EEA Austria;µg/m³;54.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Lobau - Grundwasserwerk;48.1624895263,16.5266656081;NO2;EEA Austria;µg/m³;25.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Lienz Amlacherkreuzung;46.8280347551,12.7655991765;PM10;EEA Austria;µg/m³;16.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Gratwein;47.1422262873,15.3255282417;PM10;EEA Austria;µg/m³;24.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien AKH;48.2191420188,16.3458347414;NO2;EEA Austria;µg/m³;15.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Vöcklabruck;48.0011129974,13.6680467109;PM10;EEA Austria;µg/m³;11.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Bludenz Herrengasse;47.1560945598,9.82720988215;NO2;EEA Austria;µg/m³;58.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Graz Süd Tiergartenweg;47.0419250831,15.4341345595;NO2;EEA Austria;µg/m³;73.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Gerlitzen Steinturm;46.6838983129,13.9019680109;O3;EEA Austria;µg/m³;78.0;2016-12-12T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32401;47.8141666695,16.255;SO2;EEA Austria;µg/m³;2.79999995;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32401;47.8141666695,16.255;O3;EEA Austria;µg/m³;46.593;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S416;48.2744444435,14.3147222;SO2;EEA Austria;µg/m³;2.57000017;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72547;47.5819143866,12.1697466486;O3;EEA Austria;µg/m³;3.317;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S184;48.3061194439,14.2975027778;O3;EEA Austria;µg/m³;19.701;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S184;48.3061194439,14.2975027778;PM10;EEA Austria;µg/m³;25.69199943;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2KA71;46.6266166661,14.2991444444;PM2.5;EEA Austria;µg/m³;15.27999973;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2KA71;46.6266166661,14.2991444444;NO2;EEA Austria;µg/m³;24.38000106;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32701;48.1449999995,16.4744444444;CO;EEA Austria;µg/m³;244.44;2021-09-30T09:00:00+02:00;Austria
+AT;Steiermark;AT60195;46.8138888884,15.2127777778;PM10;EEA Austria;µg/m³;49.65776062;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S235;47.8158549995,13.720737;O3;EEA Austria;µg/m³;86.867;2021-11-25T10:00:00+01:00;Austria
+AT;Burgenland;AT10003;48.1094443995,17.0713889;NO2;EEA Austria;µg/m³;21.03139877;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72110;47.2626193995,11.3923611;NO2;EEA Austria;µg/m³;54.17649841;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30601;48.3022229995,16.320833;O3;EEA Austria;µg/m³;40.906;2021-11-25T10:00:00+01:00;Austria
+AT;Tirol;AT72106;47.2712899995,11.4169445;O3;EEA Austria;µg/m³;2.776;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT32604;48.0451111106,14.7722777778;O3;EEA Austria;µg/m³;27.836;2021-11-25T09:00:00+01:00;Austria
+AT;Niederösterreich;AT30407;48.2366666661,16.6369444444;PM10;EEA Austria;µg/m³;23.0;2021-11-25T08:00:00+01:00;Austria
+AT;Niederösterreich;AT31703;48.3533333295,15.74694444;PM10;EEA Austria;µg/m³;34.5;2020-12-30T19:00:00+01:00;Austria
+AT;Amt der Salzburger Landesregierung;Zederhaus A10;47.1540699995,13.50508;PM10;EEA Austria;µg/m³;5.65999984;2017-07-20T21:00:00+02:00;Austria
+AT;Austria;Obervellach Schulzentrum;46.9355467514,13.1955328715;O3;EEA Austria;µg/m³;47.0;2016-12-12T09:00:00+01:00;Austria
+AT;Austria;Heiterwang;47.447768382,10.7442101242;NO2;EEA Austria;µg/m³;37.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Leoben Göß;47.3594250643,15.0988832955;PM10;EEA Austria;µg/m³;7.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Lobau - Grundwasserwerk;48.1624895263,16.5266656081;O3;EEA Austria;µg/m³;32.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Lienz Amlacherkreuzung;46.8280347551,12.7655991765;CO;EEA Austria;µg/m³;995.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Lienz Tristacher See Straße;46.8191835181,12.7658686711;NO2;EEA Austria;µg/m³;22.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Graz Nord;47.0955241068,15.4141919602;O3;EEA Austria;µg/m³;3.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Innsbruck Sadrach;47.2711164368,11.3666527845;NO2;EEA Austria;µg/m³;52.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Dunkelsteinerwald;48.3711226232,15.5466934646;NO2;EEA Austria;µg/m³;9.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;St. Pölten - Eybnerstraße;48.2114203668,15.6316740905;O3;EEA Austria;µg/m³;39.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Gärberbach - Brennerautobahn;47.2400210767,11.3908174657;PM10;EEA Austria;µg/m³;38.0;2016-12-12T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S406;48.1649999995,14.035556;PM2.5;EEA Austria;µg/m³;21.42149925;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S416;48.2744444435,14.3147222;PM2.5;EEA Austria;µg/m³;23.92350006;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60194;47.6047222217,15.6730555556;PM10;EEA Austria;µg/m³;31.38569259;2021-11-25T10:00:00+01:00;Austria
+AT;Oberösterreich;AT4S415;48.3233329995,14.2977778;NO2;EEA Austria;µg/m³;28.20999908;2021-11-25T10:00:00+01:00;Austria
+AT;Vorarlberg;AT81919;47.2394449995,9.597696;CO;EEA Austria;µg/m³;454.7165;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60164;47.0556109995,15.416603;SO2;EEA Austria;µg/m³;1.81390202;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60151;46.8713888884,15.4958333333;NO2;EEA Austria;µg/m³;20.85909271;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60156;47.3480599995,15.882222;NO2;EEA Austria;µg/m³;5.42989397;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9STEF;48.2081499995,16.3732536111;NO2;EEA Austria;µg/m³;14.55089759;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT30401;48.3347199995,16.729445;PM10;EEA Austria;µg/m³;30.0;2021-11-25T10:00:00+01:00;Austria
+AT;Kärnten;AT2WO15;46.8349999995,14.8436111111;SO2;EEA Austria;µg/m³;3.94000005;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60036;47.0670111106,15.4936888889;O3;EEA Austria;µg/m³;5.859;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60138;47.0943611106,15.4151111111;O3;EEA Austria;µg/m³;5.375;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60138;47.0943611106,15.4151111111;PM10;EEA Austria;µg/m³;34.9377098;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60143;47.3824999995,15.0891666667;O3;EEA Austria;µg/m³;6.478;2021-11-25T10:00:00+01:00;Austria
+AT;Steiermark;AT60143;47.3824999995,15.0891666667;NO2;EEA Austria;µg/m³;29.71009063;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9SCHA;48.2353699995,16.301563;SO2;EEA Austria;µg/m³;3.13985586;2021-11-25T10:00:00+01:00;Austria
+AT;Wien;AT9SCHA;48.2353699995,16.301563;NO2;EEA Austria;µg/m³;21.22440528;2021-11-25T09:00:00+01:00;Austria
+AT;Steiermark;AT60136;47.1202777772,15.3511111111;NO2;EEA Austria;µg/m³;25.36109542;2021-11-25T10:00:00+01:00;Austria
+AT;Niederösterreich;AT31701;48.3702779995,15.543611;SO2;EEA Austria;µg/m³;3.30000019;2021-11-25T10:00:00+01:00;Austria
+AT;Austria;Bad Vöslau - Gainfarn;47.9599829273,16.2069551984;NO2;EEA Austria;µg/m³;8.0;2016-12-12T09:00:00+01:00;Austria
+AT;Austria;Graz Mitte Gries;47.0691596333,15.4317091082;NO2;EEA Austria;µg/m³;71.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Sonnblick;47.0544730645,12.9583776365;O3;EEA Austria;µg/m³;81.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Gänserndorf;48.3347076441,16.7305831776;O3;EEA Austria;µg/m³;37.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Kufstein Praxmarerstraße;47.5863981913,12.1736094043;PM10;EEA Austria;µg/m³;12.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wien Hermannskogel;48.2711280763,16.2989426835;O3;EEA Austria;µg/m³;52.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Wald am Arlberg;47.1278043348,10.0469378006;NO2;EEA Austria;µg/m³;20.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;St. Valentin A1;48.1799830247,14.545610912;O3;EEA Austria;µg/m³;41.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Illmitz;47.7700243274,16.7664259574;SO2;EEA Austria;µg/m³;0.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Kramsach Angerberg;47.4591880767,11.9105826891;NO2;EEA Austria;µg/m³;30.0;2016-12-12T10:00:00+01:00;Austria
+AT;Austria;Salzburg Mirabellplatz;47.8061169392,13.0461430397;PM10;EEA Austria;µg/m³;11.0;2016-12-12T10:00:00+01:00;Austria
diff --git a/fda-table-service/rest-service/src/main/resources/seed/infection-small.csv b/fda-table-service/rest-service/src/main/resources/seed/infection-small.csv
new file mode 100644
index 0000000000000000000000000000000000000000..284f5a701c9abf9192aa3c7ab32bb8d62df39a4c
--- /dev/null
+++ b/fda-table-service/rest-service/src/main/resources/seed/infection-small.csv
@@ -0,0 +1,1001 @@
+dateRep,day,month,year,cases,deaths,countriesAndTerritories,geoId,countryterritoryCode,popData2019,continentExp,Cumulative_number_for_14_days_of_COVID_19_cases_per_100000
+14/12/2020,14,12,2020,746,6,Afghanistan,AF,AFG,38041757,Asia,9.01377925
+13/12/2020,13,12,2020,298,9,Afghanistan,AF,AFG,38041757,Asia,7.05277624
+12/12/2020,12,12,2020,113,11,Afghanistan,AF,AFG,38041757,Asia,6.86876792
+11/12/2020,11,12,2020,63,10,Afghanistan,AF,AFG,38041757,Asia,7.13426564
+10/12/2020,10,12,2020,202,16,Afghanistan,AF,AFG,38041757,Asia,6.96865815
+09/12/2020,9,12,2020,135,13,Afghanistan,AF,AFG,38041757,Asia,6.96340077
+08/12/2020,8,12,2020,200,6,Afghanistan,AF,AFG,38041757,Asia,7.09483529
+07/12/2020,7,12,2020,210,26,Afghanistan,AF,AFG,38041757,Asia,7.21575505
+06/12/2020,6,12,2020,234,10,Afghanistan,AF,AFG,38041757,Asia,7.32616004
+05/12/2020,5,12,2020,235,18,Afghanistan,AF,AFG,38041757,Asia,7.11586481
+04/12/2020,4,12,2020,119,5,Afghanistan,AF,AFG,38041757,Asia,7.10797874
+03/12/2020,3,12,2020,202,19,Afghanistan,AF,AFG,38041757,Asia,7.53645527
+02/12/2020,2,12,2020,400,48,Afghanistan,AF,AFG,38041757,Asia,7.00545982
+01/12/2020,1,12,2020,272,11,Afghanistan,AF,AFG,38041757,Asia,6.96077208
+30/11/2020,30,11,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,6.41663317
+29/11/2020,29,11,2020,228,11,Afghanistan,AF,AFG,38041757,Asia,6.8451097
+28/11/2020,28,11,2020,214,15,Afghanistan,AF,AFG,38041757,Asia,6.78464983
+27/11/2020,27,11,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,6.39560365
+26/11/2020,26,11,2020,200,12,Afghanistan,AF,AFG,38041757,Asia,7.34193218
+25/11/2020,25,11,2020,185,13,Afghanistan,AF,AFG,38041757,Asia,7.1999829
+24/11/2020,24,11,2020,246,17,Afghanistan,AF,AFG,38041757,Asia,6.71367519
+23/11/2020,23,11,2020,252,8,Afghanistan,AF,AFG,38041757,Asia,6.655844
+22/11/2020,22,11,2020,154,12,Afghanistan,AF,AFG,38041757,Asia,6.20370926
+21/11/2020,21,11,2020,232,25,Afghanistan,AF,AFG,38041757,Asia,6.13010593
+20/11/2020,20,11,2020,282,5,Afghanistan,AF,AFG,38041757,Asia,5.6727138
+19/11/2020,19,11,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,5.03657073
+18/11/2020,18,11,2020,383,13,Afghanistan,AF,AFG,38041757,Asia,5.35464227
+17/11/2020,17,11,2020,65,6,Afghanistan,AF,AFG,38041757,Asia,4.57392123
+16/11/2020,16,11,2020,163,9,Afghanistan,AF,AFG,38041757,Asia,4.65278194
+15/11/2020,15,11,2020,205,12,Afghanistan,AF,AFG,38041757,Asia,4.57129254
+14/11/2020,14,11,2020,66,10,Afghanistan,AF,AFG,38041757,Asia,4.23219148
+13/11/2020,13,11,2020,360,14,Afghanistan,AF,AFG,38041757,Asia,4.47140231
+12/11/2020,12,11,2020,146,4,Afghanistan,AF,AFG,38041757,Asia,3.84840269
+11/11/2020,11,11,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,3.4646139
+10/11/2020,10,11,2020,224,12,Afghanistan,AF,AFG,38041757,Asia,3.76165591
+09/11/2020,9,11,2020,80,3,Afghanistan,AF,AFG,38041757,Asia,3.69593865
+08/11/2020,8,11,2020,126,6,Afghanistan,AF,AFG,38041757,Asia,3.65650829
+07/11/2020,7,11,2020,58,2,Afghanistan,AF,AFG,38041757,Asia,3.53821723
+06/11/2020,6,11,2020,40,0,Afghanistan,AF,AFG,38041757,Asia,3.5461033
+05/11/2020,5,11,2020,121,6,Afghanistan,AF,AFG,38041757,Asia,3.74588377
+04/11/2020,4,11,2020,86,4,Afghanistan,AF,AFG,38041757,Asia,3.78268543
+03/11/2020,3,11,2020,95,3,Afghanistan,AF,AFG,38041757,Asia,3.78794281
+02/11/2020,2,11,2020,132,5,Afghanistan,AF,AFG,38041757,Asia,3.76691329
+01/11/2020,1,11,2020,76,0,Afghanistan,AF,AFG,38041757,Asia,3.57501889
+31/10/2020,31,10,2020,157,4,Afghanistan,AF,AFG,38041757,Asia,3.55398937
+30/10/2020,30,10,2020,123,3,Afghanistan,AF,AFG,38041757,Asia,3.26483343
+29/10/2020,29,10,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,2.94150452
+28/10/2020,28,10,2020,113,7,Afghanistan,AF,AFG,38041757,Asia,3.02562261
+27/10/2020,27,10,2020,199,8,Afghanistan,AF,AFG,38041757,Asia,2.90207416
+26/10/2020,26,10,2020,65,3,Afghanistan,AF,AFG,38041757,Asia,2.71806583
+25/10/2020,25,10,2020,81,4,Afghanistan,AF,AFG,38041757,Asia,2.79955524
+24/10/2020,24,10,2020,61,2,Afghanistan,AF,AFG,38041757,Asia,2.58663132
+23/10/2020,23,10,2020,116,4,Afghanistan,AF,AFG,38041757,Asia,2.45256811
+22/10/2020,22,10,2020,135,2,Afghanistan,AF,AFG,38041757,Asia,2.35004918
+21/10/2020,21,10,2020,88,2,Afghanistan,AF,AFG,38041757,Asia,2.17392693
+20/10/2020,20,10,2020,87,5,Afghanistan,AF,AFG,38041757,Asia,2.10558098
+19/10/2020,19,10,2020,59,4,Afghanistan,AF,AFG,38041757,Asia,2.25804502
+18/10/2020,18,10,2020,68,3,Afghanistan,AF,AFG,38041757,Asia,2.21861467
+17/10/2020,17,10,2020,47,4,Afghanistan,AF,AFG,38041757,Asia,2.05826455
+16/10/2020,16,10,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,1.94785956
+15/10/2020,15,10,2020,32,1,Afghanistan,AF,AFG,38041757,Asia,1.99254729
+14/10/2020,14,10,2020,66,0,Afghanistan,AF,AFG,38041757,Asia,1.94523087
+13/10/2020,13,10,2020,129,3,Afghanistan,AF,AFG,38041757,Asia,1.81116766
+12/10/2020,12,10,2020,96,4,Afghanistan,AF,AFG,38041757,Asia,1.50361089
+11/10/2020,11,10,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,1.25125661
+10/10/2020,10,10,2020,10,1,Afghanistan,AF,AFG,38041757,Asia,1.34326078
+09/10/2020,9,10,2020,77,2,Afghanistan,AF,AFG,38041757,Asia,1.33274601
+08/10/2020,8,10,2020,68,1,Afghanistan,AF,AFG,38041757,Asia,1.1723959
+07/10/2020,7,10,2020,62,2,Afghanistan,AF,AFG,38041757,Asia,1.05936222
+06/10/2020,6,10,2020,145,5,Afghanistan,AF,AFG,38041757,Asia,1.08302043
+05/10/2020,5,10,2020,44,0,Afghanistan,AF,AFG,38041757,Asia,0.78072104
+04/10/2020,4,10,2020,7,4,Afghanistan,AF,AFG,38041757,Asia,0.66505866
+03/10/2020,3,10,2020,5,0,Afghanistan,AF,AFG,38041757,Asia,0.97524412
+02/10/2020,2,10,2020,17,0,Afghanistan,AF,AFG,38041757,Asia,1.08564912
+01/10/2020,1,10,2020,14,0,Afghanistan,AF,AFG,38041757,Asia,1.04096138
+30/09/2020,30,9,2020,15,2,Afghanistan,AF,AFG,38041757,Asia,1.04884745
+29/09/2020,29,9,2020,12,3,Afghanistan,AF,AFG,38041757,Asia,1.11456471
+28/09/2020,28,9,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,1.34326078
+27/09/2020,27,9,2020,35,0,Afghanistan,AF,AFG,38041757,Asia,1.54041255
+26/09/2020,26,9,2020,6,2,Afghanistan,AF,AFG,38041757,Asia,1.54041255
+25/09/2020,25,9,2020,16,0,Afghanistan,AF,AFG,38041757,Asia,1.61401588
+24/09/2020,24,9,2020,25,5,Afghanistan,AF,AFG,38041757,Asia,1.64556017
+23/09/2020,23,9,2020,71,2,Afghanistan,AF,AFG,38041757,Asia,1.64293148
+22/09/2020,22,9,2020,30,3,Afghanistan,AF,AFG,38041757,Asia,1.52464041
+21/09/2020,21,9,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,1.69813397
+20/09/2020,20,9,2020,125,4,Afghanistan,AF,AFG,38041757,Asia,1.89265706
+19/09/2020,19,9,2020,47,1,Afghanistan,AF,AFG,38041757,Asia,1.61664457
+18/09/2020,18,9,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,1.53515517
+17/09/2020,17,9,2020,17,0,Afghanistan,AF,AFG,38041757,Asia,1.65344624
+16/09/2020,16,9,2020,40,10,Afghanistan,AF,AFG,38041757,Asia,1.70864874
+15/09/2020,15,9,2020,99,6,Afghanistan,AF,AFG,38041757,Asia,1.62715933
+14/09/2020,14,9,2020,75,0,Afghanistan,AF,AFG,38041757,Asia,1.45629446
+13/09/2020,13,9,2020,35,0,Afghanistan,AF,AFG,38041757,Asia,1.3090878
+12/09/2020,12,9,2020,34,0,Afghanistan,AF,AFG,38041757,Asia,1.22496971
+11/09/2020,11,9,2020,28,0,Afghanistan,AF,AFG,38041757,Asia,1.16450983
+10/09/2020,10,9,2020,24,2,Afghanistan,AF,AFG,38041757,Asia,1.09879257
+09/09/2020,9,9,2020,26,3,Afghanistan,AF,AFG,38041757,Asia,1.18028197
+08/09/2020,8,9,2020,96,3,Afghanistan,AF,AFG,38041757,Asia,1.11456471
+07/09/2020,7,9,2020,74,2,Afghanistan,AF,AFG,38041757,Asia,1.04884745
+06/09/2020,6,9,2020,20,0,Afghanistan,AF,AFG,38041757,Asia,0.85432437
+05/09/2020,5,9,2020,16,0,Afghanistan,AF,AFG,38041757,Asia,1.07776305
+04/09/2020,4,9,2020,45,1,Afghanistan,AF,AFG,38041757,Asia,1.13559424
+03/09/2020,3,9,2020,38,3,Afghanistan,AF,AFG,38041757,Asia,1.27228614
+02/09/2020,2,9,2020,9,0,Afghanistan,AF,AFG,38041757,Asia,1.59298636
+01/09/2020,1,9,2020,34,4,Afghanistan,AF,AFG,38041757,Asia,1.56932815
+31/08/2020,31,8,2020,19,0,Afghanistan,AF,AFG,38041757,Asia,1.48783875
+30/08/2020,30,8,2020,3,0,Afghanistan,AF,AFG,38041757,Asia,1.55618469
+29/08/2020,29,8,2020,11,1,Afghanistan,AF,AFG,38041757,Asia,1.86374147
+28/08/2020,28,8,2020,3,0,Afghanistan,AF,AFG,38041757,Asia,1.85322671
+27/08/2020,27,8,2020,55,4,Afghanistan,AF,AFG,38041757,Asia,2.05300717
+26/08/2020,26,8,2020,1,0,Afghanistan,AF,AFG,38041757,Asia,2.10820967
+25/08/2020,25,8,2020,71,10,Afghanistan,AF,AFG,38041757,Asia,2.67074941
+24/08/2020,24,8,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,2.48411239
+23/08/2020,23,8,2020,105,2,Afghanistan,AF,AFG,38041757,Asia,2.48411239
+22/08/2020,22,8,2020,38,0,Afghanistan,AF,AFG,38041757,Asia,2.31061883
+21/08/2020,21,8,2020,97,2,Afghanistan,AF,AFG,38041757,Asia,2.41576644
+20/08/2020,20,8,2020,160,8,Afghanistan,AF,AFG,38041757,Asia,2.26855978
+19/08/2020,19,8,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,2.02409158
+18/08/2020,18,8,2020,3,0,Afghanistan,AF,AFG,38041757,Asia,2.23964419
+17/08/2020,17,8,2020,45,5,Afghanistan,AF,AFG,38041757,Asia,2.32901966
+16/08/2020,16,8,2020,120,7,Afghanistan,AF,AFG,38041757,Asia,2.21072859
+15/08/2020,15,8,2020,7,0,Afghanistan,AF,AFG,38041757,Asia,1.89528575
+14/08/2020,14,8,2020,79,9,Afghanistan,AF,AFG,38041757,Asia,2.3185049
+13/08/2020,13,8,2020,76,10,Afghanistan,AF,AFG,38041757,Asia,2.29747538
+12/08/2020,12,8,2020,215,32,Afghanistan,AF,AFG,38041757,Asia,2.09769491
+11/08/2020,11,8,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,1.80328159
+10/08/2020,10,8,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,2.07929408
+09/08/2020,9,8,2020,39,5,Afghanistan,AF,AFG,38041757,Asia,2.35793526
+08/08/2020,8,8,2020,78,9,Afghanistan,AF,AFG,38041757,Asia,2.57348786
+07/08/2020,7,8,2020,41,0,Afghanistan,AF,AFG,38041757,Asia,2.65234858
+06/08/2020,6,8,2020,67,4,Afghanistan,AF,AFG,38041757,Asia,2.57874525
+05/08/2020,5,8,2020,82,6,Afghanistan,AF,AFG,38041757,Asia,2.89681678
+04/08/2020,4,8,2020,37,4,Afghanistan,AF,AFG,38041757,Asia,2.97567749
+03/08/2020,3,8,2020,0,1,Afghanistan,AF,AFG,38041757,Asia,3.2464326
+02/08/2020,2,8,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,3.70382472
+01/08/2020,1,8,2020,168,12,Afghanistan,AF,AFG,38041757,Asia,3.73536901
+31/07/2020,31,7,2020,71,0,Afghanistan,AF,AFG,38041757,Asia,3.86943221
+30/07/2020,30,7,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,3.88257567
+29/07/2020,29,7,2020,103,1,Afghanistan,AF,AFG,38041757,Asia,4.55026302
+28/07/2020,28,7,2020,105,1,Afghanistan,AF,AFG,38041757,Asia,5.02868466
+27/07/2020,27,7,2020,106,10,Afghanistan,AF,AFG,38041757,Asia,4.76318694
+26/07/2020,26,7,2020,121,13,Afghanistan,AF,AFG,38041757,Asia,4.48454576
+25/07/2020,25,7,2020,108,35,Afghanistan,AF,AFG,38041757,Asia,4.38991291
+24/07/2020,24,7,2020,13,0,Afghanistan,AF,AFG,38041757,Asia,5.30995453
+23/07/2020,23,7,2020,188,21,Afghanistan,AF,AFG,38041757,Asia,5.9460976
+22/07/2020,22,7,2020,112,4,Afghanistan,AF,AFG,38041757,Asia,5.60699654
+21/07/2020,21,7,2020,140,5,Afghanistan,AF,AFG,38041757,Asia,5.8646082
+20/07/2020,20,7,2020,174,17,Afghanistan,AF,AFG,38041757,Asia,6.63481448
+19/07/2020,19,7,2020,12,17,Afghanistan,AF,AFG,38041757,Asia,6.91082696
+18/07/2020,18,7,2020,219,32,Afghanistan,AF,AFG,38041757,Asia,7.79406692
+17/07/2020,17,7,2020,76,21,Afghanistan,AF,AFG,38041757,Asia,8.01224823
+16/07/2020,16,7,2020,254,49,Afghanistan,AF,AFG,38041757,Asia,8.30140416
+15/07/2020,15,7,2020,285,33,Afghanistan,AF,AFG,38041757,Asia,8.47226904
+14/07/2020,14,7,2020,4,2,Afghanistan,AF,AFG,38041757,Asia,8.4564969
+13/07/2020,13,7,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,9.15835722
+12/07/2020,12,7,2020,85,16,Afghanistan,AF,AFG,38041757,Asia,10.08102754
+11/07/2020,11,7,2020,458,37,Afghanistan,AF,AFG,38041757,Asia,10.29132277
+10/07/2020,10,7,2020,255,20,Afghanistan,AF,AFG,38041757,Asia,9.81290112
+09/07/2020,9,7,2020,59,1,Afghanistan,AF,AFG,38041757,Asia,10.35178265
+08/07/2020,8,7,2020,210,16,Afghanistan,AF,AFG,38041757,Asia,10.81180346
+07/07/2020,7,7,2020,433,56,Afghanistan,AF,AFG,38041757,Asia,11.14827583
+06/07/2020,6,7,2020,279,38,Afghanistan,AF,AFG,38041757,Asia,10.82494691
+05/07/2020,5,7,2020,348,7,Afghanistan,AF,AFG,38041757,Asia,11.16667666
+04/07/2020,4,7,2020,302,12,Afghanistan,AF,AFG,38041757,Asia,11.68715735
+03/07/2020,3,7,2020,186,33,Afghanistan,AF,AFG,38041757,Asia,11.80281973
+02/07/2020,2,7,2020,319,28,Afghanistan,AF,AFG,38041757,Asia,13.04356158
+01/07/2020,1,7,2020,279,13,Afghanistan,AF,AFG,38041757,Asia,13.68759072
+30/06/2020,30,6,2020,271,12,Afghanistan,AF,AFG,38041757,Asia,15.01245066
+29/06/2020,29,6,2020,351,18,Afghanistan,AF,AFG,38041757,Asia,16.30050894
+28/06/2020,28,6,2020,165,20,Afghanistan,AF,AFG,38041757,Asia,17.12328902
+27/06/2020,27,6,2020,276,8,Afghanistan,AF,AFG,38041757,Asia,18.15110695
+26/06/2020,26,6,2020,460,36,Afghanistan,AF,AFG,38041757,Asia,19.15000929
+25/06/2020,25,6,2020,234,21,Afghanistan,AF,AFG,38041757,Asia,19.90444343
+24/06/2020,24,6,2020,338,20,Afghanistan,AF,AFG,38041757,Asia,21.08735409
+23/06/2020,23,6,2020,310,17,Afghanistan,AF,AFG,38041757,Asia,21.62360692
+22/06/2020,22,6,2020,409,12,Afghanistan,AF,AFG,38041757,Asia,22.32020987
+21/06/2020,21,6,2020,546,21,Afghanistan,AF,AFG,38041757,Asia,23.32436959
+20/06/2020,20,6,2020,346,2,Afghanistan,AF,AFG,38041757,Asia,23.41900244
+19/06/2020,19,6,2020,658,42,Afghanistan,AF,AFG,38041757,Asia,24.91472726
+18/06/2020,18,6,2020,564,13,Afghanistan,AF,AFG,38041757,Asia,25.25382831
+17/06/2020,17,6,2020,783,13,Afghanistan,AF,AFG,38041757,Asia,25.76379424
+16/06/2020,16,6,2020,761,7,Afghanistan,AF,AFG,38041757,Asia,25.70070567
+15/06/2020,15,6,2020,664,20,Afghanistan,AF,AFG,38041757,Asia,25.13290856
+14/06/2020,14,6,2020,556,5,Afghanistan,AF,AFG,38041757,Asia,25.1749676
+13/06/2020,13,6,2020,656,20,Afghanistan,AF,AFG,38041757,Asia,25.98986161
+12/06/2020,12,6,2020,747,21,Afghanistan,AF,AFG,38041757,Asia,25.90311483
+11/06/2020,11,6,2020,684,21,Afghanistan,AF,AFG,38041757,Asia,25.46412354
+10/06/2020,10,6,2020,542,15,Afghanistan,AF,AFG,38041757,Asia,25.30903081
+09/06/2020,9,6,2020,575,12,Afghanistan,AF,AFG,38041757,Asia,25.61395889
+08/06/2020,8,6,2020,791,30,Afghanistan,AF,AFG,38041757,Asia,25.65601794
+07/06/2020,7,6,2020,582,18,Afghanistan,AF,AFG,38041757,Asia,25.11187903
+06/06/2020,6,6,2020,915,9,Afghanistan,AF,AFG,38041757,Asia,25.63761711
+05/06/2020,5,6,2020,787,6,Afghanistan,AF,AFG,38041757,Asia,24.65185822
+04/06/2020,4,6,2020,758,24,Afghanistan,AF,AFG,38041757,Asia,23.97891349
+03/06/2020,3,6,2020,759,5,Afghanistan,AF,AFG,38041757,Asia,23.27968185
+02/06/2020,2,6,2020,545,8,Afghanistan,AF,AFG,38041757,Asia,22.81177497
+01/06/2020,1,6,2020,680,8,Afghanistan,AF,AFG,38041757,Asia,22.45164439
+31/05/2020,31,5,2020,866,3,Afghanistan,AF,AFG,38041757,Asia,21.35285181
+30/05/2020,30,5,2020,623,11,Afghanistan,AF,AFG,38041757,Asia,19.07640596
+29/05/2020,29,5,2020,580,8,Afghanistan,AF,AFG,38041757,Asia,20.23302972
+28/05/2020,28,5,2020,625,7,Afghanistan,AF,AFG,38041757,Asia,19.00543132
+27/05/2020,27,5,2020,658,1,Afghanistan,AF,AFG,38041757,Asia,18.04333065
+26/05/2020,26,5,2020,591,1,Afghanistan,AF,AFG,38041757,Asia,17.04968569
+25/05/2020,25,5,2020,584,2,Afghanistan,AF,AFG,38041757,Asia,16.24530644
+24/05/2020,24,5,2020,782,11,Afghanistan,AF,AFG,38041757,Asia,15.68013801
+23/05/2020,23,5,2020,540,12,Afghanistan,AF,AFG,38041757,Asia,14.29481819
+22/05/2020,22,5,2020,531,6,Afghanistan,AF,AFG,38041757,Asia,13.44049382
+21/05/2020,21,5,2020,492,9,Afghanistan,AF,AFG,38041757,Asia,12.49416529
+20/05/2020,20,5,2020,581,5,Afghanistan,AF,AFG,38041757,Asia,11.64246962
+19/05/2020,19,5,2020,408,4,Afghanistan,AF,AFG,38041757,Asia,10.98266833
+18/05/2020,18,5,2020,262,1,Afghanistan,AF,AFG,38041757,Asia,10.40961384
+17/05/2020,17,5,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,10.3386392
+16/05/2020,16,5,2020,1063,32,Afghanistan,AF,AFG,38041757,Asia,10.6908837
+15/05/2020,15,5,2020,113,6,Afghanistan,AF,AFG,38041757,Asia,8.32769107
+14/05/2020,14,5,2020,259,3,Afghanistan,AF,AFG,38041757,Asia,8.61421832
+13/05/2020,13,5,2020,280,5,Afghanistan,AF,AFG,38041757,Asia,8.25408774
+12/05/2020,12,5,2020,285,2,Afghanistan,AF,AFG,38041757,Asia,7.84401204
+11/05/2020,11,5,2020,369,5,Afghanistan,AF,AFG,38041757,Asia,7.54697003
+10/05/2020,10,5,2020,255,6,Afghanistan,AF,AFG,38041757,Asia,6.75573423
+09/05/2020,9,5,2020,215,3,Afghanistan,AF,AFG,38041757,Asia,6.37983151
+08/05/2020,8,5,2020,171,2,Afghanistan,AF,AFG,38041757,Asia,5.99867141
+07/05/2020,7,5,2020,168,9,Afghanistan,AF,AFG,38041757,Asia,5.82517784
+06/05/2020,6,5,2020,330,5,Afghanistan,AF,AFG,38041757,Asia,5.60436785
+05/05/2020,5,5,2020,190,5,Afghanistan,AF,AFG,38041757,Asia,4.89725015
+04/05/2020,4,5,2020,235,13,Afghanistan,AF,AFG,38041757,Asia,4.48980314
+03/05/2020,3,5,2020,134,4,Afghanistan,AF,AFG,38041757,Asia,4.10338566
+02/05/2020,2,5,2020,164,4,Afghanistan,AF,AFG,38041757,Asia,3.91674864
+01/05/2020,1,5,2020,222,4,Afghanistan,AF,AFG,38041757,Asia,3.61970663
+30/04/2020,30,4,2020,122,0,Afghanistan,AF,AFG,38041757,Asia,3.06242427
+29/04/2020,29,4,2020,124,3,Afghanistan,AF,AFG,38041757,Asia,2.92573237
+28/04/2020,28,4,2020,172,0,Afghanistan,AF,AFG,38041757,Asia,2.7285806
+27/04/2020,27,4,2020,68,10,Afghanistan,AF,AFG,38041757,Asia,2.42890989
+26/04/2020,26,4,2020,112,4,Afghanistan,AF,AFG,38041757,Asia,2.38685085
+25/04/2020,25,4,2020,70,1,Afghanistan,AF,AFG,38041757,Asia,2.181813
+24/04/2020,24,4,2020,105,2,Afghanistan,AF,AFG,38041757,Asia,2.09506622
+23/04/2020,23,4,2020,84,4,Afghanistan,AF,AFG,38041757,Asia,1.97940384
+22/04/2020,22,4,2020,61,1,Afghanistan,AF,AFG,38041757,Asia,1.90580051
+21/04/2020,21,4,2020,35,2,Afghanistan,AF,AFG,38041757,Asia,1.82431111
+20/04/2020,20,4,2020,88,3,Afghanistan,AF,AFG,38041757,Asia,1.83219718
+19/04/2020,19,4,2020,63,0,Afghanistan,AF,AFG,38041757,Asia,1.67710445
+18/04/2020,18,4,2020,51,1,Afghanistan,AF,AFG,38041757,Asia,1.60350112
+17/04/2020,17,4,2020,10,4,Afghanistan,AF,AFG,38041757,Asia,1.46943791
+16/04/2020,16,4,2020,70,2,Afghanistan,AF,AFG,38041757,Asia,1.55618469
+15/04/2020,15,4,2020,49,2,Afghanistan,AF,AFG,38041757,Asia,1.44052232
+14/04/2020,14,4,2020,58,3,Afghanistan,AF,AFG,38041757,Asia,1.37743375
+13/04/2020,13,4,2020,52,0,Afghanistan,AF,AFG,38041757,Asia,1.29594435
+12/04/2020,12,4,2020,34,3,Afghanistan,AF,AFG,38041757,Asia,1.18028197
+11/04/2020,11,4,2020,37,0,Afghanistan,AF,AFG,38041757,Asia,1.13033686
+10/04/2020,10,4,2020,61,1,Afghanistan,AF,AFG,38041757,Asia,1.07513436
+09/04/2020,9,4,2020,56,3,Afghanistan,AF,AFG,38041757,Asia,0.91478425
+08/04/2020,8,4,2020,30,4,Afghanistan,AF,AFG,38041757,Asia,0.85432437
+07/04/2020,7,4,2020,38,0,Afghanistan,AF,AFG,38041757,Asia,0.78072104
+06/04/2020,6,4,2020,29,2,Afghanistan,AF,AFG,38041757,Asia,0.69660295
+05/04/2020,5,4,2020,35,1,Afghanistan,AF,AFG,38041757,Asia,0.64665783
+04/04/2020,4,4,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0.55465367
+03/04/2020,3,4,2020,43,0,Afghanistan,AF,AFG,38041757,Asia,0.55991105
+02/04/2020,2,4,2020,26,0,Afghanistan,AF,AFG,38041757,Asia,0.44687736
+01/04/2020,1,4,2020,25,0,Afghanistan,AF,AFG,38041757,Asia,0.37853141
+31/03/2020,31,3,2020,27,0,Afghanistan,AF,AFG,38041757,Asia,0.31544284
+30/03/2020,30,3,2020,8,1,Afghanistan,AF,AFG,38041757,Asia,0.25761166
+29/03/2020,29,3,2020,15,1,Afghanistan,AF,AFG,38041757,Asia,0.25235427
+28/03/2020,28,3,2020,16,1,Afghanistan,AF,AFG,38041757,Asia,0.22080999
+27/03/2020,27,3,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0.18663702
+26/03/2020,26,3,2020,33,0,Afghanistan,AF,AFG,38041757,Asia,0.19452309
+25/03/2020,25,3,2020,2,0,Afghanistan,AF,AFG,38041757,Asia,0.1077763
+24/03/2020,24,3,2020,6,1,Afghanistan,AF,AFG,38041757,Asia,0.10251892
+23/03/2020,23,3,2020,10,0,Afghanistan,AF,AFG,38041757,Asia,0.08674678
+22/03/2020,22,3,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0.06045988
+21/03/2020,21,3,2020,2,0,Afghanistan,AF,AFG,38041757,Asia,0.06045988
+20/03/2020,20,3,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0.0552025
+19/03/2020,19,3,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0.05783119
+18/03/2020,18,3,2020,1,0,Afghanistan,AF,AFG,38041757,Asia,0.05783119
+17/03/2020,17,3,2020,5,0,Afghanistan,AF,AFG,38041757,Asia,0.0552025
+16/03/2020,16,3,2020,6,0,Afghanistan,AF,AFG,38041757,Asia,0.04205905
+15/03/2020,15,3,2020,3,0,Afghanistan,AF,AFG,38041757,Asia,0.0262869
+11/03/2020,11,3,2020,3,0,Afghanistan,AF,AFG,38041757,Asia,0.01840083
+08/03/2020,8,3,2020,3,0,Afghanistan,AF,AFG,38041757,Asia,0.01051476
+02/03/2020,2,3,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0.00262869
+01/03/2020,1,3,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0.00262869
+29/02/2020,29,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0.00262869
+28/02/2020,28,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0.00262869
+27/02/2020,27,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0.00262869
+26/02/2020,26,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0.00262869
+25/02/2020,25,2,2020,1,0,Afghanistan,AF,AFG,38041757,Asia,0.00262869
+24/02/2020,24,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+23/02/2020,23,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+22/02/2020,22,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+21/02/2020,21,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+20/02/2020,20,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+19/02/2020,19,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+18/02/2020,18,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+17/02/2020,17,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+16/02/2020,16,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+15/02/2020,15,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+14/02/2020,14,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+13/02/2020,13,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+12/02/2020,12,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+11/02/2020,11,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+10/02/2020,10,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+09/02/2020,9,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+08/02/2020,8,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+07/02/2020,7,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+06/02/2020,6,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+05/02/2020,5,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+04/02/2020,4,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+03/02/2020,3,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+02/02/2020,2,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+01/02/2020,1,2,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+31/01/2020,31,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+30/01/2020,30,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+29/01/2020,29,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+28/01/2020,28,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+27/01/2020,27,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+26/01/2020,26,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+25/01/2020,25,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+24/01/2020,24,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+23/01/2020,23,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+22/01/2020,22,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+21/01/2020,21,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+20/01/2020,20,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+19/01/2020,19,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+18/01/2020,18,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+17/01/2020,17,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+16/01/2020,16,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+15/01/2020,15,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+14/01/2020,14,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+13/01/2020,13,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,0
+12/01/2020,12,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,
+11/01/2020,11,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,
+10/01/2020,10,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,
+09/01/2020,9,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,
+08/01/2020,8,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,
+07/01/2020,7,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,
+06/01/2020,6,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,
+05/01/2020,5,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,
+04/01/2020,4,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,
+03/01/2020,3,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,
+02/01/2020,2,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,
+01/01/2020,1,1,2020,0,0,Afghanistan,AF,AFG,38041757,Asia,
+31/12/2019,31,12,2019,0,0,Afghanistan,AF,AFG,38041757,Asia,
+14/12/2020,14,12,2020,788,14,Albania,AL,ALB,2862427,Europe,380.97041427
+13/12/2020,13,12,2020,879,12,Albania,AL,ALB,2862427,Europe,382.61237754
+12/12/2020,12,12,2020,802,12,Albania,AL,ALB,2862427,Europe,370.9439577
+11/12/2020,11,12,2020,873,14,Albania,AL,ALB,2862427,Europe,365.45910166
+10/12/2020,10,12,2020,752,15,Albania,AL,ALB,2862427,Europe,357.87812231
+09/12/2020,9,12,2020,753,14,Albania,AL,ALB,2862427,Europe,354.10510032
+08/12/2020,8,12,2020,695,17,Albania,AL,ALB,2862427,Europe,353.79068182
+07/12/2020,7,12,2020,840,16,Albania,AL,ALB,2862427,Europe,357.2842207
+06/12/2020,6,12,2020,846,19,Albania,AL,ALB,2862427,Europe,347.67698879
+05/12/2020,5,12,2020,801,18,Albania,AL,ALB,2862427,Europe,343.86903142
+04/12/2020,4,12,2020,782,13,Albania,AL,ALB,2862427,Europe,345.09177003
+03/12/2020,3,12,2020,705,17,Albania,AL,ALB,2862427,Europe,345.23151158
+02/12/2020,2,12,2020,832,12,Albania,AL,ALB,2862427,Europe,345.44112391
+01/12/2020,1,12,2020,557,12,Albania,AL,ALB,2862427,Europe,340.62004027
+30/11/2020,30,11,2020,835,11,Albania,AL,ALB,2862427,Europe,342.19213276
+29/11/2020,29,11,2020,545,16,Albania,AL,ALB,2862427,Europe,333.87751024
+28/11/2020,28,11,2020,645,18,Albania,AL,ALB,2862427,Europe,333.42335019
+27/11/2020,27,11,2020,656,10,Albania,AL,ALB,2862427,Europe,328.00836493
+26/11/2020,26,11,2020,644,8,Albania,AL,ALB,2862427,Europe,319.4142593
+25/11/2020,25,11,2020,744,19,Albania,AL,ALB,2862427,Europe,314.62811104
+24/11/2020,24,11,2020,795,17,Albania,AL,ALB,2862427,Europe,308.30480568
+23/11/2020,23,11,2020,565,14,Albania,AL,ALB,2862427,Europe,298.87225072
+22/11/2020,22,11,2020,737,13,Albania,AL,ALB,2862427,Europe,296.63638584
+21/11/2020,21,11,2020,836,15,Albania,AL,ALB,2862427,Europe,288.18202176
+20/11/2020,20,11,2020,786,11,Albania,AL,ALB,2862427,Europe,276.05944187
+19/11/2020,19,11,2020,711,9,Albania,AL,ALB,2862427,Europe,263.30802497
+18/11/2020,18,11,2020,694,6,Albania,AL,ALB,2862427,Europe,252.30337752
+17/11/2020,17,11,2020,602,8,Albania,AL,ALB,2862427,Europe,241.36860084
+16/11/2020,16,11,2020,597,11,Albania,AL,ALB,2862427,Europe,231.5517566
+15/11/2020,15,11,2020,532,7,Albania,AL,ALB,2862427,Europe,222.11920164
+14/11/2020,14,11,2020,490,7,Albania,AL,ALB,2862427,Europe,211.95300352
+13/11/2020,13,11,2020,410,8,Albania,AL,ALB,2862427,Europe,205.97905204
+12/11/2020,12,11,2020,507,11,Albania,AL,ALB,2862427,Europe,201.26277456
+11/11/2020,11,11,2020,563,8,Albania,AL,ALB,2862427,Europe,194.41543837
+10/11/2020,10,11,2020,525,12,Albania,AL,ALB,2862427,Europe,184.66846491
+09/11/2020,9,11,2020,501,2,Albania,AL,ALB,2862427,Europe,176.38877777
+08/11/2020,8,11,2020,495,8,Albania,AL,ALB,2862427,Europe,169.33182925
+07/11/2020,7,11,2020,489,6,Albania,AL,ALB,2862427,Europe,162.58929922
+06/11/2020,6,11,2020,421,7,Albania,AL,ALB,2862427,Europe,156.19612308
+05/11/2020,5,11,2020,396,4,Albania,AL,ALB,2862427,Europe,152.03881182
+04/11/2020,4,11,2020,381,5,Albania,AL,ALB,2862427,Europe,148.58020833
+03/11/2020,3,11,2020,321,9,Albania,AL,ALB,2862427,Europe,145.78537723
+02/11/2020,2,11,2020,327,9,Albania,AL,ALB,2862427,Europe,144.87705713
+01/11/2020,1,11,2020,241,7,Albania,AL,ALB,2862427,Europe,143.27002924
+31/10/2020,31,10,2020,319,3,Albania,AL,ALB,2862427,Europe,144.38796168
+30/10/2020,30,10,2020,275,6,Albania,AL,ALB,2862427,Europe,143.33990002
+29/10/2020,29,10,2020,311,6,Albania,AL,ALB,2862427,Europe,142.71106302
+28/10/2020,28,10,2020,284,7,Albania,AL,ALB,2862427,Europe,138.93804104
+27/10/2020,27,10,2020,288,3,Albania,AL,ALB,2862427,Europe,135.37463139
+26/10/2020,26,10,2020,299,4,Albania,AL,ALB,2862427,Europe,131.2871909
+25/10/2020,25,10,2020,302,4,Albania,AL,ALB,2862427,Europe,126.71065498
+24/10/2020,24,10,2020,306,4,Albania,AL,ALB,2862427,Europe,121.92450672
+23/10/2020,23,10,2020,302,3,Albania,AL,ALB,2862427,Europe,117.06848769
+22/10/2020,22,10,2020,297,4,Albania,AL,ALB,2862427,Europe,112.42208098
+21/10/2020,21,10,2020,301,4,Albania,AL,ALB,2862427,Europe,107.7058035
+20/10/2020,20,10,2020,295,3,Albania,AL,ALB,2862427,Europe,102.71004291
+19/10/2020,19,10,2020,281,3,Albania,AL,ALB,2862427,Europe,97.43479921
+18/10/2020,18,10,2020,273,5,Albania,AL,ALB,2862427,Europe,92.8233279
+17/10/2020,17,10,2020,289,4,Albania,AL,ALB,2862427,Europe,88.59614586
+16/10/2020,16,10,2020,257,5,Albania,AL,ALB,2862427,Europe,84.05454532
+15/10/2020,15,10,2020,203,5,Albania,AL,ALB,2862427,Europe,80.56100645
+14/10/2020,14,10,2020,182,5,Albania,AL,ALB,2862427,Europe,78.04565846
+13/10/2020,13,10,2020,171,4,Albania,AL,ALB,2862427,Europe,76.12421208
+12/10/2020,12,10,2020,168,4,Albania,AL,ALB,2862427,Europe,74.76173191
+11/10/2020,11,10,2020,165,3,Albania,AL,ALB,2862427,Europe,72.59573781
+10/10/2020,10,10,2020,167,2,Albania,AL,ALB,2862427,Europe,70.60442065
+09/10/2020,9,10,2020,169,4,Albania,AL,ALB,2862427,Europe,69.10219894
+08/10/2020,8,10,2020,162,4,Albania,AL,ALB,2862427,Europe,67.87946033
+07/10/2020,7,10,2020,158,3,Albania,AL,ALB,2862427,Europe,66.44710939
+06/10/2020,6,10,2020,144,4,Albania,AL,ALB,2862427,Europe,65.5038539
+05/10/2020,5,10,2020,149,4,Albania,AL,ALB,2862427,Europe,65.71346623
+04/10/2020,4,10,2020,152,3,Albania,AL,ALB,2862427,Europe,66.06282012
+03/10/2020,3,10,2020,159,1,Albania,AL,ALB,2862427,Europe,66.09775551
+02/10/2020,2,10,2020,157,1,Albania,AL,ALB,2862427,Europe,64.90995229
+01/10/2020,1,10,2020,131,3,Albania,AL,ALB,2862427,Europe,64.03656757
+30/09/2020,30,9,2020,127,4,Albania,AL,ALB,2862427,Europe,64.49072762
+29/09/2020,29,9,2020,132,3,Albania,AL,ALB,2862427,Europe,65.36411234
+28/09/2020,28,9,2020,106,2,Albania,AL,ALB,2862427,Europe,66.58685095
+27/09/2020,27,9,2020,108,2,Albania,AL,ALB,2862427,Europe,68.75284505
+26/09/2020,26,9,2020,124,3,Albania,AL,ALB,2862427,Europe,70.70922682
+25/09/2020,25,9,2020,134,0,Albania,AL,ALB,2862427,Europe,72.0018362
+24/09/2020,24,9,2020,121,3,Albania,AL,ALB,2862427,Europe,72.77041476
+23/09/2020,23,9,2020,131,3,Albania,AL,ALB,2862427,Europe,73.81847642
+22/09/2020,22,9,2020,150,2,Albania,AL,ALB,2862427,Europe,74.37744264
+21/09/2020,21,9,2020,159,4,Albania,AL,ALB,2862427,Europe,74.41237803
+20/09/2020,20,9,2020,153,5,Albania,AL,ALB,2862427,Europe,74.20276569
+19/09/2020,19,9,2020,125,5,Albania,AL,ALB,2862427,Europe,73.5739287
+18/09/2020,18,9,2020,132,5,Albania,AL,ALB,2862427,Europe,73.50405792
+17/09/2020,17,9,2020,144,3,Albania,AL,ALB,2862427,Europe,72.9450917
+16/09/2020,16,9,2020,152,2,Albania,AL,ALB,2862427,Europe,72.17651315
+15/09/2020,15,9,2020,167,4,Albania,AL,ALB,2862427,Europe,70.11532521
+14/09/2020,14,9,2020,168,4,Albania,AL,ALB,2862427,Europe,68.92752199
+13/09/2020,13,9,2020,164,3,Albania,AL,ALB,2862427,Europe,66.58685095
+12/09/2020,12,9,2020,161,3,Albania,AL,ALB,2862427,Europe,63.79201985
+11/09/2020,11,9,2020,156,2,Albania,AL,ALB,2862427,Europe,62.0801858
+10/09/2020,10,9,2020,151,1,Albania,AL,ALB,2862427,Europe,62.0801858
+09/09/2020,9,9,2020,147,2,Albania,AL,ALB,2862427,Europe,62.67408741
+08/09/2020,8,9,2020,151,3,Albania,AL,ALB,2862427,Europe,62.91863513
+07/09/2020,7,9,2020,153,4,Albania,AL,ALB,2862427,Europe,63.86189063
+06/09/2020,6,9,2020,135,6,Albania,AL,ALB,2862427,Europe,63.82695524
+05/09/2020,5,9,2020,123,5,Albania,AL,ALB,2862427,Europe,64.5605984
+04/09/2020,4,9,2020,116,5,Albania,AL,ALB,2862427,Europe,65.57372467
+03/09/2020,3,9,2020,122,6,Albania,AL,ALB,2862427,Europe,66.93620484
+02/09/2020,2,9,2020,93,6,Albania,AL,ALB,2862427,Europe,68.19387883
+01/09/2020,1,9,2020,133,4,Albania,AL,ALB,2862427,Europe,70.35987293
+31/08/2020,31,8,2020,101,5,Albania,AL,ALB,2862427,Europe,69.87077749
+30/08/2020,30,8,2020,84,4,Albania,AL,ALB,2862427,Europe,70.53454988
+29/08/2020,29,8,2020,112,5,Albania,AL,ALB,2862427,Europe,72.59573781
+28/08/2020,28,8,2020,156,3,Albania,AL,ALB,2862427,Europe,73.78354103
+27/08/2020,27,8,2020,168,4,Albania,AL,ALB,2862427,Europe,73.71367025
+26/08/2020,26,8,2020,154,5,Albania,AL,ALB,2862427,Europe,72.77041476
+25/08/2020,25,8,2020,178,4,Albania,AL,ALB,2862427,Europe,72.28131931
+24/08/2020,24,8,2020,152,5,Albania,AL,ALB,2862427,Europe,70.42974371
+23/08/2020,23,8,2020,156,5,Albania,AL,ALB,2862427,Europe,69.87077749
+22/08/2020,22,8,2020,152,2,Albania,AL,ALB,2862427,Europe,68.75284505
+21/08/2020,21,8,2020,155,4,Albania,AL,ALB,2862427,Europe,68.15894344
+20/08/2020,20,8,2020,158,2,Albania,AL,ALB,2862427,Europe,67.18075256
+19/08/2020,19,8,2020,155,2,Albania,AL,ALB,2862427,Europe,66.51698017
+18/08/2020,18,8,2020,119,2,Albania,AL,ALB,2862427,Europe,65.64359545
+17/08/2020,17,8,2020,120,3,Albania,AL,ALB,2862427,Europe,65.01475845
+16/08/2020,16,8,2020,143,6,Albania,AL,ALB,2862427,Europe,65.11956462
+15/08/2020,15,8,2020,146,6,Albania,AL,ALB,2862427,Europe,64.31605068
+14/08/2020,14,8,2020,154,5,Albania,AL,ALB,2862427,Europe,61.97537963
+13/08/2020,13,8,2020,141,3,Albania,AL,ALB,2862427,Europe,59.80938553
+12/08/2020,12,8,2020,140,5,Albania,AL,ALB,2862427,Europe,58.6565177
+11/08/2020,11,8,2020,125,1,Albania,AL,ALB,2862427,Europe,57.85300376
+10/08/2020,10,8,2020,136,6,Albania,AL,ALB,2862427,Europe,57.57352065
+09/08/2020,9,8,2020,124,4,Albania,AL,ALB,2862427,Europe,57.22416676
+08/08/2020,8,8,2020,135,1,Albania,AL,ALB,2862427,Europe,55.23284961
+07/08/2020,7,8,2020,127,6,Albania,AL,ALB,2862427,Europe,54.14985256
+06/08/2020,6,8,2020,139,6,Albania,AL,ALB,2862427,Europe,53.48608017
+05/08/2020,5,8,2020,130,4,Albania,AL,ALB,2862427,Europe,51.00566757
+04/08/2020,4,8,2020,101,6,Albania,AL,ALB,2862427,Europe,50.62137829
+03/08/2020,3,8,2020,123,5,Albania,AL,ALB,2862427,Europe,49.92267052
+02/08/2020,2,8,2020,120,4,Albania,AL,ALB,2862427,Europe,48.49031958
+01/08/2020,1,8,2020,79,3,Albania,AL,ALB,2862427,Europe,47.86148258
+31/07/2020,31,7,2020,92,4,Albania,AL,ALB,2862427,Europe,47.02303325
+30/07/2020,30,7,2020,108,2,Albania,AL,ALB,2862427,Europe,47.26758097
+29/07/2020,29,7,2020,117,4,Albania,AL,ALB,2862427,Europe,46.46406703
+28/07/2020,28,7,2020,117,6,Albania,AL,ALB,2862427,Europe,45.73042387
+27/07/2020,27,7,2020,126,4,Albania,AL,ALB,2862427,Europe,45.73042387
+26/07/2020,26,7,2020,67,6,Albania,AL,ALB,2862427,Europe,44.22820215
+25/07/2020,25,7,2020,104,5,Albania,AL,ALB,2862427,Europe,45.13652226
+24/07/2020,24,7,2020,108,3,Albania,AL,ALB,2862427,Europe,44.64742682
+23/07/2020,23,7,2020,68,3,Albania,AL,ALB,2862427,Europe,43.73910671
+22/07/2020,22,7,2020,119,4,Albania,AL,ALB,2862427,Europe,43.73910671
+21/07/2020,21,7,2020,81,1,Albania,AL,ALB,2862427,Europe,42.16701422
+20/07/2020,20,7,2020,82,1,Albania,AL,ALB,2862427,Europe,41.81766033
+19/07/2020,19,7,2020,102,4,Albania,AL,ALB,2862427,Europe,41.53817722
+18/07/2020,18,7,2020,55,3,Albania,AL,ALB,2862427,Europe,40.31543861
+17/07/2020,17,7,2020,99,3,Albania,AL,ALB,2862427,Europe,41.53817722
+16/07/2020,16,7,2020,85,4,Albania,AL,ALB,2862427,Europe,40.94427561
+15/07/2020,15,7,2020,96,2,Albania,AL,ALB,2862427,Europe,39.54686006
+14/07/2020,14,7,2020,117,2,Albania,AL,ALB,2862427,Europe,38.60360456
+13/07/2020,13,7,2020,83,4,Albania,AL,ALB,2862427,Europe,36.75202896
+12/07/2020,12,7,2020,93,4,Albania,AL,ALB,2862427,Europe,36.36773968
+11/07/2020,11,7,2020,90,2,Albania,AL,ALB,2862427,Europe,35.24980724
+10/07/2020,10,7,2020,82,0,Albania,AL,ALB,2862427,Europe,34.79564719
+09/07/2020,9,7,2020,68,2,Albania,AL,ALB,2862427,Europe,34.65590564
+08/07/2020,8,7,2020,74,2,Albania,AL,ALB,2862427,Europe,34.62097025
+07/07/2020,7,7,2020,71,3,Albania,AL,ALB,2862427,Europe,33.85239169
+06/07/2020,6,7,2020,74,2,Albania,AL,ALB,2862427,Europe,33.74758553
+05/07/2020,5,7,2020,67,2,Albania,AL,ALB,2862427,Europe,32.42004076
+04/07/2020,4,7,2020,90,3,Albania,AL,ALB,2862427,Europe,31.93094531
+03/07/2020,3,7,2020,82,4,Albania,AL,ALB,2862427,Europe,30.53352976
+02/07/2020,2,7,2020,45,3,Albania,AL,ALB,2862427,Europe,29.97456354
+01/07/2020,1,7,2020,69,4,Albania,AL,ALB,2862427,Europe,30.14924049
+30/06/2020,30,6,2020,64,3,Albania,AL,ALB,2862427,Europe,30.60340054
+29/06/2020,29,6,2020,72,2,Albania,AL,ALB,2862427,Europe,30.77807748
+28/06/2020,28,6,2020,61,2,Albania,AL,ALB,2862427,Europe,30.25404665
+27/06/2020,27,6,2020,77,2,Albania,AL,ALB,2862427,Europe,29.7998866
+26/06/2020,26,6,2020,78,2,Albania,AL,ALB,2862427,Europe,28.19285872
+25/06/2020,25,6,2020,67,2,Albania,AL,ALB,2862427,Europe,27.0050555
+24/06/2020,24,6,2020,52,1,Albania,AL,ALB,2862427,Europe,26.13167078
+23/06/2020,23,6,2020,68,0,Albania,AL,ALB,2862427,Europe,25.57270456
+22/06/2020,22,6,2020,36,1,Albania,AL,ALB,2862427,Europe,23.79099974
+21/06/2020,21,6,2020,53,1,Albania,AL,ALB,2862427,Europe,23.02242118
+20/06/2020,20,6,2020,50,3,Albania,AL,ALB,2862427,Europe,21.86955335
+19/06/2020,19,6,2020,66,1,Albania,AL,ALB,2862427,Europe,20.64681475
+18/06/2020,18,6,2020,50,1,Albania,AL,ALB,2862427,Europe,18.79523914
+17/06/2020,17,6,2020,82,1,Albania,AL,ALB,2862427,Europe,17.74717748
+16/06/2020,16,6,2020,69,0,Albania,AL,ALB,2862427,Europe,15.61611877
+15/06/2020,15,6,2020,57,0,Albania,AL,ALB,2862427,Europe,13.41518928
+14/06/2020,14,6,2020,48,0,Albania,AL,ALB,2862427,Europe,11.94790295
+13/06/2020,13,6,2020,31,1,Albania,AL,ALB,2862427,Europe,11.07451823
+12/06/2020,12,6,2020,44,1,Albania,AL,ALB,2862427,Europe,10.79503512
+11/06/2020,11,6,2020,42,0,Albania,AL,ALB,2862427,Europe,10.16619812
+10/06/2020,10,6,2020,36,0,Albania,AL,ALB,2862427,Europe,9.43255496
+09/06/2020,9,6,2020,17,0,Albania,AL,ALB,2862427,Europe,9.04826569
+08/06/2020,8,6,2020,14,0,Albania,AL,ALB,2862427,Europe,8.66397641
+07/06/2020,7,6,2020,20,1,Albania,AL,ALB,2862427,Europe,8.48929947
+06/06/2020,6,6,2020,15,0,Albania,AL,ALB,2862427,Europe,8.0700748
+05/06/2020,5,6,2020,13,0,Albania,AL,ALB,2862427,Europe,7.96526863
+04/06/2020,4,6,2020,20,0,Albania,AL,ALB,2862427,Europe,7.68578552
+03/06/2020,3,6,2020,21,0,Albania,AL,ALB,2862427,Europe,7.51110858
+02/06/2020,2,6,2020,6,0,Albania,AL,ALB,2862427,Europe,6.81240081
+01/06/2020,1,6,2020,15,0,Albania,AL,ALB,2862427,Europe,6.67265925
+31/05/2020,31,5,2020,23,0,Albania,AL,ALB,2862427,Europe,6.60278847
+30/05/2020,30,5,2020,23,0,Albania,AL,ALB,2862427,Europe,6.39317614
+29/05/2020,29,5,2020,26,0,Albania,AL,ALB,2862427,Europe,6.2184992
+28/05/2020,28,5,2020,21,0,Albania,AL,ALB,2862427,Europe,5.93901609
+27/05/2020,27,5,2020,25,1,Albania,AL,ALB,2862427,Europe,5.34511448
+26/05/2020,26,5,2020,6,0,Albania,AL,ALB,2862427,Europe,4.61147131
+25/05/2020,25,5,2020,9,1,Albania,AL,ALB,2862427,Europe,4.54160054
+24/05/2020,24,5,2020,8,0,Albania,AL,ALB,2862427,Europe,4.6464067
+23/05/2020,23,5,2020,12,0,Albania,AL,ALB,2862427,Europe,4.57653593
+22/05/2020,22,5,2020,5,0,Albania,AL,ALB,2862427,Europe,4.43679437
+21/05/2020,21,5,2020,15,0,Albania,AL,ALB,2862427,Europe,4.61147131
+20/05/2020,20,5,2020,1,0,Albania,AL,ALB,2862427,Europe,4.50666515
+19/05/2020,19,5,2020,2,0,Albania,AL,ALB,2862427,Europe,5.06563137
+18/05/2020,18,5,2020,13,0,Albania,AL,ALB,2862427,Europe,5.2752437
+17/05/2020,17,5,2020,17,0,Albania,AL,ALB,2862427,Europe,5.03069598
+16/05/2020,16,5,2020,18,0,Albania,AL,ALB,2862427,Europe,4.68134209
+15/05/2020,15,5,2020,18,0,Albania,AL,ALB,2862427,Europe,4.36692359
+14/05/2020,14,5,2020,4,0,Albania,AL,ALB,2862427,Europe,3.98263432
+13/05/2020,13,5,2020,4,0,Albania,AL,ALB,2862427,Europe,4.40185898
+12/05/2020,12,5,2020,4,0,Albania,AL,ALB,2862427,Europe,4.75121287
+11/05/2020,11,5,2020,12,0,Albania,AL,ALB,2862427,Europe,4.9608252
+10/05/2020,10,5,2020,6,0,Albania,AL,ALB,2862427,Europe,5.03069598
+09/05/2020,9,5,2020,8,0,Albania,AL,ALB,2862427,Europe,6.00888686
+08/05/2020,8,5,2020,10,0,Albania,AL,ALB,2862427,Europe,6.25343459
+07/05/2020,7,5,2020,12,0,Albania,AL,ALB,2862427,Europe,6.91720697
+06/05/2020,6,5,2020,17,0,Albania,AL,ALB,2862427,Europe,7.37136703
+05/05/2020,5,5,2020,8,0,Albania,AL,ALB,2862427,Europe,7.65085014
+04/05/2020,4,5,2020,6,0,Albania,AL,ALB,2862427,Europe,8.13994558
+03/05/2020,3,5,2020,7,0,Albania,AL,ALB,2862427,Europe,8.41942869
+02/05/2020,2,5,2020,9,0,Albania,AL,ALB,2862427,Europe,8.48929947
+01/05/2020,1,5,2020,7,0,Albania,AL,ALB,2862427,Europe,8.90852413
+30/04/2020,30,4,2020,16,1,Albania,AL,ALB,2862427,Europe,9.50242574
+29/04/2020,29,4,2020,14,2,Albania,AL,ALB,2862427,Europe,9.6072319
+28/04/2020,28,4,2020,10,0,Albania,AL,ALB,2862427,Europe,9.39761957
+27/04/2020,27,4,2020,14,1,Albania,AL,ALB,2862427,Europe,9.78190885
+26/04/2020,26,4,2020,34,0,Albania,AL,ALB,2862427,Europe,9.74697346
+25/04/2020,25,4,2020,15,0,Albania,AL,ALB,2862427,Europe,9.15307185
+24/04/2020,24,4,2020,29,0,Albania,AL,ALB,2862427,Europe,8.87358874
+23/04/2020,23,4,2020,25,1,Albania,AL,ALB,2862427,Europe,8.17488097
+22/04/2020,22,4,2020,25,0,Albania,AL,ALB,2862427,Europe,7.89539786
+21/04/2020,21,4,2020,22,0,Albania,AL,ALB,2862427,Europe,7.23162547
+20/04/2020,20,4,2020,14,0,Albania,AL,ALB,2862427,Europe,7.02201314
+19/04/2020,19,4,2020,9,0,Albania,AL,ALB,2862427,Europe,7.51110858
+18/04/2020,18,4,2020,21,0,Albania,AL,ALB,2862427,Europe,8.20981636
+17/04/2020,17,4,2020,24,1,Albania,AL,ALB,2862427,Europe,8.41942869
+16/04/2020,16,4,2020,19,1,Albania,AL,ALB,2862427,Europe,8.20981636
+15/04/2020,15,4,2020,8,1,Albania,AL,ALB,2862427,Europe,8.10501019
+14/04/2020,14,4,2020,21,0,Albania,AL,ALB,2862427,Europe,8.52423485
+13/04/2020,13,4,2020,13,0,Albania,AL,ALB,2862427,Europe,8.17488097
+12/04/2020,12,4,2020,17,0,Albania,AL,ALB,2862427,Europe,8.24475174
+11/04/2020,11,4,2020,7,0,Albania,AL,ALB,2862427,Europe,8.03513941
+10/04/2020,10,4,2020,9,1,Albania,AL,ALB,2862427,Europe,8.20981636
+09/04/2020,9,4,2020,17,0,Albania,AL,ALB,2862427,Europe,8.87358874
+08/04/2020,8,4,2020,6,0,Albania,AL,ALB,2862427,Europe,9.08320107
+07/04/2020,7,4,2020,16,1,Albania,AL,ALB,2862427,Europe,9.67710268
+06/04/2020,6,4,2020,28,2,Albania,AL,ALB,2862427,Europe,9.50242574
+05/04/2020,5,4,2020,29,2,Albania,AL,ALB,2862427,Europe,8.97839491
+04/04/2020,4,4,2020,27,1,Albania,AL,ALB,2862427,Europe,8.17488097
+03/04/2020,3,4,2020,18,1,Albania,AL,ALB,2862427,Europe,7.23162547
+02/04/2020,2,4,2020,16,0,Albania,AL,ALB,2862427,Europe,6.98707775
+01/04/2020,1,4,2020,20,3,Albania,AL,ALB,2862427,Europe,6.56785308
+31/03/2020,31,3,2020,11,2,Albania,AL,ALB,2862427,Europe,6.00888686
+30/03/2020,30,3,2020,15,0,Albania,AL,ALB,2862427,Europe,5.93901609
+29/03/2020,29,3,2020,11,1,Albania,AL,ALB,2862427,Europe,5.55472681
+28/03/2020,28,3,2020,12,3,Albania,AL,ALB,2862427,Europe,5.34511448
+27/03/2020,27,3,2020,28,1,Albania,AL,ALB,2862427,Europe,5.2752437
+26/03/2020,26,3,2020,23,0,Albania,AL,ALB,2862427,Europe,4.71627748
+25/03/2020,25,3,2020,23,1,Albania,AL,ALB,2862427,Europe,3.94769893
+24/03/2020,24,3,2020,11,2,Albania,AL,ALB,2862427,Europe,3.28392654
+23/03/2020,23,3,2020,13,0,Albania,AL,ALB,2862427,Europe,3.03937882
+22/03/2020,22,3,2020,6,0,Albania,AL,ALB,2862427,Europe,2.65508954
+21/03/2020,21,3,2020,0,0,Albania,AL,ALB,2862427,Europe,
+20/03/2020,20,3,2020,11,0,Albania,AL,ALB,2862427,Europe,
+19/03/2020,19,3,2020,4,1,Albania,AL,ALB,2862427,Europe,
+18/03/2020,18,3,2020,4,0,Albania,AL,ALB,2862427,Europe,
+17/03/2020,17,3,2020,9,0,Albania,AL,ALB,2862427,Europe,
+16/03/2020,16,3,2020,4,0,Albania,AL,ALB,2862427,Europe,
+15/03/2020,15,3,2020,5,0,Albania,AL,ALB,2862427,Europe,
+14/03/2020,14,3,2020,10,0,Albania,AL,ALB,2862427,Europe,
+13/03/2020,13,3,2020,12,0,Albania,AL,ALB,2862427,Europe,
+12/03/2020,12,3,2020,1,1,Albania,AL,ALB,2862427,Europe,
+11/03/2020,11,3,2020,4,0,Albania,AL,ALB,2862427,Europe,
+10/03/2020,10,3,2020,4,0,Albania,AL,ALB,2862427,Europe,
+09/03/2020,9,3,2020,2,0,Albania,AL,ALB,2862427,Europe,
+14/12/2020,14,12,2020,464,12,Algeria,DZ,DZA,43053054,Africa,22.95075281
+13/12/2020,13,12,2020,517,9,Algeria,DZ,DZA,43053054,Africa,24.21663281
+12/12/2020,12,12,2020,542,11,Algeria,DZ,DZA,43053054,Africa,25.44070393
+11/12/2020,11,12,2020,565,10,Algeria,DZ,DZA,43053054,Africa,26.63922518
+10/12/2020,10,12,2020,598,15,Algeria,DZ,DZA,43053054,Africa,27.84703729
+09/12/2020,9,12,2020,591,12,Algeria,DZ,DZA,43053054,Africa,28.83883685
+08/12/2020,8,12,2020,573,11,Algeria,DZ,DZA,43053054,Africa,30.0977487
+07/12/2020,7,12,2020,750,15,Algeria,DZ,DZA,43053054,Africa,31.10116184
+06/12/2020,6,12,2020,772,9,Algeria,DZ,DZA,43053054,Africa,31.88623971
+05/12/2020,5,12,2020,803,12,Algeria,DZ,DZA,43053054,Africa,32.45995046
+04/12/2020,4,12,2020,843,16,Algeria,DZ,DZA,43053054,Africa,33.15676514
+03/12/2020,3,12,2020,932,17,Algeria,DZ,DZA,43053054,Africa,33.57485395
+02/12/2020,2,12,2020,963,16,Algeria,DZ,DZA,43053054,Africa,33.8210618
+01/12/2020,1,12,2020,968,21,Algeria,DZ,DZA,43053054,Africa,33.91164771
+30/11/2020,30,11,2020,1009,17,Algeria,DZ,DZA,43053054,Africa,33.7769302
+29/11/2020,29,11,2020,1044,21,Algeria,DZ,DZA,43053054,Africa,33.43084558
+28/11/2020,28,11,2020,1058,20,Algeria,DZ,DZA,43053054,Africa,32.96630246
+27/11/2020,27,11,2020,1085,23,Algeria,DZ,DZA,43053054,Africa,32.52266378
+26/11/2020,26,11,2020,1025,20,Algeria,DZ,DZA,43053054,Africa,31.97914833
+25/11/2020,25,11,2020,1133,15,Algeria,DZ,DZA,43053054,Africa,31.48208719
+24/11/2020,24,11,2020,1005,19,Algeria,DZ,DZA,43053054,Africa,30.59945527
+23/11/2020,23,11,2020,1088,35,Algeria,DZ,DZA,43053054,Africa,29.75630951
+22/11/2020,22,11,2020,1019,1,Algeria,DZ,DZA,43053054,Africa,28.78541439
+21/11/2020,21,11,2020,1103,15,Algeria,DZ,DZA,43053054,Africa,27.76806496
+20/11/2020,20,11,2020,1023,18,Algeria,DZ,DZA,43053054,Africa,26.67174319
+19/11/2020,19,11,2020,1038,20,Algeria,DZ,DZA,43053054,Africa,25.78678855
+18/11/2020,18,11,2020,1002,18,Algeria,DZ,DZA,43053054,Africa,24.64865791
+17/11/2020,17,11,2020,910,14,Algeria,DZ,DZA,43053054,Africa,23.2619967
+16/11/2020,16,11,2020,860,15,Algeria,DZ,DZA,43053054,Africa,21.84978562
+15/11/2020,15,11,2020,844,14,Algeria,DZ,DZA,43053054,Africa,20.61874635
+14/11/2020,14,11,2020,867,14,Algeria,DZ,DZA,43053054,Africa,19.33428462
+13/11/2020,13,11,2020,851,18,Algeria,DZ,DZA,43053054,Africa,18.06143648
+12/11/2020,12,11,2020,811,16,Algeria,DZ,DZA,43053054,Africa,16.79555648
+11/11/2020,11,11,2020,753,15,Algeria,DZ,DZA,43053054,Africa,15.65510312
+10/11/2020,10,11,2020,642,14,Algeria,DZ,DZA,43053054,Africa,14.57271765
+09/11/2020,9,11,2020,670,12,Algeria,DZ,DZA,43053054,Africa,13.72260374
+08/11/2020,8,11,2020,581,12,Algeria,DZ,DZA,43053054,Africa,12.7772585
+07/11/2020,7,11,2020,631,13,Algeria,DZ,DZA,43053054,Africa,12.00843963
+06/11/2020,6,11,2020,642,12,Algeria,DZ,DZA,43053054,Africa,11.17690745
+05/11/2020,5,11,2020,548,10,Algeria,DZ,DZA,43053054,Africa,10.30356639
+04/11/2020,4,11,2020,405,9,Algeria,DZ,DZA,43053054,Africa,9.61604257
+03/11/2020,3,11,2020,302,7,Algeria,DZ,DZA,43053054,Africa,9.19330833
+02/11/2020,2,11,2020,330,9,Algeria,DZ,DZA,43053054,Africa,8.98890936
+01/11/2020,1,11,2020,291,8,Algeria,DZ,DZA,43053054,Africa,8.68463362
+31/10/2020,31,10,2020,319,7,Algeria,DZ,DZA,43053054,Africa,8.50810723
+30/10/2020,30,10,2020,306,8,Algeria,DZ,DZA,43053054,Africa,8.25725395
+29/10/2020,29,10,2020,320,10,Algeria,DZ,DZA,43053054,Africa,7.99478708
+28/10/2020,28,10,2020,287,9,Algeria,DZ,DZA,43053054,Africa,7.68122048
+27/10/2020,27,10,2020,276,8,Algeria,DZ,DZA,43053054,Africa,7.41875362
+26/10/2020,26,10,2020,263,7,Algeria,DZ,DZA,43053054,Africa,7.1330596
+25/10/2020,25,10,2020,250,10,Algeria,DZ,DZA,43053054,Africa,6.82878385
+24/10/2020,24,10,2020,273,9,Algeria,DZ,DZA,43053054,Africa,6.56399428
+23/10/2020,23,10,2020,266,8,Algeria,DZ,DZA,43053054,Africa,6.26900939
+22/10/2020,22,10,2020,252,15,Algeria,DZ,DZA,43053054,Africa,5.9717018
+21/10/2020,21,10,2020,223,0,Algeria,DZ,DZA,43053054,Africa,5.66742606
+20/10/2020,20,10,2020,214,9,Algeria,DZ,DZA,43053054,Africa,5.44909079
+19/10/2020,19,10,2020,199,10,Algeria,DZ,DZA,43053054,Africa,5.26327354
+18/10/2020,18,10,2020,215,5,Algeria,DZ,DZA,43053054,Africa,5.12855604
+17/10/2020,17,10,2020,211,5,Algeria,DZ,DZA,43053054,Africa,4.97293409
+16/10/2020,16,10,2020,193,9,Algeria,DZ,DZA,43053054,Africa,4.84750745
+15/10/2020,15,10,2020,185,9,Algeria,DZ,DZA,43053054,Africa,4.77085784
+14/10/2020,14,10,2020,174,9,Algeria,DZ,DZA,43053054,Africa,4.71743538
+13/10/2020,13,10,2020,153,8,Algeria,DZ,DZA,43053054,Africa,4.67330378
+12/10/2020,12,10,2020,132,6,Algeria,DZ,DZA,43053054,Africa,4.65704477
+11/10/2020,11,10,2020,136,6,Algeria,DZ,DZA,43053054,Africa,4.7058218
+10/10/2020,10,10,2020,146,6,Algeria,DZ,DZA,43053054,Africa,4.76156697
+09/10/2020,9,10,2020,138,4,Algeria,DZ,DZA,43053054,Africa,4.82892572
+08/10/2020,8,10,2020,121,6,Algeria,DZ,DZA,43053054,Africa,4.92415706
+07/10/2020,7,10,2020,129,5,Algeria,DZ,DZA,43053054,Africa,5.07513358
+06/10/2020,6,10,2020,134,8,Algeria,DZ,DZA,43053054,Africa,5.21914195
+05/10/2020,5,10,2020,141,4,Algeria,DZ,DZA,43053054,Africa,5.36547303
+04/10/2020,4,10,2020,148,7,Algeria,DZ,DZA,43053054,Africa,5.50948139
+03/10/2020,3,10,2020,157,8,Algeria,DZ,DZA,43053054,Africa,5.65348976
+02/10/2020,2,10,2020,160,7,Algeria,DZ,DZA,43053054,Africa,5.79749813
+01/10/2020,1,10,2020,162,8,Algeria,DZ,DZA,43053054,Africa,5.95544279
+30/09/2020,30,9,2020,155,7,Algeria,DZ,DZA,43053054,Africa,6.11803288
+29/09/2020,29,9,2020,146,5,Algeria,DZ,DZA,43053054,Africa,6.31081828
+28/09/2020,28,9,2020,153,3,Algeria,DZ,DZA,43053054,Africa,6.53379897
+27/09/2020,27,9,2020,160,4,Algeria,DZ,DZA,43053054,Africa,6.75213424
+26/09/2020,26,9,2020,175,4,Algeria,DZ,DZA,43053054,Africa,6.97279222
+25/09/2020,25,9,2020,179,5,Algeria,DZ,DZA,43053054,Africa,7.17951391
+24/09/2020,24,9,2020,186,9,Algeria,DZ,DZA,43053054,Africa,7.39552646
+23/09/2020,23,9,2020,191,10,Algeria,DZ,DZA,43053054,Africa,7.60921629
+22/09/2020,22,9,2020,197,7,Algeria,DZ,DZA,43053054,Africa,7.82755156
+21/09/2020,21,9,2020,203,7,Algeria,DZ,DZA,43053054,Africa,8.04124139
+20/09/2020,20,9,2020,210,6,Algeria,DZ,DZA,43053054,Africa,8.2502858
+19/09/2020,19,9,2020,219,5,Algeria,DZ,DZA,43053054,Africa,8.45468477
+18/09/2020,18,9,2020,228,9,Algeria,DZ,DZA,43053054,Africa,8.6521156
+17/09/2020,17,9,2020,232,13,Algeria,DZ,DZA,43053054,Africa,8.84490099
+16/09/2020,16,9,2020,238,12,Algeria,DZ,DZA,43053054,Africa,9.06091354
+15/09/2020,15,9,2020,242,8,Algeria,DZ,DZA,43053054,Africa,9.29550782
+14/09/2020,14,9,2020,247,7,Algeria,DZ,DZA,43053054,Africa,9.54171567
+13/09/2020,13,9,2020,255,6,Algeria,DZ,DZA,43053054,Africa,9.81347339
+12/09/2020,12,9,2020,264,8,Algeria,DZ,DZA,43053054,Africa,10.10149013
+11/09/2020,11,9,2020,272,10,Algeria,DZ,DZA,43053054,Africa,10.38718415
+10/09/2020,10,9,2020,278,10,Algeria,DZ,DZA,43053054,Africa,10.6775236
+09/09/2020,9,9,2020,285,9,Algeria,DZ,DZA,43053054,Africa,10.93999046
+08/09/2020,8,9,2020,289,6,Algeria,DZ,DZA,43053054,Africa,11.13742128
+07/09/2020,7,9,2020,293,7,Algeria,DZ,DZA,43053054,Africa,11.39059728
+06/09/2020,6,9,2020,298,10,Algeria,DZ,DZA,43053054,Africa,11.62054613
+05/09/2020,5,9,2020,304,8,Algeria,DZ,DZA,43053054,Africa,11.85978584
+04/09/2020,4,9,2020,311,6,Algeria,DZ,DZA,43053054,Africa,12.10367097
+03/09/2020,3,9,2020,325,7,Algeria,DZ,DZA,43053054,Africa,12.33594253
+02/09/2020,2,9,2020,339,8,Algeria,DZ,DZA,43053054,Africa,12.51711435
+01/09/2020,1,9,2020,348,9,Algeria,DZ,DZA,43053054,Africa,12.7029316
+31/08/2020,31,8,2020,364,10,Algeria,DZ,DZA,43053054,Africa,12.92126686
+30/08/2020,30,8,2020,379,8,Algeria,DZ,DZA,43053054,Africa,13.1210204
+29/08/2020,29,8,2020,387,8,Algeria,DZ,DZA,43053054,Africa,13.33006481
+28/08/2020,28,8,2020,397,10,Algeria,DZ,DZA,43053054,Africa,13.53910921
+27/08/2020,27,8,2020,391,9,Algeria,DZ,DZA,43053054,Africa,13.75047633
+26/08/2020,26,8,2020,370,10,Algeria,DZ,DZA,43053054,Africa,13.99203875
+25/08/2020,25,8,2020,398,11,Algeria,DZ,DZA,43053054,Africa,14.27541006
+24/08/2020,24,8,2020,392,11,Algeria,DZ,DZA,43053054,Africa,14.50768162
+23/08/2020,23,8,2020,401,6,Algeria,DZ,DZA,43053054,Africa,14.80731193
+22/08/2020,22,8,2020,409,7,Algeria,DZ,DZA,43053054,Africa,15.12552396
+21/08/2020,21,8,2020,411,9,Algeria,DZ,DZA,43053054,Africa,15.40424984
+20/08/2020,20,8,2020,403,11,Algeria,DZ,DZA,43053054,Africa,15.77588433
+19/08/2020,19,8,2020,419,12,Algeria,DZ,DZA,43053054,Africa,16.11964624
+18/08/2020,18,8,2020,442,9,Algeria,DZ,DZA,43053054,Africa,16.3821131
+17/08/2020,17,8,2020,450,10,Algeria,DZ,DZA,43053054,Africa,16.53308962
+16/08/2020,16,8,2020,469,9,Algeria,DZ,DZA,43053054,Africa,16.68406613
+15/08/2020,15,8,2020,477,10,Algeria,DZ,DZA,43053054,Africa,16.88614239
+14/08/2020,14,8,2020,488,8,Algeria,DZ,DZA,43053054,Africa,17.08589593
+13/08/2020,13,8,2020,495,11,Algeria,DZ,DZA,43053054,Africa,17.35068551
+12/08/2020,12,8,2020,492,10,Algeria,DZ,DZA,43053054,Africa,17.62708866
+11/08/2020,11,8,2020,498,10,Algeria,DZ,DZA,43053054,Africa,17.975496
+10/08/2020,10,8,2020,521,9,Algeria,DZ,DZA,43053054,Africa,18.24957644
+09/08/2020,9,8,2020,538,11,Algeria,DZ,DZA,43053054,Africa,18.41681196
+08/08/2020,8,8,2020,529,9,Algeria,DZ,DZA,43053054,Africa,18.57243391
+07/08/2020,7,8,2020,571,12,Algeria,DZ,DZA,43053054,Africa,18.91155039
+06/08/2020,6,8,2020,551,13,Algeria,DZ,DZA,43053054,Africa,19.00678173
+05/08/2020,5,8,2020,532,9,Algeria,DZ,DZA,43053054,Africa,19.1066585
+04/08/2020,4,8,2020,507,8,Algeria,DZ,DZA,43053054,Africa,19.23440785
+03/08/2020,3,8,2020,515,8,Algeria,DZ,DZA,43053054,Africa,19.46667941
+02/08/2020,2,8,2020,556,13,Algeria,DZ,DZA,43053054,Africa,19.51313373
+01/08/2020,1,8,2020,563,10,Algeria,DZ,DZA,43053054,Africa,19.61765593
+31/07/2020,31,7,2020,602,14,Algeria,DZ,DZA,43053054,Africa,19.6873374
+30/07/2020,30,7,2020,614,12,Algeria,DZ,DZA,43053054,Africa,19.64785123
+29/07/2020,29,7,2020,642,11,Algeria,DZ,DZA,43053054,Africa,19.50848829
+28/07/2020,28,7,2020,616,8,Algeria,DZ,DZA,43053054,Africa,19.241376
+27/07/2020,27,7,2020,593,9,Algeria,DZ,DZA,43053054,Africa,18.9580047
+26/07/2020,26,7,2020,605,10,Algeria,DZ,DZA,43053054,Africa,18.70250598
+25/07/2020,25,7,2020,675,12,Algeria,DZ,DZA,43053054,Africa,18.38893938
+24/07/2020,24,7,2020,612,13,Algeria,DZ,DZA,43053054,Africa,17.82916492
+23/07/2020,23,7,2020,594,11,Algeria,DZ,DZA,43053054,Africa,17.47611215
+22/07/2020,22,7,2020,587,13,Algeria,DZ,DZA,43053054,Africa,17.1857727
+21/07/2020,21,7,2020,607,9,Algeria,DZ,DZA,43053054,Africa,16.92562855
+20/07/2020,20,7,2020,535,10,Algeria,DZ,DZA,43053054,Africa,16.59115751
+19/07/2020,19,7,2020,601,11,Algeria,DZ,DZA,43053054,Africa,16.37282224
+18/07/2020,18,7,2020,593,5,Algeria,DZ,DZA,43053054,Africa,15.97563787
+17/07/2020,17,7,2020,585,12,Algeria,DZ,DZA,43053054,Africa,15.55754906
+16/07/2020,16,7,2020,554,12,Algeria,DZ,DZA,43053054,Africa,15.09300595
+15/07/2020,15,7,2020,527,10,Algeria,DZ,DZA,43053054,Africa,14.6540127
+14/07/2020,14,7,2020,494,7,Algeria,DZ,DZA,43053054,Africa,14.21037402
+13/07/2020,13,7,2020,483,7,Algeria,DZ,DZA,43053054,Africa,13.75512176
+12/07/2020,12,7,2020,470,8,Algeria,DZ,DZA,43053054,Africa,13.34167839
+11/07/2020,11,7,2020,434,8,Algeria,DZ,DZA,43053054,Africa,12.90733057
+10/07/2020,10,7,2020,460,10,Algeria,DZ,DZA,43053054,Africa,12.45672374
+09/07/2020,9,7,2020,469,10,Algeria,DZ,DZA,43053054,Africa,11.84584954
+08/07/2020,8,7,2020,475,9,Algeria,DZ,DZA,43053054,Africa,11.15600301
+07/07/2020,7,7,2020,463,7,Algeria,DZ,DZA,43053054,Africa,10.41505673
+06/07/2020,6,7,2020,441,6,Algeria,DZ,DZA,43053054,Africa,9.68572404
+05/07/2020,5,7,2020,430,9,Algeria,DZ,DZA,43053054,Africa,8.98658664
+04/07/2020,4,7,2020,413,9,Algeria,DZ,DZA,43053054,Africa,8.28280382
+03/07/2020,3,7,2020,385,8,Algeria,DZ,DZA,43053054,Africa,7.59992543
+02/07/2020,2,7,2020,365,8,Algeria,DZ,DZA,43053054,Africa,6.97743765
+01/07/2020,1,7,2020,336,7,Algeria,DZ,DZA,43053054,Africa,6.41069505
+30/06/2020,30,6,2020,298,8,Algeria,DZ,DZA,43053054,Africa,5.89969761
+29/06/2020,29,6,2020,305,5,Algeria,DZ,DZA,43053054,Africa,5.46767251
+28/06/2020,28,6,2020,283,7,Algeria,DZ,DZA,43053054,Africa,5.01242026
+27/06/2020,27,6,2020,240,7,Algeria,DZ,DZA,43053054,Africa,4.61523589
+26/06/2020,26,6,2020,197,9,Algeria,DZ,DZA,43053054,Africa,4.31096015
+25/06/2020,25,6,2020,172,8,Algeria,DZ,DZA,43053054,Africa,4.09727031
+24/06/2020,24,6,2020,156,9,Algeria,DZ,DZA,43053054,Africa,3.93468022
+23/06/2020,23,6,2020,149,7,Algeria,DZ,DZA,43053054,Africa,3.84409431
+22/06/2020,22,6,2020,140,8,Algeria,DZ,DZA,43053054,Africa,3.75583112
+21/06/2020,21,6,2020,127,12,Algeria,DZ,DZA,43053054,Africa,3.67221336
+20/06/2020,20,6,2020,119,14,Algeria,DZ,DZA,43053054,Africa,3.64434077
+19/06/2020,19,6,2020,117,12,Algeria,DZ,DZA,43053054,Africa,3.60950004
+18/06/2020,18,6,2020,121,11,Algeria,DZ,DZA,43053054,Africa,3.81389901
+17/06/2020,17,6,2020,116,11,Algeria,DZ,DZA,43053054,Africa,3.53285042
+16/06/2020,16,6,2020,112,10,Algeria,DZ,DZA,43053054,Africa,3.52588228
+15/06/2020,15,6,2020,109,7,Algeria,DZ,DZA,43053054,Africa,3.54214128
+14/06/2020,14,6,2020,112,9,Algeria,DZ,DZA,43053054,Africa,3.58395017
+13/06/2020,13,6,2020,109,10,Algeria,DZ,DZA,43053054,Africa,3.63272719
+12/06/2020,12,6,2020,105,9,Algeria,DZ,DZA,43053054,Africa,3.69776323
+11/06/2020,11,6,2020,102,8,Algeria,DZ,DZA,43053054,Africa,3.77905828
+10/06/2020,10,6,2020,117,9,Algeria,DZ,DZA,43053054,Africa,3.91377578
+09/06/2020,9,6,2020,111,8,Algeria,DZ,DZA,43053054,Africa,4.09262488
+08/06/2020,8,6,2020,104,9,Algeria,DZ,DZA,43053054,Africa,4.29237842
+07/06/2020,7,6,2020,115,8,Algeria,DZ,DZA,43053054,Africa,4.49910011
+06/06/2020,6,6,2020,104,9,Algeria,DZ,DZA,43053054,Africa,4.68491736
+05/06/2020,5,6,2020,205,14,Algeria,DZ,DZA,43053054,Africa,4.8846709
+04/06/2020,4,6,2020,0,0,Algeria,DZ,DZA,43053054,Africa,4.8405393
+03/06/2020,3,6,2020,113,6,Algeria,DZ,DZA,43053054,Africa,5.22378738
+02/06/2020,2,6,2020,119,8,Algeria,DZ,DZA,43053054,Africa,5.37011846
+01/06/2020,1,6,2020,127,7,Algeria,DZ,DZA,43053054,Africa,5.51644954
+31/05/2020,31,5,2020,133,8,Algeria,DZ,DZA,43053054,Africa,5.68136235
+30/05/2020,30,5,2020,137,8,Algeria,DZ,DZA,43053054,Africa,5.81840257
+29/05/2020,29,5,2020,140,7,Algeria,DZ,DZA,43053054,Africa,5.93453835
+28/05/2020,28,5,2020,160,6,Algeria,DZ,DZA,43053054,Africa,6.04835141
+27/05/2020,27,5,2020,194,8,Algeria,DZ,DZA,43053054,Africa,6.10874202
+26/05/2020,26,5,2020,197,9,Algeria,DZ,DZA,43053054,Africa,6.06693314
+25/05/2020,25,5,2020,193,8,Algeria,DZ,DZA,43053054,Africa,5.99957439
+24/05/2020,24,5,2020,195,10,Algeria,DZ,DZA,43053054,Africa,5.93453835
+23/05/2020,23,5,2020,190,7,Algeria,DZ,DZA,43053054,Africa,5.92060206
+22/05/2020,22,5,2020,186,7,Algeria,DZ,DZA,43053054,Africa,5.91363391
+21/05/2020,21,5,2020,165,7,Algeria,DZ,DZA,43053054,Africa,5.91131119
+20/05/2020,20,5,2020,176,6,Algeria,DZ,DZA,43053054,Africa,5.8973749
+19/05/2020,19,5,2020,182,7,Algeria,DZ,DZA,43053054,Africa,5.92989292
+18/05/2020,18,5,2020,198,6,Algeria,DZ,DZA,43053054,Africa,5.91131119
+17/05/2020,17,5,2020,192,6,Algeria,DZ,DZA,43053054,Africa,5.8671796
+16/05/2020,16,5,2020,187,7,Algeria,DZ,DZA,43053054,Africa,5.7487211
+15/05/2020,15,5,2020,189,7,Algeria,DZ,DZA,43053054,Africa,5.65813519
+14/05/2020,14,5,2020,186,7,Algeria,DZ,DZA,43053054,Africa,5.58613101
+13/05/2020,13,5,2020,176,8,Algeria,DZ,DZA,43053054,Africa,5.61632631
+12/05/2020,12,5,2020,168,5,Algeria,DZ,DZA,43053054,Africa,5.51412683
+11/05/2020,11,5,2020,165,8,Algeria,DZ,DZA,43053054,Africa,5.43747721
+10/05/2020,10,5,2020,189,6,Algeria,DZ,DZA,43053054,Africa,5.3468913
+09/05/2020,9,5,2020,187,5,Algeria,DZ,DZA,43053054,Africa,5.20752837
+08/05/2020,8,5,2020,185,7,Algeria,DZ,DZA,43053054,Africa,5.05190642
+07/05/2020,7,5,2020,159,6,Algeria,DZ,DZA,43053054,Africa,4.84750745
+06/05/2020,6,5,2020,190,5,Algeria,DZ,DZA,43053054,Africa,4.70814451
+05/05/2020,5,5,2020,174,2,Algeria,DZ,DZA,43053054,Africa,4.4828411
+04/05/2020,4,5,2020,179,4,Algeria,DZ,DZA,43053054,Africa,4.28541028
+03/05/2020,3,5,2020,141,6,Algeria,DZ,DZA,43053054,Africa,4.08797945
+02/05/2020,2,5,2020,148,3,Algeria,DZ,DZA,43053054,Africa,4.03223428
+01/05/2020,1,5,2020,158,6,Algeria,DZ,DZA,43053054,Africa,4.03687971
+30/04/2020,30,4,2020,199,7,Algeria,DZ,DZA,43053054,Africa,3.92074393
+29/04/2020,29,4,2020,132,5,Algeria,DZ,DZA,43053054,Africa,3.66756793
+28/04/2020,28,4,2020,135,7,Algeria,DZ,DZA,43053054,Africa,3.56304572
+27/04/2020,27,4,2020,126,6,Algeria,DZ,DZA,43053054,Africa,3.4097465
+26/04/2020,26,4,2020,129,4,Algeria,DZ,DZA,43053054,Africa,3.32380602
+25/04/2020,25,4,2020,120,8,Algeria,DZ,DZA,43053054,Africa,3.1728295
+24/04/2020,24,4,2020,97,5,Algeria,DZ,DZA,43053054,Africa,3.11476161
+23/04/2020,23,4,2020,99,10,Algeria,DZ,DZA,43053054,Africa,3.10779347
+22/04/2020,22,4,2020,93,8,Algeria,DZ,DZA,43053054,Africa,3.11940705
+21/04/2020,21,4,2020,89,9,Algeria,DZ,DZA,43053054,Africa,3.0079167
+20/04/2020,20,4,2020,94,8,Algeria,DZ,DZA,43053054,Africa,3.04043472
+19/04/2020,19,4,2020,117,3,Algeria,DZ,DZA,43053054,Africa,2.98236683
+18/04/2020,18,4,2020,150,16,Algeria,DZ,DZA,43053054,Africa,2.89642635
+17/04/2020,17,4,2020,108,12,Algeria,DZ,DZA,43053054,Africa,2.97772139
+16/04/2020,16,4,2020,90,11,Algeria,DZ,DZA,43053054,Africa,3.04972558
+15/04/2020,15,4,2020,87,12,Algeria,DZ,DZA,43053054,Africa,3.14495692
+14/04/2020,14,4,2020,69,20,Algeria,DZ,DZA,43053054,Africa,3.24947912
+13/04/2020,13,4,2020,89,18,Algeria,DZ,DZA,43053054,Africa,3.25876998
+12/04/2020,12,4,2020,64,19,Algeria,DZ,DZA,43053054,Africa,3.18444308
+11/04/2020,11,4,2020,95,21,Algeria,DZ,DZA,43053054,Africa,3.14031149
+10/04/2020,10,4,2020,94,30,Algeria,DZ,DZA,43053054,Africa,3.01720756
+09/04/2020,9,4,2020,104,12,Algeria,DZ,DZA,43053054,Africa,2.94984881
+08/04/2020,8,4,2020,45,20,Algeria,DZ,DZA,43053054,Africa,2.79654958
+07/04/2020,7,4,2020,103,21,Algeria,DZ,DZA,43053054,Africa,2.77099971
+06/04/2020,6,4,2020,69,22,Algeria,DZ,DZA,43053054,Africa,2.59911875
+05/04/2020,5,4,2020,80,25,Algeria,DZ,DZA,43053054,Africa,2.58285974
+04/04/2020,4,4,2020,185,42,Algeria,DZ,DZA,43053054,Africa,2.48298297
+03/04/2020,3,4,2020,139,5,Algeria,DZ,DZA,43053054,Africa,2.08115317
+02/04/2020,2,4,2020,131,14,Algeria,DZ,DZA,43053054,Africa,1.80010459
+01/04/2020,1,4,2020,132,9,Algeria,DZ,DZA,43053054,Africa,1.52370143
+31/03/2020,31,3,2020,73,4,Algeria,DZ,DZA,43053054,Africa,1.2217484
+30/03/2020,30,3,2020,57,2,Algeria,DZ,DZA,43053054,Africa,1.07541732
+29/03/2020,29,3,2020,45,3,Algeria,DZ,DZA,43053054,Africa,0.9685724
+28/03/2020,28,3,2020,42,1,Algeria,DZ,DZA,43053054,Africa,0.88960007
+27/03/2020,27,3,2020,65,4,Algeria,DZ,DZA,43053054,Africa,0.79436873
+26/03/2020,26,3,2020,38,2,Algeria,DZ,DZA,43053054,Africa,0.6550058
+25/03/2020,25,3,2020,34,2,Algeria,DZ,DZA,43053054,Africa,0.56674261
+24/03/2020,24,3,2020,29,0,Algeria,DZ,DZA,43053054,Africa,0.49473842
+23/03/2020,23,3,2020,62,2,Algeria,DZ,DZA,43053054,Africa,0.43899325
+22/03/2020,22,3,2020,37,5,Algeria,DZ,DZA,43053054,Africa,0.31124389
+21/03/2020,21,3,2020,12,3,Algeria,DZ,DZA,43053054,Africa,0.22994884
+20/03/2020,20,3,2020,18,1,Algeria,DZ,DZA,43053054,Africa,0.20207626
+19/03/2020,19,3,2020,12,1,Algeria,DZ,DZA,43053054,Africa,0.16491281
+18/03/2020,18,3,2020,2,1,Algeria,DZ,DZA,43053054,Africa,0.13704022
+17/03/2020,17,3,2020,10,0,Algeria,DZ,DZA,43053054,Africa,0.13239479
+16/03/2020,16,3,2020,11,2,Algeria,DZ,DZA,43053054,Africa,0.10916763
+15/03/2020,15,3,2020,11,0,Algeria,DZ,DZA,43053054,Africa,0.08594048
+14/03/2020,14,3,2020,1,1,Algeria,DZ,DZA,43053054,Africa,0.06039061
+13/03/2020,13,3,2020,5,1,Algeria,DZ,DZA,43053054,Africa,0.05806789
+12/03/2020,12,3,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0.04645431
+09/03/2020,9,3,2020,3,0,Algeria,DZ,DZA,43053054,Africa,0.04645431
+06/03/2020,6,3,2020,5,0,Algeria,DZ,DZA,43053054,Africa,0.03948617
+05/03/2020,5,3,2020,7,0,Algeria,DZ,DZA,43053054,Africa,0.02787259
+04/03/2020,4,3,2020,2,0,Algeria,DZ,DZA,43053054,Africa,0.01161358
+02/03/2020,2,3,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0.00696815
+01/03/2020,1,3,2020,2,0,Algeria,DZ,DZA,43053054,Africa,0.00696815
+29/02/2020,29,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0.00232272
+28/02/2020,28,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0.00232272
+27/02/2020,27,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0.00232272
+26/02/2020,26,2,2020,1,0,Algeria,DZ,DZA,43053054,Africa,0.00232272
+25/02/2020,25,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+24/02/2020,24,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+23/02/2020,23,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+22/02/2020,22,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+21/02/2020,21,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+20/02/2020,20,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+19/02/2020,19,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+18/02/2020,18,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+17/02/2020,17,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+16/02/2020,16,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+15/02/2020,15,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+14/02/2020,14,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+13/02/2020,13,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+12/02/2020,12,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+11/02/2020,11,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+10/02/2020,10,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+09/02/2020,9,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+08/02/2020,8,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+07/02/2020,7,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+06/02/2020,6,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+05/02/2020,5,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+04/02/2020,4,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+03/02/2020,3,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+02/02/2020,2,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+01/02/2020,1,2,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+31/01/2020,31,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+30/01/2020,30,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+29/01/2020,29,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+28/01/2020,28,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+27/01/2020,27,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+26/01/2020,26,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+25/01/2020,25,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+24/01/2020,24,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+23/01/2020,23,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+22/01/2020,22,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+21/01/2020,21,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+20/01/2020,20,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+19/01/2020,19,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+18/01/2020,18,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+17/01/2020,17,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+16/01/2020,16,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+15/01/2020,15,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+14/01/2020,14,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+13/01/2020,13,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,0
+12/01/2020,12,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,
+11/01/2020,11,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,
+10/01/2020,10,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,
+09/01/2020,9,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,
+08/01/2020,8,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,
+07/01/2020,7,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,
+06/01/2020,6,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,
+05/01/2020,5,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,
+04/01/2020,4,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,
+03/01/2020,3,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,
+02/01/2020,2,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,
+01/01/2020,1,1,2020,0,0,Algeria,DZ,DZA,43053054,Africa,
+31/12/2019,31,12,2019,0,0,Algeria,DZ,DZA,43053054,Africa,
+14/12/2020,14,12,2020,50,1,Andorra,AD,AND,76177,Europe,821.77035063
+13/12/2020,13,12,2020,52,0,Andorra,AD,AND,76177,Europe,811.26849311
+12/12/2020,12,12,2020,46,0,Andorra,AD,AND,76177,Europe,821.77035063
+11/12/2020,11,12,2020,28,0,Andorra,AD,AND,76177,Europe,861.15231632
+10/12/2020,10,12,2020,35,0,Andorra,AD,AND,76177,Europe,963.5454271
+09/12/2020,9,12,2020,43,0,Andorra,AD,AND,76177,Europe,1018.68017906
+08/12/2020,8,12,2020,34,0,Andorra,AD,AND,76177,Europe,1023.93110781
+07/12/2020,7,12,2020,45,0,Andorra,AD,AND,76177,Europe,1042.30935847
+06/12/2020,6,12,2020,50,1,Andorra,AD,AND,76177,Europe,1047.56028723
+05/12/2020,5,12,2020,51,0,Andorra,AD,AND,76177,Europe,1067.25127007
+04/12/2020,4,12,2020,62,1,Andorra,AD,AND,76177,Europe,1100.06957481
+03/12/2020,3,12,2020,52,0,Andorra,AD,AND,76177,Europe,1081.69132415
+02/12/2020,2,12,2020,45,0,Andorra,AD,AND,76177,Europe,1101.382307
+01/12/2020,1,12,2020,33,0,Andorra,AD,AND,76177,Europe,1090.88044948
+30/11/2020,30,11,2020,42,0,Andorra,AD,AND,76177,Europe,1102.69503919
+29/11/2020,29,11,2020,60,0,Andorra,AD,AND,76177,Europe,1240.53191908
+28/11/2020,28,11,2020,76,0,Andorra,AD,AND,76177,Europe,1161.76798771
+27/11/2020,27,11,2020,106,0,Andorra,AD,AND,76177,Europe,1205.08814997
+26/11/2020,26,11,2020,77,0,Andorra,AD,AND,76177,Europe,1130.26241516
+25/11/2020,25,11,2020,47,0,Andorra,AD,AND,76177,Europe,1147.32793363
+24/11/2020,24,11,2020,48,0,Andorra,AD,AND,76177,Europe,1138.1388083
+23/11/2020,23,11,2020,49,0,Andorra,AD,AND,76177,Europe,1146.01520144
+22/11/2020,22,11,2020,65,0,Andorra,AD,AND,76177,Europe,1165.70618428
+21/11/2020,21,11,2020,76,0,Andorra,AD,AND,76177,Europe,1321.92131483
+20/11/2020,20,11,2020,48,0,Andorra,AD,AND,76177,Europe,1222.15366843
+19/11/2020,19,11,2020,67,0,Andorra,AD,AND,76177,Europe,1277.28842039
+18/11/2020,18,11,2020,37,0,Andorra,AD,AND,76177,Europe,1366.55420928
+17/11/2020,17,11,2020,42,0,Andorra,AD,AND,76177,Europe,1346.86322643
+16/11/2020,16,11,2020,147,1,Andorra,AD,AND,76177,Europe,1374.43060241
+15/11/2020,15,11,2020,0,0,Andorra,AD,AND,76177,Europe,1272.03749163
+14/11/2020,14,11,2020,109,0,Andorra,AD,AND,76177,Europe,1391.49612088
+13/11/2020,13,11,2020,49,0,Andorra,AD,AND,76177,Europe,1377.05606679
+12/11/2020,12,11,2020,90,0,Andorra,AD,AND,76177,Europe,1378.36879898
+11/11/2020,11,11,2020,40,0,Andorra,AD,AND,76177,Europe,1400.6852462
diff --git a/fda-table-service/rest-service/src/main/resources/seed/weather-small.csv b/fda-table-service/rest-service/src/main/resources/seed/weather-small.csv
new file mode 100644
index 0000000000000000000000000000000000000000..a9e5716e5a9ad132be060446c0c50f0e3ef64069
--- /dev/null
+++ b/fda-table-service/rest-service/src/main/resources/seed/weather-small.csv
@@ -0,0 +1,1001 @@
+Date,Location,MinTemp,MaxTemp,Rainfall,Evaporation,Sunshine,WindGustDir,WindGustSpeed,WindDir9am,WindDir3pm,WindSpeed9am,WindSpeed3pm,Humidity9am,Humidity3pm,Pressure9am,Pressure3pm,Cloud9am,Cloud3pm,Temp9am,Temp3pm,RainToday,RainTomorrow
+2008-12-01,Albury,13.4,22.9,0.6,NA,NA,W,44,W,WNW,20,24,71,22,1007.7,1007.1,8,NA,16.9,21.8,No,No
+2008-12-02,Albury,7.4,25.1,0,NA,NA,WNW,44,NNW,WSW,4,22,44,25,1010.6,1007.8,NA,NA,17.2,24.3,No,No
+2008-12-03,Albury,12.9,25.7,0,NA,NA,WSW,46,W,WSW,19,26,38,30,1007.6,1008.7,NA,2,21,23.2,No,No
+2008-12-04,Albury,9.2,28,0,NA,NA,NE,24,SE,E,11,9,45,16,1017.6,1012.8,NA,NA,18.1,26.5,No,No
+2008-12-05,Albury,17.5,32.3,1,NA,NA,W,41,ENE,NW,7,20,82,33,1010.8,1006,7,8,17.8,29.7,No,No
+2008-12-06,Albury,14.6,29.7,0.2,NA,NA,WNW,56,W,W,19,24,55,23,1009.2,1005.4,NA,NA,20.6,28.9,No,No
+2008-12-07,Albury,14.3,25,0,NA,NA,W,50,SW,W,20,24,49,19,1009.6,1008.2,1,NA,18.1,24.6,No,No
+2008-12-08,Albury,7.7,26.7,0,NA,NA,W,35,SSE,W,6,17,48,19,1013.4,1010.1,NA,NA,16.3,25.5,No,No
+2008-12-09,Albury,9.7,31.9,0,NA,NA,NNW,80,SE,NW,7,28,42,9,1008.9,1003.6,NA,NA,18.3,30.2,No,Yes
+2008-12-10,Albury,13.1,30.1,1.4,NA,NA,W,28,S,SSE,15,11,58,27,1007,1005.7,NA,NA,20.1,28.2,Yes,No
+2008-12-11,Albury,13.4,30.4,0,NA,NA,N,30,SSE,ESE,17,6,48,22,1011.8,1008.7,NA,NA,20.4,28.8,No,Yes
+2008-12-12,Albury,15.9,21.7,2.2,NA,NA,NNE,31,NE,ENE,15,13,89,91,1010.5,1004.2,8,8,15.9,17,Yes,Yes
+2008-12-13,Albury,15.9,18.6,15.6,NA,NA,W,61,NNW,NNW,28,28,76,93,994.3,993,8,8,17.4,15.8,Yes,Yes
+2008-12-14,Albury,12.6,21,3.6,NA,NA,SW,44,W,SSW,24,20,65,43,1001.2,1001.8,NA,7,15.8,19.8,Yes,No
+2008-12-15,Albury,8.4,24.6,0,NA,NA,NA,NA,S,WNW,4,30,57,32,1009.7,1008.7,NA,NA,15.9,23.5,No,NA
+2008-12-16,Albury,9.8,27.7,NA,NA,NA,WNW,50,NA,WNW,NA,22,50,28,1013.4,1010.3,0,NA,17.3,26.2,NA,No
+2008-12-17,Albury,14.1,20.9,0,NA,NA,ENE,22,SSW,E,11,9,69,82,1012.2,1010.4,8,1,17.2,18.1,No,Yes
+2008-12-18,Albury,13.5,22.9,16.8,NA,NA,W,63,N,WNW,6,20,80,65,1005.8,1002.2,8,1,18,21.5,Yes,Yes
+2008-12-19,Albury,11.2,22.5,10.6,NA,NA,SSE,43,WSW,SW,24,17,47,32,1009.4,1009.7,NA,2,15.5,21,Yes,No
+2008-12-20,Albury,9.8,25.6,0,NA,NA,SSE,26,SE,NNW,17,6,45,26,1019.2,1017.1,NA,NA,15.8,23.2,No,No
+2008-12-21,Albury,11.5,29.3,0,NA,NA,S,24,SE,SE,9,9,56,28,1019.3,1014.8,NA,NA,19.1,27.3,No,No
+2008-12-22,Albury,17.1,33,0,NA,NA,NE,43,NE,N,17,22,38,28,1013.6,1008.1,NA,1,24.5,31.6,No,No
+2008-12-23,Albury,20.5,31.8,0,NA,NA,WNW,41,W,W,19,20,54,24,1007.8,1005.7,NA,NA,23.8,30.8,No,No
+2008-12-24,Albury,15.3,30.9,0,NA,NA,N,33,ESE,NW,6,13,55,23,1011,1008.2,5,NA,20.9,29,No,No
+2008-12-25,Albury,12.6,32.4,0,NA,NA,W,43,E,W,4,19,49,17,1012.9,1010.1,NA,NA,21.5,31.2,No,No
+2008-12-26,Albury,16.2,33.9,0,NA,NA,WSW,35,SE,WSW,9,13,45,19,1010.9,1007.6,NA,1,23.2,33,No,No
+2008-12-27,Albury,16.9,33,0,NA,NA,WSW,57,NA,W,0,26,41,28,1006.8,1003.6,NA,1,26.6,31.2,No,No
+2008-12-28,Albury,20.1,32.7,0,NA,NA,WNW,48,N,WNW,13,30,56,15,1005.2,1001.7,NA,NA,24.6,32.1,No,No
+2008-12-29,Albury,19.7,27.2,0,NA,NA,WNW,46,NW,WSW,19,30,49,22,1004.8,1004.2,NA,NA,21.6,26.1,No,Yes
+2008-12-30,Albury,12.5,24.2,1.2,NA,NA,WNW,50,WSW,SW,11,22,78,70,1005.6,1003.4,8,8,12.5,18.2,Yes,No
+2008-12-31,Albury,12,24.4,0.8,NA,NA,W,39,WNW,WNW,17,17,48,28,1006.1,1005.1,1,NA,16.9,22.7,No,No
+2009-01-01,Albury,11.3,26.5,0,NA,NA,WNW,56,W,WNW,19,31,46,26,1004.5,1003.2,NA,NA,19.7,25.7,No,No
+2009-01-02,Albury,9.6,23.9,0,NA,NA,W,41,WSW,SSW,19,11,44,22,1014.4,1013.1,NA,NA,14.9,22.1,No,No
+2009-01-03,Albury,10.5,28.8,0,NA,NA,SSE,26,SSE,E,11,7,43,22,1018.7,1014.8,NA,NA,17.1,26.5,No,No
+2009-01-04,Albury,12.3,34.6,0,NA,NA,WNW,37,SSE,NW,6,17,41,12,1015.1,1010.3,NA,NA,20.7,33.9,No,No
+2009-01-05,Albury,12.9,35.8,0,NA,NA,WNW,41,ENE,NW,6,26,41,9,1012.6,1009.2,NA,NA,22.4,34.4,No,No
+2009-01-06,Albury,13.7,37.9,0,NA,NA,W,52,SE,WNW,4,26,33,8,1010.9,1006.7,NA,NA,23.1,36.8,No,No
+2009-01-07,Albury,16.1,38.9,0,NA,NA,W,57,E,W,6,30,34,12,1007,1002.7,NA,NA,25.2,38.4,No,No
+2009-01-08,Albury,14,28.3,0,NA,NA,W,48,W,WSW,17,24,43,15,1011.9,1010.9,NA,NA,17.9,27.6,No,No
+2009-01-09,Albury,12.5,28.4,0,NA,NA,NE,37,SSE,S,20,9,38,16,1017.8,1013.7,NA,NA,17.2,26.6,No,No
+2009-01-10,Albury,17,30.8,0,NA,NA,NE,37,NNE,E,15,11,36,24,1013.4,1008.1,NA,NA,20.2,29.3,No,No
+2009-01-11,Albury,16.9,32,0,NA,NA,S,31,SSE,N,13,17,52,31,1009.9,1006.8,NA,NA,22.8,30,No,No
+2009-01-12,Albury,17.3,34.7,0,NA,NA,SW,35,SE,WSW,7,15,48,16,1014.1,1012.1,NA,NA,24.2,33.2,No,No
+2009-01-13,Albury,17.2,37.7,0,NA,NA,NNW,35,SE,NW,7,17,51,19,1015.7,1010.9,NA,NA,24.3,35.7,No,No
+2009-01-14,Albury,17.4,43,0,NA,NA,NW,39,SSE,SSW,7,17,40,8,1011.6,1006.9,NA,NA,25.6,41.5,No,No
+2009-01-15,Albury,19.8,32.7,0,NA,NA,WNW,44,W,W,20,28,34,28,1008.4,1009.2,NA,NA,27.6,27.1,No,No
+2009-01-16,Albury,14.9,26.7,0,NA,NA,SW,56,WSW,SW,20,31,46,20,1014.1,1012.7,NA,NA,18,25.5,No,No
+2009-01-17,Albury,10.5,28.4,0,NA,NA,SE,33,SE,SW,19,11,35,16,1019.7,1017.4,NA,NA,16,25.8,No,No
+2009-01-18,Albury,11.3,32.2,0,NA,NA,WNW,28,ENE,SSW,17,15,34,17,1019.7,1016.2,NA,NA,20.9,30.5,No,No
+2009-01-19,Albury,13.9,36.6,0,NA,NA,WNW,39,SSE,NNE,2,15,39,10,1015.8,1010.6,NA,NA,22,34.4,No,No
+2009-01-20,Albury,18.6,39.9,0,NA,NA,NNW,61,SSE,WNW,9,20,36,21,1010.1,1004.8,NA,NA,26.8,37.7,No,No
+2009-01-21,Albury,19.3,38.1,0.8,NA,NA,NNW,61,NE,WSW,15,17,48,17,1009.6,1005.9,NA,NA,27.3,36.1,No,No
+2009-01-22,Albury,24.4,34,0.6,NA,NA,NW,98,N,NNW,26,48,60,39,1005.3,997.8,4,1,26.1,33.1,No,Yes
+2009-01-23,Albury,18.8,35.2,6.4,NA,NA,WNW,52,S,NW,6,28,43,28,1007.9,1003.9,NA,NA,22.8,33,Yes,No
+2009-01-24,Albury,20.8,30.6,0,NA,NA,W,54,W,W,30,28,41,21,1005.4,1007.6,NA,NA,23.3,29.7,No,No
+2009-01-25,Albury,14,34.3,0,NA,NA,WSW,24,ESE,SSE,7,13,44,10,1016.5,1014.6,NA,NA,21.2,32.1,No,No
+2009-01-26,Albury,15.7,38.4,0,NA,NA,S,33,SSE,WSW,7,7,48,12,1017.7,1014.6,NA,NA,23.4,36.5,No,No
+2009-01-27,Albury,18.5,38.2,0,NA,NA,NNE,31,SE,NNW,9,17,48,25,1017.8,1014.1,NA,NA,25.8,36.2,No,No
+2009-01-28,Albury,20.4,40.7,0,NA,NA,N,37,E,NNE,7,13,45,15,1014.9,1011.6,NA,NA,28.2,39.2,No,No
+2009-01-29,Albury,21.8,41.5,0,NA,NA,SW,24,ESE,S,6,11,38,13,1015.7,1011.8,NA,NA,29,40.1,No,No
+2009-01-30,Albury,22.3,42.9,0,NA,NA,NNE,28,ESE,SE,9,11,37,11,1014.6,1010.2,NA,NA,29.2,41.2,No,No
+2009-01-31,Albury,22,42.7,0,NA,NA,ESE,48,ESE,SW,4,4,33,11,1014.2,1010.5,NA,NA,29.9,42,No,No
+2009-02-01,Albury,28,43.1,0,NA,NA,SW,83,SE,E,15,9,27,9,1012.5,1008.7,NA,NA,32.4,41.9,No,No
+2009-02-02,Albury,24.4,38.3,0.2,NA,NA,SW,56,NE,NW,19,7,32,21,1011.7,1007.4,NA,NA,28.8,37.1,No,No
+2009-02-03,Albury,21.5,37.7,0,NA,NA,NA,NA,N,NA,13,9,51,21,1009.2,1005.7,NA,NA,27.2,36.2,No,No
+2009-02-04,Albury,21.7,36.9,0,NA,NA,NA,NA,NA,NA,11,11,53,26,1008.8,1004.7,NA,NA,25.5,35.2,No,No
+2009-02-05,Albury,21.5,41.2,0,NA,NA,WSW,35,SSE,S,7,19,48,15,1005.9,1002.6,NA,NA,26.5,39.7,No,No
+2009-02-06,Albury,23.5,42.2,0,NA,NA,W,37,SE,W,6,15,39,8,1008,1005,NA,NA,28.7,41.6,No,No
+2009-02-07,Albury,22.3,44.8,0,NA,NA,NNW,59,SE,NW,9,33,36,11,1008.2,1003.8,NA,NA,29.6,43.4,No,No
+2009-02-08,Albury,28.3,40.2,0,NA,NA,NW,52,N,W,9,22,20,19,1007,1006.5,NA,5,34.5,38.5,No,No
+2009-02-09,Albury,18.4,31.2,0.4,NA,NA,SE,37,SW,WSW,7,11,66,31,1009.3,1007.8,7,8,18.7,29.4,No,No
+2009-02-10,Albury,14.9,27.3,0,NA,NA,SSE,41,SSE,SE,20,13,50,30,1011.6,1008.5,NA,1,17.4,25.8,No,No
+2009-02-11,Albury,13.5,26.7,0,NA,NA,SSE,46,SSE,E,19,11,45,24,1012.8,1011.1,NA,NA,16.7,24.9,No,No
+2009-02-12,Albury,16.1,21.6,0,NA,NA,SE,46,SSE,NE,11,15,58,69,1017,1017.3,2,8,17,17.3,No,Yes
+2009-02-13,Albury,14.6,29,3,NA,NA,SSE,41,SE,SSE,26,24,41,21,1023.3,1019.7,NA,NA,18,27.6,Yes,No
+2009-02-14,Albury,12.4,29.2,0,NA,NA,NE,39,S,NA,7,0,37,18,1022.5,1016.4,NA,NA,18.3,28.5,No,No
+2009-02-15,Albury,13.3,31.3,0,NA,NA,NNE,41,SSE,SSW,7,15,50,23,1016.2,1012.8,NA,NA,19.2,29.2,No,No
+2009-02-16,Albury,17.2,31.1,0,NA,NA,E,35,SE,ESE,17,11,43,22,1017.7,1013.8,NA,NA,21.4,29.5,No,No
+2009-02-17,Albury,12.5,28.8,0,NA,NA,N,31,SSE,ENE,7,11,46,17,1017.2,1013.5,NA,NA,18,27,No,No
+2009-02-18,Albury,18,32,0,NA,NA,NW,31,ENE,SW,4,13,44,22,1012.4,1007.5,NA,NA,22.1,30.7,No,No
+2009-02-19,Albury,16.2,34,0,NA,NA,WSW,48,SE,WSW,4,22,53,16,1007.8,1004.5,NA,NA,21,32.7,No,No
+2009-02-20,Albury,18.7,29.1,0,NA,NA,SSW,41,NNW,SSE,7,17,45,39,1010.1,1010.8,NA,NA,21.5,26.8,No,No
+2009-02-21,Albury,13.7,31.7,0,NA,NA,SSE,28,SSE,S,2,9,63,19,1012.5,1010.4,NA,NA,19.3,29.8,No,No
+2009-02-22,Albury,15.5,33.2,0,NA,NA,NW,31,S,WNW,11,15,49,23,1015.6,1012.4,NA,NA,20.9,31.3,No,No
+2009-02-23,Albury,14.3,34,0,NA,NA,NW,70,SE,NW,6,22,48,10,1013,1009.2,NA,NA,20.7,33.4,No,No
+2009-02-24,Albury,12.9,29.6,0,NA,NA,WNW,46,SW,WNW,7,24,54,14,1014,1012.7,6,7,18.7,28.6,No,No
+2009-02-25,Albury,8.9,31.9,0,NA,NA,WNW,43,NA,WSW,0,17,49,16,1016.6,1013.4,7,7,15,29.3,No,No
+2009-02-26,Albury,15,32.7,0,NA,NA,ESE,26,ESE,S,15,2,43,19,1017.8,1015,NA,NA,20.7,30.5,No,No
+2009-02-27,Albury,15.4,32.6,0,NA,NA,W,24,NA,S,0,6,53,25,1016.2,1012.6,NA,NA,20,30.8,No,No
+2009-02-28,Albury,16,34.5,0,NA,NA,WSW,44,E,NA,6,NA,44,14,1007.5,1004.6,NA,NA,22.2,33.6,No,No
+2009-03-01,Albury,12.8,30.3,0,NA,NA,W,30,W,WSW,4,13,53,27,1010.5,1008.7,NA,NA,17.3,28.1,No,No
+2009-03-02,Albury,13.2,31.9,0,NA,NA,NNW,35,S,ENE,6,9,53,25,1014.1,1011.6,NA,NA,18,29.8,No,No
+2009-03-03,Albury,18,31.1,0,NA,NA,WNW,52,NE,NNE,15,26,58,35,1014.7,1009,5,NA,23,29.2,No,No
+2009-03-04,Albury,13.8,22.1,0.2,NA,NA,WNW,57,W,WNW,26,33,57,26,1014.5,1013.1,NA,NA,15.6,21.9,No,No
+2009-03-05,Albury,11.5,22,0,NA,NA,SW,50,WSW,W,19,33,60,33,1013.7,1011.8,NA,NA,13.9,21.4,No,No
+2009-03-06,Albury,7.6,24,0,NA,NA,WSW,30,NA,WNW,0,13,52,23,1014.5,1012,NA,NA,12.6,22,No,No
+2009-03-07,Albury,8.3,27.9,0,NA,NA,W,37,S,W,4,20,58,22,1015.2,1012.4,NA,NA,13.3,27,No,No
+2009-03-08,Albury,11,30.2,0,NA,NA,SSE,24,E,SSE,7,11,54,20,1017,1014.7,NA,NA,17.6,28.8,No,No
+2009-03-09,Albury,13.8,31.8,0,NA,NA,NNE,24,SSE,NE,6,17,49,28,1019.7,1015.9,NA,NA,18.6,30.5,No,No
+2009-03-10,Albury,15.5,32,0,NA,NA,NE,50,ESE,E,2,4,51,25,1019.5,1016.2,NA,NA,20.1,30.8,No,Yes
+2009-03-11,Albury,18.4,30.5,1.2,NA,NA,NE,44,NE,N,15,19,57,23,1021.3,1018,NA,NA,21.5,29.6,Yes,No
+2009-03-12,Albury,20.9,25.7,0,NA,NA,W,37,ENE,S,11,9,52,90,1019.5,1018.9,NA,8,22.2,18.8,No,Yes
+2009-03-13,Albury,17.1,25.8,5.8,NA,NA,ENE,31,NA,S,0,13,82,68,1017.4,1014.7,8,NA,19,23.8,Yes,Yes
+2009-03-14,Albury,16.4,27,3,NA,NA,SW,69,E,N,9,22,82,74,1012.7,1008,NA,4,19.9,19.7,Yes,Yes
+2009-03-15,Albury,10,19.7,11.6,NA,NA,WNW,39,W,NW,11,17,62,41,1013.4,1012,NA,8,12.7,18.3,Yes,No
+2009-03-16,Albury,8.8,21.9,0,NA,NA,W,39,S,WNW,2,20,78,34,1013.3,1011.6,NA,6,12.2,20.5,No,No
+2009-03-17,Albury,8.4,25.3,0,NA,NA,WNW,35,SSE,WSW,9,17,78,34,1015.6,1013.2,NA,NA,12.1,23.9,No,No
+2009-03-18,Albury,9.3,28,0,NA,NA,NW,52,SSE,NW,6,11,76,19,1017.4,1013.9,NA,NA,14.7,27.2,No,No
+2009-03-19,Albury,11.3,30.1,0,NA,NA,WSW,24,S,SW,6,7,56,15,1016.3,1013.6,NA,NA,14.7,29.3,No,No
+2009-03-20,Albury,11.5,33.5,0,NA,NA,SSE,22,NE,N,7,7,50,13,1016.5,1013.6,NA,NA,17.4,32.6,No,No
+2009-03-21,Albury,13.8,33.6,0,NA,NA,NNW,28,NA,NNE,0,11,47,17,1017,1013.1,NA,2,18.8,33.5,No,No
+2009-03-22,Albury,14.6,30,0,NA,NA,NE,37,E,NNE,4,19,56,30,1014.8,1012.7,3,1,18.1,29,No,No
+2009-03-23,Albury,14.4,31.6,0,NA,NA,NW,37,NA,WNW,0,24,63,25,1013.7,1011.8,NA,NA,18.8,31.4,No,No
+2009-03-24,Albury,10.8,31.9,0,NA,NA,S,48,SSE,WNW,6,20,62,20,1016.5,1014.4,NA,NA,15.4,30.7,No,No
+2009-03-25,Albury,15.4,22.3,0.4,NA,NA,ENE,30,SSE,SSE,11,9,69,78,1017.4,1019.2,8,8,18.3,19.6,No,Yes
+2009-03-26,Albury,13.3,29.8,1.8,NA,NA,WSW,33,NA,WNW,0,20,87,26,1019.1,1017.2,NA,6,16.2,29.2,Yes,No
+2009-03-27,Albury,10.1,27.6,0,NA,NA,WNW,43,NA,W,0,11,63,30,1023,1020.7,NA,NA,16.5,26.8,No,No
+2009-03-28,Albury,9.1,28.9,0,NA,NA,NNW,24,N,N,2,17,60,26,1023.8,1020.6,NA,NA,14,27.7,No,No
+2009-03-29,Albury,10.4,31.2,0,NA,NA,S,22,NA,SE,0,6,60,18,1022.4,1019.1,NA,NA,16,29.9,No,No
+2009-03-30,Albury,13.4,30.4,0,NA,NA,ENE,22,NA,SE,0,9,57,16,1023,1019.5,NA,NA,17.2,29.2,No,No
+2009-03-31,Albury,12.3,29.9,0,NA,NA,WSW,26,S,SSW,2,13,61,25,1023.2,1019.5,NA,NA,17.1,28.6,No,No
+2009-04-01,Albury,12.2,30.6,0,NA,NA,SE,22,NA,ENE,0,6,59,22,1022.6,1019.4,NA,NA,16.6,29.5,No,No
+2009-04-02,Albury,14.3,32.1,0,NA,NA,NE,28,NA,ENE,0,11,59,30,1022.6,1018.4,NA,NA,18.4,30.9,No,Yes
+2009-04-03,Albury,18.4,28.1,8.6,NA,NA,W,98,E,NNE,7,17,92,49,1018.8,1012.9,8,6,19,27.4,Yes,Yes
+2009-04-04,Albury,10.7,21.4,12.6,NA,NA,W,43,NA,WSW,0,13,60,33,1019.8,1019.3,NA,NA,13.9,20.3,Yes,No
+2009-04-05,Albury,7.8,21.7,0,NA,NA,WSW,31,E,NW,6,19,72,37,1020.4,1016.5,NA,NA,12.9,21.2,No,No
+2009-04-06,Albury,8.1,21.4,0,NA,NA,W,35,SSE,WSW,13,19,58,20,1021.8,1019.6,NA,NA,13.8,20.9,No,No
+2009-04-07,Albury,7.5,22.5,0,NA,NA,SE,28,S,S,7,7,55,27,1026.7,1023.5,NA,NA,13.3,21.6,No,No
+2009-04-08,Albury,8.2,24,0,NA,NA,SSE,17,SSE,SSE,7,13,60,30,1027.1,1023.4,NA,NA,13.8,23.5,No,No
+2009-04-09,Albury,8.1,25.7,0,NA,NA,ENE,22,ESE,S,9,13,67,27,1024.2,1019.6,NA,NA,15.1,25,No,No
+2009-04-10,Albury,11.6,26.7,0,NA,NA,W,48,SE,NE,6,11,59,42,1021.5,1017.7,8,7,16.4,24.3,No,Yes
+2009-04-11,Albury,13,24.9,8.4,NA,NA,W,46,S,E,6,11,75,47,1024.4,1020.3,8,6,18,24.4,Yes,Yes
+2009-04-12,Albury,13.5,24.2,6.2,NA,NA,WSW,20,NA,SE,0,6,88,52,1024.1,1020.8,8,NA,15.4,23.1,Yes,No
+2009-04-13,Albury,9.9,25.4,0,NA,NA,NNE,19,ENE,SSW,4,7,65,35,1023,1018.7,NA,NA,16.1,25,No,No
+2009-04-14,Albury,12.2,25,0,NA,NA,WNW,30,NA,W,0,15,68,39,1016.3,1011.6,6,NA,16.2,24.6,No,No
+2009-04-15,Albury,10.7,21.9,0,NA,NA,W,63,NW,W,26,31,44,27,1008.2,1009.8,2,NA,20.5,18.9,No,No
+2009-04-16,Albury,3.5,20,0,NA,NA,W,31,NA,WNW,0,13,65,30,1016.3,1012.8,NA,NA,9.6,19.4,No,No
+2009-04-17,Albury,6.6,21.6,0,NA,NA,WNW,26,ENE,W,6,11,59,39,1018.5,1016.8,5,1,12.6,21.6,No,No
+2009-04-18,Albury,7,23.4,0,NA,NA,W,24,SSE,W,2,17,73,37,1022.8,1019.3,NA,NA,12.4,22.9,No,No
+2009-04-19,Albury,11.2,23.9,0,NA,NA,SE,31,SE,SE,13,15,54,33,1022.7,1019.6,NA,NA,18,23.6,No,No
+2009-04-20,Albury,7.4,22,0,NA,NA,SSE,28,SE,SE,2,7,58,29,1023.6,1020,NA,NA,14.1,21.3,No,No
+2009-04-21,Albury,5.7,21.4,0,NA,NA,ESE,17,ENE,SSE,6,7,68,39,1025.2,1020.9,NA,NA,12.2,20.9,No,No
+2009-04-22,Albury,6.2,22.7,0,NA,NA,ESE,17,NA,SW,0,7,73,33,1026,1021.6,NA,NA,11.2,22.3,No,No
+2009-04-23,Albury,6,22.9,0,NA,NA,NE,33,NA,NE,0,20,68,34,1021.3,1015.7,NA,NA,12.9,22.6,No,No
+2009-04-24,Albury,10.6,16.2,0,NA,NA,WNW,39,ESE,NNE,7,4,74,86,1008.9,1002.4,8,8,14.9,15.1,No,Yes
+2009-04-25,Albury,12.9,15.8,20,NA,NA,W,70,WNW,NNW,19,15,83,89,1004.8,1000.9,8,8,13.3,14.5,Yes,Yes
+2009-04-26,Albury,8.6,12.9,21,NA,NA,NNW,63,NW,WNW,26,31,77,62,1004,1003.3,8,8,9.5,11.6,Yes,Yes
+2009-04-27,Albury,4.5,11.5,3.2,NA,NA,NW,26,N,NNW,9,13,82,79,1013.8,1013.5,8,8,7.6,9.4,Yes,Yes
+2009-04-28,Albury,7.6,14.5,4.8,NA,NA,WNW,35,W,W,15,20,83,48,1018,1018.3,8,1,10.1,14,Yes,No
+2009-04-29,Albury,5.4,12.2,0,NA,NA,SSE,19,SE,SSE,9,7,62,46,1023.1,1020.9,NA,8,8.2,12.1,No,No
+2009-04-30,Albury,2.1,16.5,0,NA,NA,SW,19,NA,SW,0,7,70,38,1023.4,1021.5,NA,NA,7.9,16.1,No,No
+2009-05-01,Albury,1.8,17,0,NA,NA,SW,19,NA,WSW,0,7,77,44,1026,1023.2,NA,NA,7.2,16.3,No,No
+2009-05-02,Albury,7.2,19.2,0,NA,NA,SW,22,ENE,W,7,6,81,49,1026.9,1024,8,4,10.1,19.1,No,No
+2009-05-03,Albury,4.6,18.9,0,NA,NA,S,15,N,SSE,4,7,75,51,1028.7,1025.9,NA,NA,10.6,18.5,No,No
+2009-05-04,Albury,4.2,19.1,0,NA,NA,W,19,ENE,WSW,6,13,86,44,1029.8,1027.3,NA,NA,9.6,18.8,No,No
+2009-05-05,Albury,5.2,18.8,0,NA,NA,ESE,15,NA,SE,0,7,71,47,1031.4,1028.1,NA,NA,10.3,18.4,No,No
+2009-05-06,Albury,4.1,19.3,0,NA,NA,SW,20,ENE,WNW,6,7,82,49,1028.5,1024.6,NA,NA,10,19.2,No,No
+2009-05-07,Albury,3.2,18.4,0,NA,NA,SW,20,SE,WNW,6,11,86,49,1026.2,1023.6,NA,NA,8.3,18.2,No,No
+2009-05-08,Albury,4.3,19,0,NA,NA,W,15,NA,W,0,9,68,36,1028.8,1025.8,NA,NA,11,18.5,No,No
+2009-05-09,Albury,3.7,20.5,0,NA,NA,W,17,NA,WSW,0,7,78,45,1026,1021.8,NA,NA,9.4,20.2,No,No
+2009-05-10,Albury,5.4,19.5,0,NA,NA,SE,17,NA,SE,0,7,69,40,1025.1,1022.3,NA,NA,11.7,19.1,No,No
+2009-05-11,Albury,4.3,17.7,0,NA,NA,ESE,15,NNW,S,6,7,89,53,1025.6,1022.2,8,NA,8.5,17.7,No,No
+2009-05-12,Albury,3.6,18.5,0,NA,NA,W,26,ENE,WNW,4,17,81,49,1022.3,1018.5,NA,NA,9.1,18,No,No
+2009-05-13,Albury,3.6,15.1,0,NA,NA,WNW,28,SE,W,4,17,86,61,1018.4,1015.7,NA,8,7.5,14.6,No,No
+2009-05-14,Albury,6.9,16.3,0,NA,NA,WNW,35,WNW,WNW,17,19,77,59,1015.3,1013.1,8,8,10.3,15.3,No,No
+2009-05-15,Albury,10.3,16.6,0,NA,NA,WNW,54,NW,NW,13,19,82,63,1015,1011,8,7,12.9,15.9,No,Yes
+2009-05-16,Albury,12.4,16.4,1.8,NA,NA,W,52,W,WSW,22,24,82,54,1011.8,1013.4,8,8,13,14.5,Yes,No
+2009-05-17,Albury,3,15.6,0,NA,NA,W,20,E,E,6,9,83,61,1022.5,1019.3,4,NA,7,14.7,No,No
+2009-05-18,Albury,2.6,19.7,0,NA,NA,E,13,NA,ENE,0,4,82,34,1024.7,1021.2,NA,NA,8.8,18.7,No,No
+2009-05-19,Albury,3.7,19.1,0,NA,NA,SSE,19,NA,SSE,0,11,87,51,1023.6,1019.9,NA,NA,7.4,18.9,No,No
+2009-05-20,Albury,5.1,18.6,0,NA,NA,E,13,SSE,ENE,2,9,75,57,1022.8,1020.5,7,7,12.4,18,No,No
+2009-05-21,Albury,4.4,19.8,0,NA,NA,SE,20,NA,SE,0,7,81,48,1025.2,1022.3,NA,NA,9.4,19.1,No,No
+2009-05-22,Albury,4.7,19.8,0,NA,NA,SE,24,S,SE,4,19,75,43,1025.2,1021.4,NA,NA,10.1,19.6,No,No
+2009-05-23,Albury,6.2,22.9,0,NA,NA,E,30,NE,SE,6,9,71,37,1022.2,1019.4,NA,NA,11.9,21.7,No,No
+2009-05-24,Albury,6.7,21.1,0,NA,NA,SE,20,NA,SE,0,11,69,43,1025,1022.1,NA,NA,12.5,20.8,No,No
+2009-05-25,Albury,9.3,20.3,0,NA,NA,NE,31,SE,NE,9,22,77,50,1024.6,1019.7,2,8,11.6,19.5,No,Yes
+2009-05-26,Albury,11.6,18.1,4.2,NA,NA,E,19,E,SSE,2,6,97,74,1021.4,1019.2,8,3,13.6,17.4,Yes,No
+2009-05-27,Albury,8,16.2,0.8,NA,NA,W,20,NA,WSW,0,11,99,58,1021.7,1019.3,8,NA,10.1,15.6,No,No
+2009-05-28,Albury,2.6,15.7,0,NA,NA,SSE,13,NA,S,0,2,91,48,1023.4,1021.6,NA,NA,7.1,15.3,No,No
+2009-05-29,Albury,2.2,16.5,0,NA,NA,ESE,33,NA,SE,0,19,67,44,1025.6,1024,NA,NA,10.2,15.9,No,No
+2009-05-30,Albury,2.2,16.8,0,NA,NA,SE,26,NA,SE,0,15,65,44,1030.3,1028.5,NA,NA,9.6,16.7,No,No
+2009-05-31,Albury,1.7,17.1,0,NA,NA,NW,44,NA,SE,0,9,73,46,1034.1,1029.9,NA,NA,8,16.8,No,Yes
+2009-06-01,Albury,8,14.3,1.2,NA,NA,SE,13,NA,NA,0,0,88,75,1031.9,1029.2,8,8,9.2,14,Yes,Yes
+2009-06-02,Albury,8.4,13.4,1.4,NA,NA,SE,13,NA,ESE,0,7,78,75,1029.3,1026.2,8,8,10.6,13.4,Yes,Yes
+2009-06-03,Albury,10.6,14.3,4.8,NA,NA,SE,13,ENE,SE,6,9,85,97,1023.5,1020.4,8,8,12.4,13,Yes,Yes
+2009-06-04,Albury,8.9,17.4,8,NA,NA,ENE,13,NW,E,2,4,99,58,1021,1017.5,8,7,11.3,16.5,Yes,No
+2009-06-05,Albury,2.8,16.1,0,NA,NA,W,20,NNE,W,4,11,86,57,1017.9,1015.1,NA,NA,7.6,15.6,No,No
+2009-06-06,Albury,1.7,10.5,0.2,NA,NA,ESE,11,E,NA,4,0,99,91,1015.2,1011.1,8,8,4.7,10.2,No,Yes
+2009-06-07,Albury,4.7,11.6,14.4,NA,NA,NNW,30,NNW,NNW,6,17,93,80,1007.5,1006.3,8,8,10,11.5,Yes,Yes
+2009-06-08,Albury,9,12,4.6,NA,NA,WNW,33,WNW,WNW,9,26,88,79,1009.6,1008.7,8,8,10.3,11.4,Yes,Yes
+2009-06-09,Albury,6.3,8.8,2,NA,NA,W,43,NNW,WNW,13,13,92,95,1011.1,1008.3,8,8,6.8,7.9,Yes,Yes
+2009-06-10,Albury,3,10.5,5.6,NA,NA,WNW,37,W,WSW,15,22,77,56,1017.6,1018.4,NA,4,4.9,9.7,Yes,No
+2009-06-11,Albury,-2,9.6,0,NA,NA,SE,13,NA,ESE,0,6,84,72,1025.1,1023,NA,1,2.2,8.8,No,No
+2009-06-12,Albury,-1.3,8.2,0,NA,NA,ESE,15,E,SSE,6,6,99,72,1025.7,1022.2,8,7,1.9,7.9,No,No
+2009-06-13,Albury,1.8,12.4,0,NA,NA,ENE,28,E,NE,4,15,86,60,1018.3,1013,NA,4,5.9,12.1,No,No
+2009-06-14,Albury,2,15.8,0,NA,NA,NNE,24,NA,NE,0,11,82,49,1011.8,1009.3,NA,NA,6.5,15.5,No,No
+2009-06-15,Albury,0.5,14.9,0.4,NA,NA,ESE,13,NNE,NA,2,0,99,63,1013.9,1012.8,NA,NA,5.4,13.9,No,No
+2009-06-16,Albury,1.2,17.7,0,NA,NA,SE,17,NA,ESE,0,6,83,49,1022.3,1022.2,NA,NA,6.6,15.4,No,No
+2009-06-17,Albury,0.6,15.9,0,NA,NA,WSW,13,NA,W,0,2,94,52,1029.7,1027.7,NA,NA,5.6,14.9,No,No
+2009-06-18,Albury,0.5,14.7,0,NA,NA,N,11,N,NA,6,0,99,63,1031.6,1028.6,8,NA,4.7,14.5,No,No
+2009-06-19,Albury,0.5,15.3,0,NA,NA,ESE,13,NE,SE,6,6,93,56,1030.8,1027.1,NA,NA,5.4,15.1,No,No
+2009-06-20,Albury,0.9,17.3,0,NA,NA,NNE,28,NE,NE,4,17,85,56,1025.7,1020.6,7,8,7,16.7,No,Yes
+2009-06-21,Albury,7,17,1.6,NA,NA,ENE,46,NW,ENE,4,20,99,71,1021.9,1018.6,1,1,8.3,16.4,Yes,Yes
+2009-06-22,Albury,5,14.9,5.6,NA,NA,SE,19,SE,ENE,4,6,99,78,1020.7,1018.6,1,8,9.1,13.6,Yes,No
+2009-06-23,Albury,3.9,15.5,0,NA,NA,W,35,ENE,SSE,11,7,99,70,1020.2,1016.4,8,6,8.3,15.2,No,Yes
+2009-06-24,Albury,7.7,14.1,6,NA,NA,ESE,41,ESE,SE,7,9,81,65,1014.9,1012.7,8,5,9.6,13.7,Yes,No
+2009-06-25,Albury,4.7,12.2,0,NA,NA,NNW,24,ESE,N,2,13,99,75,1015.5,1012.7,7,8,6.9,11.6,No,Yes
+2009-06-26,Albury,6.9,13.7,4.4,NA,NA,SE,46,ESE,ESE,7,9,99,73,1011.6,1008.1,7,NA,8.4,13,Yes,No
+2009-06-27,Albury,8.4,11.9,0,NA,NA,SSE,22,SE,SE,7,6,79,81,1007.8,1005.5,8,8,10.3,11.3,No,Yes
+2009-06-28,Albury,9.3,12.3,5.4,NA,NA,W,22,WSW,NNW,9,11,98,76,1007.5,1006.6,7,8,9.8,12.3,Yes,Yes
+2009-06-29,Albury,8.2,15.7,3.6,NA,NA,NE,26,NE,NNE,9,15,91,69,1011.4,1009.4,8,8,10.1,15.6,Yes,Yes
+2009-06-30,Albury,9.1,16.1,2,NA,NA,NW,72,NE,NE,11,19,78,73,1007.6,1001,8,8,13.5,15.3,Yes,Yes
+2009-07-01,Albury,8.3,13.3,8.4,NA,NA,NW,52,N,NW,20,22,85,68,1006.5,1005.2,8,5,9.5,13.1,Yes,Yes
+2009-07-02,Albury,8.8,11.6,5,NA,NA,WNW,54,NW,WNW,19,19,88,74,1009.4,1006.8,8,4,8.8,11.4,Yes,Yes
+2009-07-03,Albury,7.6,12,7.8,NA,NA,W,61,W,WSW,17,22,82,62,1008.6,1009.6,8,1,7.8,11.7,Yes,No
+2009-07-04,Albury,5.7,13.2,0,NA,NA,WNW,39,WNW,WNW,15,24,91,76,1016.3,1014.9,8,8,7.9,12.6,No,No
+2009-07-05,Albury,3.4,12.4,0,NA,NA,W,31,W,W,9,15,80,56,1019.9,1019,NA,NA,7,12,No,No
+2009-07-06,Albury,0,12.1,0,NA,NA,ENE,19,NNE,WSW,7,7,99,65,1022.4,1020.4,8,NA,2.3,11.4,No,No
+2009-07-07,Albury,-1.5,12.5,0,NA,NA,E,19,NA,ENE,0,7,91,46,1026,1024.6,NA,NA,2.4,12.4,No,No
+2009-07-08,Albury,-1.7,13.8,0,NA,NA,E,17,NA,ESE,0,7,84,54,1030.4,1028.1,NA,NA,3.3,12.4,No,No
+2009-07-09,Albury,-0.4,15,0.2,NA,NA,ESE,13,NA,SE,0,7,84,54,1032,1028.6,NA,NA,3.8,14.3,No,No
+2009-07-10,Albury,0.1,13.5,0,NA,NA,E,13,NA,SSE,0,9,93,62,1028.7,1023.8,NA,NA,4.8,13.4,No,No
+2009-07-11,Albury,4.8,13.3,0.6,NA,NA,NE,24,NA,NE,0,13,96,63,1020.5,1015.6,7,1,8.1,13.2,No,No
+2009-07-12,Albury,8.1,16.5,0.6,NA,NA,NNW,33,SSE,NNW,7,19,77,53,1010.4,1007.7,2,6,11.6,15.4,No,No
+2009-07-13,Albury,5.9,13.1,1,NA,NA,WNW,41,N,NNW,13,11,82,73,1007.6,1005.5,8,8,9,12.3,No,Yes
+2009-07-14,Albury,6.9,11,6.8,NA,NA,W,30,N,SSW,9,9,94,75,1006.6,1005.8,8,8,7.5,10.1,Yes,Yes
+2009-07-15,Albury,2.9,12.6,1.8,NA,NA,WSW,22,ENE,NA,4,0,99,57,1010.5,1009.9,8,NA,5.9,12.5,Yes,No
+2009-07-16,Albury,-0.6,13.4,0,NA,NA,WNW,24,NA,WSW,0,9,95,57,1015.6,1014.5,NA,NA,3.8,12.8,No,No
+2009-07-17,Albury,-0.3,14.4,0.2,NA,NA,N,17,NNE,SW,4,6,88,52,1022.4,1020.6,NA,NA,4.5,14.2,No,No
+2009-07-18,Albury,-1,12,0,NA,NA,N,20,NA,N,0,11,98,64,1023,1019.5,7,5,3.2,11.2,No,No
+2009-07-19,Albury,3.2,14.1,0.6,NA,NA,NNE,24,ESE,NE,7,11,94,65,1021.6,1019.8,8,8,7.8,13.5,No,No
+2009-07-20,Albury,3.6,16.5,0.2,NA,NA,NW,39,NA,N,0,19,95,53,1023.1,1018.4,8,NA,7.1,16.3,No,No
+2009-07-21,Albury,0.8,17.7,0,NA,NA,N,43,ENE,ENE,4,17,87,46,1019.7,1013.4,NA,NA,6.6,17.6,No,No
+2009-07-22,Albury,6.6,12.3,0,NA,NA,W,44,ENE,NNW,7,20,74,81,1009.5,1006.2,7,8,11.3,10.2,No,Yes
+2009-07-23,Albury,6,13.5,9.8,NA,NA,WNW,26,W,W,13,17,83,58,1015.1,1018.4,7,7,8.5,12.9,Yes,No
+2009-07-24,Albury,-0.1,12.9,0,NA,NA,NW,22,NA,NNW,0,15,87,58,1027.3,1025.4,NA,2,3.7,11.6,No,No
+2009-07-25,Albury,-0.3,12.2,0,NA,NA,NE,20,NA,NE,0,9,95,61,1026.8,1022.7,NA,NA,2.5,10.8,No,No
+2009-07-26,Albury,2.1,9.8,0,NA,NA,SSE,13,NA,E,0,2,85,74,1018,1013.7,5,NA,4.4,9.6,No,No
+2009-07-27,Albury,1.3,8.8,0,NA,NA,N,20,ENE,NNW,6,9,99,91,1019.9,1019.9,8,8,4.2,7.3,No,Yes
+2009-07-28,Albury,4.2,12.7,3.8,NA,NA,WNW,31,NW,WNW,11,11,89,71,1024,1023.1,8,8,8.8,12,Yes,Yes
+2009-07-29,Albury,8.3,13.2,2.4,NA,NA,WNW,24,NW,WSW,11,9,98,81,1026,1025.4,8,8,9.3,12.1,Yes,No
+2009-07-30,Albury,3.3,12.1,0.2,NA,NA,NNW,22,NA,WNW,0,9,99,76,1025.8,1022.7,7,7,6.5,12,No,Yes
+2009-07-31,Albury,6.5,14.5,5.2,NA,NA,W,35,W,WSW,19,22,81,61,1021.3,1021.5,5,8,11.6,12.7,Yes,No
+2009-08-01,Albury,7.4,13.9,0.2,NA,NA,W,30,NA,WNW,0,15,99,70,1026.8,1025.3,7,3,8.9,13.3,No,No
+2009-08-02,Albury,7.5,14.1,0.8,NA,NA,NNW,30,SW,NNW,2,17,94,65,1027.9,1024.8,1,6,10.5,13.3,No,No
+2009-08-03,Albury,8.3,13.8,0.8,NA,NA,NNW,37,W,WNW,20,15,79,49,1023.1,1022.9,NA,NA,9.9,13.6,No,No
+2009-08-04,Albury,3.2,14.7,0,NA,NA,SSE,17,NA,ENE,0,4,91,53,1021.7,1018.9,1,NA,5.7,14,No,Yes
+2009-08-05,Albury,5.7,13.8,5.4,NA,NA,NNE,19,ENE,S,7,7,98,76,1022.2,1020.2,8,8,8.9,13.6,Yes,No
+2009-08-06,Albury,5.1,17.1,0.4,NA,NA,N,35,NA,NE,0,19,99,58,1021.9,1016.7,7,NA,8,16.6,No,No
+2009-08-07,Albury,8,13.9,0.8,NA,NA,WNW,57,WNW,WSW,35,33,79,47,1012.8,1015.6,8,8,9.8,13.7,No,Yes
+2009-08-08,Albury,-0.8,12.9,4.2,NA,NA,WNW,24,E,WSW,6,6,78,50,1026.4,1023,NA,NA,4.4,12.3,Yes,No
+2009-08-09,Albury,-1,12.2,0,NA,NA,ESE,15,S,E,2,7,91,48,1021.6,1018.5,NA,NA,2,12.1,No,No
+2009-08-10,Albury,1.9,14.8,0.2,NA,NA,SE,20,SSE,SE,4,11,72,60,1018.6,1014.7,NA,NA,5.9,12.6,No,No
+2009-08-11,Albury,5.9,17.7,0.4,NA,NA,NNE,43,E,NNW,19,22,62,59,1009,1008.6,1,1,14.8,15.6,No,Yes
+2009-08-12,Albury,6.9,14.3,4.8,NA,NA,W,24,SSE,NW,6,13,99,74,1011.5,1010,8,8,9.1,13,Yes,No
+2009-08-13,Albury,7.7,11.6,0.2,NA,NA,NW,22,NW,N,6,13,94,87,1015.7,1015.3,8,7,9.4,11.1,No,Yes
+2009-08-14,Albury,6.8,15.2,1.2,NA,NA,WSW,22,NA,WNW,0,13,99,61,1021.1,1019.1,8,NA,9,14.7,Yes,No
+2009-08-15,Albury,2.7,17.5,0.2,NA,NA,NNE,24,SE,NE,7,13,99,57,1021.2,1016.8,8,NA,6.7,17,No,Yes
+2009-08-16,Albury,5.1,15.5,1.6,NA,NA,W,39,NE,ENE,11,11,79,70,1012.2,1006.4,8,8,11,14.3,Yes,Yes
+2009-08-17,Albury,4.2,13.6,3.2,NA,NA,WNW,37,W,WNW,20,19,73,57,1018.2,1019.7,1,NA,9.8,12.8,Yes,No
+2009-08-18,Albury,0.6,15.6,0,NA,NA,WNW,15,NA,S,0,6,85,58,1029.8,1027.2,NA,2,6,14.4,No,No
+2009-08-19,Albury,1.6,16.4,0,NA,NA,E,17,NE,S,7,7,99,61,1027.7,1022.5,8,1,5.5,15.2,No,No
+2009-08-20,Albury,5.5,18.4,0,NA,NA,N,22,ESE,N,6,13,78,51,1019.7,1014.3,NA,NA,11.1,17.3,No,No
+2009-08-21,Albury,7.3,14.8,1,NA,NA,WNW,59,NNE,WSW,26,30,72,85,1004,1001.7,3,8,13.3,10.1,No,Yes
+2009-08-22,Albury,0.2,14.1,6.6,NA,NA,NE,26,SE,NNE,9,13,90,57,1012,1009.6,NA,NA,5.8,12.9,Yes,Yes
+2009-08-23,Albury,5.8,18.9,3.8,NA,NA,NNE,26,ENE,NNE,7,11,94,67,1011.5,1007.1,3,3,10.8,18.2,Yes,Yes
+2009-08-24,Albury,8.9,17.1,1.2,NA,NA,WNW,63,NNW,NW,26,22,68,52,1004.1,1001,NA,NA,13.2,16.4,Yes,Yes
+2009-08-25,Albury,7.1,12.8,2,NA,NA,W,85,W,NW,15,20,75,53,1009.6,1008.2,3,NA,7.7,11.7,Yes,Yes
+2009-08-26,Albury,4.2,14.4,3.6,NA,NA,NW,43,NNW,NW,13,30,83,56,1016.1,1014.4,NA,8,6.9,13.6,Yes,No
+2009-08-27,Albury,1.1,16.7,0.4,NA,NA,N,30,ENE,N,11,19,72,49,1018.5,1014.6,NA,NA,8.9,16.2,No,No
+2009-08-28,Albury,1.1,18.6,0,NA,NA,NNW,24,ESE,E,7,11,87,51,1016.9,1013.3,NA,NA,7.2,17.6,No,Yes
+2009-08-29,Albury,7.2,17.9,4.2,NA,NA,W,59,NE,W,20,19,81,80,1002.6,996.9,1,8,13,17.5,Yes,Yes
+2009-08-30,Albury,6.3,11.1,13.4,NA,NA,WNW,56,W,W,26,20,77,57,1014.2,1015.2,8,8,6.7,10.7,Yes,Yes
+2009-08-31,Albury,6.7,14.2,1.4,NA,NA,NW,39,NW,NW,19,22,90,72,1018.9,1016.8,7,5,9.7,13.9,Yes,Yes
+2009-09-01,Albury,5.1,14.2,3,NA,NA,WNW,24,WNW,W,7,15,96,58,1023.2,1021.7,8,1,9.7,12.5,Yes,No
+2009-09-02,Albury,1,16.8,0,NA,NA,ESE,24,ESE,E,9,9,82,45,1024.9,1020.2,NA,NA,7,16,No,No
+2009-09-03,Albury,6.1,20.7,0,NA,NA,NE,43,SE,NE,4,24,80,54,1016.6,1010.8,NA,NA,10.2,20.3,No,Yes
+2009-09-04,Albury,6.3,16.9,1.4,NA,NA,NW,35,ESE,WNW,6,13,85,58,1014.4,1012.3,1,NA,12.5,15.5,Yes,No
+2009-09-05,Albury,2.1,15,0,NA,NA,WNW,30,ESE,NW,4,11,81,54,1019.5,1017.9,NA,6,8.6,14.9,No,No
+2009-09-06,Albury,1.6,16.6,0,NA,NA,NE,37,SE,NE,9,20,79,47,1018.4,1011.4,NA,NA,8.3,15.4,No,No
+2009-09-07,Albury,8.3,17.6,0,NA,NA,W,41,ENE,W,9,30,73,53,1005,1002.7,NA,NA,13.9,16.5,No,No
+2009-09-08,Albury,5.7,16.5,0,NA,NA,W,46,W,WSW,7,30,90,59,1009.9,1009,5,4,9.4,15.3,No,No
+2009-09-09,Albury,7.5,14.3,0,NA,NA,W,35,W,WNW,17,22,82,67,1012.8,1011.3,8,8,9.5,13.4,No,No
+2009-09-10,Albury,2.6,NA,0,NA,NA,NA,NA,E,WNW,6,13,71,55,1017.8,1017.6,NA,6,9.7,14.3,No,NA
+2009-09-11,Albury,NA,18.8,NA,NA,NA,N,31,SE,NNE,7,19,83,46,1022.2,1018.2,NA,NA,8.7,18.1,NA,No
+2009-09-12,Albury,6.5,24.7,0,NA,NA,NE,39,SE,NE,6,22,70,39,1020,1015.4,NA,NA,13.2,24,No,No
+2009-09-13,Albury,13.2,25.1,0,NA,NA,NNE,35,E,WNW,9,11,44,25,1017,1012.2,NA,NA,17.3,23.1,No,No
+2009-09-14,Albury,4.3,17.8,0,NA,NA,SW,24,NE,NNW,2,6,60,29,1022.6,1019.9,NA,NA,10.9,17.1,No,No
+2009-09-15,Albury,1.6,17.2,0,NA,NA,S,20,ESE,S,6,7,68,44,1022.5,1019.1,NA,NA,8.1,16.7,No,No
+2009-09-16,Albury,2.8,21.1,0,NA,NA,E,17,E,ESE,7,9,74,39,1022.2,1016.8,NA,NA,11.2,20.7,No,No
+2009-09-17,Albury,6.3,19,0,NA,NA,WNW,24,E,NW,6,2,76,73,1013.8,1011.9,NA,7,12.9,14,No,Yes
+2009-09-18,Albury,7.4,20.4,10.2,NA,NA,WNW,46,NA,NA,0,0,75,54,1021.2,1018.6,NA,NA,12.9,20.3,Yes,No
+2009-09-19,Albury,5.4,20.6,0,NA,NA,NNW,22,NE,WNW,6,11,98,46,1018.8,1015,8,8,10.2,19.2,No,No
+2009-09-20,Albury,8,18.9,0.4,NA,NA,W,33,NA,W,0,20,79,50,1014.6,1013.7,8,NA,14.3,16.8,No,No
+2009-09-21,Albury,3.7,19,0.2,NA,NA,NE,43,ESE,ENE,9,15,73,50,1014.5,1008.2,NA,NA,11.5,18.3,No,Yes
+2009-09-22,Albury,11.5,20.2,8.4,NA,NA,NNE,50,NNW,N,17,13,77,55,1002.6,999.2,8,1,15.5,19.2,Yes,Yes
+2009-09-23,Albury,9.3,16.8,28.8,NA,NA,W,56,W,WSW,26,30,82,54,997.8,1003.8,5,8,13.1,15.9,Yes,Yes
+2009-09-24,Albury,8.2,18.2,1.4,NA,NA,NW,41,WNW,NW,9,24,72,55,1015.1,1011.8,NA,4,12.6,17.2,Yes,No
+2009-09-25,Albury,5.3,20.6,0,NA,NA,NNW,44,NNE,N,22,13,60,57,1009.3,1002.9,2,7,15.2,17.3,No,Yes
+2009-09-26,Albury,6.8,12.2,6,NA,NA,WNW,56,WNW,W,37,24,79,72,1005.2,1003.9,7,6,7.9,11.1,Yes,Yes
+2009-09-27,Albury,4.5,12.9,1.6,NA,NA,W,61,WNW,W,35,37,78,72,1009.8,1008.4,5,8,6.7,10.7,Yes,No
+2009-09-28,Albury,5.5,17.9,0,NA,NA,W,43,W,W,17,24,79,56,1012.3,1009.9,NA,1,9.2,16.8,No,No
+2009-09-29,Albury,1.7,17,0,NA,NA,NW,19,E,WNW,6,11,73,49,1015.6,1013.4,NA,NA,9.4,16.2,No,No
+2009-09-30,Albury,4,21.4,0,NA,NA,NNW,35,E,NNE,7,17,75,36,1018,1013.4,NA,NA,11.3,20.9,No,No
+2009-10-01,Albury,8.9,21.1,0,NA,NA,SSW,28,N,S,6,9,76,61,1012.4,1008.8,NA,NA,12.9,19.4,No,No
+2009-10-02,Albury,11.7,22,0,NA,NA,SE,30,S,SSW,4,11,68,55,1009.6,1004.9,NA,NA,16.1,20.6,No,Yes
+2009-10-03,Albury,8.5,13.5,3.2,NA,NA,SSE,31,ESE,ESE,17,11,87,75,1014,1015.1,7,7,9.6,13,Yes,Yes
+2009-10-04,Albury,9.6,16.2,1.8,NA,NA,NNE,20,NA,SE,0,9,85,75,1020.6,1019.4,NA,1,12.6,14.8,Yes,No
+2009-10-05,Albury,8.3,19.7,0.2,NA,NA,W,35,NA,SW,0,20,85,47,1020.7,1018.6,4,NA,12.5,19.2,No,No
+2009-10-06,Albury,5.2,16.2,0,NA,NA,SE,37,ENE,SSE,6,15,85,77,1020.2,1018.3,2,2,8.8,10,No,Yes
+2009-10-07,Albury,3.8,15.9,3.6,NA,NA,S,35,NA,SSW,0,15,90,42,1018.7,1018.5,NA,NA,7.1,15.2,Yes,No
+2009-10-08,Albury,1.2,16.3,0,NA,NA,ESE,39,E,SE,6,13,65,43,1024,1023.2,NA,NA,7.8,15.7,No,No
+2009-10-09,Albury,3.2,18.2,0,NA,NA,SSE,33,ESE,S,11,9,63,39,1027.7,1025.7,NA,NA,11.8,17.8,No,No
+2009-10-10,Albury,4.6,19,0,NA,NA,SE,22,SE,S,17,9,55,36,1029.5,1025.7,NA,NA,11.2,17.3,No,No
+2009-10-11,Albury,6.4,18.7,0,NA,NA,W,48,SE,NNE,7,17,68,50,1022.6,1016.9,NA,NA,11.3,18.2,No,No
+2009-10-12,Albury,5.8,23.3,0,NA,NA,W,59,SSE,NE,9,20,88,64,1007.9,999.4,NA,1,11,19,No,Yes
+2009-10-13,Albury,6.6,17.7,2,NA,NA,N,50,N,NW,17,30,70,71,1001.9,997.6,7,6,10.8,14.8,Yes,Yes
+2009-10-14,Albury,9.5,15.1,7,NA,NA,W,65,WNW,W,26,30,88,60,1000.5,1002.7,8,1,10.3,14.1,Yes,Yes
+2009-10-15,Albury,9.7,15.7,1.4,NA,NA,WNW,50,NW,WSW,15,22,79,84,1008.5,1007.8,8,8,11.1,10.9,Yes,Yes
+2009-10-16,Albury,4.1,16.6,6.8,NA,NA,W,39,W,WNW,15,19,77,56,1016,1016.2,NA,4,8.8,14.9,Yes,No
+2009-10-17,Albury,4.6,19.2,0,NA,NA,WSW,28,SE,W,6,13,83,46,1022.7,1021.6,NA,1,10.9,18.8,No,No
+2009-10-18,Albury,5.1,20.3,0,NA,NA,NW,24,SSW,ESE,6,9,72,50,1026.9,1024.7,NA,8,12.1,19.3,No,No
+2009-10-19,Albury,5.1,22.7,0,NA,NA,NE,19,WSW,NW,4,6,78,38,1026.6,1023.7,NA,NA,12.2,22,No,No
+2009-10-20,Albury,6.9,26.6,0,NA,NA,NNW,30,SE,S,7,17,71,31,1022.9,1018.4,NA,NA,13.4,25.8,No,No
+2009-10-21,Albury,8.8,27.1,0,NA,NA,SSE,20,ESE,SSE,7,15,73,44,1018.9,1017.4,NA,NA,15.4,25.3,No,No
+2009-10-22,Albury,9.1,27.1,0,NA,NA,WSW,24,SE,SSE,9,13,67,38,1020.8,1018.4,NA,NA,15.6,25.4,No,No
+2009-10-23,Albury,8.1,23.9,0,NA,NA,WNW,35,ENE,SW,2,13,70,26,1019.6,1017.6,NA,NA,14.8,23.2,No,No
+2009-10-24,Albury,7.4,25.4,0,NA,NA,WSW,30,E,W,9,13,68,28,1019.5,1016.2,NA,NA,14.7,24.8,No,No
+2009-10-25,Albury,10.6,23.1,0,NA,NA,SE,63,WSW,WSW,2,13,68,34,1014.7,1013,NA,NA,14.4,21.3,No,No
+2009-10-26,Albury,10.8,22,0,NA,NA,SE,35,SE,SSE,20,15,52,38,1023.8,1022,NA,NA,14.7,20.9,No,No
+2009-10-27,Albury,5.9,24.1,0,NA,NA,ENE,26,S,NNE,7,9,64,43,1027.5,1023.1,NA,NA,12.9,23.4,No,No
+2009-10-28,Albury,11.3,26.8,0,NA,NA,W,19,SE,SE,4,9,67,41,1025.4,1020.9,NA,NA,17.9,25.8,No,No
+2009-10-29,Albury,14.5,26.9,0,NA,NA,NNW,31,SE,N,9,20,65,50,1023.4,1020.6,NA,NA,19.1,25.8,No,No
+2009-10-30,Albury,13.7,29.1,0,NA,NA,WSW,22,SE,S,11,11,75,46,1022.8,1019.5,NA,NA,19.1,28.4,No,No
+2009-10-31,Albury,15.6,30.8,0,NA,NA,SSE,20,E,SE,11,11,65,38,1022.3,1019,NA,NA,21.4,30.3,No,No
+2009-11-01,Albury,17.8,34,0,NA,NA,WNW,33,SE,SE,9,17,66,35,1021.6,1017.3,NA,NA,23.1,32.7,No,No
+2009-11-02,Albury,18.7,32.4,0,NA,NA,S,20,SE,SE,9,9,66,47,1018.8,1014.6,NA,NA,23.9,31.1,No,No
+2009-11-03,Albury,18.7,24.3,0,NA,NA,W,46,W,W,24,20,46,39,1009.8,1011.9,NA,NA,24.2,21.9,No,No
+2009-11-04,Albury,10,23.2,0,NA,NA,WNW,39,WSW,WNW,7,19,59,27,1017.1,1015.8,NA,NA,15,22.6,No,No
+2009-11-05,Albury,6.6,25.3,0,NA,NA,NE,44,SE,SE,7,26,67,28,1020.5,1017.3,NA,NA,14,25.3,No,No
+2009-11-06,Albury,10.8,27.9,0,NA,NA,SSE,28,SE,S,11,15,55,32,1025,1021.8,NA,NA,17.5,27,No,No
+2009-11-07,Albury,11.3,29.8,0,NA,NA,S,22,SE,S,6,15,57,27,1028.5,1025.3,NA,NA,19.2,28.9,No,No
+2009-11-08,Albury,13.5,31.8,0,NA,NA,SSE,28,SE,E,4,9,55,29,1029.1,1024.8,NA,NA,21,30.3,No,No
+2009-11-09,Albury,15.4,33.4,0,NA,NA,WSW,37,ESE,SSE,7,13,48,29,1025.4,1020.6,NA,NA,22.1,32.8,No,No
+2009-11-10,Albury,15.9,35.2,0,NA,NA,SW,33,SE,SW,7,11,49,23,1021,1017.2,NA,NA,23.3,33.8,No,No
+2009-11-11,Albury,17.1,36,0,NA,NA,ESE,26,SSE,SE,4,13,43,18,1021.4,1017.8,NA,NA,24.5,34.9,No,No
+2009-11-12,Albury,16.7,35.1,0,NA,NA,WSW,43,E,SW,2,28,49,18,1018.9,1014.8,NA,NA,24.7,34.6,No,No
+2009-11-13,Albury,18.1,32.8,0,NA,NA,SE,31,SE,SSE,19,17,42,22,1017.2,1013.9,NA,NA,23.2,31.7,No,No
+2009-11-14,Albury,13.4,35.4,0,NA,NA,W,46,SSE,SSW,13,11,55,25,1015.6,1011.2,NA,NA,21.7,32.6,No,No
+2009-11-15,Albury,17.2,36.3,0,NA,NA,W,35,ENE,W,6,22,57,16,1009.8,1006.5,NA,NA,23.9,35.4,No,No
+2009-11-16,Albury,15.3,35.1,0,NA,NA,W,54,SSE,S,4,13,46,20,1007,1002.6,NA,NA,24.1,33.4,No,No
+2009-11-17,Albury,12.1,30.5,0,NA,NA,SSE,30,SSE,SSE,19,9,38,18,1008,1005.9,NA,NA,19.5,28.6,No,No
+2009-11-18,Albury,11.4,33.5,0,NA,NA,N,24,S,W,9,9,53,18,1010,1007.1,NA,NA,21,32.7,No,No
+2009-11-19,Albury,18.6,39.7,0,NA,NA,NW,37,NNE,WNW,17,22,29,11,1006.8,1004.6,NA,NA,27.8,39,No,No
+2009-11-20,Albury,15.3,38.2,0,NA,NA,NW,78,SSE,WNW,4,13,45,21,1007.6,1002.3,NA,1,24.7,36.4,No,Yes
+2009-11-21,Albury,19.3,21,10.6,NA,NA,NE,37,NE,SSE,9,9,95,91,1010.8,1009,8,8,19.7,20.8,Yes,Yes
+2009-11-22,Albury,18.3,28.3,25.8,NA,NA,NNW,61,NA,W,0,46,98,67,1003.7,1003.5,8,8,19.2,25.6,Yes,No
+2009-11-23,Albury,11.9,23.6,0.4,NA,NA,W,24,WSW,S,7,9,63,37,1020.7,1020.6,NA,NA,14.4,22.7,No,No
+2009-11-24,Albury,12.8,25.8,0,NA,NA,WNW,30,SSE,S,7,7,60,40,1024.6,1021.6,NA,1,18.1,24.9,No,No
+2009-11-25,Albury,17.2,32.9,0,NA,NA,SE,24,S,S,4,7,60,36,1020.8,1016,NA,NA,22,32,No,No
+2009-11-26,Albury,21,34.5,0,NA,NA,N,78,SE,WNW,13,39,48,70,1012.2,1008.4,1,4,28.2,25.2,No,Yes
+2009-11-27,Albury,15.9,26.2,10.2,NA,NA,N,24,NE,NA,11,0,82,56,1010.7,1008.6,7,5,17.6,24.7,Yes,No
+2009-11-28,Albury,17.1,26.4,0,NA,NA,W,52,WNW,NW,24,24,48,27,1006.5,1002.7,2,1,18.8,25.7,No,Yes
+2009-11-29,Albury,12.8,22.3,9.4,NA,NA,WNW,46,WSW,WNW,6,19,94,54,1000.5,1000.9,8,4,13.5,20.7,Yes,Yes
+2009-11-30,Albury,13.2,23.9,2.4,NA,NA,SE,50,SSE,SE,9,24,82,35,1010.3,1009.3,3,1,15.9,23.6,Yes,No
+2009-12-01,Albury,12.3,23.6,0,NA,NA,E,37,SE,SE,24,22,43,31,1018.4,1016.9,NA,NA,16.6,22.6,No,No
+2009-12-02,Albury,10.6,27,0,NA,NA,WNW,39,SSE,WSW,7,9,48,29,1022,1018.9,NA,NA,16.8,25.5,No,No
+2009-12-03,Albury,11.4,31.5,0,NA,NA,W,50,S,NNW,6,17,57,16,1019.2,1014.3,NA,NA,20.3,29.8,No,No
+2009-12-04,Albury,12.3,27.5,0,NA,NA,WSW,44,SW,SW,11,20,42,7,1015.9,1014.4,NA,NA,19.5,26.8,No,No
+2009-12-05,Albury,10.7,26.7,0,NA,NA,W,37,SE,WSW,2,24,44,22,1015.1,1012.9,NA,NA,17.6,25.7,No,No
+2009-12-06,Albury,11.1,30.7,0,NA,NA,W,28,NE,W,4,13,58,23,1015.9,1012.4,NA,NA,18.9,28.7,No,No
+2009-12-07,Albury,13.4,31.9,0,NA,NA,W,39,ENE,NW,6,28,47,19,1012.3,1009,NA,NA,21.2,30.6,No,No
+2009-12-08,Albury,18.2,24.9,0,NA,NA,SW,54,WSW,SW,13,28,58,45,1006.9,1006,7,5,21,21.8,No,Yes
+2009-12-09,Albury,9.2,25.4,1.2,NA,NA,WNW,30,SSW,NW,6,15,64,24,1011.6,1009.2,NA,NA,15.7,23.4,Yes,No
+2009-12-10,Albury,14.2,27.4,0,NA,NA,W,52,SE,W,6,19,52,26,1008.9,1004.7,7,7,19.7,25.6,No,No
+2009-12-11,Albury,9.2,22.6,1,NA,NA,SW,41,WSW,SW,19,20,62,30,1016.9,1016.3,6,3,12.8,21,No,No
+2009-12-12,Albury,9,26.5,0,NA,NA,WSW,39,ENE,SW,4,15,52,31,1019.2,1016.1,NA,4,17,26,No,No
+2009-12-13,Albury,11.8,29.6,0,NA,NA,SW,43,SSE,WSW,2,24,52,27,1017.6,1015,NA,NA,19.5,28.9,No,No
+2009-12-14,Albury,13.6,32,0,NA,NA,SSE,28,SSE,SSE,13,15,48,25,1018.7,1015.8,NA,NA,21.8,30.6,No,No
+2009-12-15,Albury,13.1,34.7,0,NA,NA,SSW,28,SE,S,7,19,51,22,1019.4,1015.4,NA,NA,22.1,32.5,No,No
+2009-12-16,Albury,14.6,38.6,0,NA,NA,NNW,39,SSE,NNE,9,20,45,8,1017,1012.3,NA,NA,23.8,36.9,No,No
+2009-12-17,Albury,14.5,40.3,0,NA,NA,NW,107,S,WNW,9,50,40,28,1008.9,1005.7,NA,2,24.2,31.4,No,Yes
+2009-12-18,Albury,12.2,26.4,3,NA,NA,W,41,NW,W,11,17,60,19,1015,1014.1,NA,NA,16,24.9,Yes,No
+2009-12-19,Albury,11.1,29.2,0,NA,NA,WSW,37,SSE,WSW,2,20,45,23,1016.2,1014.2,NA,NA,19.1,27.7,No,No
+2009-12-20,Albury,12,31.3,0,NA,NA,NNW,31,SSE,ESE,7,7,52,21,1018.1,1013.7,NA,NA,20.8,30.4,No,No
+2009-12-21,Albury,12.7,33.7,0,NA,NA,NW,39,ESE,NW,6,22,48,10,1013.5,1009.6,NA,NA,21,32.7,No,No
+2009-12-22,Albury,15.1,36.6,0,NA,NA,WSW,39,ENE,SW,11,19,44,10,1010.9,1007.3,NA,NA,23.1,35.9,No,No
+2009-12-23,Albury,18.1,38.2,0,NA,NA,E,37,SE,N,11,11,41,12,1012.4,1008.8,NA,NA,27.2,37.5,No,No
+2009-12-24,Albury,22.9,34.6,0,NA,NA,NNE,63,N,NNW,31,20,21,29,1006.5,1006.3,NA,NA,32.1,30.4,No,Yes
+2009-12-25,Albury,18.8,28.3,9.8,NA,NA,SE,31,NA,NNE,0,6,84,49,1009.8,1008,5,1,20.9,27.5,Yes,No
+2009-12-26,Albury,17.1,31.3,0,NA,NA,N,33,SSE,NW,17,7,56,34,1014.7,1011.9,1,NA,20,29.4,No,No
+2009-12-27,Albury,17.6,27.3,0,NA,NA,ENE,24,S,NE,11,15,61,74,1016.3,1013.9,1,NA,22.1,22.7,No,No
+2009-12-28,Albury,17.8,35.9,0,NA,NA,SE,33,SW,WSW,6,11,58,23,1015.2,1012.6,NA,NA,24.4,34.1,No,No
+2009-12-29,Albury,18.7,35.9,0,NA,NA,SSE,31,ENE,NE,4,9,46,24,1020,1017,NA,NA,25.6,34.1,No,No
+2009-12-30,Albury,19.8,36.8,0,NA,NA,N,33,S,NE,4,15,41,15,1022,1016.7,NA,NA,26,35.1,No,No
+2009-12-31,Albury,21.1,33.2,0,NA,NA,N,44,ENE,NE,15,20,41,35,1016.8,1012,NA,1,28.1,31.1,No,Yes
+2010-01-01,Albury,19.4,31.9,5,NA,NA,NNE,39,NW,WNW,9,9,70,40,1012.2,1008.5,NA,1,23.4,30.9,Yes,Yes
+2010-01-02,Albury,18.6,29.1,12.4,NA,NA,W,56,S,W,6,28,88,48,1007.8,1006.2,5,NA,20.6,28,Yes,No
+2010-01-03,Albury,12.2,29.7,0,NA,NA,W,30,SSW,SW,9,19,57,32,1014.4,1012.5,NA,NA,18,28,No,No
+2010-01-04,Albury,14.8,32.8,0,NA,NA,SW,30,ENE,NNW,11,9,55,24,1017.5,1013.6,NA,NA,21.3,30.6,No,No
+2010-01-05,Albury,15,35.8,0,NA,NA,W,46,E,NW,4,17,46,13,1014.9,1011.5,NA,NA,23.3,34.9,No,No
+2010-01-06,Albury,16.3,33.8,0,NA,NA,WNW,41,ENE,W,2,26,49,7,1014.1,1011.5,NA,NA,24.3,33.4,No,No
+2010-01-07,Albury,15,33,0,NA,NA,SSE,28,NE,NA,9,NA,45,17,1014.9,1012.7,NA,1,22.8,31.8,No,No
+2010-01-08,Albury,17.4,36.4,0,NA,NA,N,30,SE,WNW,6,13,50,19,1018,1014.6,NA,NA,24.6,35.3,No,No
+2010-01-09,Albury,19.6,39.8,0,NA,NA,W,41,ESE,W,7,22,48,19,1017.2,1013.1,NA,1,26.4,38.6,No,No
+2010-01-10,Albury,20.6,42.2,0,NA,NA,WSW,41,E,SW,9,15,38,8,1015.4,1011.2,NA,NA,27.8,41.2,No,No
+2010-01-11,Albury,21,42.2,0,NA,NA,NE,30,SE,NNW,11,9,39,15,1013.8,1009.1,NA,NA,29.1,40.9,No,No
+2010-01-12,Albury,24.5,42.4,0.2,NA,NA,NNW,74,S,NNW,7,33,48,12,1007.7,1003.6,3,NA,29.4,41.1,No,No
+2010-01-13,Albury,22.6,28.4,0.4,NA,NA,SW,44,WSW,WNW,13,11,56,79,1009.8,1012,NA,8,25.1,19.9,No,Yes
+2010-01-14,Albury,15.7,31.7,3,NA,NA,SSW,35,SSE,SSE,15,19,55,28,1016.1,1013.2,8,NA,20.9,30.4,Yes,No
+2010-01-15,Albury,17.2,36.3,0,NA,NA,NNW,33,SE,NE,11,13,51,20,1015.6,1011.4,NA,NA,24.2,34.4,No,No
+2010-01-16,Albury,21.8,36.6,0,NA,NA,W,46,N,W,22,30,50,11,1009.6,1004.1,NA,NA,27.7,36,No,No
+2010-01-17,Albury,16.8,25.6,0,NA,NA,WNW,57,W,W,20,35,51,24,1006.9,1005.5,4,1,18,24.1,No,No
+2010-01-18,Albury,10.5,22.6,0,NA,NA,SW,52,W,WSW,22,30,44,30,1007.7,1007,2,8,14.4,20.5,No,No
+2010-01-19,Albury,8.7,25.2,0,NA,NA,W,50,W,WSW,6,30,47,27,1011.5,1009.7,NA,NA,15,23.8,No,No
+2010-01-20,Albury,11,32.9,0,NA,NA,W,48,SSE,WNW,2,19,52,15,1011.8,1008.8,NA,NA,18.5,30.7,No,No
+2010-01-21,Albury,15.4,37.3,0,NA,NA,W,56,SE,WNW,2,22,39,18,1010.7,1008.1,NA,NA,22.4,34.3,No,No
+2010-01-22,Albury,19.2,41.8,0,NA,NA,NNW,69,SE,NNW,7,31,40,9,1008.8,1003.7,NA,NA,26,39.1,No,No
+2010-01-23,Albury,24.7,35.4,0,NA,NA,WSW,43,WNW,W,20,19,43,9,1006.7,1006.5,NA,NA,25,34.6,No,No
+2010-01-24,Albury,14.4,33.7,0,NA,NA,SSW,28,SSE,WNW,6,15,50,22,1013.2,1009.7,NA,NA,21.5,31.7,No,No
+2010-01-25,Albury,14.3,35.8,0,NA,NA,WNW,35,E,WSW,6,17,47,8,1011.4,1008.1,NA,NA,22.8,34.7,No,No
+2010-01-26,Albury,15.1,35.9,0,NA,NA,WSW,39,NA,WSW,0,17,35,10,1010,1008.5,NA,NA,22.9,34.4,No,No
+2010-01-27,Albury,17.7,36.4,0,NA,NA,W,43,S,WSW,7,15,45,14,1011.4,1007.9,NA,NA,24.2,35.3,No,No
+2010-01-28,Albury,15.2,34.4,0,NA,NA,NW,35,SE,WNW,2,22,51,8,1008.5,1005.2,NA,NA,23.1,34.1,No,No
+2010-01-29,Albury,16,35.2,0,NA,NA,SSE,35,SE,NNE,2,7,46,14,1009,1007.7,NA,NA,23.1,33.9,No,No
+2010-01-30,Albury,18.9,36.5,0,NA,NA,NE,46,SSE,NW,15,9,48,22,1015.3,1012,NA,NA,23.5,34.8,No,No
+2010-01-31,Albury,21.7,36.3,0,NA,NA,NE,44,ENE,E,22,15,39,16,1014.2,1009.7,NA,NA,26.6,34.7,No,No
+2010-02-01,Albury,21,38.2,0,NA,NA,E,67,S,SSE,4,15,46,19,1014,1009.9,NA,NA,25.2,36.9,No,Yes
+2010-02-02,Albury,17.8,34.3,8.6,NA,NA,ENE,39,SSE,NE,7,9,61,24,1016.1,1011.7,NA,NA,22.9,32.5,Yes,No
+2010-02-03,Albury,17.9,35.6,0,NA,NA,E,57,SSE,ESE,15,17,36,23,1014,1008.5,NA,3,24.3,34.6,No,No
+2010-02-04,Albury,23.5,32,0,NA,NA,NNW,44,ENE,NA,19,NA,51,44,1010.8,1006.2,4,NA,26.3,31.1,No,Yes
+2010-02-05,Albury,19.2,26.1,52.2,NA,NA,SE,33,S,SSW,9,13,83,70,1009.9,1009.4,4,8,22.1,25,Yes,Yes
+2010-02-06,Albury,19.5,30.3,5.6,NA,NA,SE,43,SE,SE,20,22,55,38,1016.4,1015.7,NA,NA,22.6,30.1,Yes,No
+2010-02-07,Albury,20.3,33.9,0,NA,NA,SE,37,SE,E,19,6,53,32,1020.8,1017.5,NA,NA,23.2,32.6,No,No
+2010-02-08,Albury,23,34,0,NA,NA,NNW,37,ESE,ESE,7,11,66,32,1020.8,1017.8,7,7,25.9,33.8,No,No
+2010-02-09,Albury,22.1,35.1,0,NA,NA,NA,NA,ENE,SW,6,11,58,37,1020.9,1017.8,NA,1,26.9,33.5,No,NA
+2010-02-10,Albury,21.7,35.6,NA,NA,NA,SSW,46,NA,S,NA,15,64,28,1018.8,1014.7,NA,4,25.2,32.9,NA,No
+2010-02-11,Albury,21.5,35,0,NA,NA,NA,NA,SSE,E,9,7,76,35,1015.8,1010.3,NA,8,24.2,33.1,No,NA
+2010-02-12,Albury,22.5,29.1,NA,NA,NA,SW,24,NA,NNW,NA,11,81,67,1008.5,1007.8,NA,7,23.4,26.4,NA,No
+2010-02-13,Albury,20.8,27.1,0,NA,NA,NE,24,E,NE,9,11,82,59,1009.9,1007.9,8,1,21.2,26.6,No,No
+2010-02-14,Albury,20.5,30.3,0,NA,NA,SE,41,SSE,SE,7,20,80,43,1006.8,1003.9,8,8,21.7,28.9,No,No
+2010-02-15,Albury,17.8,26.8,0,NA,NA,ESE,52,SSW,SE,7,28,76,44,1008.6,1008.8,8,NA,19.7,26.2,No,No
+2010-02-16,Albury,17.6,29,0,NA,NA,SE,31,SSE,E,19,13,48,34,1014.7,1013.3,NA,NA,20.6,27.2,No,No
+2010-02-17,Albury,15.5,30.6,0,NA,NA,NA,NA,SE,SSW,6,11,66,30,1015.9,1013.8,NA,NA,19.4,30,No,NA
+2010-02-18,Albury,NA,31.2,NA,NA,NA,ESE,31,SSE,SSW,7,7,33,24,1020.4,1019.1,NA,NA,21,30,NA,No
+2010-02-19,Albury,16.4,30.3,0,NA,NA,NNE,26,E,WNW,9,9,54,34,1023.6,1019.6,NA,NA,20.8,29.2,No,No
+2010-02-20,Albury,15.7,31.8,0,NA,NA,NW,57,SE,N,7,19,70,35,1018.9,1014.3,1,2,19.6,30.9,No,No
+2010-02-21,Albury,19.6,34.7,0.6,NA,NA,SSW,59,SE,SE,6,24,71,59,1015.3,1011.2,3,8,23.8,27.3,No,Yes
+2010-02-22,Albury,20.2,26.4,3.6,NA,NA,E,46,ENE,NW,4,9,83,70,1014.6,1011.9,8,8,21.3,24.2,Yes,No
+2010-02-23,Albury,12.5,26.1,0.2,NA,NA,W,31,W,SSE,15,11,56,34,1017.3,1016.7,NA,NA,15.2,24.3,No,No
+2010-02-24,Albury,12.8,28.5,0,NA,NA,SE,24,SE,SE,9,11,57,35,1020.3,1018.4,NA,NA,17.9,26.4,No,No
+2010-02-25,Albury,15,31,0,NA,NA,NNW,22,ESE,ESE,2,7,61,33,1023.9,1021.3,NA,NA,19.5,29.3,No,No
+2010-02-26,Albury,17.2,NA,0,NA,NA,NA,NA,NE,E,13,9,54,28,1024.6,1020.7,NA,NA,20.6,29.2,No,NA
+2010-02-27,Albury,NA,26.3,NA,NA,NA,NE,26,SE,E,9,13,70,62,1019.4,1018.3,2,2,20.8,24.8,NA,Yes
+2010-02-28,Albury,18.2,29.3,1.4,NA,NA,W,39,NA,W,0,20,84,45,1016.7,1013.6,8,NA,19.9,28.5,Yes,No
+2010-03-01,Albury,14.4,NA,0,NA,NA,NA,NA,SE,SSE,19,20,50,35,1018.5,1016.2,6,NA,17.1,25.5,No,NA
+2010-03-02,Albury,11.2,28.5,NA,NA,NA,SSE,28,SE,ESE,9,15,58,23,1019.3,1015.4,NA,NA,16.6,26.5,NA,No
+2010-03-03,Albury,12.5,31.2,0,NA,NA,ENE,19,NA,ENE,0,4,61,26,1018.6,1014.2,NA,NA,17.8,28.9,No,No
+2010-03-04,Albury,15.1,NA,0,NA,NA,NA,NA,SE,S,7,11,70,35,1014.2,1009.8,NA,NA,20.1,28.6,No,No
+2010-03-05,Albury,NA,22.3,0,NA,NA,NE,37,NE,NE,24,17,74,93,1008.8,1006.6,8,8,20.9,20.1,No,Yes
+2010-03-06,Albury,18.8,30.3,20.6,NA,NA,WSW,39,W,N,9,7,87,48,1010,1009,8,1,22.3,29.4,Yes,Yes
+2010-03-07,Albury,18.3,22.9,5.8,NA,NA,SE,39,NW,E,15,13,89,82,1013.3,1008.8,8,7,19,21.1,Yes,Yes
+2010-03-08,Albury,18.1,25.5,66,NA,NA,NW,56,N,NNW,11,37,79,38,1008.7,1007.5,NA,1,19.8,24.1,Yes,Yes
+2010-03-09,Albury,15.7,22.4,6.2,NA,NA,NW,46,WNW,WNW,20,17,90,67,1014.4,1015.9,8,8,16.3,19,Yes,No
+2010-03-10,Albury,8.8,NA,0,NA,NA,NA,NA,SSE,SSE,9,11,69,35,1023.7,1023,NA,1,12.5,21.8,No,NA
+2010-03-11,Albury,12.3,24.4,NA,NA,NA,SSE,28,SE,SE,13,11,56,40,1031.4,1030.2,NA,NA,15.2,22.8,NA,No
+2010-03-12,Albury,10.6,25,0,NA,NA,NNE,20,S,W,4,4,72,40,1036.3,1033.6,NA,NA,14.2,24.1,No,No
+2010-03-13,Albury,11.5,25.7,0,NA,NA,SE,24,NA,E,0,9,80,44,1035.2,1031.4,NA,NA,15,23.9,No,No
+2010-03-14,Albury,12.2,26.3,0,NA,NA,SE,24,SSE,SSE,6,7,75,37,1030,1026,NA,NA,15.6,24.8,No,No
+2010-03-15,Albury,13.2,26.6,0,NA,NA,E,22,NA,SSW,0,11,72,38,1025.5,1022.3,NA,1,16.2,26,No,No
+2010-03-16,Albury,12.5,28.6,0,NA,NA,ENE,46,NA,SSW,0,4,73,28,1023.8,1021,NA,NA,16.1,28.1,No,No
+2010-03-17,Albury,13.3,29.6,0,NA,NA,SSW,19,N,W,2,4,76,35,1025.6,1023.3,NA,NA,17.6,29.5,No,No
+2010-03-18,Albury,15.1,30.4,0,NA,NA,SSE,48,SE,W,2,9,73,36,1025.4,1022.2,NA,NA,18.9,29.7,No,No
+2010-03-19,Albury,14.9,31.4,0,NA,NA,W,33,SSE,WNW,4,15,79,31,1020.4,1017.3,NA,1,17.7,30,No,No
+2010-03-20,Albury,16.7,31.9,0,NA,NA,W,35,SSE,SW,6,19,77,36,1020.2,1017.9,8,NA,19.4,31.5,No,No
+2010-03-21,Albury,16.8,25.6,0,NA,NA,W,44,NA,WSW,0,24,78,46,1018.7,1017.7,2,NA,20.2,24.7,No,No
+2010-03-22,Albury,9.1,25.3,0,NA,NA,WNW,30,SSE,WNW,6,13,69,36,1020.8,1018.8,NA,NA,13,24.1,No,No
+2010-03-23,Albury,8.3,27,0,NA,NA,WNW,31,S,WNW,6,19,79,23,1021.2,1018.6,NA,NA,12.1,26.1,No,No
+2010-03-24,Albury,10.5,28.8,0,NA,NA,S,22,NA,W,0,6,81,31,1022,1019.5,NA,NA,13.3,26.9,No,No
+2010-03-25,Albury,11.6,29.6,0,NA,NA,NNW,24,E,NNW,4,6,75,32,1021.8,1018,NA,NA,15.4,28.9,No,No
+2010-03-26,Albury,12.6,30,0,NA,NA,WNW,24,NA,WNW,0,11,80,32,1019.2,1016.4,NA,NA,15.8,29.1,No,No
+2010-03-27,Albury,15.6,30.2,0,NA,NA,E,20,NA,S,0,9,73,32,1019.8,1017,NA,NA,18.3,30,No,No
+2010-03-28,Albury,17.2,28.7,0,NA,NA,W,39,ENE,N,4,13,79,41,1016.4,1011.8,NA,NA,19.4,28.3,No,Yes
+2010-03-29,Albury,18.2,26.3,11,NA,NA,WNW,26,W,WNW,7,20,94,61,1015.8,1014.9,7,5,18.2,24.8,Yes,No
+2010-03-30,Albury,16.5,26.9,0.4,NA,NA,SSW,28,NA,WSW,0,11,91,44,1019.6,1017.6,NA,NA,17.5,26,No,No
+2010-03-31,Albury,13.4,26.1,0,NA,NA,SSE,28,SSE,NE,9,9,71,42,1021.2,1018.1,NA,1,16.5,25.1,No,No
+2010-04-01,Albury,11.6,25.8,0,NA,NA,WNW,26,ESE,NW,2,9,82,44,1020,1017.4,NA,2,14.6,25.2,No,No
+2010-04-02,Albury,10,25.1,0,NA,NA,SE,20,NA,S,0,6,78,42,1019.8,1017.4,NA,NA,15.3,24.4,No,No
+2010-04-03,Albury,12.4,24.8,0,NA,NA,NE,26,NA,NE,0,11,71,41,1020.7,1018.4,NA,5,15.5,24.7,No,No
+2010-04-04,Albury,12.5,24.8,0,NA,NA,SE,20,SE,N,13,7,58,37,1022.1,1018.2,7,NA,18.3,24.2,No,No
+2010-04-05,Albury,10.3,25.3,0,NA,NA,SE,17,SSE,ENE,2,9,76,38,1020.7,1016.3,1,NA,15.5,24.6,No,No
+2010-04-06,Albury,10.6,24.7,0,NA,NA,NE,33,NA,ENE,0,20,75,40,1017.9,1013.3,NA,NA,15.7,23.8,No,Yes
+2010-04-07,Albury,15.7,23.4,3,NA,NA,N,30,NNE,WNW,17,9,87,69,1012.8,1010.5,8,3,19.2,23.2,Yes,Yes
+2010-04-08,Albury,13.5,23.1,3.2,NA,NA,NW,46,WNW,WSW,13,20,84,53,1016.7,1015.3,1,1,17.5,23,Yes,No
+2010-04-09,Albury,10.1,21.9,0,NA,NA,E,22,SE,SSE,4,7,73,55,1016.1,1011.3,NA,2,15.7,21.2,No,No
+2010-04-10,Albury,14.1,18.6,0.2,NA,NA,WNW,22,NE,NE,6,11,84,79,1011.6,1009,8,8,16.7,18.3,No,Yes
+2010-04-11,Albury,14.2,18.7,7,NA,NA,WNW,57,NW,W,17,35,86,43,1010.1,1010.2,8,2,15.9,17.8,Yes,No
+2010-04-12,Albury,5.6,17.4,0,NA,NA,SW,41,W,SW,19,24,71,54,1018.1,1017.3,NA,8,11,16,No,No
+2010-04-13,Albury,4.6,19.9,0,NA,NA,SW,19,SSW,W,4,11,82,49,1023.8,1021.1,NA,NA,10.1,19.5,No,No
+2010-04-14,Albury,5.1,21.9,0,NA,NA,SSE,19,E,SSW,9,7,81,49,1023.6,1020.1,NA,NA,12.5,21.6,No,No
+2010-04-15,Albury,6.1,23.5,0,NA,NA,SE,17,NA,S,0,6,79,40,1022.6,1020.7,NA,NA,13.3,22.4,No,No
+2010-04-16,Albury,7.7,24.7,0,NA,NA,SSE,19,S,SSE,6,11,79,45,1026.5,1023,NA,NA,13.6,24.1,No,No
+2010-04-17,Albury,8.5,25.4,0,NA,NA,ESE,17,ENE,SSE,7,11,74,38,1027.8,1024.4,NA,NA,15.8,25,No,No
+2010-04-18,Albury,10.1,25.1,0,NA,NA,SSW,17,NA,S,0,9,67,47,1027.1,1023.2,4,NA,16.8,24.6,No,No
+2010-04-19,Albury,11.2,25.9,0,NA,NA,ESE,17,NA,SSE,0,9,81,46,1025.7,1021.9,2,3,14.6,25.6,No,No
+2010-04-20,Albury,11.8,25.2,0,NA,NA,ENE,26,SSE,E,2,13,79,49,1024.6,1020.1,1,1,16.4,24.3,No,No
+2010-04-21,Albury,12.3,27.5,0,NA,NA,NW,20,ENE,SSW,6,7,74,44,1022.8,1019.5,NA,NA,18.5,26.4,No,No
+2010-04-22,Albury,11.4,27.3,0,NA,NA,WSW,17,NA,SSW,0,9,74,40,1023.6,1019.4,NA,NA,17.8,26.4,No,No
+2010-04-23,Albury,11.3,29,0,NA,NA,NNW,35,ESE,NNW,7,15,89,34,1020.5,1014,1,NA,15.4,27.9,No,Yes
+2010-04-24,Albury,15.4,19.8,3.6,NA,NA,NNW,46,NNE,NNW,11,28,95,86,1013.4,1008.7,8,8,17.1,18.6,Yes,Yes
+2010-04-25,Albury,10.8,18.5,17,NA,NA,W,37,WSW,W,11,20,72,40,1016.2,1017.6,NA,NA,14.4,18.4,Yes,No
+2010-04-26,Albury,5.1,17.9,0,NA,NA,SSE,15,E,S,4,9,78,49,1026.5,1023,NA,NA,10.4,16.9,No,No
+2010-04-27,Albury,7.1,16.1,0,NA,NA,ENE,17,NA,ENE,0,7,84,58,1020.9,1018,6,7,9.7,15.9,No,Yes
+2010-04-28,Albury,9.7,17.3,1.6,NA,NA,NW,30,NE,WNW,6,17,84,50,1022,1019.6,1,1,12.4,16.9,Yes,No
+2010-04-29,Albury,10.5,17.7,0.4,NA,NA,W,28,WSW,WSW,7,11,79,69,1021.9,1020.4,5,8,14.3,17,No,No
+2010-04-30,Albury,5.6,19.1,0,NA,NA,ESE,13,NA,ESE,0,2,99,53,1026.8,1024.4,8,NA,9.4,19,No,No
+2010-05-01,Albury,5.9,21.1,0.2,NA,NA,N,22,NA,NE,0,9,84,46,1027.9,1024.1,NA,NA,11.7,20.6,No,No
+2010-05-02,Albury,4.8,20.7,0,NA,NA,SSW,15,NE,ESE,7,9,97,47,1026.7,1024.3,6,NA,10,20.3,No,No
+2010-05-03,Albury,6.8,23,0,NA,NA,NNW,30,NA,NE,0,11,83,39,1027.1,1021.9,NA,NA,12.7,22.7,No,No
+2010-05-04,Albury,8,25.3,0.2,NA,NA,WNW,61,WSW,N,7,26,92,29,1017.8,1011.2,8,4,11.9,24.8,No,Yes
+2010-05-05,Albury,8.9,14.5,3,NA,NA,W,39,NW,W,17,22,84,51,1016.1,1015.5,8,NA,9.3,14.5,Yes,No
+2010-05-06,Albury,7.1,15.3,0,NA,NA,W,35,NW,W,11,9,78,68,1022.3,1021.6,8,8,10.8,15.3,No,No
+2010-05-07,Albury,5.7,17.5,0,NA,NA,W,20,S,WNW,2,6,89,56,1024.7,1021.7,8,6,10.2,16.8,No,No
+2010-05-08,Albury,9.6,19.3,0,NA,NA,SSE,13,NA,NA,0,0,84,59,1023.7,1021.1,6,1,13,18.6,No,No
+2010-05-09,Albury,5.7,19.5,0,NA,NA,ENE,17,E,SSE,7,4,99,54,1023.4,1019.6,8,1,9.2,18.6,No,No
+2010-05-10,Albury,5,19.8,0,NA,NA,ENE,17,S,NE,2,9,99,47,1020.8,1015.2,7,NA,8.1,19.6,No,No
+2010-05-11,Albury,3,15.6,0,NA,NA,WSW,43,WNW,WSW,9,20,77,47,1012.5,1014.8,NA,NA,10.7,13.2,No,No
+2010-05-12,Albury,1.3,14.9,0,NA,NA,W,28,ESE,W,7,13,81,48,1022.8,1021.5,NA,NA,6,13.8,No,No
+2010-05-13,Albury,1,17.1,0,NA,NA,W,30,NA,W,0,20,79,55,1024.1,1019.9,NA,NA,6.4,16.9,No,No
+2010-05-14,Albury,3.1,17.7,0.2,NA,NA,SE,15,E,SE,7,7,99,46,1021.2,1017.1,8,NA,5.7,17.1,No,No
+2010-05-15,Albury,2.2,18.4,0,NA,NA,SE,13,NA,ENE,0,2,83,44,1019.9,1017.3,NA,NA,8.1,18.1,No,No
+2010-05-16,Albury,1.7,17.5,0,NA,NA,ESE,13,NA,SW,0,4,84,51,1021.6,1018.9,NA,NA,8.2,16.3,No,No
+2010-05-17,Albury,4.5,17,0,NA,NA,ESE,48,S,SSE,7,7,92,50,1021.1,1017.9,NA,NA,9.2,16.7,No,No
+2010-05-18,Albury,1.6,19.7,0,NA,NA,WNW,17,NNW,WNW,7,9,90,38,1020.9,1018.7,NA,NA,7.4,19.4,No,No
+2010-05-19,Albury,1.4,18.5,0,NA,NA,W,28,NA,NW,0,7,86,39,1024.1,1021.3,NA,NA,6.6,18.4,No,No
+2010-05-20,Albury,2.1,16.5,0,NA,NA,N,13,NA,WSW,0,4,88,44,1023.8,1020.4,NA,NA,6.8,16.1,No,No
+2010-05-21,Albury,1.7,17.9,0,NA,NA,SSE,15,NA,SSE,0,9,92,42,1022.3,1019.3,1,NA,7.6,17.5,No,No
+2010-05-22,Albury,1.1,17.1,0,NA,NA,ESE,22,NA,SSE,0,7,76,45,1023.3,1020.5,NA,3,6.3,16.1,No,No
+2010-05-23,Albury,0.9,18.1,0,NA,NA,NNW,24,ESE,NNW,4,13,76,35,1023.5,1019.2,NA,NA,6.6,17.8,No,No
+2010-05-24,Albury,5.2,16.3,0,NA,NA,ESE,20,ESE,ESE,9,9,74,73,1017.6,1013.3,NA,2,10.3,15,No,Yes
+2010-05-25,Albury,10.2,14.9,10.4,NA,NA,E,26,E,SSE,7,7,88,99,1008.7,1005,7,7,13.5,12.8,Yes,Yes
+2010-05-26,Albury,8.4,19,13.4,NA,NA,SSE,30,SE,SSE,11,6,71,50,1008.9,1010.1,3,NA,14.9,18.9,Yes,No
+2010-05-27,Albury,5.7,16.6,0.2,NA,NA,SSE,11,NA,SSE,0,9,92,59,1019.6,1018,8,8,9.7,16.5,No,No
+2010-05-28,Albury,6.4,17,0,NA,NA,ENE,22,NA,NE,0,13,96,63,1019.4,1014.3,8,6,9.4,17,No,Yes
+2010-05-29,Albury,9.4,15,28,NA,NA,N,26,E,SE,9,11,99,89,1005.7,1002.8,8,8,12.1,14,Yes,Yes
+2010-05-30,Albury,8.8,20.2,5.8,NA,NA,SE,46,SSW,SSE,11,31,99,47,1004.7,1004.8,8,1,10.8,19.6,Yes,No
+2010-05-31,Albury,10.7,19.1,0,NA,NA,SSE,48,SSE,SE,19,15,54,48,1015.2,1014.8,NA,NA,15,18.4,No,No
+2010-06-01,Albury,4.2,16.6,0,NA,NA,SE,13,NA,SE,0,7,89,58,1020.7,1018.5,NA,NA,8.3,16.1,No,No
+2010-06-02,Albury,4.3,17.7,0,NA,NA,W,13,NA,SSW,0,4,93,60,1022.3,1020.6,NA,NA,8.6,16.8,No,No
+2010-06-03,Albury,3.4,17.7,0,NA,NA,SSE,17,NA,SE,0,7,79,50,1026.5,1023.5,NA,NA,8.9,17.2,No,No
+2010-06-04,Albury,3.1,18.4,0,NA,NA,W,19,NA,W,0,11,82,53,1023.6,1019.4,NA,NA,8.7,18.1,No,No
+2010-06-05,Albury,1.7,10.2,0,NA,NA,SW,17,ESE,WSW,7,11,99,84,1018.7,1015.8,8,NA,5.1,8.9,No,No
+2010-06-06,Albury,5,15.8,0,NA,NA,SW,13,SE,ENE,7,7,97,61,1020.6,1020.4,8,NA,6.2,14.6,No,No
+2010-06-07,Albury,0.4,14,0,NA,NA,S,17,NA,S,0,9,80,50,1026.7,1024.3,NA,2,4.2,13.3,No,No
+2010-06-08,Albury,3.1,12.2,0,NA,NA,WNW,19,SSE,WNW,2,11,89,49,1023.7,1019.5,7,7,5.3,11.6,No,No
+2010-06-09,Albury,5.3,8.4,0,NA,NA,WNW,37,NNW,WNW,11,13,81,92,1012.9,1011.1,7,8,7.8,7.9,No,Yes
+2010-06-10,Albury,4.9,12.9,2.4,NA,NA,W,44,WSW,WSW,15,19,85,57,1021.2,1021.1,NA,6,7.2,12.5,Yes,No
+2010-06-11,Albury,7.2,13.2,0,NA,NA,W,28,WSW,WSW,6,13,82,66,1023,1019.7,7,7,9.2,12.8,No,No
+2010-06-12,Albury,0,13.3,0,NA,NA,W,22,NA,S,0,4,95,51,1025.4,1024.3,5,NA,3.3,12.3,No,No
+2010-06-13,Albury,-1,13.1,0,NA,NA,ESE,11,NNW,SSE,6,9,83,47,1031.8,1030.7,NA,NA,4.1,12,No,No
+2010-06-14,Albury,-2,13.2,0,NA,NA,ESE,17,NA,E,0,6,85,50,1035.2,1032,NA,6,2.2,12.6,No,No
+2010-06-15,Albury,-0.3,12.8,0,NA,NA,SSE,11,SE,ESE,2,9,92,65,1032.3,1028.3,6,1,3.4,12.4,No,No
+2010-06-16,Albury,1.5,15.5,0,NA,NA,NNW,52,E,E,4,9,91,73,1027.4,1022.1,1,7,7.4,13.5,No,Yes
+2010-06-17,Albury,7.4,16.2,11.6,NA,NA,W,94,NNW,WNW,30,30,82,65,1010,1010.4,8,NA,13,11,Yes,Yes
+2010-06-18,Albury,3,12.2,2.2,NA,NA,W,24,NW,W,7,13,88,70,1019.6,1018,7,2,6.9,10.9,Yes,Yes
+2010-06-19,Albury,6.9,15.2,1.8,NA,NA,WNW,35,WNW,NW,17,20,95,66,1019.4,1019.6,8,NA,10.3,14.4,Yes,No
+2010-06-20,Albury,3.6,13.1,0,NA,NA,NW,39,NA,SSW,0,2,98,86,1027.2,1026.7,8,8,7.7,12.7,No,No
+2010-06-21,Albury,5,12.5,0.4,NA,NA,W,17,S,W,9,9,99,83,1034.5,1033.8,8,NA,7.4,11.8,No,No
+2010-06-22,Albury,3,14.8,0,NA,NA,SE,15,NA,SE,0,7,94,61,1037.3,1035.2,NA,NA,6.1,14.7,No,No
+2010-06-23,Albury,3.5,16.5,0,NA,NA,E,20,NA,E,0,7,89,52,1036.9,1032.9,NA,8,7.2,15.5,No,No
+2010-06-24,Albury,3.4,17,0,NA,NA,ENE,24,E,E,4,17,85,56,1030.1,1024.7,3,1,8.3,16.9,No,No
+2010-06-25,Albury,7,16.1,0,NA,NA,NNE,31,E,SE,9,2,83,95,1021.9,1018.6,8,8,12.1,13.2,No,Yes
+2010-06-26,Albury,6.2,12.1,10.2,NA,NA,WNW,35,WNW,N,4,4,86,71,1020.5,1020.5,7,8,7.6,11.1,Yes,No
+2010-06-27,Albury,0.6,11.9,0.2,NA,NA,W,22,SW,NW,2,11,99,54,1024.3,1021.8,1,2,2.8,11.5,No,No
+2010-06-28,Albury,-0.6,8.3,0,NA,NA,NNW,52,SE,WSW,7,9,99,70,1022.7,1020.3,8,7,2.3,8.2,No,No
+2010-06-29,Albury,2.3,9.4,0,NA,NA,N,20,ENE,N,9,13,71,57,1021.2,1019.4,8,8,6.5,9.1,No,No
+2010-06-30,Albury,5.1,9.8,0.2,NA,NA,N,24,SSE,NNW,6,9,81,78,1020.7,1019.6,8,8,6.3,8.8,No,Yes
+2010-07-01,Albury,3.2,11.9,1.2,NA,NA,NNE,13,NA,SW,0,6,99,67,1025.2,1024.3,7,7,5.5,10.4,Yes,No
+2010-07-02,Albury,0.2,10.9,0.2,NA,NA,ESE,19,S,SSE,2,7,99,70,1027.6,1024,8,4,3.2,10.2,No,No
+2010-07-03,Albury,1,10.3,0,NA,NA,NNW,11,NA,SW,0,2,99,76,1030.5,1029.8,8,NA,3.7,10,No,No
+2010-07-04,Albury,1.5,10.8,0,NA,NA,E,13,SSE,NA,4,0,99,77,1032.5,1029,8,NA,3.1,10,No,No
+2010-07-05,Albury,1.8,12.1,0.2,NA,NA,SE,22,SSE,NA,7,0,99,70,1027.5,1022.8,8,3,2.4,11.7,No,Yes
+2010-07-06,Albury,2.3,13.9,5.6,NA,NA,SSE,35,WNW,W,7,15,94,56,1020.9,1019.2,NA,NA,6.7,13.8,Yes,No
+2010-07-07,Albury,1.5,13.5,0,NA,NA,NNE,50,NA,WNW,0,7,99,64,1026.9,1025.1,7,NA,3,12.6,No,No
+2010-07-08,Albury,2.1,14.8,0.4,NA,NA,ESE,13,NA,NE,0,6,99,50,1029.5,1026.6,5,NA,4.1,14.6,No,No
+2010-07-09,Albury,0,14.6,0,NA,NA,ENE,15,NA,ESE,0,7,90,57,1030.9,1027.1,NA,NA,4.8,14.1,No,No
+2010-07-10,Albury,1.5,16.1,0,NA,NA,N,46,NNW,NNE,6,28,96,61,1024.1,1019.5,NA,8,5,15,No,Yes
+2010-07-11,Albury,5,15.4,13.4,NA,NA,N,28,W,NW,4,11,99,62,1020.6,1019.6,8,1,11.8,15.2,Yes,No
+2010-07-12,Albury,3.5,15.3,0.2,NA,NA,SE,13,E,NA,9,0,99,62,1024.3,1021,8,NA,5.9,15.1,No,No
+2010-07-13,Albury,3.5,16.3,0,NA,NA,WNW,59,NW,E,7,13,98,93,1016.8,1008.9,8,8,6.2,12,No,Yes
+2010-07-14,Albury,6.2,10,21.4,NA,NA,NW,57,NW,NW,24,19,82,91,1009.2,1008.7,8,8,8.5,9.1,Yes,Yes
+2010-07-15,Albury,3.4,12.2,11,NA,NA,WNW,43,W,W,13,15,85,63,1020.2,1022,NA,6,6.9,11.4,Yes,No
+2010-07-16,Albury,0.6,13.1,0,NA,NA,ENE,48,NNE,NNW,2,2,99,56,1028.7,1026.3,8,2,2.9,13,No,No
+2010-07-17,Albury,-0.4,11.5,0,NA,NA,E,15,ESE,NA,6,0,99,69,1029.2,1025.9,8,4,2.8,10.8,No,No
+2010-07-18,Albury,0.7,12.8,0,NA,NA,ENE,24,NE,N,9,13,96,59,1023.1,1018.7,NA,1,5.2,12.1,No,Yes
+2010-07-19,Albury,5,13.5,1.6,NA,NA,NW,20,S,S,4,4,99,61,1018.8,1017.8,8,8,7.7,13.4,Yes,No
+2010-07-20,Albury,0.5,11.6,0.2,NA,NA,WNW,19,SSE,WNW,7,11,99,62,1025.4,1024,8,1,3.1,11.5,No,No
+2010-07-21,Albury,0.6,12.9,0,NA,NA,W,17,NA,SSW,0,7,99,58,1029.3,1027.1,8,NA,2.9,12.5,No,No
+2010-07-22,Albury,-0.5,13.8,0,NA,NA,SW,19,NA,SW,0,11,89,51,1032.7,1030.7,7,1,4,12.4,No,No
+2010-07-23,Albury,0.1,15.7,0,NA,NA,W,17,E,W,7,9,99,61,1035.5,1032,8,NA,4.1,15.2,No,No
+2010-07-24,Albury,1,14.6,0,NA,NA,W,22,ENE,W,6,13,99,60,1032.1,1028.9,8,NA,4.5,14.2,No,No
+2010-07-25,Albury,2.5,14.3,0.2,NA,NA,W,20,S,N,4,2,99,58,1031.7,1029.1,8,NA,4.5,13.8,No,No
+2010-07-26,Albury,1.9,14.9,0.2,NA,NA,WSW,19,NA,W,0,9,99,52,1035.9,1034.1,2,NA,3.7,14.6,No,No
+2010-07-27,Albury,-1.2,15,0.2,NA,NA,SSE,15,NA,ESE,0,7,85,52,1036.1,1031.5,NA,NA,4,14.7,No,No
+2010-07-28,Albury,2.1,12.6,0,NA,NA,ESE,15,N,ESE,4,6,80,67,1027.8,1022.3,NA,8,5.8,12.2,No,Yes
+2010-07-29,Albury,5.8,14.8,6.2,NA,NA,NW,20,NA,WSW,0,9,99,80,1018.5,1014.9,8,8,10.3,14,Yes,No
+2010-07-30,Albury,8.9,14.9,0,NA,NA,NNE,30,ENE,N,2,13,91,86,1015.5,1013.5,8,8,11.1,14.1,No,Yes
+2010-07-31,Albury,7.5,12.3,2.2,NA,NA,W,30,WSW,NW,4,19,100,85,1013.7,1015.6,8,8,11.1,11.6,Yes,Yes
+2010-08-01,Albury,7.5,10.1,4.2,NA,NA,WNW,41,N,WSW,20,11,86,93,1016.3,1014.6,8,8,9.3,7.3,Yes,Yes
+2010-08-02,Albury,5.4,14.7,18.6,NA,NA,W,39,W,WSW,15,19,85,56,1019.5,1018.7,4,8,7.8,13.7,Yes,No
+2010-08-03,Albury,1.2,15.7,0,NA,NA,WNW,28,NA,WNW,0,15,86,51,1023.2,1020.1,NA,NA,6.4,15.5,No,No
+2010-08-04,Albury,1.2,9.6,0,NA,NA,NA,NA,NA,N,0,7,94,71,1019.8,1017,8,8,5.5,9.2,No,NA
+2010-08-05,Albury,NA,11.8,NA,NA,NA,WSW,28,N,WNW,2,19,97,65,1019.5,1018.3,7,4,6.7,11.3,NA,No
+2010-08-06,Albury,0.7,12.6,0.2,NA,NA,NW,22,SE,WNW,6,13,99,59,1024.5,1022.8,8,1,3.2,12.2,No,No
+2010-08-07,Albury,-0.6,13.1,0.2,NA,NA,ESE,15,NA,SW,0,9,83,54,1026.9,1023.3,NA,8,4.6,12.7,No,No
+2010-08-08,Albury,-1.3,12.6,0,NA,NA,SSE,15,NA,ESE,0,9,86,58,1022.2,1018.8,NA,8,4.3,12.2,No,No
+2010-08-09,Albury,0.3,15.5,0,NA,NA,E,31,NW,NE,6,15,79,47,1022.4,1019,NA,NA,6,14.9,No,Yes
+2010-08-10,Albury,4.4,16,7.2,NA,NA,NNW,41,E,N,9,15,86,77,1013.9,1008.7,8,8,9.7,15.2,Yes,Yes
+2010-08-11,Albury,7.2,10.4,8.2,NA,NA,NNE,33,NE,N,11,13,96,85,1006.2,1000.1,8,8,7.7,10,Yes,Yes
+2010-08-12,Albury,4.5,14.9,10.8,NA,NA,SW,50,W,WSW,19,28,91,45,1005.7,1008,8,NA,9.2,14.7,Yes,No
+2010-08-13,Albury,1.6,15,0,NA,NA,W,20,NA,SW,0,9,99,56,1016.7,1013.5,8,1,6.5,14.5,No,No
+2010-08-14,Albury,3.2,13,0,NA,NA,ENE,41,NE,NE,15,24,85,67,1014.4,1006.9,7,NA,8.9,12.7,No,Yes
+2010-08-15,Albury,7.2,12.1,1.8,NA,NA,WNW,46,NNE,N,11,13,83,94,1004.5,1004.4,8,8,10.7,10.9,Yes,Yes
+2010-08-16,Albury,6.4,11.8,10.2,NA,NA,W,56,N,W,17,24,94,65,1013.8,1013.8,8,6,7.7,11.3,Yes,Yes
+2010-08-17,Albury,-1,12.1,3.8,NA,NA,E,15,NA,NE,0,9,87,55,1024.1,1020.4,NA,1,4.5,11.3,Yes,No
+2010-08-18,Albury,1.3,11.8,0.2,NA,NA,ENE,31,NA,NE,0,20,92,86,1016.9,1006.3,4,8,5,8.7,No,Yes
+2010-08-19,Albury,5,15.1,15.4,NA,NA,NW,57,NNW,NW,15,30,85,56,1008.2,1007.8,8,6,11.6,14.5,Yes,Yes
+2010-08-20,Albury,4.5,11.7,2,NA,NA,W,46,WNW,WNW,20,30,82,58,1015.7,1014.8,4,5,6.4,10.4,Yes,No
+2010-08-21,Albury,6.3,12.9,0,NA,NA,WNW,39,WNW,W,17,19,86,68,1018.7,1017.8,8,3,7,12,No,No
+2010-08-22,Albury,2.1,15.3,0.2,NA,NA,N,26,E,NW,7,15,87,49,1024,1020.5,NA,6,7.6,14.3,No,No
+2010-08-23,Albury,4.1,12.8,0.2,NA,NA,NW,17,SSE,WNW,6,7,91,61,1017.7,1012.6,8,8,6.4,12,No,Yes
+2010-08-24,Albury,6.4,13.3,1.8,NA,NA,WNW,67,NW,NNW,19,22,90,55,1013.2,1010.3,8,8,9.4,11.7,Yes,Yes
+2010-08-25,Albury,4.2,10.7,1.8,NA,NA,WNW,65,WNW,NNW,13,24,87,65,1010.9,1005.5,8,8,5.4,10.1,Yes,Yes
+2010-08-26,Albury,5.4,11.8,9.6,NA,NA,NW,50,NNW,WNW,20,15,84,70,1003.1,1001,8,8,7.3,11.2,Yes,Yes
+2010-08-27,Albury,6.8,13.4,4,NA,NA,NW,43,WNW,WSW,20,20,75,55,1009.5,1012.2,NA,NA,9,12.3,Yes,No
+2010-08-28,Albury,0.9,14.4,0,NA,NA,WSW,22,ENE,W,6,4,99,58,1024.4,1024,8,3,4.1,13.3,No,No
+2010-08-29,Albury,1.9,15.2,0,NA,NA,WSW,15,W,NW,2,6,85,57,1029.6,1027.2,5,7,7.1,14.1,No,No
+2010-08-30,Albury,2.3,15.4,0,NA,NA,WNW,20,NA,NW,0,9,84,51,1028.9,1025.2,NA,NA,7.4,15.2,No,No
+2010-08-31,Albury,2.9,14.2,0,NA,NA,N,20,S,NE,6,13,89,61,1024.8,1020.4,NA,6,7.2,13.4,No,No
+2010-09-01,Albury,7.1,15.1,0,NA,NA,NW,17,SSW,SW,7,6,86,71,1015.8,1014.9,7,8,11.2,14.2,No,No
+2010-09-02,Albury,10,16.8,0.8,NA,NA,SSE,33,NA,W,0,9,92,68,1016.5,1016,7,5,10.9,16.1,No,No
+2010-09-03,Albury,7.1,17.6,0,NA,NA,SE,26,SSE,E,17,17,65,55,1022.1,1017.5,NA,NA,10.2,17.2,No,Yes
+2010-09-04,Albury,10.1,17.7,21.8,NA,NA,N,70,NE,N,24,24,96,87,1004.7,999,8,8,15.1,14.8,Yes,Yes
+2010-09-05,Albury,9.8,14.2,20.8,NA,NA,NNW,72,NW,W,22,19,81,67,1011.7,1013.8,8,7,10.6,13.2,Yes,Yes
+2010-09-06,Albury,6.8,12.8,2.4,NA,NA,NW,50,NW,W,11,13,89,64,1019.7,1018.7,8,6,9.5,12.5,Yes,Yes
+2010-09-07,Albury,2.3,15.1,1.2,NA,NA,SW,52,SE,WSW,7,11,83,49,1026.2,1024.3,NA,1,8,14.7,Yes,No
+2010-09-08,Albury,1.7,15.9,0,NA,NA,NNE,24,ESE,ENE,7,13,74,51,1026.9,1022.6,NA,7,8.8,14.6,No,No
+2010-09-09,Albury,7.2,14.7,0,NA,NA,ENE,39,SE,ENE,7,11,76,90,1015.6,1009.7,8,8,11.1,11.9,No,Yes
+2010-09-10,Albury,8.1,14,24.8,NA,NA,W,50,WNW,W,28,22,91,86,1004.5,1006,8,8,10.9,11,Yes,Yes
+2010-09-11,Albury,2.6,15.9,3.2,NA,NA,WNW,35,S,WNW,7,13,88,54,1020.2,1019.2,NA,8,8.4,15.8,Yes,No
+2010-09-12,Albury,4.5,16.3,0,NA,NA,N,22,ESE,NW,9,6,84,51,1022.5,1017.5,NA,8,10.2,15.4,No,No
+2010-09-13,Albury,6,18.7,0.4,NA,NA,W,31,E,WNW,7,17,88,47,1017.1,1014.8,NA,1,11.4,18.2,No,No
+2010-09-14,Albury,5.8,19,0,NA,NA,WSW,46,SE,SE,19,7,76,50,1014.7,1010.3,NA,NA,12.2,18.1,No,No
+2010-09-15,Albury,5.5,13.6,0,NA,NA,WSW,43,W,WNW,20,24,68,58,1015.2,1015.6,NA,7,9.5,13.4,No,No
+2010-09-16,Albury,7.5,13.4,0,NA,NA,WSW,54,W,W,20,28,64,49,1019.2,1017,6,3,10.2,13.1,No,No
+2010-09-17,Albury,4.3,14.3,0.2,NA,NA,SW,39,W,WSW,13,20,76,54,1024,1021.9,NA,5,8.8,13.7,No,No
+2010-09-18,Albury,3.3,13.9,0,NA,NA,W,31,WNW,W,11,19,67,60,1021.8,1018.8,6,8,9.8,13.5,No,No
+2010-09-19,Albury,2.4,16.4,0,NA,NA,W,30,E,W,2,17,90,55,1022.7,1020.8,8,2,9,16.2,No,No
+2010-09-20,Albury,2.8,18.7,0,NA,NA,W,24,SSE,W,6,9,79,54,1026.1,1023.3,NA,NA,10,18.6,No,No
+2010-09-21,Albury,5,19.6,0,NA,NA,W,24,E,WNW,2,15,81,64,1025.2,1022.6,NA,NA,11.9,19.2,No,No
+2010-09-22,Albury,8.6,20.1,0,NA,NA,W,26,W,SE,2,6,70,48,1025.8,1021.7,5,8,14.7,19.1,No,No
+2010-09-23,Albury,5.7,19.9,0,NA,NA,W,28,NA,W,0,17,76,52,1024.4,1021.9,1,NA,12.1,19.1,No,No
+2010-09-24,Albury,3.7,19.1,0,NA,NA,NE,33,E,WNW,2,17,96,61,1023.9,1020.7,8,2,9,18.3,No,No
+2010-09-25,Albury,5.6,19.7,0,NA,NA,NW,28,S,NNW,7,17,84,52,1018.6,1015.1,NA,1,12.1,18.7,No,No
+2010-09-26,Albury,5.4,20.6,0,NA,NA,WSW,24,NA,WNW,0,13,75,43,1020.5,1017.3,NA,NA,13.2,20.1,No,No
+2010-09-27,Albury,6.5,20,0,NA,NA,WNW,43,NW,WNW,4,22,83,50,1014.1,1011.2,NA,NA,11.9,19,No,No
+2010-09-28,Albury,5.4,14.6,0,NA,NA,W,39,WNW,WNW,11,22,65,49,1016,1015.1,NA,NA,10.4,13.5,No,No
+2010-09-29,Albury,3.7,14.3,0,NA,NA,W,39,W,W,19,26,66,43,1021.4,1020.5,NA,NA,9.4,13.9,No,No
+2010-09-30,Albury,-0.1,14.6,0,NA,NA,NNW,28,E,WNW,9,17,59,45,1026.3,1023.7,NA,NA,9.5,14,No,No
+2010-10-01,Albury,4.1,17.4,0,NA,NA,NE,20,NW,NE,7,11,71,42,1027.5,1024.6,NA,NA,9.9,16.5,No,No
+2010-10-02,Albury,4.8,21.1,0,NA,NA,NE,37,SE,NE,13,15,61,47,1028.2,1025.1,NA,NA,13.7,20.8,No,No
+2010-10-03,Albury,7.4,23,0,NA,NA,NE,35,SSE,NNE,2,20,72,45,1028.4,1025,NA,NA,13.4,22.3,No,No
+2010-10-04,Albury,8.2,23.2,0,NA,NA,NE,35,WNW,NNW,6,15,85,52,1024.6,1020.4,NA,NA,13.2,22.5,No,No
+2010-10-05,Albury,10.1,25.9,0,NA,NA,NE,24,ESE,SE,7,9,78,52,1021.9,1019.5,NA,1,16.3,23.8,No,No
+2010-10-06,Albury,11.1,24.9,0,NA,NA,W,69,ESE,N,11,20,80,52,1019.8,1014.4,NA,NA,17.4,24.5,No,Yes
+2010-10-07,Albury,7.3,15.9,10,NA,NA,WSW,46,W,WSW,20,26,64,42,1020,1020.7,NA,NA,10,15.5,Yes,No
+2010-10-08,Albury,4.2,19,0,NA,NA,W,30,SE,WNW,2,15,59,49,1025.3,1023,NA,NA,10.9,17.3,No,No
+2010-10-09,Albury,5.4,20.8,0,NA,NA,N,17,SSW,ESE,2,4,83,49,1025.7,1023.6,1,NA,9.9,19.7,No,No
+2010-10-10,Albury,8.2,23.2,0,NA,NA,NE,39,W,NE,6,19,71,42,1029.4,1028.1,NA,NA,14.8,22.3,No,No
+2010-10-11,Albury,7.6,23.7,0,NA,NA,E,37,SE,NNE,15,19,60,45,1030.9,1027.2,NA,NA,15.4,23.2,No,No
+2010-10-12,Albury,14.5,19.9,0.8,NA,NA,NNE,31,ESE,ENE,7,19,91,66,1027.7,1023.9,8,8,14.7,19.5,No,Yes
+2010-10-13,Albury,14.7,18,11.4,NA,NA,WSW,30,NNE,E,11,11,92,94,1017.9,1013.7,NA,8,16.2,16.7,Yes,Yes
+2010-10-14,Albury,12.7,19.1,19,NA,NA,W,24,NNW,W,4,6,92,69,1013.6,1010.3,7,NA,14,18,Yes,Yes
+2010-10-15,Albury,13.8,18.6,22.2,NA,NA,WNW,63,NNW,NE,28,4,93,90,989.8,982.9,8,8,18.5,17.1,Yes,Yes
+2010-10-16,Albury,4.8,12.8,32.8,NA,NA,W,52,WSW,W,20,28,72,61,1004.6,1008.3,8,NA,6.4,11.2,Yes,No
+2010-10-17,Albury,6.3,15.4,0,NA,NA,WNW,35,WNW,NW,15,17,77,56,1016.1,1016.3,7,8,9.5,14.7,No,No
+2010-10-18,Albury,9.2,17.4,0,NA,NA,W,39,NW,WNW,2,20,74,50,1019.9,1019.4,7,1,12.5,17.1,No,No
+2010-10-19,Albury,4.8,19,0,NA,NA,WNW,22,W,WSW,6,11,78,49,1026,1024.8,NA,4,10.9,18.2,No,No
+2010-10-20,Albury,5.7,21.8,0,NA,NA,SE,20,NA,SSE,0,11,80,51,1028.7,1025,NA,NA,11.9,19.9,No,No
+2010-10-21,Albury,8,23.3,0,NA,NA,N,20,NA,SSW,0,11,75,47,1024.5,1020.8,NA,NA,13.5,22.9,No,No
+2010-10-22,Albury,9.5,25.8,0,NA,NA,NNE,30,E,N,6,17,77,49,1020.9,1016.9,NA,NA,14.9,25.2,No,No
+2010-10-23,Albury,14.8,19,0.4,NA,NA,W,28,W,NW,6,15,81,77,1016.8,1016.8,8,5,17.4,17.2,No,Yes
+2010-10-24,Albury,8.2,22.2,2.4,NA,NA,SSE,26,SE,S,19,9,65,51,1020.6,1018.7,5,NA,14.2,21.1,Yes,No
+2010-10-25,Albury,10.9,22.2,0,NA,NA,WNW,22,SSE,WNW,4,11,77,47,1022.4,1018.5,4,1,14.6,20.8,No,No
+2010-10-26,Albury,8.8,23.5,0,NA,NA,WNW,33,SE,NW,7,20,80,35,1017.9,1015.6,NA,NA,14.8,23,No,Yes
+2010-10-27,Albury,10.2,22.3,1.6,NA,NA,WNW,35,S,W,11,17,81,46,1016.2,1015.4,NA,2,15.6,21.6,Yes,No
+2010-10-28,Albury,8.8,23.6,0,NA,NA,NE,26,SSE,NNE,7,7,73,48,1019.8,1016.4,NA,NA,15,21.9,No,No
+2010-10-29,Albury,10.3,25.6,0,NA,NA,NE,39,E,ENE,7,24,70,44,1017.2,1012.6,NA,NA,17.1,25.5,No,Yes
+2010-10-30,Albury,16,19.5,3.4,NA,NA,NE,33,SE,ENE,7,19,95,96,1010.7,1008.4,8,8,17.6,18.6,Yes,Yes
+2010-10-31,Albury,13.8,18.7,50.8,NA,NA,NNW,52,N,NNW,17,22,78,67,1011.3,1012,8,8,15.5,17.6,Yes,Yes
+2010-11-01,Albury,10.2,18.9,1.2,NA,NA,W,35,W,W,6,19,79,52,1016.5,1013.8,7,1,12.5,17.5,Yes,No
+2010-11-02,Albury,7.1,20.3,0,NA,NA,SW,44,WSW,WSW,11,24,73,51,1016.3,1014.7,NA,8,12.1,20.2,No,No
+2010-11-03,Albury,10.7,18,0,NA,NA,WNW,35,W,WNW,9,26,63,49,1019.3,1018.2,NA,5,14.4,16.9,No,No
+2010-11-04,Albury,10.1,18.8,0,NA,NA,SSE,33,SE,E,13,15,61,48,1020.8,1019,8,5,13.3,18.2,No,No
+2010-11-05,Albury,11.1,21,0,NA,NA,ENE,44,SE,SE,19,13,53,37,1023,1019.6,7,NA,15,20.5,No,No
+2010-11-06,Albury,7.5,22.9,0,NA,NA,ENE,31,SE,NNE,15,6,59,42,1022.6,1018.6,NA,NA,14.4,20.9,No,No
+2010-11-07,Albury,9.3,24.5,0,NA,NA,W,54,SE,N,9,19,73,46,1018.3,1013.8,NA,1,15.9,24.1,No,Yes
+2010-11-08,Albury,14.7,24.7,2.2,NA,NA,NW,31,N,WSW,11,20,71,64,1013.8,1014.7,7,4,19.4,23.4,Yes,No
+2010-11-09,Albury,11.6,27.7,0,NA,NA,SSW,46,SE,S,7,11,69,47,1024.3,1021.4,NA,1,18.4,26,No,No
+2010-11-10,Albury,15.5,29,0,NA,NA,WSW,46,E,NNW,7,17,76,45,1019.9,1015,NA,3,21.5,28.2,No,No
+2010-11-11,Albury,15.2,30.5,0.6,NA,NA,N,28,SSE,NNE,9,13,73,47,1014.3,1010,NA,NA,20.6,29.2,No,No
+2010-11-12,Albury,17.5,31.3,0,NA,NA,NNE,41,NE,NE,20,26,60,41,1012.5,1008.7,1,NA,24.4,30.4,No,No
+2010-11-13,Albury,21.1,26.9,0,NA,NA,ENE,61,E,ENE,13,24,63,78,1012.1,1011,7,3,24.4,24.8,No,Yes
+2010-11-14,Albury,19.2,22.6,52.6,NA,NA,N,26,WNW,WNW,15,15,93,73,1013.9,1013.2,8,NA,19.2,22.1,Yes,Yes
+2010-11-15,Albury,15.9,23.1,2.4,NA,NA,W,37,W,W,19,19,84,32,1014.3,1011.7,7,NA,16.7,22.6,Yes,No
+2010-11-16,Albury,11.4,20.8,0,NA,NA,W,33,W,WSW,11,19,56,42,1015.4,1013.8,NA,3,15.8,19.8,No,No
+2010-11-17,Albury,8.8,23.3,0,NA,NA,W,43,E,W,4,17,65,34,1017.5,1014.5,NA,NA,15.6,22,No,No
+2010-11-18,Albury,9.1,24.8,0,NA,NA,W,37,ENE,WNW,6,22,68,36,1015.7,1013.5,NA,NA,16,24,No,No
+2010-11-19,Albury,12.1,25.5,0,NA,NA,SE,26,SSE,S,17,11,56,39,1020.9,1019.8,NA,NA,17.1,24.2,No,No
+2010-11-20,Albury,12,27.3,0,NA,NA,NE,26,E,SSE,7,9,63,39,1026,1022.1,NA,NA,18.3,25.5,No,No
+2010-11-21,Albury,12.7,29.7,0,NA,NA,N,22,E,W,11,9,70,29,1022.1,1019.1,5,NA,20,29.5,No,No
+2010-11-22,Albury,14.7,29.9,0,NA,NA,ENE,26,SE,NNE,7,7,59,36,1022.7,1019.5,NA,NA,22,29.2,No,No
+2010-11-23,Albury,14.8,29.4,0,NA,NA,N,31,ENE,NNE,22,17,49,34,1023.5,1020.5,NA,2,23.2,28.4,No,No
+2010-11-24,Albury,18.1,30.1,0,NA,NA,N,35,NNE,NNE,20,11,46,31,1021.8,1018.8,NA,NA,24,29.5,No,No
+2010-11-25,Albury,18.9,27.6,0,NA,NA,W,44,ENE,WSW,7,15,47,57,1018.2,1017,7,NA,23.9,25.7,No,Yes
+2010-11-26,Albury,17.9,24.2,4,NA,NA,WSW,39,NNW,ENE,13,9,92,68,1018.1,1015.5,8,8,18.5,23.6,Yes,Yes
+2010-11-27,Albury,14.8,27.6,19.2,NA,NA,N,44,SE,N,9,6,77,66,1012.6,1008.5,NA,8,20.6,22.7,Yes,Yes
+2010-11-28,Albury,17.8,21.4,18.8,NA,NA,NNE,44,NNW,NW,17,17,86,89,1007.6,1007.9,NA,NA,18.5,19.4,Yes,Yes
+2010-11-29,Albury,13.6,22.6,14.8,NA,NA,SSE,43,SE,SE,20,22,69,51,1013.6,1012.7,5,2,16.6,21.7,Yes,Yes
+2010-11-30,Albury,14.4,23.3,1.6,NA,NA,SE,35,SE,NE,22,13,69,81,1015,1014.3,NA,NA,17.4,19.5,Yes,Yes
+2010-12-01,Albury,16.7,23.9,12,NA,NA,SE,24,SE,SE,11,9,72,73,1014.1,1013.3,NA,8,19.6,20.6,Yes,No
+2010-12-02,Albury,16.1,26.6,0.6,NA,NA,NW,50,ESE,S,9,11,70,90,1015,1013.3,NA,8,21.3,19,No,Yes
+2010-12-03,Albury,15.7,27.3,18.4,NA,NA,NNE,41,SE,S,13,15,71,75,1014.6,1011.3,NA,NA,21.3,21.4,Yes,Yes
+2010-12-04,Albury,17.3,29.9,1.2,NA,NA,WSW,44,SSW,WNW,2,17,65,48,1012.6,1009.3,1,6,22.5,28.6,Yes,No
+2010-12-05,Albury,16.6,31.6,0,NA,NA,SSE,28,SSE,SE,4,13,63,31,1011.5,1008.2,NA,NA,23.1,30.7,No,No
+2010-12-06,Albury,18.9,30.4,0,NA,NA,ENE,43,SE,NE,11,19,63,38,1012.7,1008.9,1,NA,23.3,29.3,No,No
+2010-12-07,Albury,21.3,29.8,0,NA,NA,NNE,43,NE,NE,24,26,50,44,1011.5,1008.8,1,8,25.5,29,No,Yes
+2010-12-08,Albury,20.3,29.7,3.2,NA,NA,NNW,61,NNE,NNE,22,35,82,55,1009.4,1005,8,7,21.4,29.1,Yes,Yes
+2010-12-09,Albury,18,26.7,25.6,NA,NA,W,39,W,WNW,11,20,85,50,1009.1,1007.2,8,8,20.5,26,Yes,No
+2010-12-10,Albury,16.7,22.5,0,NA,NA,WNW,46,WNW,W,13,26,59,38,1010.1,1008.7,8,NA,19.1,21.9,No,No
+2010-12-11,Albury,11.2,24.3,0,NA,NA,WNW,43,W,WNW,17,24,59,35,1009.2,1004.5,NA,1,15.6,22.8,No,No
+2010-12-12,Albury,15,22.2,0,NA,NA,NW,46,W,WNW,24,24,54,33,1005.6,1006.3,2,NA,17.7,22,No,No
+2010-12-13,Albury,10.5,26.2,0,NA,NA,WNW,33,ESE,SW,7,11,65,32,1014.3,1012.5,NA,NA,17,24.2,No,No
+2010-12-14,Albury,13.7,28.8,0,NA,NA,ENE,24,SE,NE,6,7,67,36,1015,1010.4,NA,NA,18.6,27.6,No,No
+2010-12-15,Albury,16.1,31.1,0,NA,NA,NNE,35,ENE,NNW,15,11,57,28,1008.7,1003.6,NA,5,24.3,29.8,No,No
+2010-12-16,Albury,15.1,25.6,0.4,NA,NA,W,43,W,WSW,20,26,72,21,1004.6,1003.8,NA,NA,17.6,24.7,No,No
+2010-12-17,Albury,10.3,25.9,0,NA,NA,NW,46,NE,W,6,26,62,31,1005.3,1002.1,NA,7,17.7,24.1,No,No
+2010-12-18,Albury,14,20.8,1,NA,NA,WNW,76,NNW,W,19,35,64,52,1002.4,1002.8,NA,7,16.9,18.7,No,Yes
+2010-12-19,Albury,10.4,18,3,NA,NA,W,61,ENE,NNW,9,13,71,55,998.8,994.3,8,8,15,17.4,Yes,Yes
+2010-12-20,Albury,8.6,20.5,6.2,NA,NA,WSW,52,W,WSW,20,22,79,50,1002.3,1004.3,7,8,10.8,18.6,Yes,Yes
+2010-12-21,Albury,9.9,21.2,1.6,NA,NA,WSW,41,WSW,W,15,19,68,48,1010.5,1011.5,NA,7,14.3,19.3,Yes,No
+2010-12-22,Albury,9.4,25.9,0,NA,NA,SW,28,ESE,SE,6,11,71,37,1018.4,1015.7,NA,NA,16.6,24.2,No,No
+2010-12-23,Albury,12.3,29.2,0,NA,NA,SW,41,NA,WSW,0,20,62,24,1018.1,1017.4,NA,NA,19.8,28.1,No,No
+2010-12-24,Albury,13.9,30.8,0,NA,NA,NE,31,SE,ENE,15,9,47,33,1022.3,1018.2,NA,NA,20.6,29.4,No,No
+2010-12-25,Albury,19.3,29.1,0,NA,NA,SSE,35,NE,N,15,24,60,72,1014.6,1009.9,NA,8,23.2,23.4,No,No
+2010-12-26,Albury,17.5,30,1,NA,NA,SW,43,E,W,6,30,75,35,1005.4,1000.5,2,NA,22.2,28.4,No,No
+2010-12-27,Albury,11.3,22.2,0,NA,NA,W,57,W,W,13,31,57,38,1006.7,1007.1,NA,NA,16.3,22,No,No
+2010-12-28,Albury,9.1,26.7,0,NA,NA,SSE,37,SE,ENE,17,11,49,35,1016.8,1014.2,NA,NA,15.1,24.7,No,No
+2010-12-29,Albury,13.5,31,0,NA,NA,NW,30,N,SW,19,13,57,28,1015.6,1012.8,NA,NA,21.9,29.6,No,No
+2010-12-30,Albury,14.8,34,0,NA,NA,SW,41,ESE,WSW,9,24,55,25,1015.8,1013.3,NA,NA,21.7,33.5,No,No
+2010-12-31,Albury,15.7,38.1,0,NA,NA,N,46,ESE,N,2,9,55,22,1014.3,1010.7,NA,NA,23.3,36.7,No,No
+2011-01-01,Albury,23.2,35.8,0,NA,NA,ENE,26,S,WSW,13,9,46,29,1011.1,1009.2,NA,NA,26.8,32.8,No,No
+2011-01-02,Albury,20.1,31.1,0.6,NA,NA,W,35,SW,WSW,2,15,45,27,1010.9,1009.5,NA,NA,25.1,30.2,No,No
+2011-01-03,Albury,13.6,29.4,0,NA,NA,WNW,35,SSE,WNW,19,11,56,28,1011.8,1009.3,NA,NA,20.2,28.4,No,No
+2011-01-04,Albury,13.9,29.2,0,NA,NA,SSE,24,SE,SE,11,11,53,38,1011.6,1007.8,NA,NA,19.9,27.9,No,No
+2011-01-05,Albury,16,28.9,0,NA,NA,SSE,31,ENE,SW,4,9,57,31,1006.2,1004.3,NA,NA,22,26.8,No,No
+2011-01-06,Albury,16.5,31.6,0,NA,NA,NNE,30,SE,N,19,13,48,34,1010.3,1007.7,NA,NA,21.4,30,No,No
+2011-01-07,Albury,16.1,30.7,0,NA,NA,NNE,26,NNE,SW,17,6,51,42,1012.7,1010.1,NA,NA,23.4,29.3,No,No
+2011-01-08,Albury,17.8,32,0,NA,NA,ENE,31,NA,E,0,11,66,40,1012,1009.1,NA,NA,22.9,31.1,No,No
+2011-01-09,Albury,20.1,33,0,NA,NA,ENE,61,SE,SSE,17,22,55,41,1013.8,1010.6,NA,NA,26.7,32.5,No,Yes
+2011-01-10,Albury,20.1,32,35,NA,NA,ENE,37,SSE,ENE,19,11,68,40,1013.6,1010,NA,NA,24.1,31.2,Yes,Yes
+2011-01-11,Albury,21.6,26.4,1.4,NA,NA,NE,37,SE,NNE,13,15,81,87,1011.7,1009.4,8,8,22.5,23,Yes,Yes
+2011-01-12,Albury,21.5,28.9,5,NA,NA,NE,44,NE,NW,19,11,66,84,1006.9,1006.2,8,NA,25.5,24.5,Yes,Yes
+2011-01-13,Albury,22.1,30.6,14.2,NA,NA,NE,41,ESE,ENE,6,28,86,59,1009.5,1006.5,8,8,24.4,29.5,Yes,Yes
+2011-01-14,Albury,24,25.5,2.4,NA,NA,NE,52,NE,NNE,33,22,61,90,1006,1006,NA,8,24.5,21.2,Yes,Yes
+2011-01-15,Albury,19.9,31.4,13.8,NA,NA,WSW,24,SE,SSE,4,11,83,34,1009.4,1007.4,1,NA,22.3,29.6,Yes,No
+2011-01-16,Albury,18.5,33.7,0,NA,NA,WSW,31,S,NW,2,13,71,46,1009.7,1005.1,NA,NA,23.8,32.6,No,No
+2011-01-17,Albury,19.8,26.9,0,NA,NA,WSW,48,WNW,W,19,24,70,36,1004.4,1003.3,NA,NA,21.6,26.5,No,No
+2011-01-18,Albury,12.9,27.2,0,NA,NA,W,28,S,S,6,9,64,43,1007.4,1005.9,NA,NA,17.9,25.5,No,No
+2011-01-19,Albury,12.9,29.3,0,NA,NA,NE,28,E,SE,4,9,70,36,1009.1,1007.8,NA,NA,19.1,26.9,No,No
+2011-01-20,Albury,16.1,31.9,0,NA,NA,E,22,SSE,NNE,13,13,63,38,1011.8,1009.4,NA,NA,21.4,29.5,No,No
+2011-01-21,Albury,17.8,32.5,0,NA,NA,N,37,SE,NNW,9,6,60,40,1012.4,1009.9,NA,NA,24.9,32,No,No
+2011-01-22,Albury,19.8,34.6,0,NA,NA,NE,43,ESE,N,13,13,60,37,1013.6,1010.3,NA,NA,25.3,33,No,No
+2011-01-23,Albury,20.7,31.4,0,NA,NA,ENE,39,E,S,11,7,53,41,1010.4,1006.1,NA,NA,24.6,30.9,No,No
+2011-01-24,Albury,19.8,30.6,0,NA,NA,WSW,35,NA,W,0,15,68,29,1002.5,1001.5,NA,NA,22.2,30.4,No,No
+2011-01-25,Albury,14.9,32,0,NA,NA,SW,28,S,W,4,15,60,30,1008,1006.6,NA,NA,21.1,30.3,No,No
+2011-01-26,Albury,21.1,34.4,0,NA,NA,SW,39,S,SSW,9,20,63,40,1008.2,1009.6,NA,NA,25.1,33.4,No,No
+2011-01-27,Albury,14.3,31.6,0,NA,NA,WSW,39,NA,WSW,0,19,60,30,1014.5,1013.7,NA,NA,19.8,29.5,No,No
+2011-01-28,Albury,12.6,32.3,0,NA,NA,E,28,SE,SSE,13,9,56,20,1017.8,1015.9,NA,NA,20.6,30.6,No,No
+2011-01-29,Albury,14.5,32,0,NA,NA,NW,35,ENE,NNW,7,9,59,32,1018.9,1017.2,NA,NA,21.5,30.2,No,No
+2011-01-30,Albury,16.7,35.4,0,NA,NA,SSE,28,SE,ESE,9,17,68,31,1019,1015.6,NA,NA,23,33.4,No,No
+2011-01-31,Albury,19.9,38.2,0,NA,NA,S,24,SSE,S,7,17,56,25,1015.3,1011.4,NA,NA,25.3,37.3,No,No
+2011-02-01,Albury,20.5,39.8,0,NA,NA,NW,61,E,NW,6,28,57,16,1009,1005.2,NA,NA,27.2,38.8,No,No
+2011-02-02,Albury,21.9,33.7,0,NA,NA,NNE,41,NNE,N,17,20,77,49,1014.1,1011.1,NA,NA,25.4,32,No,Yes
+2011-02-03,Albury,21.9,36,3.4,NA,NA,WNW,31,NA,W,0,7,74,50,1012.3,1011.6,NA,1,25.8,33.9,Yes,Yes
+2011-02-04,Albury,22.5,28.2,2.6,NA,NA,WNW,81,S,SE,4,9,80,99,1012.7,1011.1,NA,8,24.8,23.4,Yes,Yes
+2011-02-05,Albury,20.4,23,99.2,NA,NA,NW,28,NE,NW,11,4,97,95,1008.6,1007.3,5,8,22.5,22.5,Yes,Yes
+2011-02-06,Albury,14.7,21.5,51,NA,NA,WSW,43,WNW,W,19,22,81,45,1017,1019.6,8,NA,14.7,19.1,Yes,No
+2011-02-07,Albury,10.8,25.5,0,NA,NA,SSE,26,SSE,WNW,15,7,58,40,1023.6,1019.5,NA,NA,14.5,23.9,No,No
+2011-02-08,Albury,13.4,27.3,0,NA,NA,SE,22,ESE,SE,7,11,66,50,1018.7,1016.6,NA,NA,18.5,26.4,No,No
+2011-02-09,Albury,15,29.4,0,NA,NA,NNE,20,S,E,6,9,66,43,1022,1019.8,NA,NA,18.7,27.1,No,No
+2011-02-10,Albury,17,29.7,0,NA,NA,N,28,SSE,ENE,9,17,79,55,1020.1,1016.1,2,NA,19.8,27.9,No,Yes
+2011-02-11,Albury,19.8,24.8,39.8,NA,NA,SW,54,NE,NNW,15,9,98,94,1013.4,1011.5,8,8,20.4,22,Yes,Yes
+2011-02-12,Albury,18.7,28.5,28.2,NA,NA,WNW,28,W,WNW,7,19,88,57,1014.2,1012.9,8,4,19.6,28.2,Yes,No
+2011-02-13,Albury,15.1,28.6,0,NA,NA,SSE,24,SSE,S,11,7,73,50,1017.6,1016.5,NA,NA,20.6,27.6,No,No
+2011-02-14,Albury,14.5,29.2,0,NA,NA,ENE,20,E,E,6,9,57,45,1022.2,1019.9,NA,NA,19.4,27.6,No,No
+2011-02-15,Albury,16.4,28,0,NA,NA,ESE,24,ESE,N,7,9,69,40,1022.3,1018.6,NA,NA,20.5,26.7,No,No
+2011-02-16,Albury,18.9,22,0.2,NA,NA,ENE,31,NA,NE,0,13,80,85,1017.6,1016.1,8,NA,20.7,20.6,No,Yes
+2011-02-17,Albury,18.9,29.2,5.8,NA,NA,ESE,30,NA,SSE,0,4,90,55,1012.9,1010.8,8,5,19.9,28.1,Yes,No
+2011-02-18,Albury,19.3,30.7,0,NA,NA,ESE,52,SE,E,13,15,68,51,1013.7,1010.3,1,1,22,30.4,No,Yes
+2011-02-19,Albury,21.7,29,12.2,NA,NA,NNE,59,N,NW,17,20,91,67,1005.2,1004.5,NA,8,22.1,27.4,Yes,Yes
+2011-02-20,Albury,16.7,25.7,12.8,NA,NA,WNW,43,WSW,WNW,13,26,80,50,1010.1,1009.7,8,5,19.4,25.2,Yes,No
+2011-02-21,Albury,10.1,22.5,0,NA,NA,W,41,WSW,W,19,20,62,40,1015.2,1015.2,NA,NA,13.6,21.7,No,No
+2011-02-22,Albury,12.3,25.2,0,NA,NA,SW,69,SSE,SSW,15,9,53,43,1022.1,1020.5,NA,NA,15,23.2,No,No
+2011-02-23,Albury,12.6,28,0.2,NA,NA,WSW,28,ESE,W,7,11,66,43,1024,1020,NA,NA,16.8,26.7,No,No
+2011-02-24,Albury,13.9,29.2,0,NA,NA,WSW,28,NE,WSW,2,13,76,43,1019.2,1015.5,NA,NA,18.9,27.7,No,No
+2011-02-25,Albury,16.5,29.8,0,NA,NA,WNW,24,S,NNW,2,7,75,36,1014.1,1011.5,NA,NA,19.2,29.2,No,No
+2011-02-26,Albury,15.6,30.9,0,NA,NA,W,33,SSE,N,6,7,70,36,1011.3,1008.6,NA,NA,19.6,30.2,No,No
+2011-02-27,Albury,19.6,24.8,0.2,NA,NA,WNW,20,SSW,NE,6,7,87,87,1009.9,1009,8,8,20.4,21.1,No,Yes
+2011-02-28,Albury,17.9,30,11.8,NA,NA,SE,20,SSE,ESE,7,11,85,55,1007.8,1003.7,4,7,20.4,28.5,Yes,No
+2011-03-01,Albury,16,22.8,0,NA,NA,WSW,44,W,WSW,22,30,82,40,1006.5,1009.1,1,NA,16,21.6,No,No
+2011-03-02,Albury,8.8,23.4,0,NA,NA,WNW,24,S,WNW,11,11,67,41,1015.8,1012.8,NA,NA,13,22.3,No,No
+2011-03-03,Albury,8.4,22.3,0,NA,NA,WSW,37,ESE,WSW,4,22,77,45,1012.9,1011.6,NA,NA,13.4,21.3,No,No
+2011-03-04,Albury,8.6,22.1,0,NA,NA,W,33,ENE,W,6,20,79,42,1014.3,1013.6,NA,NA,13.2,21,No,No
+2011-03-05,Albury,11.5,25,0,NA,NA,SE,30,SSE,E,19,13,58,30,1020.6,1019.4,NA,NA,15.6,24.9,No,No
+2011-03-06,Albury,9.6,25.3,0,NA,NA,E,22,NA,S,0,9,68,38,1025.8,1022.8,NA,NA,15,23.6,No,No
+2011-03-07,Albury,10.6,26.6,0,NA,NA,SE,31,ESE,NNE,4,9,73,42,1023.9,1019.2,NA,NA,16.2,25.8,No,No
+2011-03-08,Albury,11.4,28.7,0,NA,NA,NE,30,E,NNE,6,17,71,34,1017.5,1013.2,NA,2,16.8,28,No,No
+2011-03-09,Albury,16.8,27,0,NA,NA,NNE,30,NA,NNW,0,15,61,57,1014.8,1013,2,NA,22.3,23.9,No,Yes
+2011-03-10,Albury,18.7,20.8,13.4,NA,NA,N,22,ENE,ENE,9,13,92,95,1012.3,1011.9,8,8,19.8,19.6,Yes,Yes
+2011-03-11,Albury,16.8,27,10.2,NA,NA,E,30,NA,SE,0,13,90,54,1015.4,1013.7,8,NA,19,26.2,Yes,No
+2011-03-12,Albury,17.2,28.2,0.6,NA,NA,ENE,37,NA,NNE,0,19,88,56,1018.8,1017.1,NA,8,19.8,27,No,No
+2011-03-13,Albury,19.6,29.3,0.6,NA,NA,SW,54,NA,NE,0,13,87,61,1019.8,1017.2,8,NA,21.8,28.8,No,Yes
+2011-03-14,Albury,18.2,26.9,19.8,NA,NA,SSE,19,S,SE,7,7,96,61,1021.3,1019.2,7,NA,19.6,26.2,Yes,No
+2011-03-15,Albury,16.3,28.4,0.2,NA,NA,E,24,SE,NE,7,11,81,56,1020.3,1017,NA,NA,19.4,26.6,No,No
+2011-03-16,Albury,17.1,28.2,0.4,NA,NA,SW,30,E,W,6,19,87,37,1017.3,1015.5,7,NA,19.8,28,No,No
+2011-03-17,Albury,12.1,25.9,0.2,NA,NA,WNW,22,SSW,SSE,7,7,84,51,1018.7,1016,7,NA,15.4,24.6,No,No
+2011-03-18,Albury,12.8,26.3,0,NA,NA,SE,20,SSE,SSE,9,11,77,47,1015.4,1012.4,1,1,16.2,25.2,No,No
+2011-03-19,Albury,13.3,27.4,0,NA,NA,NNE,24,SSE,ENE,13,15,74,43,1013.9,1010.6,NA,5,17.4,26.7,No,No
+2011-03-20,Albury,13.9,28.1,0,NA,NA,SE,57,SE,ENE,13,9,71,46,1011.9,1008.4,NA,1,19.4,27.4,No,No
+2011-03-21,Albury,18.2,25.9,0,NA,NA,E,30,SSE,NE,4,15,75,59,1005.4,1002.5,NA,NA,19.3,24.9,No,No
+2011-03-22,Albury,18.6,26.8,0,NA,NA,WNW,37,NA,WNW,0,13,82,58,1001.4,1000.3,8,5,20.1,26,No,No
+2011-03-23,Albury,16.3,20.1,0,NA,NA,W,37,NNW,WNW,15,22,76,63,1005.7,1005.3,8,8,16.4,18.4,No,Yes
+2011-03-24,Albury,13.9,22,8,NA,NA,WNW,44,NNW,WNW,13,19,90,64,1003.7,1003.8,8,3,15.7,20.7,Yes,No
+2011-03-25,Albury,13.3,22.1,0,NA,NA,WNW,43,W,WSW,17,17,77,49,1011.8,1012.6,3,8,14.9,20.9,No,No
+2011-03-26,Albury,9.6,24.2,0,NA,NA,SSE,26,NNW,SE,2,4,67,43,1020.8,1019.7,NA,NA,15.1,22.7,No,No
+2011-03-27,Albury,9.8,23,0,NA,NA,S,19,NA,S,0,7,69,47,1025.3,1023.6,NA,1,13.9,22.4,No,No
+2011-03-28,Albury,10.2,24.7,0,NA,NA,E,20,S,ENE,2,11,81,45,1026.9,1023.8,NA,NA,14.2,23.5,No,No
+2011-03-29,Albury,11.5,25.7,0,NA,NA,NE,26,NA,ENE,0,11,86,52,1024,1020.2,8,8,14.8,24.3,No,No
+2011-03-30,Albury,12.3,25.8,0,NA,NA,SW,33,ESE,NW,9,6,87,55,1018.7,1015.6,5,8,15.6,24.1,No,No
+2011-03-31,Albury,7.2,22.1,0.2,NA,NA,SSE,24,NA,SE,0,7,83,47,1022.8,1021.5,NA,NA,11.6,21.4,No,No
+2011-05-01,Albury,8.7,20.4,0,NA,NA,NE,15,NA,S,0,9,81,66,1019.6,1016.3,4,8,12.8,19.5,No,No
+2011-05-02,Albury,12.3,22.3,0,NA,NA,WNW,24,NA,SSW,0,7,90,57,1016.5,1014.3,NA,8,13.9,19.4,No,No
+2011-05-03,Albury,9,21.9,0,NA,NA,SSE,28,NA,NA,0,0,74,46,1016.6,1014.5,5,1,14.6,21.6,No,No
+2011-05-04,Albury,6.7,19,0.6,NA,NA,W,28,NA,NW,0,19,85,47,1019.6,1018,NA,NA,10.7,18.6,No,No
+2011-05-05,Albury,4.4,18.1,0.2,NA,NA,SE,24,NA,E,0,6,70,42,1024.3,1022.3,NA,NA,10.8,17.8,No,No
+2011-05-06,Albury,2.8,16.8,0,NA,NA,SSW,13,NA,SSE,0,7,76,53,1025.4,1021.5,NA,NA,8.1,15.9,No,No
+2011-05-07,Albury,3.4,15.9,0,NA,NA,SE,17,NA,ESE,0,9,96,57,1020.7,1016,7,NA,6.2,15.7,No,No
+2011-05-08,Albury,2.1,16.8,0,NA,NA,WNW,24,NA,WNW,0,17,94,39,1016,1013.5,8,NA,7.4,16.6,No,No
+2011-05-09,Albury,3.8,16.1,0,NA,NA,SSE,44,ESE,SSE,7,24,60,43,1017.9,1016.8,NA,NA,11.4,15.6,No,No
+2011-05-10,Albury,1.1,15.2,0,NA,NA,NW,26,NA,NW,0,17,69,43,1019.3,1015.3,NA,NA,7.4,14.6,No,Yes
+2011-05-11,Albury,3,11,3.6,NA,NA,W,54,WNW,WNW,22,26,83,55,1010.6,1009,2,5,8,10.8,Yes,No
+2011-05-12,Albury,0.2,10.1,0.4,NA,NA,WSW,24,SSW,NE,4,4,94,89,1015.3,1013.8,6,8,4.1,8.6,No,Yes
+2011-05-13,Albury,3.8,14.1,5,NA,NA,W,35,WNW,WNW,11,20,98,74,1015,1012.3,8,6,9,13.2,Yes,Yes
+2011-05-14,Albury,3.8,14.3,1.8,NA,NA,W,35,W,WSW,20,19,82,46,1020.7,1021.8,NA,7,6.8,13.6,Yes,No
+2011-05-15,Albury,-0.7,13.7,0,NA,NA,W,15,NA,WSW,0,9,95,57,1031.5,1029.9,8,5,3.3,12.3,No,No
+2011-05-16,Albury,0.8,11.2,0,NA,NA,W,20,SE,W,4,7,99,74,1033,1030.5,8,8,4.2,10.9,No,No
+2011-05-17,Albury,0.5,15.8,0,NA,NA,E,15,NA,ESE,0,4,85,54,1031.8,1028.1,NA,NA,5.4,14.7,No,No
+2011-05-18,Albury,2.3,17.9,0,NA,NA,E,20,E,ENE,7,7,99,48,1032,1029.2,1,NA,7.1,17.6,No,No
+2011-05-19,Albury,2.7,16,0,NA,NA,S,13,NA,SSE,0,6,91,55,1031.5,1028.8,NA,NA,6.6,15.9,No,No
+2011-05-20,Albury,4.5,18.6,0,NA,NA,SE,15,NA,ESE,0,7,93,48,1028.7,1024.9,NA,NA,7.7,18.1,No,No
+2011-05-21,Albury,3.3,20.5,0,NA,NA,ESE,19,NA,ESE,0,9,85,50,1025.4,1020.7,NA,NA,8,19.6,No,No
+2011-05-22,Albury,5.8,22,0,NA,NA,ENE,46,NA,NE,0,20,94,53,1017,1009.3,6,6,10.2,20.4,No,Yes
+2011-05-23,Albury,10.2,15,17.4,NA,NA,WNW,44,NNE,WNW,19,20,88,85,1002.9,1000.5,8,8,13.2,14,Yes,Yes
+2011-05-24,Albury,8.9,15.6,3.6,NA,NA,WNW,26,WSW,WNW,15,7,85,65,1007.8,1008.2,8,8,10,14.8,Yes,No
+2011-05-25,Albury,3.1,14.7,0,NA,NA,SE,30,S,SE,11,17,74,47,1017.3,1016.1,NA,NA,7.3,14.3,No,No
+2011-05-26,Albury,1.3,14.9,0,NA,NA,WSW,26,NA,WSW,0,20,75,52,1020.5,1018.6,NA,NA,6.6,13.6,No,No
+2011-05-27,Albury,1.9,13.8,0,NA,NA,W,17,NE,WSW,2,11,99,65,1021.9,1020.6,7,1,6.1,12.8,No,No
+2011-05-28,Albury,2.6,13.9,0,NA,NA,WSW,15,NA,WSW,0,11,99,72,1025.4,1023.5,NA,NA,6.1,13,No,No
+2011-05-29,Albury,2.5,14.8,0,NA,NA,SSE,11,WSW,NA,4,0,99,63,1026.5,1023.4,NA,NA,4.7,14.1,No,No
+2011-05-30,Albury,3.6,15.9,0,NA,NA,SSE,26,NA,ESE,0,11,76,51,1025.9,1023.2,NA,NA,8.7,15.8,No,No
+2011-05-31,Albury,2.8,19.4,0,NA,NA,SE,22,NA,SE,0,9,73,48,1024.8,1022,NA,NA,8,19.2,No,No
+2011-06-01,Albury,3.1,19.8,0,NA,NA,NE,17,NA,NE,0,11,86,53,1028,1025.1,NA,NA,8.8,19.1,No,No
+2011-06-02,Albury,2.9,17.6,0,NA,NA,N,15,NNW,SSE,7,9,99,58,1027.8,1023.4,7,NA,7.7,17.3,No,No
+2011-06-03,Albury,4.3,18.3,0,NA,NA,NW,20,ENE,NW,6,11,97,57,1020.6,1016.4,8,NA,8.5,17.4,No,Yes
+2011-06-04,Albury,8.5,14.8,8.8,NA,NA,W,24,W,WNW,9,11,95,72,1016.3,1015.6,8,1,10.9,13.8,Yes,No
+2011-06-05,Albury,2.2,12,0,NA,NA,N,28,NA,N,0,15,98,75,1018.7,1014.7,8,2,6.7,11.5,No,Yes
+2011-06-06,Albury,4.9,12.8,2,NA,NA,WSW,26,W,WNW,9,15,77,50,1017.9,1018,NA,NA,6.8,12.4,Yes,No
+2011-06-07,Albury,-0.5,9.8,0,NA,NA,SW,52,S,NW,4,13,97,79,1019.3,1014.3,8,NA,3.1,9,No,Yes
+2011-06-08,Albury,1.5,10.2,2.6,NA,NA,WNW,37,WNW,W,13,22,89,63,1019.2,1017.3,8,8,3,9.7,Yes,No
+2011-06-09,Albury,2.9,14.6,0,NA,NA,WSW,33,W,SSW,13,17,89,51,1018.1,1016.2,7,NA,7.2,13.7,No,No
+2011-06-10,Albury,-1.1,14,0,NA,NA,SSE,20,NA,SSE,0,13,85,46,1021.3,1021.7,NA,NA,4.3,13.9,No,No
+2011-06-11,Albury,-1.4,13.9,0,NA,NA,SSE,26,NA,SSE,0,17,82,50,1028.7,1026.6,NA,NA,3.5,13.7,No,No
+2011-06-12,Albury,1,16.1,0.2,NA,NA,SE,28,NA,SSE,0,17,76,49,1029.1,1026,NA,NA,7.6,16,No,No
+2011-06-13,Albury,-0.3,15.9,0,NA,NA,SSE,20,NA,ESE,0,11,91,41,1027.3,1024.5,NA,NA,4.3,15.7,No,No
+2011-06-14,Albury,1.7,16.7,0,NA,NA,SSE,35,NNE,SSE,7,19,78,45,1025.3,1023.7,NA,NA,8.2,16.5,No,No
+2011-06-15,Albury,0.5,16.9,0,NA,NA,S,15,E,S,2,7,82,48,1027,1024.7,NA,NA,5.8,16.8,No,No
+2011-06-16,Albury,1,16.1,0,NA,NA,ESE,46,NA,E,0,6,89,52,1023.6,1018.4,NA,NA,4.8,16,No,No
+2011-06-17,Albury,3,12.6,1,NA,NA,WNW,35,NW,W,11,15,92,68,1010.6,1010.1,8,NA,7.5,11.5,No,No
+2011-06-18,Albury,5.7,12.5,0.2,NA,NA,NW,28,WNW,WNW,13,11,91,85,1015.1,1014.5,8,8,7.9,11.1,No,No
+2011-06-19,Albury,3.3,11.8,0,NA,NA,NW,20,NA,NNE,0,7,99,92,1017.7,1015.2,8,8,7.6,11.4,No,Yes
+2011-06-20,Albury,7.6,14.6,3.6,NA,NA,N,46,NNE,NNE,6,19,86,67,1015.4,1010.8,7,8,10.4,14.1,Yes,Yes
+2011-06-21,Albury,6.6,11.6,10.6,NA,NA,NNW,65,NW,WNW,11,28,93,58,1002,1003.9,8,2,6.8,10.3,Yes,No
+2011-06-22,Albury,5.9,11.1,0.6,NA,NA,NW,43,WNW,NW,19,19,93,69,1013.3,1013.6,8,8,6.3,10.4,No,Yes
+2011-06-23,Albury,6.2,14.2,3.4,NA,NA,W,43,W,W,19,17,85,70,1020.2,1020.9,8,NA,11,13.3,Yes,No
+2011-06-24,Albury,2.9,13.1,0,NA,NA,WNW,15,NE,S,6,7,99,87,1028.3,1027.8,NA,NA,6.4,11.9,No,No
+2011-06-25,Albury,5.5,15.5,0.4,NA,NA,SE,13,SSE,S,7,6,99,65,1031,1028.1,8,NA,8,14.8,No,No
+2011-06-26,Albury,3.2,15.7,0,NA,NA,NE,24,NE,NNW,6,13,99,55,1029.2,1025.1,8,NA,5.7,14.6,No,No
+2011-06-27,Albury,0.9,16.4,0,NA,NA,NNE,13,NA,NA,0,0,99,47,1030.5,1028.7,NA,NA,4.3,16.2,No,No
+2011-06-28,Albury,-0.2,15.2,0,NA,NA,SSE,15,NA,ESE,0,7,98,52,1035.7,1032.6,NA,NA,3.6,15.2,No,No
+2011-06-29,Albury,0.9,16.6,0,NA,NA,ENE,17,NA,ESE,0,6,81,50,1037.4,1035.1,NA,NA,5.6,16.1,No,No
+2011-06-30,Albury,0.3,15.2,0,NA,NA,SE,20,NA,SE,0,9,92,53,1038.9,1034.2,NA,NA,5.4,15.1,No,No
+2011-07-01,Albury,0.3,14.1,0,NA,NA,E,13,SE,SE,2,4,99,59,1033.6,1028.7,8,NA,3.9,13.8,No,No
+2011-07-02,Albury,0.2,15.2,0,NA,NA,N,20,E,SE,4,9,99,63,1026.7,1020.9,7,NA,3.7,14.5,No,No
+2011-07-03,Albury,2.9,14.8,0,NA,NA,SE,48,ESE,S,6,7,98,80,1018.7,1014.3,8,7,6.3,12.8,No,Yes
+2011-07-04,Albury,6.3,14.8,15.4,NA,NA,W,69,N,NW,7,35,85,54,1013.2,1009.1,6,6,10.7,14.1,Yes,Yes
+2011-07-05,Albury,6.9,11.2,3.8,NA,NA,WNW,59,NW,WNW,26,28,84,73,1010.1,1008.8,8,NA,7.8,10.6,Yes,Yes
+2011-07-06,Albury,7,10.8,1.2,NA,NA,NW,61,NW,NNW,17,19,94,87,1010.8,1007.7,8,8,7.9,10,Yes,Yes
+2011-07-07,Albury,6.8,11.2,4.4,NA,NA,WNW,52,WNW,W,15,24,85,54,1013.9,1018.3,2,1,7.5,10.6,Yes,No
+2011-07-08,Albury,-0.5,8.3,0,NA,NA,WNW,28,NA,W,0,15,93,64,1026,1024.7,NA,8,4.3,8,No,Yes
+2011-07-09,Albury,4.3,9.2,4.2,NA,NA,WNW,28,WNW,WNW,13,19,94,87,1022.2,1021.1,8,8,7.4,8.1,Yes,No
+2011-07-10,Albury,6.4,11,0,NA,NA,WNW,46,NNW,WNW,19,28,78,68,1017.7,1012.6,8,8,7,10.5,No,Yes
+2011-07-11,Albury,4.7,11.8,6.6,NA,NA,W,30,WNW,W,15,19,85,64,1022.2,1022.7,6,8,5.7,11.2,Yes,No
+2011-07-12,Albury,5.7,10.5,0,NA,NA,NW,28,NA,NW,0,19,83,64,1025.4,1023.4,8,7,7.7,9.8,No,No
+2011-07-13,Albury,7.1,9.8,0,NA,NA,W,30,WNW,WNW,15,17,91,88,1021.6,1020.1,7,NA,7.2,8.7,No,Yes
+2011-07-14,Albury,-0.3,12.6,4,NA,NA,SW,15,S,ENE,6,2,99,65,1029.3,1029.7,8,NA,4,10.7,Yes,No
+2011-07-15,Albury,-1.6,12.1,0,NA,NA,E,17,NA,E,0,7,95,46,1036.6,1033.3,NA,NA,2.6,12,No,No
+2011-07-16,Albury,0.2,14.1,0,NA,NA,SE,20,NA,E,0,9,78,56,1031.3,1026.3,NA,5,5.3,13.7,No,No
+2011-07-17,Albury,5.3,11.1,0,NA,NA,W,31,SE,SSE,7,9,86,95,1024,1021.2,8,8,8.4,9.5,No,Yes
+2011-07-18,Albury,8.4,11,8.8,NA,NA,WNW,33,W,N,17,7,92,85,1018.8,1018.3,8,8,8.6,8.6,Yes,Yes
+2011-07-19,Albury,0.4,14.5,1.8,NA,NA,WSW,13,NW,NA,4,0,99,66,1020.4,1017.8,NA,NA,3.4,14,Yes,No
+2011-07-20,Albury,0.3,16.7,0.2,NA,NA,SE,33,SE,SE,2,19,99,54,1021.5,1020.2,1,5,3.6,15.8,No,No
+2011-07-21,Albury,3.5,17.2,0,NA,NA,SE,26,NW,S,4,11,75,46,1022.2,1020,NA,4,8.8,16.8,No,No
+2011-07-22,Albury,6.9,15.6,0,NA,NA,SSE,33,SE,SSE,17,15,56,45,1023.5,1021.4,NA,NA,12.5,15.3,No,No
+2011-07-23,Albury,0.1,14.6,0,NA,NA,W,19,NA,W,0,11,72,45,1024.7,1021.6,NA,NA,5.8,14.3,No,No
+2011-07-24,Albury,1.6,9.3,0.2,NA,NA,E,19,NA,E,0,11,93,81,1021,1018.2,NA,8,5.5,8.9,No,Yes
+2011-07-25,Albury,5.5,13.2,16.2,NA,NA,NW,26,SE,NW,9,11,99,80,1016.6,1015.8,8,NA,8,12.2,Yes,Yes
+2011-07-26,Albury,4.1,14.1,2.2,NA,NA,WNW,28,NE,S,2,11,99,63,1022.3,1022,NA,NA,7,12.6,Yes,No
+2011-07-27,Albury,0.5,14.5,0,NA,NA,NNW,15,NA,NW,0,7,99,49,1030.1,1028.8,NA,NA,4.3,14.2,No,No
+2011-07-28,Albury,0.2,13.1,0,NA,NA,SE,41,ESE,S,6,6,99,59,1031,1027.6,NA,NA,2.9,12.6,No,No
+2011-07-29,Albury,-1.4,14.7,0,NA,NA,E,17,NW,ESE,2,9,92,52,1028.9,1024.7,NA,NA,3.6,14.1,No,No
+2011-07-30,Albury,0.6,16.1,0.2,NA,NA,SE,19,WNW,SSE,2,13,89,54,1024.6,1020,NA,NA,4.9,15.8,No,No
+2011-07-31,Albury,4.9,14.7,1,NA,NA,E,20,NNE,ENE,2,15,96,76,1021.7,1019.8,NA,NA,8.8,13.8,No,No
+2011-08-01,Albury,3.4,19,0,NA,NA,NE,20,NA,NNE,0,11,92,55,1021.6,1018.5,NA,NA,8.7,18.9,No,No
+2011-08-02,Albury,6.5,20.6,0,NA,NA,ENE,26,NA,NE,0,13,90,44,1022.2,1018,NA,NA,10.7,19.5,No,No
+2011-08-03,Albury,3.9,21.5,0.2,NA,NA,NNE,28,NA,NE,0,15,92,43,1022.2,1019.9,NA,NA,9,21.3,No,No
+2011-08-04,Albury,7.1,22.9,0,NA,NA,NNE,35,ESE,N,7,24,64,37,1024,1021.4,NA,NA,14.7,22.7,No,No
+2011-08-05,Albury,5.6,20.7,0,NA,NA,ESE,44,SE,NNE,7,24,65,42,1023,1018.1,NA,NA,13.9,20.3,No,Yes
+2011-08-06,Albury,9.9,12.9,14.6,NA,NA,WSW,30,SE,ESE,7,6,99,92,1019.4,1014.8,8,NA,10.3,12.4,Yes,Yes
+2011-08-07,Albury,5.3,11.1,4.2,NA,NA,WNW,28,WNW,SSW,9,7,96,84,1016.4,1013.2,NA,NA,7.6,9.6,Yes,Yes
+2011-08-08,Albury,7.1,12.3,8.2,NA,NA,WSW,24,S,W,6,13,95,76,1011.9,1009.5,7,NA,7.6,9.7,Yes,Yes
+2011-08-09,Albury,3.1,10.1,1.2,NA,NA,W,24,ENE,WNW,2,13,89,76,1010.2,1008.4,NA,7,6.3,9.9,Yes,Yes
+2011-08-10,Albury,6.3,10.9,3.6,NA,NA,WNW,19,N,W,4,13,89,83,1009.3,1006.9,NA,NA,8.9,10.4,Yes,Yes
+2011-08-11,Albury,3.4,16.8,2.8,NA,NA,SSE,37,SE,SE,4,22,84,50,1012,1012.3,NA,NA,7.4,16.7,Yes,No
+2011-08-12,Albury,1.6,16.3,0,NA,NA,SW,24,SSE,W,4,15,74,43,1020.7,1019.5,NA,NA,6.9,16.2,No,No
+2011-08-13,Albury,0.7,13.4,0,NA,NA,ESE,13,NA,E,0,7,91,65,1025,1023.1,NA,NA,5.8,13,No,No
+2011-08-14,Albury,4.3,17.3,0,NA,NA,SSE,22,NA,NNW,0,4,88,50,1027.1,1024,NA,NA,8.2,16.3,No,Yes
+2011-08-15,Albury,3.9,13.8,1.2,NA,NA,ENE,15,SE,ESE,6,7,86,73,1025.6,1021.7,NA,NA,9.3,13.3,Yes,No
+2011-08-16,Albury,9,19.4,0.2,NA,NA,NE,24,NA,NNE,0,13,80,45,1020.8,1016.2,NA,NA,11.8,18.7,No,Yes
+2011-08-17,Albury,7.1,12.6,5.6,NA,NA,NE,44,SE,NE,4,28,95,91,1011.8,1005.7,NA,NA,10.4,11.8,Yes,Yes
+2011-08-18,Albury,7.4,10.8,30.8,NA,NA,WNW,35,WNW,WNW,19,15,90,91,1010.7,1010.2,NA,NA,7.5,9.6,Yes,No
+2011-08-19,Albury,6.9,19.3,0.8,NA,NA,SE,28,SSE,SE,11,19,88,49,1021,1020.7,NA,NA,8.2,19.1,No,No
+2011-08-20,Albury,3.2,17.3,0,NA,NA,SE,22,SE,SSE,7,9,62,32,1031.5,1030.4,NA,NA,11.2,16.6,No,No
+2011-08-21,Albury,2.1,18,0,NA,NA,SW,20,ESE,SW,6,11,79,46,1037.3,1034.6,NA,NA,8.9,17.4,No,No
+2011-08-22,Albury,1.8,17.7,0,NA,NA,WSW,22,NNE,NW,6,7,79,47,1039.9,1036,NA,NA,8.8,17.1,No,No
+2011-08-23,Albury,2.5,16.9,0,NA,NA,S,17,E,NNE,7,9,99,56,1037.3,1032.6,NA,NA,6.4,16.1,No,No
+2011-08-24,Albury,2.4,17.5,0,NA,NA,ENE,17,ESE,SE,11,6,99,56,1031.4,1026.7,NA,NA,6.6,16.8,No,No
+2011-08-25,Albury,2.5,20.7,0,NA,NA,N,31,SSE,N,7,19,99,48,1025.6,1020.6,NA,NA,7.2,20.2,No,No
+2011-08-26,Albury,1.9,16.6,0,NA,NA,WNW,24,S,W,6,13,99,36,1025.6,1023.2,8,NA,6.5,16.4,No,No
+2011-08-27,Albury,0.8,16.8,0,NA,NA,WSW,31,ESE,W,2,17,71,42,1023.7,1019.9,NA,NA,8.2,16.4,No,No
+2011-08-28,Albury,0.4,16.2,0,NA,NA,WSW,24,NA,WNW,0,7,72,44,1022.8,1018.7,NA,2,7.3,15.8,No,No
+2011-08-29,Albury,1.4,15.9,0,NA,NA,W,26,W,WNW,2,19,80,59,1019.2,1018.2,NA,8,8.2,15.6,No,No
+2011-08-30,Albury,0.6,15.7,0,NA,NA,WNW,20,NA,NNW,0,7,99,47,1024.3,1022.1,NA,NA,5.4,15,No,No
+2011-08-31,Albury,0.4,15.8,0,NA,NA,WNW,26,SE,WSW,6,19,87,56,1025.4,1023.2,NA,NA,6.5,15.6,No,No
+2011-09-01,Albury,2.6,18.3,0,NA,NA,S,15,E,S,6,4,82,42,1025.6,1023,NA,NA,9.3,17.9,No,No
+2011-09-02,Albury,2.8,20.4,0,NA,NA,ESE,17,SE,E,7,7,65,31,1028.4,1025.3,NA,NA,10.4,19.6,No,No
+2011-09-03,Albury,2.6,19.6,0,NA,NA,NE,30,ESE,ENE,4,20,71,44,1028.4,1023.6,NA,NA,10.2,18.8,No,No
+2011-09-04,Albury,6.5,16.8,0,NA,NA,ENE,31,ENE,E,9,11,65,68,1024.2,1021.8,NA,NA,14.5,15.6,No,Yes
+2011-09-05,Albury,4.8,21.4,3.2,NA,NA,N,31,NA,NNE,0,22,86,52,1024.5,1020.2,4,NA,10.8,20.7,Yes,Yes
+2011-09-06,Albury,10.8,18.8,5,NA,NA,W,56,N,W,24,33,55,71,1014.9,1014.1,3,8,16.7,12.1,Yes,No
+2011-09-07,Albury,-0.1,14.4,1,NA,NA,NW,30,NA,WSW,0,17,78,44,1021.3,1020.2,NA,NA,7.3,13.7,No,No
+2011-09-08,Albury,0.4,15.9,0,NA,NA,WNW,22,SSE,NW,7,11,74,38,1022.7,1018.6,NA,NA,7.8,15.7,No,No
+2011-09-09,Albury,2.7,14,0,NA,NA,S,57,W,WSW,20,30,70,47,1013.1,1010.6,8,8,8.4,13,No,No
+2011-09-10,Albury,4,NA,0.2,NA,NA,NA,NA,W,WSW,20,30,79,47,1015.9,1013.8,NA,NA,9.3,15.6,No,NA
+2011-09-11,Albury,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA
+2011-09-12,Albury,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA
+2011-09-13,Albury,NA,15.8,NA,NA,NA,NA,NA,NA,NNW,NA,9,NA,47,NA,1023.9,NA,5,NA,15.1,NA,NA
+2011-09-14,Albury,0.9,20.8,NA,NA,NA,W,33,ESE,WSW,9,15,83,42,1021.7,1018.3,NA,NA,9.4,20.6,NA,No
+2011-09-15,Albury,1.7,17.2,0,NA,NA,W,31,E,NW,4,15,72,33,1023.3,1020.4,NA,NA,9.7,16.9,No,No
+2011-09-16,Albury,4.4,20.8,0,NA,NA,WSW,24,SSE,S,6,7,78,50,1017.8,1013.9,NA,3,9.8,19.3,No,No
+2011-09-17,Albury,3.7,21.7,0,NA,NA,NE,26,E,NE,7,20,78,52,1017.5,1011.8,NA,NA,12,21.5,No,No
+2011-09-18,Albury,5.5,23.9,0,NA,NA,NNW,19,SE,WSW,4,11,52,36,1015.6,1015.2,NA,NA,14.7,23.2,No,No
+2011-09-19,Albury,5.3,26.7,0,NA,NA,WNW,57,SE,NE,9,22,70,36,1015.5,1007,NA,NA,14.8,26.4,No,No
+2011-09-20,Albury,10.1,13.6,1,NA,NA,W,61,WNW,W,31,22,73,70,1008.8,1011.2,8,NA,12.2,12.9,No,Yes
+2011-09-21,Albury,1.7,18.2,3.6,NA,NA,W,30,NA,WNW,0,17,99,53,1022.6,1020.3,8,5,7.8,18,Yes,No
+2011-09-22,Albury,4.4,22.1,0,NA,NA,ENE,30,E,N,9,13,81,36,1023.4,1017.4,NA,NA,12.6,21.9,No,No
+2011-09-23,Albury,10,18.4,0,NA,NA,W,35,W,WNW,17,22,65,39,1017.9,1018.1,NA,NA,14.5,17.8,No,No
+2011-09-24,Albury,1.9,18.3,0,NA,NA,SE,37,ESE,NW,11,11,69,39,1020.3,1016.3,NA,NA,11.8,17.9,No,No
+2011-09-25,Albury,8.6,19.8,1,NA,NA,SSE,43,S,E,15,9,53,36,1022.2,1020.5,NA,NA,13.7,18.9,No,No
+2011-09-26,Albury,3.1,19.6,0,NA,NA,ENE,20,ESE,NNE,6,9,65,37,1025,1019.7,NA,NA,11.7,19,No,No
diff --git a/fda-table-service/rest-service/src/main/resources/weather-small.csv b/fda-table-service/rest-service/src/main/resources/weather-small.csv
deleted file mode 100644
index 6c2d91e8fb825e106844ae607cb1bdf6838ef6d3..0000000000000000000000000000000000000000
--- a/fda-table-service/rest-service/src/main/resources/weather-small.csv
+++ /dev/null
@@ -1,1001 +0,0 @@
-id,Date,Location,MinTemp,MaxTemp,Rainfall
-1,2008-12-01,Albury,13.4,22.9,0.6
-2,2008-12-02,Albury,7.4,25.1,0
-3,2008-12-03,Albury,12.9,25.7,0
-4,2008-12-04,Albury,9.2,28,0
-5,2008-12-05,Albury,17.5,32.3,1
-6,2008-12-06,Albury,14.6,29.7,0.2
-7,2008-12-07,Albury,14.3,25,0
-8,2008-12-08,Albury,7.7,26.7,0
-9,2008-12-09,Albury,9.7,31.9,0
-10,2008-12-10,Albury,13.1,30.1,1.4
-11,2008-12-11,Albury,13.4,30.4,0
-12,2008-12-12,Albury,15.9,21.7,2.2
-13,2008-12-13,Albury,15.9,18.6,15.6
-14,2008-12-14,Albury,12.6,21,3.6
-15,2008-12-15,Albury,8.4,24.6,0
-16,2008-12-16,Albury,9.8,27.7,NA
-17,2008-12-17,Albury,14.1,20.9,0
-18,2008-12-18,Albury,13.5,22.9,16.8
-19,2008-12-19,Albury,11.2,22.5,10.6
-20,2008-12-20,Albury,9.8,25.6,0
-21,2008-12-21,Albury,11.5,29.3,0
-22,2008-12-22,Albury,17.1,33,0
-23,2008-12-23,Albury,20.5,31.8,0
-24,2008-12-24,Albury,15.3,30.9,0
-25,2008-12-25,Albury,12.6,32.4,0
-26,2008-12-26,Albury,16.2,33.9,0
-27,2008-12-27,Albury,16.9,33,0
-28,2008-12-28,Albury,20.1,32.7,0
-29,2008-12-29,Albury,19.7,27.2,0
-30,2008-12-30,Albury,12.5,24.2,1.2
-31,2008-12-31,Albury,12,24.4,0.8
-32,2009-01-01,Albury,11.3,26.5,0
-33,2009-01-02,Albury,9.6,23.9,0
-34,2009-01-03,Albury,10.5,28.8,0
-35,2009-01-04,Albury,12.3,34.6,0
-36,2009-01-05,Albury,12.9,35.8,0
-37,2009-01-06,Albury,13.7,37.9,0
-38,2009-01-07,Albury,16.1,38.9,0
-39,2009-01-08,Albury,14,28.3,0
-40,2009-01-09,Albury,12.5,28.4,0
-41,2009-01-10,Albury,17,30.8,0
-42,2009-01-11,Albury,16.9,32,0
-43,2009-01-12,Albury,17.3,34.7,0
-44,2009-01-13,Albury,17.2,37.7,0
-45,2009-01-14,Albury,17.4,43,0
-46,2009-01-15,Albury,19.8,32.7,0
-47,2009-01-16,Albury,14.9,26.7,0
-48,2009-01-17,Albury,10.5,28.4,0
-49,2009-01-18,Albury,11.3,32.2,0
-50,2009-01-19,Albury,13.9,36.6,0
-51,2009-01-20,Albury,18.6,39.9,0
-52,2009-01-21,Albury,19.3,38.1,0.8
-53,2009-01-22,Albury,24.4,34,0.6
-54,2009-01-23,Albury,18.8,35.2,6.4
-55,2009-01-24,Albury,20.8,30.6,0
-56,2009-01-25,Albury,14,34.3,0
-57,2009-01-26,Albury,15.7,38.4,0
-58,2009-01-27,Albury,18.5,38.2,0
-59,2009-01-28,Albury,20.4,40.7,0
-60,2009-01-29,Albury,21.8,41.5,0
-61,2009-01-30,Albury,22.3,42.9,0
-62,2009-01-31,Albury,22,42.7,0
-63,2009-02-01,Albury,28,43.1,0
-64,2009-02-02,Albury,24.4,38.3,0.2
-65,2009-02-03,Albury,21.5,37.7,0
-66,2009-02-04,Albury,21.7,36.9,0
-67,2009-02-05,Albury,21.5,41.2,0
-68,2009-02-06,Albury,23.5,42.2,0
-69,2009-02-07,Albury,22.3,44.8,0
-70,2009-02-08,Albury,28.3,40.2,0
-71,2009-02-09,Albury,18.4,31.2,0.4
-72,2009-02-10,Albury,14.9,27.3,0
-73,2009-02-11,Albury,13.5,26.7,0
-74,2009-02-12,Albury,16.1,21.6,0
-75,2009-02-13,Albury,14.6,29,3
-76,2009-02-14,Albury,12.4,29.2,0
-77,2009-02-15,Albury,13.3,31.3,0
-78,2009-02-16,Albury,17.2,31.1,0
-79,2009-02-17,Albury,12.5,28.8,0
-80,2009-02-18,Albury,18,32,0
-81,2009-02-19,Albury,16.2,34,0
-82,2009-02-20,Albury,18.7,29.1,0
-83,2009-02-21,Albury,13.7,31.7,0
-84,2009-02-22,Albury,15.5,33.2,0
-85,2009-02-23,Albury,14.3,34,0
-86,2009-02-24,Albury,12.9,29.6,0
-87,2009-02-25,Albury,8.9,31.9,0
-88,2009-02-26,Albury,15,32.7,0
-89,2009-02-27,Albury,15.4,32.6,0
-90,2009-02-28,Albury,16,34.5,0
-91,2009-03-01,Albury,12.8,30.3,0
-92,2009-03-02,Albury,13.2,31.9,0
-93,2009-03-03,Albury,18,31.1,0
-94,2009-03-04,Albury,13.8,22.1,0.2
-95,2009-03-05,Albury,11.5,22,0
-96,2009-03-06,Albury,7.6,24,0
-97,2009-03-07,Albury,8.3,27.9,0
-98,2009-03-08,Albury,11,30.2,0
-99,2009-03-09,Albury,13.8,31.8,0
-100,2009-03-10,Albury,15.5,32,0
-101,2009-03-11,Albury,18.4,30.5,1.2
-102,2009-03-12,Albury,20.9,25.7,0
-103,2009-03-13,Albury,17.1,25.8,5.8
-104,2009-03-14,Albury,16.4,27,3
-105,2009-03-15,Albury,10,19.7,11.6
-106,2009-03-16,Albury,8.8,21.9,0
-107,2009-03-17,Albury,8.4,25.3,0
-108,2009-03-18,Albury,9.3,28,0
-109,2009-03-19,Albury,11.3,30.1,0
-110,2009-03-20,Albury,11.5,33.5,0
-111,2009-03-21,Albury,13.8,33.6,0
-112,2009-03-22,Albury,14.6,30,0
-113,2009-03-23,Albury,14.4,31.6,0
-114,2009-03-24,Albury,10.8,31.9,0
-115,2009-03-25,Albury,15.4,22.3,0.4
-116,2009-03-26,Albury,13.3,29.8,1.8
-117,2009-03-27,Albury,10.1,27.6,0
-118,2009-03-28,Albury,9.1,28.9,0
-119,2009-03-29,Albury,10.4,31.2,0
-120,2009-03-30,Albury,13.4,30.4,0
-121,2009-03-31,Albury,12.3,29.9,0
-122,2009-04-01,Albury,12.2,30.6,0
-123,2009-04-02,Albury,14.3,32.1,0
-124,2009-04-03,Albury,18.4,28.1,8.6
-125,2009-04-04,Albury,10.7,21.4,12.6
-126,2009-04-05,Albury,7.8,21.7,0
-127,2009-04-06,Albury,8.1,21.4,0
-128,2009-04-07,Albury,7.5,22.5,0
-129,2009-04-08,Albury,8.2,24,0
-130,2009-04-09,Albury,8.1,25.7,0
-131,2009-04-10,Albury,11.6,26.7,0
-132,2009-04-11,Albury,13,24.9,8.4
-133,2009-04-12,Albury,13.5,24.2,6.2
-134,2009-04-13,Albury,9.9,25.4,0
-135,2009-04-14,Albury,12.2,25,0
-136,2009-04-15,Albury,10.7,21.9,0
-137,2009-04-16,Albury,3.5,20,0
-138,2009-04-17,Albury,6.6,21.6,0
-139,2009-04-18,Albury,7,23.4,0
-140,2009-04-19,Albury,11.2,23.9,0
-141,2009-04-20,Albury,7.4,22,0
-142,2009-04-21,Albury,5.7,21.4,0
-143,2009-04-22,Albury,6.2,22.7,0
-144,2009-04-23,Albury,6,22.9,0
-145,2009-04-24,Albury,10.6,16.2,0
-146,2009-04-25,Albury,12.9,15.8,20
-147,2009-04-26,Albury,8.6,12.9,21
-148,2009-04-27,Albury,4.5,11.5,3.2
-149,2009-04-28,Albury,7.6,14.5,4.8
-150,2009-04-29,Albury,5.4,12.2,0
-151,2009-04-30,Albury,2.1,16.5,0
-152,2009-05-01,Albury,1.8,17,0
-153,2009-05-02,Albury,7.2,19.2,0
-154,2009-05-03,Albury,4.6,18.9,0
-155,2009-05-04,Albury,4.2,19.1,0
-156,2009-05-05,Albury,5.2,18.8,0
-157,2009-05-06,Albury,4.1,19.3,0
-158,2009-05-07,Albury,3.2,18.4,0
-159,2009-05-08,Albury,4.3,19,0
-160,2009-05-09,Albury,3.7,20.5,0
-161,2009-05-10,Albury,5.4,19.5,0
-162,2009-05-11,Albury,4.3,17.7,0
-163,2009-05-12,Albury,3.6,18.5,0
-164,2009-05-13,Albury,3.6,15.1,0
-165,2009-05-14,Albury,6.9,16.3,0
-166,2009-05-15,Albury,10.3,16.6,0
-167,2009-05-16,Albury,12.4,16.4,1.8
-168,2009-05-17,Albury,3,15.6,0
-169,2009-05-18,Albury,2.6,19.7,0
-170,2009-05-19,Albury,3.7,19.1,0
-171,2009-05-20,Albury,5.1,18.6,0
-172,2009-05-21,Albury,4.4,19.8,0
-173,2009-05-22,Albury,4.7,19.8,0
-174,2009-05-23,Albury,6.2,22.9,0
-175,2009-05-24,Albury,6.7,21.1,0
-176,2009-05-25,Albury,9.3,20.3,0
-177,2009-05-26,Albury,11.6,18.1,4.2
-178,2009-05-27,Albury,8,16.2,0.8
-179,2009-05-28,Albury,2.6,15.7,0
-180,2009-05-29,Albury,2.2,16.5,0
-181,2009-05-30,Albury,2.2,16.8,0
-182,2009-05-31,Albury,1.7,17.1,0
-183,2009-06-01,Albury,8,14.3,1.2
-184,2009-06-02,Albury,8.4,13.4,1.4
-185,2009-06-03,Albury,10.6,14.3,4.8
-186,2009-06-04,Albury,8.9,17.4,8
-187,2009-06-05,Albury,2.8,16.1,0
-188,2009-06-06,Albury,1.7,10.5,0.2
-189,2009-06-07,Albury,4.7,11.6,14.4
-190,2009-06-08,Albury,9,12,4.6
-191,2009-06-09,Albury,6.3,8.8,2
-192,2009-06-10,Albury,3,10.5,5.6
-193,2009-06-11,Albury,-2,9.6,0
-194,2009-06-12,Albury,-1.3,8.2,0
-195,2009-06-13,Albury,1.8,12.4,0
-196,2009-06-14,Albury,2,15.8,0
-197,2009-06-15,Albury,0.5,14.9,0.4
-198,2009-06-16,Albury,1.2,17.7,0
-199,2009-06-17,Albury,0.6,15.9,0
-200,2009-06-18,Albury,0.5,14.7,0
-201,2009-06-19,Albury,0.5,15.3,0
-202,2009-06-20,Albury,0.9,17.3,0
-203,2009-06-21,Albury,7,17,1.6
-204,2009-06-22,Albury,5,14.9,5.6
-205,2009-06-23,Albury,3.9,15.5,0
-206,2009-06-24,Albury,7.7,14.1,6
-207,2009-06-25,Albury,4.7,12.2,0
-208,2009-06-26,Albury,6.9,13.7,4.4
-209,2009-06-27,Albury,8.4,11.9,0
-210,2009-06-28,Albury,9.3,12.3,5.4
-211,2009-06-29,Albury,8.2,15.7,3.6
-212,2009-06-30,Albury,9.1,16.1,2
-213,2009-07-01,Albury,8.3,13.3,8.4
-214,2009-07-02,Albury,8.8,11.6,5
-215,2009-07-03,Albury,7.6,12,7.8
-216,2009-07-04,Albury,5.7,13.2,0
-217,2009-07-05,Albury,3.4,12.4,0
-218,2009-07-06,Albury,0,12.1,0
-219,2009-07-07,Albury,-1.5,12.5,0
-220,2009-07-08,Albury,-1.7,13.8,0
-221,2009-07-09,Albury,-0.4,15,0.2
-222,2009-07-10,Albury,0.1,13.5,0
-223,2009-07-11,Albury,4.8,13.3,0.6
-224,2009-07-12,Albury,8.1,16.5,0.6
-225,2009-07-13,Albury,5.9,13.1,1
-226,2009-07-14,Albury,6.9,11,6.8
-227,2009-07-15,Albury,2.9,12.6,1.8
-228,2009-07-16,Albury,-0.6,13.4,0
-229,2009-07-17,Albury,-0.3,14.4,0.2
-230,2009-07-18,Albury,-1,12,0
-231,2009-07-19,Albury,3.2,14.1,0.6
-232,2009-07-20,Albury,3.6,16.5,0.2
-233,2009-07-21,Albury,0.8,17.7,0
-234,2009-07-22,Albury,6.6,12.3,0
-235,2009-07-23,Albury,6,13.5,9.8
-236,2009-07-24,Albury,-0.1,12.9,0
-237,2009-07-25,Albury,-0.3,12.2,0
-238,2009-07-26,Albury,2.1,9.8,0
-239,2009-07-27,Albury,1.3,8.8,0
-240,2009-07-28,Albury,4.2,12.7,3.8
-241,2009-07-29,Albury,8.3,13.2,2.4
-242,2009-07-30,Albury,3.3,12.1,0.2
-243,2009-07-31,Albury,6.5,14.5,5.2
-244,2009-08-01,Albury,7.4,13.9,0.2
-245,2009-08-02,Albury,7.5,14.1,0.8
-246,2009-08-03,Albury,8.3,13.8,0.8
-247,2009-08-04,Albury,3.2,14.7,0
-248,2009-08-05,Albury,5.7,13.8,5.4
-249,2009-08-06,Albury,5.1,17.1,0.4
-250,2009-08-07,Albury,8,13.9,0.8
-251,2009-08-08,Albury,-0.8,12.9,4.2
-252,2009-08-09,Albury,-1,12.2,0
-253,2009-08-10,Albury,1.9,14.8,0.2
-254,2009-08-11,Albury,5.9,17.7,0.4
-255,2009-08-12,Albury,6.9,14.3,4.8
-256,2009-08-13,Albury,7.7,11.6,0.2
-257,2009-08-14,Albury,6.8,15.2,1.2
-258,2009-08-15,Albury,2.7,17.5,0.2
-259,2009-08-16,Albury,5.1,15.5,1.6
-260,2009-08-17,Albury,4.2,13.6,3.2
-261,2009-08-18,Albury,0.6,15.6,0
-262,2009-08-19,Albury,1.6,16.4,0
-263,2009-08-20,Albury,5.5,18.4,0
-264,2009-08-21,Albury,7.3,14.8,1
-265,2009-08-22,Albury,0.2,14.1,6.6
-266,2009-08-23,Albury,5.8,18.9,3.8
-267,2009-08-24,Albury,8.9,17.1,1.2
-268,2009-08-25,Albury,7.1,12.8,2
-269,2009-08-26,Albury,4.2,14.4,3.6
-270,2009-08-27,Albury,1.1,16.7,0.4
-271,2009-08-28,Albury,1.1,18.6,0
-272,2009-08-29,Albury,7.2,17.9,4.2
-273,2009-08-30,Albury,6.3,11.1,13.4
-274,2009-08-31,Albury,6.7,14.2,1.4
-275,2009-09-01,Albury,5.1,14.2,3
-276,2009-09-02,Albury,1,16.8,0
-277,2009-09-03,Albury,6.1,20.7,0
-278,2009-09-04,Albury,6.3,16.9,1.4
-279,2009-09-05,Albury,2.1,15,0
-280,2009-09-06,Albury,1.6,16.6,0
-281,2009-09-07,Albury,8.3,17.6,0
-282,2009-09-08,Albury,5.7,16.5,0
-283,2009-09-09,Albury,7.5,14.3,0
-284,2009-09-10,Albury,2.6,NA,0
-285,2009-09-11,Albury,NA,18.8,NA
-286,2009-09-12,Albury,6.5,24.7,0
-287,2009-09-13,Albury,13.2,25.1,0
-288,2009-09-14,Albury,4.3,17.8,0
-289,2009-09-15,Albury,1.6,17.2,0
-290,2009-09-16,Albury,2.8,21.1,0
-291,2009-09-17,Albury,6.3,19,0
-292,2009-09-18,Albury,7.4,20.4,10.2
-293,2009-09-19,Albury,5.4,20.6,0
-294,2009-09-20,Albury,8,18.9,0.4
-295,2009-09-21,Albury,3.7,19,0.2
-296,2009-09-22,Albury,11.5,20.2,8.4
-297,2009-09-23,Albury,9.3,16.8,28.8
-298,2009-09-24,Albury,8.2,18.2,1.4
-299,2009-09-25,Albury,5.3,20.6,0
-300,2009-09-26,Albury,6.8,12.2,6
-301,2009-09-27,Albury,4.5,12.9,1.6
-302,2009-09-28,Albury,5.5,17.9,0
-303,2009-09-29,Albury,1.7,17,0
-304,2009-09-30,Albury,4,21.4,0
-305,2009-10-01,Albury,8.9,21.1,0
-306,2009-10-02,Albury,11.7,22,0
-307,2009-10-03,Albury,8.5,13.5,3.2
-308,2009-10-04,Albury,9.6,16.2,1.8
-309,2009-10-05,Albury,8.3,19.7,0.2
-310,2009-10-06,Albury,5.2,16.2,0
-311,2009-10-07,Albury,3.8,15.9,3.6
-312,2009-10-08,Albury,1.2,16.3,0
-313,2009-10-09,Albury,3.2,18.2,0
-314,2009-10-10,Albury,4.6,19,0
-315,2009-10-11,Albury,6.4,18.7,0
-316,2009-10-12,Albury,5.8,23.3,0
-317,2009-10-13,Albury,6.6,17.7,2
-318,2009-10-14,Albury,9.5,15.1,7
-319,2009-10-15,Albury,9.7,15.7,1.4
-320,2009-10-16,Albury,4.1,16.6,6.8
-321,2009-10-17,Albury,4.6,19.2,0
-322,2009-10-18,Albury,5.1,20.3,0
-323,2009-10-19,Albury,5.1,22.7,0
-324,2009-10-20,Albury,6.9,26.6,0
-325,2009-10-21,Albury,8.8,27.1,0
-326,2009-10-22,Albury,9.1,27.1,0
-327,2009-10-23,Albury,8.1,23.9,0
-328,2009-10-24,Albury,7.4,25.4,0
-329,2009-10-25,Albury,10.6,23.1,0
-330,2009-10-26,Albury,10.8,22,0
-331,2009-10-27,Albury,5.9,24.1,0
-332,2009-10-28,Albury,11.3,26.8,0
-333,2009-10-29,Albury,14.5,26.9,0
-334,2009-10-30,Albury,13.7,29.1,0
-335,2009-10-31,Albury,15.6,30.8,0
-336,2009-11-01,Albury,17.8,34,0
-337,2009-11-02,Albury,18.7,32.4,0
-338,2009-11-03,Albury,18.7,24.3,0
-339,2009-11-04,Albury,10,23.2,0
-340,2009-11-05,Albury,6.6,25.3,0
-341,2009-11-06,Albury,10.8,27.9,0
-342,2009-11-07,Albury,11.3,29.8,0
-343,2009-11-08,Albury,13.5,31.8,0
-344,2009-11-09,Albury,15.4,33.4,0
-345,2009-11-10,Albury,15.9,35.2,0
-346,2009-11-11,Albury,17.1,36,0
-347,2009-11-12,Albury,16.7,35.1,0
-348,2009-11-13,Albury,18.1,32.8,0
-349,2009-11-14,Albury,13.4,35.4,0
-350,2009-11-15,Albury,17.2,36.3,0
-351,2009-11-16,Albury,15.3,35.1,0
-352,2009-11-17,Albury,12.1,30.5,0
-353,2009-11-18,Albury,11.4,33.5,0
-354,2009-11-19,Albury,18.6,39.7,0
-355,2009-11-20,Albury,15.3,38.2,0
-356,2009-11-21,Albury,19.3,21,10.6
-357,2009-11-22,Albury,18.3,28.3,25.8
-358,2009-11-23,Albury,11.9,23.6,0.4
-359,2009-11-24,Albury,12.8,25.8,0
-360,2009-11-25,Albury,17.2,32.9,0
-361,2009-11-26,Albury,21,34.5,0
-362,2009-11-27,Albury,15.9,26.2,10.2
-363,2009-11-28,Albury,17.1,26.4,0
-364,2009-11-29,Albury,12.8,22.3,9.4
-365,2009-11-30,Albury,13.2,23.9,2.4
-366,2009-12-01,Albury,12.3,23.6,0
-367,2009-12-02,Albury,10.6,27,0
-368,2009-12-03,Albury,11.4,31.5,0
-369,2009-12-04,Albury,12.3,27.5,0
-370,2009-12-05,Albury,10.7,26.7,0
-371,2009-12-06,Albury,11.1,30.7,0
-372,2009-12-07,Albury,13.4,31.9,0
-373,2009-12-08,Albury,18.2,24.9,0
-374,2009-12-09,Albury,9.2,25.4,1.2
-375,2009-12-10,Albury,14.2,27.4,0
-376,2009-12-11,Albury,9.2,22.6,1
-377,2009-12-12,Albury,9,26.5,0
-378,2009-12-13,Albury,11.8,29.6,0
-379,2009-12-14,Albury,13.6,32,0
-380,2009-12-15,Albury,13.1,34.7,0
-381,2009-12-16,Albury,14.6,38.6,0
-382,2009-12-17,Albury,14.5,40.3,0
-383,2009-12-18,Albury,12.2,26.4,3
-384,2009-12-19,Albury,11.1,29.2,0
-385,2009-12-20,Albury,12,31.3,0
-386,2009-12-21,Albury,12.7,33.7,0
-387,2009-12-22,Albury,15.1,36.6,0
-388,2009-12-23,Albury,18.1,38.2,0
-389,2009-12-24,Albury,22.9,34.6,0
-390,2009-12-25,Albury,18.8,28.3,9.8
-391,2009-12-26,Albury,17.1,31.3,0
-392,2009-12-27,Albury,17.6,27.3,0
-393,2009-12-28,Albury,17.8,35.9,0
-394,2009-12-29,Albury,18.7,35.9,0
-395,2009-12-30,Albury,19.8,36.8,0
-396,2009-12-31,Albury,21.1,33.2,0
-397,2010-01-01,Albury,19.4,31.9,5
-398,2010-01-02,Albury,18.6,29.1,12.4
-399,2010-01-03,Albury,12.2,29.7,0
-400,2010-01-04,Albury,14.8,32.8,0
-401,2010-01-05,Albury,15,35.8,0
-402,2010-01-06,Albury,16.3,33.8,0
-403,2010-01-07,Albury,15,33,0
-404,2010-01-08,Albury,17.4,36.4,0
-405,2010-01-09,Albury,19.6,39.8,0
-406,2010-01-10,Albury,20.6,42.2,0
-407,2010-01-11,Albury,21,42.2,0
-408,2010-01-12,Albury,24.5,42.4,0.2
-409,2010-01-13,Albury,22.6,28.4,0.4
-410,2010-01-14,Albury,15.7,31.7,3
-411,2010-01-15,Albury,17.2,36.3,0
-412,2010-01-16,Albury,21.8,36.6,0
-413,2010-01-17,Albury,16.8,25.6,0
-414,2010-01-18,Albury,10.5,22.6,0
-415,2010-01-19,Albury,8.7,25.2,0
-416,2010-01-20,Albury,11,32.9,0
-417,2010-01-21,Albury,15.4,37.3,0
-418,2010-01-22,Albury,19.2,41.8,0
-419,2010-01-23,Albury,24.7,35.4,0
-420,2010-01-24,Albury,14.4,33.7,0
-421,2010-01-25,Albury,14.3,35.8,0
-422,2010-01-26,Albury,15.1,35.9,0
-423,2010-01-27,Albury,17.7,36.4,0
-424,2010-01-28,Albury,15.2,34.4,0
-425,2010-01-29,Albury,16,35.2,0
-426,2010-01-30,Albury,18.9,36.5,0
-427,2010-01-31,Albury,21.7,36.3,0
-428,2010-02-01,Albury,21,38.2,0
-429,2010-02-02,Albury,17.8,34.3,8.6
-430,2010-02-03,Albury,17.9,35.6,0
-431,2010-02-04,Albury,23.5,32,0
-432,2010-02-05,Albury,19.2,26.1,52.2
-433,2010-02-06,Albury,19.5,30.3,5.6
-434,2010-02-07,Albury,20.3,33.9,0
-435,2010-02-08,Albury,23,34,0
-436,2010-02-09,Albury,22.1,35.1,0
-437,2010-02-10,Albury,21.7,35.6,NA
-438,2010-02-11,Albury,21.5,35,0
-439,2010-02-12,Albury,22.5,29.1,NA
-440,2010-02-13,Albury,20.8,27.1,0
-441,2010-02-14,Albury,20.5,30.3,0
-442,2010-02-15,Albury,17.8,26.8,0
-443,2010-02-16,Albury,17.6,29,0
-444,2010-02-17,Albury,15.5,30.6,0
-445,2010-02-18,Albury,NA,31.2,NA
-446,2010-02-19,Albury,16.4,30.3,0
-447,2010-02-20,Albury,15.7,31.8,0
-448,2010-02-21,Albury,19.6,34.7,0.6
-449,2010-02-22,Albury,20.2,26.4,3.6
-450,2010-02-23,Albury,12.5,26.1,0.2
-451,2010-02-24,Albury,12.8,28.5,0
-452,2010-02-25,Albury,15,31,0
-453,2010-02-26,Albury,17.2,NA,0
-454,2010-02-27,Albury,NA,26.3,NA
-455,2010-02-28,Albury,18.2,29.3,1.4
-456,2010-03-01,Albury,14.4,NA,0
-457,2010-03-02,Albury,11.2,28.5,NA
-458,2010-03-03,Albury,12.5,31.2,0
-459,2010-03-04,Albury,15.1,NA,0
-460,2010-03-05,Albury,NA,22.3,0
-461,2010-03-06,Albury,18.8,30.3,20.6
-462,2010-03-07,Albury,18.3,22.9,5.8
-463,2010-03-08,Albury,18.1,25.5,66
-464,2010-03-09,Albury,15.7,22.4,6.2
-465,2010-03-10,Albury,8.8,NA,0
-466,2010-03-11,Albury,12.3,24.4,NA
-467,2010-03-12,Albury,10.6,25,0
-468,2010-03-13,Albury,11.5,25.7,0
-469,2010-03-14,Albury,12.2,26.3,0
-470,2010-03-15,Albury,13.2,26.6,0
-471,2010-03-16,Albury,12.5,28.6,0
-472,2010-03-17,Albury,13.3,29.6,0
-473,2010-03-18,Albury,15.1,30.4,0
-474,2010-03-19,Albury,14.9,31.4,0
-475,2010-03-20,Albury,16.7,31.9,0
-476,2010-03-21,Albury,16.8,25.6,0
-477,2010-03-22,Albury,9.1,25.3,0
-478,2010-03-23,Albury,8.3,27,0
-479,2010-03-24,Albury,10.5,28.8,0
-480,2010-03-25,Albury,11.6,29.6,0
-481,2010-03-26,Albury,12.6,30,0
-482,2010-03-27,Albury,15.6,30.2,0
-483,2010-03-28,Albury,17.2,28.7,0
-484,2010-03-29,Albury,18.2,26.3,11
-485,2010-03-30,Albury,16.5,26.9,0.4
-486,2010-03-31,Albury,13.4,26.1,0
-487,2010-04-01,Albury,11.6,25.8,0
-488,2010-04-02,Albury,10,25.1,0
-489,2010-04-03,Albury,12.4,24.8,0
-490,2010-04-04,Albury,12.5,24.8,0
-491,2010-04-05,Albury,10.3,25.3,0
-492,2010-04-06,Albury,10.6,24.7,0
-493,2010-04-07,Albury,15.7,23.4,3
-494,2010-04-08,Albury,13.5,23.1,3.2
-495,2010-04-09,Albury,10.1,21.9,0
-496,2010-04-10,Albury,14.1,18.6,0.2
-497,2010-04-11,Albury,14.2,18.7,7
-498,2010-04-12,Albury,5.6,17.4,0
-499,2010-04-13,Albury,4.6,19.9,0
-500,2010-04-14,Albury,5.1,21.9,0
-501,2010-04-15,Albury,6.1,23.5,0
-502,2010-04-16,Albury,7.7,24.7,0
-503,2010-04-17,Albury,8.5,25.4,0
-504,2010-04-18,Albury,10.1,25.1,0
-505,2010-04-19,Albury,11.2,25.9,0
-506,2010-04-20,Albury,11.8,25.2,0
-507,2010-04-21,Albury,12.3,27.5,0
-508,2010-04-22,Albury,11.4,27.3,0
-509,2010-04-23,Albury,11.3,29,0
-510,2010-04-24,Albury,15.4,19.8,3.6
-511,2010-04-25,Albury,10.8,18.5,17
-512,2010-04-26,Albury,5.1,17.9,0
-513,2010-04-27,Albury,7.1,16.1,0
-514,2010-04-28,Albury,9.7,17.3,1.6
-515,2010-04-29,Albury,10.5,17.7,0.4
-516,2010-04-30,Albury,5.6,19.1,0
-517,2010-05-01,Albury,5.9,21.1,0.2
-518,2010-05-02,Albury,4.8,20.7,0
-519,2010-05-03,Albury,6.8,23,0
-520,2010-05-04,Albury,8,25.3,0.2
-521,2010-05-05,Albury,8.9,14.5,3
-522,2010-05-06,Albury,7.1,15.3,0
-523,2010-05-07,Albury,5.7,17.5,0
-524,2010-05-08,Albury,9.6,19.3,0
-525,2010-05-09,Albury,5.7,19.5,0
-526,2010-05-10,Albury,5,19.8,0
-527,2010-05-11,Albury,3,15.6,0
-528,2010-05-12,Albury,1.3,14.9,0
-529,2010-05-13,Albury,1,17.1,0
-530,2010-05-14,Albury,3.1,17.7,0.2
-531,2010-05-15,Albury,2.2,18.4,0
-532,2010-05-16,Albury,1.7,17.5,0
-533,2010-05-17,Albury,4.5,17,0
-534,2010-05-18,Albury,1.6,19.7,0
-535,2010-05-19,Albury,1.4,18.5,0
-536,2010-05-20,Albury,2.1,16.5,0
-537,2010-05-21,Albury,1.7,17.9,0
-538,2010-05-22,Albury,1.1,17.1,0
-539,2010-05-23,Albury,0.9,18.1,0
-540,2010-05-24,Albury,5.2,16.3,0
-541,2010-05-25,Albury,10.2,14.9,10.4
-542,2010-05-26,Albury,8.4,19,13.4
-543,2010-05-27,Albury,5.7,16.6,0.2
-544,2010-05-28,Albury,6.4,17,0
-545,2010-05-29,Albury,9.4,15,28
-546,2010-05-30,Albury,8.8,20.2,5.8
-547,2010-05-31,Albury,10.7,19.1,0
-548,2010-06-01,Albury,4.2,16.6,0
-549,2010-06-02,Albury,4.3,17.7,0
-550,2010-06-03,Albury,3.4,17.7,0
-551,2010-06-04,Albury,3.1,18.4,0
-552,2010-06-05,Albury,1.7,10.2,0
-553,2010-06-06,Albury,5,15.8,0
-554,2010-06-07,Albury,0.4,14,0
-555,2010-06-08,Albury,3.1,12.2,0
-556,2010-06-09,Albury,5.3,8.4,0
-557,2010-06-10,Albury,4.9,12.9,2.4
-558,2010-06-11,Albury,7.2,13.2,0
-559,2010-06-12,Albury,0,13.3,0
-560,2010-06-13,Albury,-1,13.1,0
-561,2010-06-14,Albury,-2,13.2,0
-562,2010-06-15,Albury,-0.3,12.8,0
-563,2010-06-16,Albury,1.5,15.5,0
-564,2010-06-17,Albury,7.4,16.2,11.6
-565,2010-06-18,Albury,3,12.2,2.2
-566,2010-06-19,Albury,6.9,15.2,1.8
-567,2010-06-20,Albury,3.6,13.1,0
-568,2010-06-21,Albury,5,12.5,0.4
-569,2010-06-22,Albury,3,14.8,0
-570,2010-06-23,Albury,3.5,16.5,0
-571,2010-06-24,Albury,3.4,17,0
-572,2010-06-25,Albury,7,16.1,0
-573,2010-06-26,Albury,6.2,12.1,10.2
-574,2010-06-27,Albury,0.6,11.9,0.2
-575,2010-06-28,Albury,-0.6,8.3,0
-576,2010-06-29,Albury,2.3,9.4,0
-577,2010-06-30,Albury,5.1,9.8,0.2
-578,2010-07-01,Albury,3.2,11.9,1.2
-579,2010-07-02,Albury,0.2,10.9,0.2
-580,2010-07-03,Albury,1,10.3,0
-581,2010-07-04,Albury,1.5,10.8,0
-582,2010-07-05,Albury,1.8,12.1,0.2
-583,2010-07-06,Albury,2.3,13.9,5.6
-584,2010-07-07,Albury,1.5,13.5,0
-585,2010-07-08,Albury,2.1,14.8,0.4
-586,2010-07-09,Albury,0,14.6,0
-587,2010-07-10,Albury,1.5,16.1,0
-588,2010-07-11,Albury,5,15.4,13.4
-589,2010-07-12,Albury,3.5,15.3,0.2
-590,2010-07-13,Albury,3.5,16.3,0
-591,2010-07-14,Albury,6.2,10,21.4
-592,2010-07-15,Albury,3.4,12.2,11
-593,2010-07-16,Albury,0.6,13.1,0
-594,2010-07-17,Albury,-0.4,11.5,0
-595,2010-07-18,Albury,0.7,12.8,0
-596,2010-07-19,Albury,5,13.5,1.6
-597,2010-07-20,Albury,0.5,11.6,0.2
-598,2010-07-21,Albury,0.6,12.9,0
-599,2010-07-22,Albury,-0.5,13.8,0
-600,2010-07-23,Albury,0.1,15.7,0
-601,2010-07-24,Albury,1,14.6,0
-602,2010-07-25,Albury,2.5,14.3,0.2
-603,2010-07-26,Albury,1.9,14.9,0.2
-604,2010-07-27,Albury,-1.2,15,0.2
-605,2010-07-28,Albury,2.1,12.6,0
-606,2010-07-29,Albury,5.8,14.8,6.2
-607,2010-07-30,Albury,8.9,14.9,0
-608,2010-07-31,Albury,7.5,12.3,2.2
-609,2010-08-01,Albury,7.5,10.1,4.2
-610,2010-08-02,Albury,5.4,14.7,18.6
-611,2010-08-03,Albury,1.2,15.7,0
-612,2010-08-04,Albury,1.2,9.6,0
-613,2010-08-05,Albury,NA,11.8,NA
-614,2010-08-06,Albury,0.7,12.6,0.2
-615,2010-08-07,Albury,-0.6,13.1,0.2
-616,2010-08-08,Albury,-1.3,12.6,0
-617,2010-08-09,Albury,0.3,15.5,0
-618,2010-08-10,Albury,4.4,16,7.2
-619,2010-08-11,Albury,7.2,10.4,8.2
-620,2010-08-12,Albury,4.5,14.9,10.8
-621,2010-08-13,Albury,1.6,15,0
-622,2010-08-14,Albury,3.2,13,0
-623,2010-08-15,Albury,7.2,12.1,1.8
-624,2010-08-16,Albury,6.4,11.8,10.2
-625,2010-08-17,Albury,-1,12.1,3.8
-626,2010-08-18,Albury,1.3,11.8,0.2
-627,2010-08-19,Albury,5,15.1,15.4
-628,2010-08-20,Albury,4.5,11.7,2
-629,2010-08-21,Albury,6.3,12.9,0
-630,2010-08-22,Albury,2.1,15.3,0.2
-631,2010-08-23,Albury,4.1,12.8,0.2
-632,2010-08-24,Albury,6.4,13.3,1.8
-633,2010-08-25,Albury,4.2,10.7,1.8
-634,2010-08-26,Albury,5.4,11.8,9.6
-635,2010-08-27,Albury,6.8,13.4,4
-636,2010-08-28,Albury,0.9,14.4,0
-637,2010-08-29,Albury,1.9,15.2,0
-638,2010-08-30,Albury,2.3,15.4,0
-639,2010-08-31,Albury,2.9,14.2,0
-640,2010-09-01,Albury,7.1,15.1,0
-641,2010-09-02,Albury,10,16.8,0.8
-642,2010-09-03,Albury,7.1,17.6,0
-643,2010-09-04,Albury,10.1,17.7,21.8
-644,2010-09-05,Albury,9.8,14.2,20.8
-645,2010-09-06,Albury,6.8,12.8,2.4
-646,2010-09-07,Albury,2.3,15.1,1.2
-647,2010-09-08,Albury,1.7,15.9,0
-648,2010-09-09,Albury,7.2,14.7,0
-649,2010-09-10,Albury,8.1,14,24.8
-650,2010-09-11,Albury,2.6,15.9,3.2
-651,2010-09-12,Albury,4.5,16.3,0
-652,2010-09-13,Albury,6,18.7,0.4
-653,2010-09-14,Albury,5.8,19,0
-654,2010-09-15,Albury,5.5,13.6,0
-655,2010-09-16,Albury,7.5,13.4,0
-656,2010-09-17,Albury,4.3,14.3,0.2
-657,2010-09-18,Albury,3.3,13.9,0
-658,2010-09-19,Albury,2.4,16.4,0
-659,2010-09-20,Albury,2.8,18.7,0
-660,2010-09-21,Albury,5,19.6,0
-661,2010-09-22,Albury,8.6,20.1,0
-662,2010-09-23,Albury,5.7,19.9,0
-663,2010-09-24,Albury,3.7,19.1,0
-664,2010-09-25,Albury,5.6,19.7,0
-665,2010-09-26,Albury,5.4,20.6,0
-666,2010-09-27,Albury,6.5,20,0
-667,2010-09-28,Albury,5.4,14.6,0
-668,2010-09-29,Albury,3.7,14.3,0
-669,2010-09-30,Albury,-0.1,14.6,0
-670,2010-10-01,Albury,4.1,17.4,0
-671,2010-10-02,Albury,4.8,21.1,0
-672,2010-10-03,Albury,7.4,23,0
-673,2010-10-04,Albury,8.2,23.2,0
-674,2010-10-05,Albury,10.1,25.9,0
-675,2010-10-06,Albury,11.1,24.9,0
-676,2010-10-07,Albury,7.3,15.9,10
-677,2010-10-08,Albury,4.2,19,0
-678,2010-10-09,Albury,5.4,20.8,0
-679,2010-10-10,Albury,8.2,23.2,0
-680,2010-10-11,Albury,7.6,23.7,0
-681,2010-10-12,Albury,14.5,19.9,0.8
-682,2010-10-13,Albury,14.7,18,11.4
-683,2010-10-14,Albury,12.7,19.1,19
-684,2010-10-15,Albury,13.8,18.6,22.2
-685,2010-10-16,Albury,4.8,12.8,32.8
-686,2010-10-17,Albury,6.3,15.4,0
-687,2010-10-18,Albury,9.2,17.4,0
-688,2010-10-19,Albury,4.8,19,0
-689,2010-10-20,Albury,5.7,21.8,0
-690,2010-10-21,Albury,8,23.3,0
-691,2010-10-22,Albury,9.5,25.8,0
-692,2010-10-23,Albury,14.8,19,0.4
-693,2010-10-24,Albury,8.2,22.2,2.4
-694,2010-10-25,Albury,10.9,22.2,0
-695,2010-10-26,Albury,8.8,23.5,0
-696,2010-10-27,Albury,10.2,22.3,1.6
-697,2010-10-28,Albury,8.8,23.6,0
-698,2010-10-29,Albury,10.3,25.6,0
-699,2010-10-30,Albury,16,19.5,3.4
-700,2010-10-31,Albury,13.8,18.7,50.8
-701,2010-11-01,Albury,10.2,18.9,1.2
-702,2010-11-02,Albury,7.1,20.3,0
-703,2010-11-03,Albury,10.7,18,0
-704,2010-11-04,Albury,10.1,18.8,0
-705,2010-11-05,Albury,11.1,21,0
-706,2010-11-06,Albury,7.5,22.9,0
-707,2010-11-07,Albury,9.3,24.5,0
-708,2010-11-08,Albury,14.7,24.7,2.2
-709,2010-11-09,Albury,11.6,27.7,0
-710,2010-11-10,Albury,15.5,29,0
-711,2010-11-11,Albury,15.2,30.5,0.6
-712,2010-11-12,Albury,17.5,31.3,0
-713,2010-11-13,Albury,21.1,26.9,0
-714,2010-11-14,Albury,19.2,22.6,52.6
-715,2010-11-15,Albury,15.9,23.1,2.4
-716,2010-11-16,Albury,11.4,20.8,0
-717,2010-11-17,Albury,8.8,23.3,0
-718,2010-11-18,Albury,9.1,24.8,0
-719,2010-11-19,Albury,12.1,25.5,0
-720,2010-11-20,Albury,12,27.3,0
-721,2010-11-21,Albury,12.7,29.7,0
-722,2010-11-22,Albury,14.7,29.9,0
-723,2010-11-23,Albury,14.8,29.4,0
-724,2010-11-24,Albury,18.1,30.1,0
-725,2010-11-25,Albury,18.9,27.6,0
-726,2010-11-26,Albury,17.9,24.2,4
-727,2010-11-27,Albury,14.8,27.6,19.2
-728,2010-11-28,Albury,17.8,21.4,18.8
-729,2010-11-29,Albury,13.6,22.6,14.8
-730,2010-11-30,Albury,14.4,23.3,1.6
-731,2010-12-01,Albury,16.7,23.9,12
-732,2010-12-02,Albury,16.1,26.6,0.6
-733,2010-12-03,Albury,15.7,27.3,18.4
-734,2010-12-04,Albury,17.3,29.9,1.2
-735,2010-12-05,Albury,16.6,31.6,0
-736,2010-12-06,Albury,18.9,30.4,0
-737,2010-12-07,Albury,21.3,29.8,0
-738,2010-12-08,Albury,20.3,29.7,3.2
-739,2010-12-09,Albury,18,26.7,25.6
-740,2010-12-10,Albury,16.7,22.5,0
-741,2010-12-11,Albury,11.2,24.3,0
-742,2010-12-12,Albury,15,22.2,0
-743,2010-12-13,Albury,10.5,26.2,0
-744,2010-12-14,Albury,13.7,28.8,0
-745,2010-12-15,Albury,16.1,31.1,0
-746,2010-12-16,Albury,15.1,25.6,0.4
-747,2010-12-17,Albury,10.3,25.9,0
-748,2010-12-18,Albury,14,20.8,1
-749,2010-12-19,Albury,10.4,18,3
-750,2010-12-20,Albury,8.6,20.5,6.2
-751,2010-12-21,Albury,9.9,21.2,1.6
-752,2010-12-22,Albury,9.4,25.9,0
-753,2010-12-23,Albury,12.3,29.2,0
-754,2010-12-24,Albury,13.9,30.8,0
-755,2010-12-25,Albury,19.3,29.1,0
-756,2010-12-26,Albury,17.5,30,1
-757,2010-12-27,Albury,11.3,22.2,0
-758,2010-12-28,Albury,9.1,26.7,0
-759,2010-12-29,Albury,13.5,31,0
-760,2010-12-30,Albury,14.8,34,0
-761,2010-12-31,Albury,15.7,38.1,0
-762,2011-01-01,Albury,23.2,35.8,0
-763,2011-01-02,Albury,20.1,31.1,0.6
-764,2011-01-03,Albury,13.6,29.4,0
-765,2011-01-04,Albury,13.9,29.2,0
-766,2011-01-05,Albury,16,28.9,0
-767,2011-01-06,Albury,16.5,31.6,0
-768,2011-01-07,Albury,16.1,30.7,0
-769,2011-01-08,Albury,17.8,32,0
-770,2011-01-09,Albury,20.1,33,0
-771,2011-01-10,Albury,20.1,32,35
-772,2011-01-11,Albury,21.6,26.4,1.4
-773,2011-01-12,Albury,21.5,28.9,5
-774,2011-01-13,Albury,22.1,30.6,14.2
-775,2011-01-14,Albury,24,25.5,2.4
-776,2011-01-15,Albury,19.9,31.4,13.8
-777,2011-01-16,Albury,18.5,33.7,0
-778,2011-01-17,Albury,19.8,26.9,0
-779,2011-01-18,Albury,12.9,27.2,0
-780,2011-01-19,Albury,12.9,29.3,0
-781,2011-01-20,Albury,16.1,31.9,0
-782,2011-01-21,Albury,17.8,32.5,0
-783,2011-01-22,Albury,19.8,34.6,0
-784,2011-01-23,Albury,20.7,31.4,0
-785,2011-01-24,Albury,19.8,30.6,0
-786,2011-01-25,Albury,14.9,32,0
-787,2011-01-26,Albury,21.1,34.4,0
-788,2011-01-27,Albury,14.3,31.6,0
-789,2011-01-28,Albury,12.6,32.3,0
-790,2011-01-29,Albury,14.5,32,0
-791,2011-01-30,Albury,16.7,35.4,0
-792,2011-01-31,Albury,19.9,38.2,0
-793,2011-02-01,Albury,20.5,39.8,0
-794,2011-02-02,Albury,21.9,33.7,0
-795,2011-02-03,Albury,21.9,36,3.4
-796,2011-02-04,Albury,22.5,28.2,2.6
-797,2011-02-05,Albury,20.4,23,99.2
-798,2011-02-06,Albury,14.7,21.5,51
-799,2011-02-07,Albury,10.8,25.5,0
-800,2011-02-08,Albury,13.4,27.3,0
-801,2011-02-09,Albury,15,29.4,0
-802,2011-02-10,Albury,17,29.7,0
-803,2011-02-11,Albury,19.8,24.8,39.8
-804,2011-02-12,Albury,18.7,28.5,28.2
-805,2011-02-13,Albury,15.1,28.6,0
-806,2011-02-14,Albury,14.5,29.2,0
-807,2011-02-15,Albury,16.4,28,0
-808,2011-02-16,Albury,18.9,22,0.2
-809,2011-02-17,Albury,18.9,29.2,5.8
-810,2011-02-18,Albury,19.3,30.7,0
-811,2011-02-19,Albury,21.7,29,12.2
-812,2011-02-20,Albury,16.7,25.7,12.8
-813,2011-02-21,Albury,10.1,22.5,0
-814,2011-02-22,Albury,12.3,25.2,0
-815,2011-02-23,Albury,12.6,28,0.2
-816,2011-02-24,Albury,13.9,29.2,0
-817,2011-02-25,Albury,16.5,29.8,0
-818,2011-02-26,Albury,15.6,30.9,0
-819,2011-02-27,Albury,19.6,24.8,0.2
-820,2011-02-28,Albury,17.9,30,11.8
-821,2011-03-01,Albury,16,22.8,0
-822,2011-03-02,Albury,8.8,23.4,0
-823,2011-03-03,Albury,8.4,22.3,0
-824,2011-03-04,Albury,8.6,22.1,0
-825,2011-03-05,Albury,11.5,25,0
-826,2011-03-06,Albury,9.6,25.3,0
-827,2011-03-07,Albury,10.6,26.6,0
-828,2011-03-08,Albury,11.4,28.7,0
-829,2011-03-09,Albury,16.8,27,0
-830,2011-03-10,Albury,18.7,20.8,13.4
-831,2011-03-11,Albury,16.8,27,10.2
-832,2011-03-12,Albury,17.2,28.2,0.6
-833,2011-03-13,Albury,19.6,29.3,0.6
-834,2011-03-14,Albury,18.2,26.9,19.8
-835,2011-03-15,Albury,16.3,28.4,0.2
-836,2011-03-16,Albury,17.1,28.2,0.4
-837,2011-03-17,Albury,12.1,25.9,0.2
-838,2011-03-18,Albury,12.8,26.3,0
-839,2011-03-19,Albury,13.3,27.4,0
-840,2011-03-20,Albury,13.9,28.1,0
-841,2011-03-21,Albury,18.2,25.9,0
-842,2011-03-22,Albury,18.6,26.8,0
-843,2011-03-23,Albury,16.3,20.1,0
-844,2011-03-24,Albury,13.9,22,8
-845,2011-03-25,Albury,13.3,22.1,0
-846,2011-03-26,Albury,9.6,24.2,0
-847,2011-03-27,Albury,9.8,23,0
-848,2011-03-28,Albury,10.2,24.7,0
-849,2011-03-29,Albury,11.5,25.7,0
-850,2011-03-30,Albury,12.3,25.8,0
-851,2011-03-31,Albury,7.2,22.1,0.2
-852,2011-05-01,Albury,8.7,20.4,0
-853,2011-05-02,Albury,12.3,22.3,0
-854,2011-05-03,Albury,9,21.9,0
-855,2011-05-04,Albury,6.7,19,0.6
-856,2011-05-05,Albury,4.4,18.1,0.2
-857,2011-05-06,Albury,2.8,16.8,0
-858,2011-05-07,Albury,3.4,15.9,0
-859,2011-05-08,Albury,2.1,16.8,0
-860,2011-05-09,Albury,3.8,16.1,0
-861,2011-05-10,Albury,1.1,15.2,0
-862,2011-05-11,Albury,3,11,3.6
-863,2011-05-12,Albury,0.2,10.1,0.4
-864,2011-05-13,Albury,3.8,14.1,5
-865,2011-05-14,Albury,3.8,14.3,1.8
-866,2011-05-15,Albury,-0.7,13.7,0
-867,2011-05-16,Albury,0.8,11.2,0
-868,2011-05-17,Albury,0.5,15.8,0
-869,2011-05-18,Albury,2.3,17.9,0
-870,2011-05-19,Albury,2.7,16,0
-871,2011-05-20,Albury,4.5,18.6,0
-872,2011-05-21,Albury,3.3,20.5,0
-873,2011-05-22,Albury,5.8,22,0
-874,2011-05-23,Albury,10.2,15,17.4
-875,2011-05-24,Albury,8.9,15.6,3.6
-876,2011-05-25,Albury,3.1,14.7,0
-877,2011-05-26,Albury,1.3,14.9,0
-878,2011-05-27,Albury,1.9,13.8,0
-879,2011-05-28,Albury,2.6,13.9,0
-880,2011-05-29,Albury,2.5,14.8,0
-881,2011-05-30,Albury,3.6,15.9,0
-882,2011-05-31,Albury,2.8,19.4,0
-883,2011-06-01,Albury,3.1,19.8,0
-884,2011-06-02,Albury,2.9,17.6,0
-885,2011-06-03,Albury,4.3,18.3,0
-886,2011-06-04,Albury,8.5,14.8,8.8
-887,2011-06-05,Albury,2.2,12,0
-888,2011-06-06,Albury,4.9,12.8,2
-889,2011-06-07,Albury,-0.5,9.8,0
-890,2011-06-08,Albury,1.5,10.2,2.6
-891,2011-06-09,Albury,2.9,14.6,0
-892,2011-06-10,Albury,-1.1,14,0
-893,2011-06-11,Albury,-1.4,13.9,0
-894,2011-06-12,Albury,1,16.1,0.2
-895,2011-06-13,Albury,-0.3,15.9,0
-896,2011-06-14,Albury,1.7,16.7,0
-897,2011-06-15,Albury,0.5,16.9,0
-898,2011-06-16,Albury,1,16.1,0
-899,2011-06-17,Albury,3,12.6,1
-900,2011-06-18,Albury,5.7,12.5,0.2
-901,2011-06-19,Albury,3.3,11.8,0
-902,2011-06-20,Albury,7.6,14.6,3.6
-903,2011-06-21,Albury,6.6,11.6,10.6
-904,2011-06-22,Albury,5.9,11.1,0.6
-905,2011-06-23,Albury,6.2,14.2,3.4
-906,2011-06-24,Albury,2.9,13.1,0
-907,2011-06-25,Albury,5.5,15.5,0.4
-908,2011-06-26,Albury,3.2,15.7,0
-909,2011-06-27,Albury,0.9,16.4,0
-910,2011-06-28,Albury,-0.2,15.2,0
-911,2011-06-29,Albury,0.9,16.6,0
-912,2011-06-30,Albury,0.3,15.2,0
-913,2011-07-01,Albury,0.3,14.1,0
-914,2011-07-02,Albury,0.2,15.2,0
-915,2011-07-03,Albury,2.9,14.8,0
-916,2011-07-04,Albury,6.3,14.8,15.4
-917,2011-07-05,Albury,6.9,11.2,3.8
-918,2011-07-06,Albury,7,10.8,1.2
-919,2011-07-07,Albury,6.8,11.2,4.4
-920,2011-07-08,Albury,-0.5,8.3,0
-921,2011-07-09,Albury,4.3,9.2,4.2
-922,2011-07-10,Albury,6.4,11,0
-923,2011-07-11,Albury,4.7,11.8,6.6
-924,2011-07-12,Albury,5.7,10.5,0
-925,2011-07-13,Albury,7.1,9.8,0
-926,2011-07-14,Albury,-0.3,12.6,4
-927,2011-07-15,Albury,-1.6,12.1,0
-928,2011-07-16,Albury,0.2,14.1,0
-929,2011-07-17,Albury,5.3,11.1,0
-930,2011-07-18,Albury,8.4,11,8.8
-931,2011-07-19,Albury,0.4,14.5,1.8
-932,2011-07-20,Albury,0.3,16.7,0.2
-933,2011-07-21,Albury,3.5,17.2,0
-934,2011-07-22,Albury,6.9,15.6,0
-935,2011-07-23,Albury,0.1,14.6,0
-936,2011-07-24,Albury,1.6,9.3,0.2
-937,2011-07-25,Albury,5.5,13.2,16.2
-938,2011-07-26,Albury,4.1,14.1,2.2
-939,2011-07-27,Albury,0.5,14.5,0
-940,2011-07-28,Albury,0.2,13.1,0
-941,2011-07-29,Albury,-1.4,14.7,0
-942,2011-07-30,Albury,0.6,16.1,0.2
-943,2011-07-31,Albury,4.9,14.7,1
-944,2011-08-01,Albury,3.4,19,0
-945,2011-08-02,Albury,6.5,20.6,0
-946,2011-08-03,Albury,3.9,21.5,0.2
-947,2011-08-04,Albury,7.1,22.9,0
-948,2011-08-05,Albury,5.6,20.7,0
-949,2011-08-06,Albury,9.9,12.9,14.6
-950,2011-08-07,Albury,5.3,11.1,4.2
-951,2011-08-08,Albury,7.1,12.3,8.2
-952,2011-08-09,Albury,3.1,10.1,1.2
-953,2011-08-10,Albury,6.3,10.9,3.6
-954,2011-08-11,Albury,3.4,16.8,2.8
-955,2011-08-12,Albury,1.6,16.3,0
-956,2011-08-13,Albury,0.7,13.4,0
-957,2011-08-14,Albury,4.3,17.3,0
-958,2011-08-15,Albury,3.9,13.8,1.2
-959,2011-08-16,Albury,9,19.4,0.2
-960,2011-08-17,Albury,7.1,12.6,5.6
-961,2011-08-18,Albury,7.4,10.8,30.8
-962,2011-08-19,Albury,6.9,19.3,0.8
-963,2011-08-20,Albury,3.2,17.3,0
-964,2011-08-21,Albury,2.1,18,0
-965,2011-08-22,Albury,1.8,17.7,0
-966,2011-08-23,Albury,2.5,16.9,0
-967,2011-08-24,Albury,2.4,17.5,0
-968,2011-08-25,Albury,2.5,20.7,0
-969,2011-08-26,Albury,1.9,16.6,0
-970,2011-08-27,Albury,0.8,16.8,0
-971,2011-08-28,Albury,0.4,16.2,0
-972,2011-08-29,Albury,1.4,15.9,0
-973,2011-08-30,Albury,0.6,15.7,0
-974,2011-08-31,Albury,0.4,15.8,0
-975,2011-09-01,Albury,2.6,18.3,0
-976,2011-09-02,Albury,2.8,20.4,0
-977,2011-09-03,Albury,2.6,19.6,0
-978,2011-09-04,Albury,6.5,16.8,0
-979,2011-09-05,Albury,4.8,21.4,3.2
-980,2011-09-06,Albury,10.8,18.8,5
-981,2011-09-07,Albury,-0.1,14.4,1
-982,2011-09-08,Albury,0.4,15.9,0
-983,2011-09-09,Albury,2.7,14,0
-984,2011-09-10,Albury,4,NA,0.2
-985,2011-09-11,Albury,NA,NA,NA
-986,2011-09-12,Albury,NA,NA,NA
-987,2011-09-13,Albury,NA,15.8,NA
-988,2011-09-14,Albury,0.9,20.8,NA
-989,2011-09-15,Albury,1.7,17.2,0
-990,2011-09-16,Albury,4.4,20.8,0
-991,2011-09-17,Albury,3.7,21.7,0
-992,2011-09-18,Albury,5.5,23.9,0
-993,2011-09-19,Albury,5.3,26.7,0
-994,2011-09-20,Albury,10.1,13.6,1
-995,2011-09-21,Albury,1.7,18.2,3.6
-996,2011-09-22,Albury,4.4,22.1,0
-997,2011-09-23,Albury,10,18.4,0
-998,2011-09-24,Albury,1.9,18.3,0
-999,2011-09-25,Albury,8.6,19.8,1
-1000,2011-09-26,Albury,3.1,19.6,0
\ No newline at end of file
diff --git a/fda-table-service/rest-service/src/test/java/at/tuwien/mapper/TableMapperUnitTest.java b/fda-table-service/rest-service/src/test/java/at/tuwien/mapper/TableMapperUnitTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..e74e90c1679ab8d5408828f720aa4e3c4d9657e9
--- /dev/null
+++ b/fda-table-service/rest-service/src/test/java/at/tuwien/mapper/TableMapperUnitTest.java
@@ -0,0 +1,45 @@
+package at.tuwien.mapper;
+
+import at.tuwien.BaseUnitTest;
+import at.tuwien.config.ReadyConfig;
+import com.rabbitmq.client.Channel;
+import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import java.sql.SQLException;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
+@SpringBootTest
+@Log4j2
+@ExtendWith(SpringExtension.class)
+public class TableMapperUnitTest extends BaseUnitTest {
+
+ @MockBean
+ private Channel channel;
+
+ @MockBean
+ private ReadyConfig readyConfig;
+
+ @Autowired
+ private Properties postgresProperties;
+
+ @Autowired
+ private TableMapper tableMapper;
+
+ @Test
+ public void tableColumn_succeeds() throws SQLException {
+
+ /* test */
+ fail();
+ }
+
+}
diff --git a/fda-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java b/fda-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java
index c25457487645b2870e500b34caaa9c59fdc856c7..1a2c90a6030febaf73effbb7c2c9a3e7d9e4ec53 100644
--- a/fda-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java
+++ b/fda-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java
@@ -2,6 +2,8 @@ package at.tuwien.service;
import at.tuwien.BaseUnitTest;
import at.tuwien.api.database.table.TableCreateDto;
+import at.tuwien.api.database.table.columns.ColumnCreateDto;
+import at.tuwien.api.database.table.columns.ColumnTypeDto;
import at.tuwien.config.DockerConfig;
import at.tuwien.config.MariaDbConfig;
import at.tuwien.config.ReadyConfig;
@@ -34,11 +36,14 @@ import org.springframework.transaction.annotation.Transactional;
import java.io.File;
import java.sql.SQLException;
import java.util.Arrays;
+import java.util.List;
import java.util.Objects;
+import java.util.Optional;
import static at.tuwien.config.DockerConfig.dockerClient;
import static at.tuwien.config.DockerConfig.hostConfig;
import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.when;
@Log4j2
@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
@@ -126,7 +131,7 @@ public class TableServiceIntegrationTest extends BaseUnitTest {
}
@Test
- public void create_table_succeeds() throws ArbitraryPrimaryKeysException, DatabaseNotFoundException,
+ public void createTable_succeeds() throws ArbitraryPrimaryKeysException, DatabaseNotFoundException,
ImageNotSupportedException, DataProcessingException, TableMalformedException, InterruptedException, SQLException {
final TableCreateDto request = TableCreateDto.builder()
.name(TABLE_2_NAME)
@@ -147,6 +152,47 @@ public class TableServiceIntegrationTest extends BaseUnitTest {
assertEquals(COLUMNS_CSV01.length, response.getColumns().size());
}
+ /**
+ * TODO https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues/99
+ *
+ * When creating a table (POST /database/1/table) with columns of these types, I get this error:
+ *
+ * type: "STRING", name: "username"
+ * type: "BLOB"
+ */
+ @Test
+ public void createTable_text_pk_succeeds() throws InterruptedException, SQLException, TableMalformedException,
+ ArbitraryPrimaryKeysException, DatabaseNotFoundException, ImageNotSupportedException,
+ DataProcessingException {
+ final TableCreateDto request = TableCreateDto.builder()
+ .name("Issue 99")
+ .description("Related to issue 99")
+ .columns(new ColumnCreateDto[]{
+ ColumnCreateDto.builder()
+ .name("username")
+ .nullAllowed(false)
+ .type(ColumnTypeDto.TEXT)
+ .unique(true)
+ .primaryKey(true)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("data")
+ .nullAllowed(true)
+ .type(ColumnTypeDto.BLOB)
+ .unique(false)
+ .primaryKey(false)
+ .build()
+ })
+ .build();
+
+ /* start */
+ DockerConfig.startContainer(CONTAINER_1);
+ MariaDbConfig.clearDatabase(TABLE_1);
+
+ /* test */
+ tableService.createTable(DATABASE_1_ID, request);
+ }
+
@Test
public void delete_succeeds() throws TableNotFoundException, DatabaseNotFoundException, ImageNotSupportedException,
DataProcessingException, InterruptedException, SQLException {
@@ -159,4 +205,18 @@ public class TableServiceIntegrationTest extends BaseUnitTest {
tableService.deleteTable(DATABASE_1_ID, TABLE_1_ID);
}
+ @Test
+ public void createTable_issue106_fails() {
+ final TableCreateDto request = TableCreateDto.builder()
+ .name("Table")
+ .description(TABLE_2_DESCRIPTION)
+ .columns(COLUMNS_CSV01)
+ .build();
+
+ /* test */
+ assertThrows(TableMalformedException.class, () -> {
+ tableService.createTable(DATABASE_1_ID, request);
+ });
+ }
+
}
diff --git a/fda-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java b/fda-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
index 7a81cd0551dc993dba222a48d11e1311ab5cb4ef..439286958b1f286b82e23d053755631c71e906e5 100644
--- a/fda-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
+++ b/fda-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
@@ -1,6 +1,7 @@
package at.tuwien.service;
import at.tuwien.BaseUnitTest;
+import at.tuwien.api.database.table.TableCreateDto;
import at.tuwien.api.database.table.TableCsvDto;
import at.tuwien.api.database.table.TableInsertDto;
import at.tuwien.config.ReadyConfig;
@@ -171,6 +172,58 @@ public class TableServiceUnitTest extends BaseUnitTest {
assertEquals(1001, response.getData().size());
}
+ @Test
+ public void createTable_issue106_fails() {
+ final TableCreateDto request = TableCreateDto.builder()
+ .name("Table")
+ .description(TABLE_2_DESCRIPTION)
+ .columns(COLUMNS_CSV01)
+ .build();
+
+ /* mock */
+ when(databaseRepository.findById(DATABASE_1_ID))
+ .thenReturn(Optional.of(DATABASE_1));
+
+ /* test */
+ assertThrows(TableMalformedException.class, () -> {
+ tableService.createTable(DATABASE_1_ID, request);
+ });
+ }
+
+ @Test
+ public void createTable_emptyName_fails() {
+ final TableCreateDto request = TableCreateDto.builder()
+ .name("")
+ .description(TABLE_2_DESCRIPTION)
+ .columns(COLUMNS_CSV01)
+ .build();
+
+ /* mock */
+ when(databaseRepository.findById(DATABASE_1_ID))
+ .thenReturn(Optional.of(DATABASE_1));
+
+ /* test */
+ assertThrows(TableMalformedException.class, () -> {
+ tableService.createTable(DATABASE_1_ID, request);
+ });
+ }
+
+ @Test
+ public void createTable_nameContainsMinus_fails() {
+ final TableCreateDto request = TableCreateDto.builder()
+ .name("COVID-19")
+ .description(TABLE_2_DESCRIPTION)
+ .columns(COLUMNS_CSV01)
+ .build();
+
+ /* mock */
+ when(databaseRepository.findById(DATABASE_1_ID))
+ .thenReturn(Optional.of(DATABASE_1));
+ /* test */
+ assertThrows(TableMalformedException.class, () -> {
+ tableService.createTable(DATABASE_1_ID, request);
+ });
+ }
}
diff --git a/fda-table-service/services/src/main/java/at/tuwien/mapper/QueryMapper.java b/fda-table-service/services/src/main/java/at/tuwien/mapper/QueryMapper.java
index 30ef83fc31c2a67a3e43a20376987919eb512041..51cb27ded905ef4ca0b5563234f5a9c884f5d2d4 100644
--- a/fda-table-service/services/src/main/java/at/tuwien/mapper/QueryMapper.java
+++ b/fda-table-service/services/src/main/java/at/tuwien/mapper/QueryMapper.java
@@ -20,6 +20,7 @@ public interface QueryMapper {
for (Record record : data) {
final Map<String, Object> map = new HashMap<>();
for (Field<?> column : record.fields()) {
+ System.out.println("Columnname: "+column);
map.put(column.getName(), record.get(column.getName()));
}
result.add(map);
diff --git a/fda-table-service/services/src/main/java/at/tuwien/mapper/TableMapper.java b/fda-table-service/services/src/main/java/at/tuwien/mapper/TableMapper.java
index 01204994b10262c729c0f12478482f9920262a02..421aa470f5ebd09bb6fef477c6624cbc6908d487 100644
--- a/fda-table-service/services/src/main/java/at/tuwien/mapper/TableMapper.java
+++ b/fda-table-service/services/src/main/java/at/tuwien/mapper/TableMapper.java
@@ -1,6 +1,5 @@
package at.tuwien.mapper;
-import at.tuwien.api.amqp.TupleDto;
import at.tuwien.api.database.table.TableBriefDto;
import at.tuwien.api.database.table.TableCreateDto;
import at.tuwien.api.database.table.TableCsvDto;
@@ -21,6 +20,7 @@ import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
import org.mapstruct.Named;
+import java.math.BigInteger;
import java.text.Normalizer;
import java.util.*;
import java.util.Comparator;
@@ -34,6 +34,8 @@ import static org.jooq.impl.DSL.*;
@Mapper(componentModel = "spring")
public interface TableMapper {
+ org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(TableMapper.class);
+
@Mappings({
@Mapping(source = "id", target = "id"),
@Mapping(target = "name", expression = "java(data.getName())"),
@@ -90,10 +92,7 @@ public interface TableMapper {
return slug.toLowerCase(Locale.ENGLISH);
}
- default String nameToColumnName(String data) {
- return "mdb " + data;
- }
-
+ // TODO used?
@Named("camelMapping")
default String nameToCamelCase(String data) {
if (data == null || data.length() == 0) {
@@ -111,9 +110,10 @@ public interface TableMapper {
}
default String columnCreateDtoToEnumTypeName(TableCreateDto table, ColumnCreateDto data) {
- return "__" + nameToInternalName(nameToColumnName(table.getName())) + "_" + nameToInternalName(nameToColumnName(data.getName()));
+ return "__" + nameToInternalName(table.getName()) + "_" + nameToInternalName(data.getName());
}
+ // FIXME
@Named("identityMapping")
default String identity(String data) {
return data;
@@ -125,30 +125,57 @@ public interface TableMapper {
@Mapping(source = "type", target = "columnType"),
@Mapping(source = "nullAllowed", target = "isNullAllowed"),
@Mapping(source = "name", target = "name", qualifiedByName = "identityMapping"),
- @Mapping(target = "internalName", expression = "java(nameToInternalName(nameToColumnName(data.getName())))"),
+ @Mapping(target = "internalName", expression = "java(nameToInternalName(data.getName()))"),
@Mapping(source = "checkExpression", target = "checkExpression", qualifiedByName = "identityMapping"),
@Mapping(source = "foreignKey", target = "foreignKey", qualifiedByName = "identityMapping"),
})
TableColumn columnCreateDtoToTableColumn(ColumnCreateDto data);
+ default String tableNameToSequenceName(String tableName) {
+ return "seq_" + nameToInternalName(tableName);
+ }
+
+ /* create sequence nonetheless, if it is used or not */
+ default CreateSequenceFlagsStep tableCreateDtoToCreateSequenceFlagsStep(DSLContext context, TableCreateDto data) {
+ return context.createSequenceIfNotExists(tableNameToSequenceName(data.getName()));
+ }
+
default CreateTableColumnStep tableCreateDtoToCreateTableColumnStep(DSLContext context, TableCreateDto data)
throws ArbitraryPrimaryKeysException, ImageNotSupportedException, TableMalformedException {
+ final List<Constraint> constraints = new LinkedList<>();
if (data.getColumns().length == 0) {
throw new TableMalformedException("The must be at least one column");
}
+ if (Arrays.stream(data.getColumns()).map(ColumnCreateDto::getPrimaryKey).filter(Objects::isNull).count() > 1) {
+ log.error("Primary key column must either be true or false, cannot be null");
+ throw new ArbitraryPrimaryKeysException("Primary key column must either be true or false, cannot be null");
+ }
if (Arrays.stream(data.getColumns()).noneMatch(ColumnCreateDto::getPrimaryKey)) {
- throw new ArbitraryPrimaryKeysException("There must be at least one primary key column");
+ log.warn("No primary key found, use auto-generated hidden id column");
+ final ColumnCreateDto[] newColumns = Arrays.copyOf(data.getColumns(), data.getColumns().length + 1);
+ newColumns[data.getColumns().length] = ColumnCreateDto.builder()
+ .name("id")
+ .type(ColumnTypeDto.NUMBER)
+ .checkExpression(null)
+ .autoGenerated(true)
+ .nullAllowed(false)
+ .primaryKey(true)
+ .unique(true)
+ .build();
+ data.setColumns(newColumns);
}
if (Arrays.stream(data.getColumns()).anyMatch(dto -> dto.getCheckExpression() != null)) {
+ // TODO
+ log.error("Currently no check operations are supported");
throw new ImageNotSupportedException("Currently no check operations are supported");
}
- final List<Constraint> constraints = new LinkedList<>();
final CreateTableColumnStep columnStep = context.createTableIfNotExists(nameToInternalName(data.getName()));
/* types for enum */
for (ColumnCreateDto column : data.getColumns()) {
if (!column.getType().equals(ColumnTypeDto.ENUM)) {
continue;
}
+ /* create type */
context.createType(columnCreateDtoToEnumTypeName(data, column))
.asEnum(column.getEnumValues())
.execute();
@@ -165,13 +192,13 @@ public interface TableMapper {
}
final DataType<?> dataType = columnTypeDtoToDataType(data, column)
.nullable(column.getNullAllowed());
- columnStep.column(nameToInternalName(nameToColumnName(column.getName())), dataType);
+ columnStep.column(nameToInternalName(column.getName()), dataType);
}
/* primary keys */
- constraints.add(constraint("PK_" + nameToInternalName(data.getName()))
+ constraints.add(constraint("pk_" + nameToInternalName(data.getName()))
.primaryKey(Arrays.stream(data.getColumns())
.filter(ColumnCreateDto::getPrimaryKey)
- .map(c -> field(nameToInternalName(nameToColumnName(c.getName()))))
+ .map(this::primaryKeyField)
.toArray(Field[]::new)));
/* constraints */
final long count = Arrays.stream(data.getColumns())
@@ -181,8 +208,8 @@ public interface TableMapper {
/* primary key constraints */
Arrays.stream(data.getColumns())
.filter(c -> Objects.nonNull(c.getUnique()) && c.getUnique())
- .forEach(c -> constraints.add(constraint("UK_" + nameToInternalName(nameToColumnName(c.getName())))
- .unique(nameToInternalName(nameToColumnName(c.getName())))));
+ .forEach(c -> constraints.add(constraint("uk_" + nameToInternalName(c.getName()))
+ .unique(nameToInternalName(c.getName()))));
/* check constraints */
if (Arrays.stream(data.getColumns()).anyMatch(c -> Objects.nonNull(c.getCheckExpression()))) {
throw new ArbitraryPrimaryKeysException("Check constraints currently not supported");
@@ -190,7 +217,7 @@ public interface TableMapper {
/* foreign key constraints */
Arrays.stream(data.getColumns())
.filter(c -> Objects.nonNull(c.getForeignKey()))
- .forEach(c -> constraints.add(constraint("FK_" + nameToInternalName(nameToColumnName(c.getName())))
+ .forEach(c -> constraints.add(constraint("fk_" + nameToInternalName(c.getName()))
.foreignKey(c.getForeignKey())
.references(c.getReferences())));
}
@@ -198,6 +225,13 @@ public interface TableMapper {
return columnStep;
}
+ default Field<?> primaryKeyField(ColumnCreateDto column) {
+ if (column.getType().equals(ColumnTypeDto.TEXT) || column.getType().equals(ColumnTypeDto.BLOB)) {
+ return field(sql(nameToInternalName(column.getName()) + "(255)"));
+ }
+ return field(nameToInternalName(column.getName()));
+ }
+
default List<Field<?>> tableToFieldList(Table data) {
return data.getColumns()
.stream()
diff --git a/fda-table-service/services/src/main/java/at/tuwien/seeder/DataSeeder.java b/fda-table-service/services/src/main/java/at/tuwien/seeder/DataSeeder.java
new file mode 100644
index 0000000000000000000000000000000000000000..d988fcf6cc2ee19c8256a9a1a07ff4bb3eb14ad6
--- /dev/null
+++ b/fda-table-service/services/src/main/java/at/tuwien/seeder/DataSeeder.java
@@ -0,0 +1,69 @@
+package at.tuwien.seeder;
+
+import at.tuwien.api.database.table.TableInsertDto;
+import at.tuwien.entities.database.Database;
+import at.tuwien.entities.database.table.Table;
+import at.tuwien.exception.*;
+import at.tuwien.repository.jpa.TableRepository;
+import at.tuwien.service.DataService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Slf4j
+@Component
+public class DataSeeder implements Seeder {
+
+ private final static Long TABLE_1_ID = 1L;
+ private final static Long DATABASE_1_ID = 1L;
+
+ private final static Long TABLE_2_ID = 2L;
+ private final static Long DATABASE_2_ID = 2L;
+
+ private final static Long TABLE_3_ID = 3L;
+ private final static Long DATABASE_3_ID = 3L;
+
+ private final static TableInsertDto TABLE_1_INSERT = TableInsertDto.builder()
+ .csvLocation("test:seed/weather-small.csv")
+ .nullElement("NA")
+ .skipHeader(true)
+ .trueElement("Yes")
+ .falseElement("No")
+ .delimiter(',')
+ .build();
+
+ private final static TableInsertDto TABLE_2_INSERT = TableInsertDto.builder()
+ .csvLocation("test:seed/infection-small.csv")
+ .skipHeader(true)
+ .delimiter(',')
+ .build();
+
+ private final static TableInsertDto TABLE_3_INSERT = TableInsertDto.builder()
+ .csvLocation("test:seed/air-small.csv")
+ .skipHeader(true)
+ .delimiter(';')
+ .build();
+
+ private final DataService dataService;
+ private final TableRepository tableRepository;
+
+ @Autowired
+ public DataSeeder(DataService dataService, TableRepository tableRepository) {
+ this.dataService = dataService;
+ this.tableRepository = tableRepository;
+ }
+
+ @Override
+ public void seed() throws TableNotFoundException, TableMalformedException, DatabaseNotFoundException,
+ ImageNotSupportedException, FileStorageException {
+ dataService.insertCsv(DATABASE_1_ID, TABLE_1_ID, TABLE_1_INSERT);
+ log.info("Seeded table {}", TABLE_1_ID);
+ dataService.insertCsv(DATABASE_2_ID, TABLE_2_ID, TABLE_2_INSERT);
+ log.info("Seeded table {}", TABLE_2_ID);
+ dataService.insertCsv(DATABASE_3_ID, TABLE_3_ID, TABLE_3_INSERT);
+ log.info("Seeded table {}", TABLE_3_ID);
+ }
+
+}
diff --git a/fda-table-service/services/src/main/java/at/tuwien/seeder/Seeder.java b/fda-table-service/services/src/main/java/at/tuwien/seeder/Seeder.java
new file mode 100644
index 0000000000000000000000000000000000000000..a4ec3c6bf5b7fe2203033eb475b4429fe917ecf5
--- /dev/null
+++ b/fda-table-service/services/src/main/java/at/tuwien/seeder/Seeder.java
@@ -0,0 +1,13 @@
+package at.tuwien.seeder;
+
+import at.tuwien.exception.*;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+
+@Component
+public interface Seeder {
+
+ void seed() throws ImageNotSupportedException, AmqpException, TableMalformedException, ArbitraryPrimaryKeysException, DatabaseNotFoundException, DataProcessingException, TableNotFoundException, FileStorageException, IOException;
+
+}
diff --git a/fda-table-service/services/src/main/java/at/tuwien/seeder/ServiceSeeder.java b/fda-table-service/services/src/main/java/at/tuwien/seeder/ServiceSeeder.java
new file mode 100644
index 0000000000000000000000000000000000000000..e5d4aca0130a27b0678287f91bd57c78973e5457
--- /dev/null
+++ b/fda-table-service/services/src/main/java/at/tuwien/seeder/ServiceSeeder.java
@@ -0,0 +1,49 @@
+package at.tuwien.seeder;
+
+import at.tuwien.exception.*;
+import com.google.common.io.Files;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Profile;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+
+@Slf4j
+@Component
+@Profile("seeder")
+public class ServiceSeeder implements Seeder {
+
+ @Value("${fda.ready.path}")
+ private String readyPath;
+
+ private final DataSeeder dataSeeder;
+ private final TableSeeder tableSeeder;
+ private final Environment environment;
+
+ @Autowired
+ public ServiceSeeder(DataSeeder dataSeeder, TableSeeder tableSeeder, Environment environment) {
+ this.dataSeeder = dataSeeder;
+ this.tableSeeder = tableSeeder;
+ this.environment = environment;
+ }
+
+ @Override
+ @PostConstruct
+ public void seed() throws TableMalformedException, ArbitraryPrimaryKeysException, DatabaseNotFoundException,
+ ImageNotSupportedException, DataProcessingException, TableNotFoundException, FileStorageException,
+ IOException {
+ if (Arrays.asList(environment.getActiveProfiles()).contains("sandbox")) {
+ tableSeeder.seed();
+ dataSeeder.seed();
+ }
+ log.info("Seeding completed, service is ready");
+ Files.touch(new File(readyPath));
+ }
+
+}
diff --git a/fda-table-service/services/src/main/java/at/tuwien/seeder/TableSeeder.java b/fda-table-service/services/src/main/java/at/tuwien/seeder/TableSeeder.java
new file mode 100644
index 0000000000000000000000000000000000000000..6694c76a4cebb7736acf265db4c8cf7a47fad7d6
--- /dev/null
+++ b/fda-table-service/services/src/main/java/at/tuwien/seeder/TableSeeder.java
@@ -0,0 +1,475 @@
+package at.tuwien.seeder;
+
+import at.tuwien.api.database.table.TableCreateDto;
+import at.tuwien.api.database.table.columns.ColumnCreateDto;
+import at.tuwien.api.database.table.columns.ColumnTypeDto;
+import at.tuwien.exception.*;
+import at.tuwien.service.TableService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class TableSeeder implements Seeder {
+
+ private final static Long TABLE_1_ID = 1L;
+ private final static Long TABLE_1_DATABASE_ID = 1L;
+ private final static String TABLE_1_NAME = "Rain in Australia";
+ private final static String TABLE_1_DESCRIPTION = "Predict next-day rain by training classification models on the target variable RainTomorrow";
+
+ private final static Long TABLE_2_ID = 1L;
+ private final static Long TABLE_2_DATABASE_ID = 2L;
+ private final static String TABLE_2_NAME = "Infection COVID19";
+ private final static String TABLE_2_DESCRIPTION = "Download historical data (to 14 December 2020) on the daily number of new reported COVID-19 cases and deaths worldwide";
+
+ private final static Long TABLE_3_ID = 1L;
+ private final static Long TABLE_3_DATABASE_ID = 3L;
+ private final static String TABLE_3_NAME = "Air Quality AT";
+ private final static String TABLE_3_DESCRIPTION = "World Air Quality (OpenAQ) for Austria 2016-2021";
+
+ private final static TableCreateDto TABLE_1_CREATE = TableCreateDto.builder()
+ .name(TABLE_1_NAME)
+ .description(TABLE_1_DESCRIPTION)
+ .columns(new ColumnCreateDto[]{
+ ColumnCreateDto.builder()
+ .name("Date")
+ .type(ColumnTypeDto.DATE)
+ .unique(true)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("Location")
+ .type(ColumnTypeDto.STRING)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("MinTemp")
+ .type(ColumnTypeDto.NUMBER)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("MaxTemp")
+ .type(ColumnTypeDto.NUMBER)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("Rainfall")
+ .type(ColumnTypeDto.NUMBER)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("Evaporation")
+ .type(ColumnTypeDto.NUMBER)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("Sunshine")
+ .type(ColumnTypeDto.NUMBER)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("WindGustDir")
+ .type(ColumnTypeDto.STRING)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("WindGustSpeed")
+ .type(ColumnTypeDto.NUMBER)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("WindDir9am")
+ .type(ColumnTypeDto.STRING)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("WindDir3pm")
+ .type(ColumnTypeDto.STRING)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("WindSpeed9am")
+ .type(ColumnTypeDto.NUMBER)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("WindSpeed3pm")
+ .type(ColumnTypeDto.NUMBER)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("Humidity9am")
+ .type(ColumnTypeDto.NUMBER)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("Humidity3pm")
+ .type(ColumnTypeDto.NUMBER)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("Pressure9am")
+ .type(ColumnTypeDto.NUMBER)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("Pressure3pm")
+ .type(ColumnTypeDto.NUMBER)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("Cloud9am")
+ .type(ColumnTypeDto.NUMBER)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("Cloud3pm")
+ .type(ColumnTypeDto.NUMBER)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("Temp9am")
+ .type(ColumnTypeDto.NUMBER)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("Temp3pm")
+ .type(ColumnTypeDto.NUMBER)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("RainToday")
+ .type(ColumnTypeDto.BOOLEAN)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("RainTomorrow")
+ .type(ColumnTypeDto.BOOLEAN)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build()
+ })
+ .build();
+
+ private final static TableCreateDto TABLE_2_CREATE = TableCreateDto.builder()
+ .name(TABLE_2_NAME)
+ .description(TABLE_2_DESCRIPTION)
+ .columns(new ColumnCreateDto[]{
+ ColumnCreateDto.builder()
+ .name("dateRep")
+ .type(ColumnTypeDto.STRING)
+ .unique(false)
+ .nullAllowed(false)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("day")
+ .type(ColumnTypeDto.NUMBER)
+ .unique(false)
+ .nullAllowed(false)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("month")
+ .type(ColumnTypeDto.NUMBER)
+ .unique(false)
+ .nullAllowed(false)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("year")
+ .type(ColumnTypeDto.NUMBER)
+ .unique(false)
+ .nullAllowed(false)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("cases")
+ .type(ColumnTypeDto.NUMBER)
+ .unique(false)
+ .nullAllowed(false)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("deaths")
+ .type(ColumnTypeDto.NUMBER)
+ .unique(false)
+ .nullAllowed(false)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("countriesAndTerritories")
+ .type(ColumnTypeDto.STRING)
+ .unique(false)
+ .nullAllowed(false)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("geoId")
+ .type(ColumnTypeDto.STRING)
+ .unique(false)
+ .nullAllowed(false)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("countryterritoryCode")
+ .type(ColumnTypeDto.STRING)
+ .unique(false)
+ .nullAllowed(false)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("popData2019")
+ .type(ColumnTypeDto.NUMBER)
+ .unique(false)
+ .nullAllowed(false)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("continentExp")
+ .type(ColumnTypeDto.STRING)
+ .unique(false)
+ .nullAllowed(false)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("Cumulative_number_for_14_days_of_COVID_19_cases_per_100000")
+ .type(ColumnTypeDto.NUMBER)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build()
+ })
+ .build();
+
+ private final static TableCreateDto TABLE_3_CREATE = TableCreateDto.builder()
+ .name(TABLE_3_NAME)
+ .description(TABLE_3_DESCRIPTION)
+ .columns(new ColumnCreateDto[]{
+ ColumnCreateDto.builder()
+ .name("Country Code")
+ .type(ColumnTypeDto.STRING)
+ .unique(false)
+ .nullAllowed(false)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("City")
+ .type(ColumnTypeDto.STRING)
+ .unique(false)
+ .nullAllowed(false)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("Location")
+ .type(ColumnTypeDto.STRING)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("Coordinates")
+ .type(ColumnTypeDto.STRING)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("Pollutant")
+ .type(ColumnTypeDto.STRING)
+ .unique(false)
+ .nullAllowed(true)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("Source Name")
+ .type(ColumnTypeDto.STRING)
+ .unique(false)
+ .nullAllowed(false)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("Unit")
+ .type(ColumnTypeDto.STRING)
+ .unique(false)
+ .nullAllowed(false)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("Value")
+ .type(ColumnTypeDto.STRING)
+ .unique(false)
+ .nullAllowed(false)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("Last Updated")
+ .type(ColumnTypeDto.STRING)
+ .unique(false)
+ .nullAllowed(false)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("Country Label")
+ .type(ColumnTypeDto.STRING)
+ .unique(false)
+ .nullAllowed(false)
+ .primaryKey(false)
+ .autoGenerated(false)
+ .checkExpression(null)
+ .build(),
+ })
+ .build();
+
+ private final TableService tableService;
+
+ @Autowired
+ public TableSeeder(TableService tableService) {
+ this.tableService = tableService;
+ }
+
+ @Override
+ public void seed() throws TableMalformedException, ArbitraryPrimaryKeysException, DatabaseNotFoundException,
+ ImageNotSupportedException, DataProcessingException {
+ log.debug("seeded table {}", tableService.createTable(TABLE_1_DATABASE_ID, TABLE_1_CREATE));
+ log.info("Seeded table {}", TABLE_1_ID);
+ log.debug("seeded table {}", tableService.createTable(TABLE_2_DATABASE_ID, TABLE_2_CREATE));
+ log.info("Seeded table {}", TABLE_2_ID);
+ log.debug("seeded table {}", tableService.createTable(TABLE_3_DATABASE_ID, TABLE_3_CREATE));
+ log.info("Seeded table {}", TABLE_3_ID);
+ }
+
+}
diff --git a/fda-table-service/services/src/main/java/at/tuwien/service/TableService.java b/fda-table-service/services/src/main/java/at/tuwien/service/TableService.java
index 35d213faef1607e157092858240e572bb0775d73..054157e091754045f38774dcecfee6d40e6f95e5 100644
--- a/fda-table-service/services/src/main/java/at/tuwien/service/TableService.java
+++ b/fda-table-service/services/src/main/java/at/tuwien/service/TableService.java
@@ -1,9 +1,15 @@
package at.tuwien.service;
import at.tuwien.api.database.table.TableCreateDto;
+import at.tuwien.api.database.table.TableCsvDto;
+import at.tuwien.api.database.table.TableInsertDto;
+import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.table.Table;
import at.tuwien.exception.*;
+import com.opencsv.exceptions.CsvException;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
import java.util.List;
public interface TableService {
@@ -62,4 +68,9 @@ public interface TableService {
*/
Table createTable(Long databaseId, TableCreateDto createDto) throws ImageNotSupportedException,
DatabaseNotFoundException, DataProcessingException, ArbitraryPrimaryKeysException, TableMalformedException;
+
+ Database findDatabase(Long id) throws DatabaseNotFoundException;
+
+ TableCsvDto readCsv(Table table, TableInsertDto data, MultipartFile file) throws IOException, CsvException,
+ ArrayIndexOutOfBoundsException;
}
diff --git a/fda-table-service/services/src/main/java/at/tuwien/service/impl/JdbcConnector.java b/fda-table-service/services/src/main/java/at/tuwien/service/impl/JdbcConnector.java
index 073a249879b550f7997ad870dd982998d6de2f58..0154d24ae9c0accd1f15be03cfbc7f0c3ded4b47 100644
--- a/fda-table-service/services/src/main/java/at/tuwien/service/impl/JdbcConnector.java
+++ b/fda-table-service/services/src/main/java/at/tuwien/service/impl/JdbcConnector.java
@@ -4,6 +4,8 @@ import at.tuwien.api.database.table.TableCreateDto;
import at.tuwien.api.database.table.TableCsvDto;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.table.Table;
+import at.tuwien.entities.database.table.columns.TableColumn;
+import at.tuwien.entities.database.table.columns.TableColumnType;
import at.tuwien.exception.ArbitraryPrimaryKeysException;
import at.tuwien.exception.ImageNotSupportedException;
import at.tuwien.exception.TableMalformedException;
@@ -12,24 +14,32 @@ import at.tuwien.mapper.TableMapper;
import at.tuwien.service.DatabaseConnector;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
import org.jooq.*;
import org.jooq.Record;
import org.jooq.exception.DataAccessException;
import org.jooq.impl.DSL;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.web.servlet.server.Encoding;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ResourceUtils;
+import java.io.File;
import java.io.IOException;
-import java.nio.file.Files;
+import java.io.InputStream;
+import java.math.BigInteger;
+import java.net.URI;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.*;
import java.util.stream.Collectors;
+import static java.util.Objects.nonNull;
import static org.jooq.impl.DSL.*;
@Log4j2
@@ -48,7 +58,6 @@ public abstract class JdbcConnector implements DatabaseConnector {
@Override
public DSLContext open(Database database) throws SQLException, ImageNotSupportedException {
final String url = "jdbc:" + database.getContainer().getImage().getJdbcMethod() + "://" + database.getContainer().getInternalName() + "/" + database.getInternalName();
- log.trace("Attempt to connect to '{}'", url);
final Properties properties = imageMapper.containerImageToProperties(database.getContainer().getImage());
final Connection connection = DriverManager.getConnection(url, properties);
return DSL.using(connection, SQLDialect.valueOf(database.getContainer().getImage().getDialect()));
@@ -60,20 +69,42 @@ public abstract class JdbcConnector implements DatabaseConnector {
if (isReserved(createDto.getName())) {
throw new TableMalformedException("Table name contains reserved name");
}
+ if (createDto.getName().isEmpty()) {
+ throw new TableMalformedException("Table name is empty");
+ }
final DSLContext context = open(database);
- CreateTableColumnStep createTableColumnStep = tableMapper.tableCreateDtoToCreateTableColumnStep(context, createDto);
- log.debug("Before insertion: {} ", createTableColumnStep.getSQL());
+ final CreateSequenceFlagsStep createSequenceFlagsStep = tableMapper.tableCreateDtoToCreateSequenceFlagsStep(context,
+ createDto);
+ createSequenceFlagsStep.execute();
+ log.debug("created id sequence");
+ final CreateTableColumnStep createTableColumnStep = tableMapper.tableCreateDtoToCreateTableColumnStep(context,
+ createDto);
+ log.trace("before execution: {} ", createTableColumnStep.getSQL());
/* add versioning for mariadb databases */
if (database.getContainer().getImage().getDialect().equals("MARIADB")) {
String sql = createTableColumnStep.getSQL();
- sql = sql + "WITH SYSTEM VERSIONING;";
- log.debug("With versioning {} ", sql);
+ sql = sql + " WITH SYSTEM VERSIONING;";
+ log.trace("with versioning {} ", sql);
context.fetch(sql);
} else {
createTableColumnStep.execute();
}
}
+ /**
+ * Return the next sequence value
+ *
+ * @param context The context.
+ * @param table The table.
+ * @return The value.
+ */
+ protected BigInteger nextSequence(DSLContext context, Table table) {
+ final Field<BigInteger> id = sequence(name(tableMapper.tableNameToSequenceName(table.getName())))
+ .nextval();
+ return context.select(id)
+ .fetchOne(id);
+ }
+
@Override
@Transactional
public void insertCsv(Table table, TableCsvDto data) throws SQLException, ImageNotSupportedException, TableMalformedException {
@@ -90,7 +121,19 @@ public abstract class JdbcConnector implements DatabaseConnector {
log.trace("first row received {}", data.getData().size() > 0 ? data.getData().get(0) : null);
final DSLContext context = open(table.getDatabase());
final List<InsertValuesStepN<Record>> statements = new LinkedList<>();
+ final Optional<TableColumn> idxColumn = table.getColumns()
+ .stream()
+ .filter(c -> nonNull(c.getAutoGenerated()))
+ .filter(TableColumn::getAutoGenerated)
+ .filter(c -> c.getColumnType().equals(TableColumnType.NUMBER))
+ .findFirst();
for (List<Object> row : tableMapper.tableCsvDtoToObjectListList(data)) {
+ if (idxColumn.isPresent()) {
+ final int idx = table.getColumns().indexOf(idxColumn.get());
+ final BigInteger idVal = nextSequence(context, table);
+ log.trace("set auto-generated sequence value {}", idVal);
+ row.set(idx, idVal);
+ }
statements.add(context.insertInto(table(table.getInternalName()), headers)
.values(row));
}
@@ -102,6 +145,13 @@ public abstract class JdbcConnector implements DatabaseConnector {
}
}
+ /**
+ * Deletes a table based on the name.
+ *
+ * @param table The table.
+ * @throws SQLException Invalid SQL.
+ * @throws ImageNotSupportedException Image is not MariaDB.
+ */
@Override
public void delete(Table table) throws SQLException, ImageNotSupportedException {
final DSLContext context = open(table.getDatabase());
@@ -109,14 +159,14 @@ public abstract class JdbcConnector implements DatabaseConnector {
}
/**
- * Checks if the word is in the reserved word csv (i.e. a SQL keyword)
+ * Checks if the word is in the reserved word csv (i.e. an SQL keyword), solves issue 106
*
* @param word The word
* @return True if it is reserved word
*/
public Boolean isReserved(String word) throws IOException {
- final List<String> reserved = FileUtils.readLines(ResourceUtils.getFile("classpath:mariadb/reserved.csv"),
- Encoding.DEFAULT_CHARSET);
+ final InputStream stream = new ClassPathResource("mariadb/reserved.csv").getInputStream();
+ final List<String> reserved = IOUtils.readLines(stream, "UTF-8");
return reserved.contains(word.toUpperCase());
}
diff --git a/fda-table-service/services/src/main/java/at/tuwien/service/impl/MariaDataService.java b/fda-table-service/services/src/main/java/at/tuwien/service/impl/MariaDataService.java
index 608ac3bdfaa3f9b1061a963e73bafe5aa4257d84..1ffdb34c545a4c5bfac7a87c4128bf921da2398f 100644
--- a/fda-table-service/services/src/main/java/at/tuwien/service/impl/MariaDataService.java
+++ b/fda-table-service/services/src/main/java/at/tuwien/service/impl/MariaDataService.java
@@ -5,6 +5,8 @@ import at.tuwien.api.database.table.TableCsvDto;
import at.tuwien.api.database.table.TableInsertDto;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.table.Table;
+import at.tuwien.entities.database.table.columns.TableColumn;
+import at.tuwien.entities.database.table.columns.TableColumnType;
import at.tuwien.exception.*;
import at.tuwien.mapper.ImageMapper;
import at.tuwien.mapper.QueryMapper;
@@ -13,29 +15,26 @@ import at.tuwien.repository.jpa.DatabaseRepository;
import at.tuwien.repository.jpa.TableRepository;
import at.tuwien.service.DataService;
import at.tuwien.utils.FileUtils;
+import at.tuwien.utils.TableUtils;
import com.opencsv.CSVParser;
import com.opencsv.CSVParserBuilder;
import com.opencsv.CSVReader;
import com.opencsv.CSVReaderBuilder;
import com.opencsv.exceptions.CsvException;
-import com.opencsv.exceptions.CsvValidationException;
-import com.opencsv.validators.LineValidator;
import lombok.NonNull;
import lombok.extern.log4j.Log4j2;
import org.jooq.DSLContext;
import org.jooq.exception.DataAccessException;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
+import java.io.*;
+import java.math.BigInteger;
import java.net.URI;
-import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.sql.SQLException;
@@ -43,6 +42,7 @@ import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.*;
+import java.util.stream.Collectors;
@Log4j2
@Service
@@ -99,6 +99,9 @@ public class MariaDataService extends JdbcConnector implements DataService {
} catch (IOException | CsvException | ArrayIndexOutOfBoundsException e) {
log.error("Failed to parse csv {}", e.getMessage());
throw new FileStorageException("failed to parse csv", e);
+ } catch (SQLException e) {
+ log.error("Failed to get next id value", e);
+ throw new TableNotFoundException("Failed to get next id value", e);
}
try {
insertCsv(table, values);
@@ -120,19 +123,20 @@ public class MariaDataService extends JdbcConnector implements DataService {
}
protected TableCsvDto readCsv(Table table, TableInsertDto data) throws IOException, CsvException,
- ArrayIndexOutOfBoundsException, TableMalformedException {
- log.debug("insert into table {} with params {}", table, data);
+ ArrayIndexOutOfBoundsException, TableMalformedException, FileStorageException, SQLException, ImageNotSupportedException {
+ log.trace("insert into table {} with params {}", table, data);
if (data.getDelimiter() == null) {
- log.info("No delimiter provided, using comma ','");
+ log.warn("No delimiter provided, using comma ','");
data.setDelimiter(',');
}
-
- if (!FileUtils.isTestFile(data.getCsvLocation())) {
- if (!FileUtils.isUrl(data.getCsvLocation())) {
- data.setCsvLocation("/tmp/" + data.getCsvLocation());
- }
+ boolean isClassPathFile = false;
+ if (!FileUtils.isTestFile(data.getCsvLocation()) && !FileUtils.isUrl(data.getCsvLocation())) {
+ log.trace("read prod file from /tmp/{}", data.getCsvLocation());
+ data.setCsvLocation("/tmp/" + data.getCsvLocation());
} else {
+ isClassPathFile = true;
/* assume it is test file */
+ log.trace("read test file from {}", data.getCsvLocation().substring(5));
data.setCsvLocation(data.getCsvLocation().substring(5));
}
final CSVParser csvParser = new CSVParserBuilder()
@@ -142,48 +146,89 @@ public class MariaDataService extends JdbcConnector implements DataService {
Reader fileReader;
if (FileUtils.isUrl(data.getCsvLocation())) {
/* source is remote file */
- fileReader = new BufferedReader(new InputStreamReader(URI.create(data.getCsvLocation()).toURL().openStream()));
+ log.trace("read file from url {}", data.getCsvLocation());
+ fileReader = new BufferedReader(new InputStreamReader(URI.create(data.getCsvLocation()).toURL()
+ .openStream()));
} else {
- /* source is local file */
- final MultipartFile multipartFile = new MockMultipartFile(data.getCsvLocation(),
- Files.readAllBytes(Paths.get(data.getCsvLocation())));
+ MultipartFile multipartFile;
+ log.trace("generate multipart file for location {}, classpath (y/n) {}", data.getCsvLocation(), isClassPathFile ? 'y' : 'n');
+ if (!isClassPathFile) {
+ /* source is local file, read from external /tmp path */
+ multipartFile = new MockMultipartFile(data.getCsvLocation(),
+ Files.readAllBytes(Paths.get(data.getCsvLocation())));
+ } else {
+ /* source is in class path */
+ final InputStream stream = new ClassPathResource(data.getCsvLocation()).getInputStream();
+ multipartFile = new MockMultipartFile(data.getCsvLocation(),
+ stream.readAllBytes());
+ }
fileReader = new InputStreamReader(multipartFile.getInputStream());
}
final CSVReader reader = new CSVReaderBuilder(fileReader)
.withCSVParser(csvParser)
.build();
- List<String> headers = null;
- final LinkedList<List<String>> cells = new LinkedList<>();
+ final List<List<String>> rows = new LinkedList<>();
reader.readAll()
- .forEach(x -> cells.add(Arrays.asList(x)));
- log.trace("csv rows {}", cells.size());
- /* get header */
+ .forEach(x -> rows.add(new ArrayList<>(List.of(x))));
+ log.trace("csv rows {}", rows.size());
+ /* generic header, ref issue #95 */
+ List<String> headers = TableUtils.fill(0, rows.get(0).size());
if (data.getSkipHeader()) {
- headers = cells.get(0);
- log.debug("got headers {}", headers);
+ /* get header */
+ headers = rows.get(0);
+ log.trace("csv headers {}", headers);
}
- if (headers != null && headers.size() != table.getColumns().size()) {
- log.error("header size: {}, column size: {}", headers.size(), table.getColumns().size());
- throw new TableMalformedException("Header size is not the same as cell size, maybe wrong delimiter?");
+ if (!TableUtils.needsPrimaryKey(table) && /* auto-generated id columns have -1 in size */
+ headers.size() != table.getColumns().size() && /* differ */
+ table.getColumns().stream().noneMatch(TableColumn::getAutoGenerated)) {
+ log.error("Header size is not the same as cell size and none is auto-generated: header size={}, column " +
+ "size={}", headers.size(), table.getColumns().size());
+ throw new TableMalformedException("Header size is not the same as cell size.");
}
final List<Map<String, Object>> records = new LinkedList<>();
/* map to the map-list structure */
- for (int i = (data.getSkipHeader() ? 1 : 0); i < cells.size(); i++) {
+ final List<String> booleanColumns = table.getColumns()
+ .stream()
+ .filter(c -> c.getColumnType().equals(TableColumnType.BOOLEAN))
+ .map(TableColumn::getInternalName)
+ .collect(Collectors.toList());
+ for (int k = (data.getSkipHeader() ? 1 : 0); k < rows.size(); k++) {
final Map<String, Object> record = new LinkedHashMap<>();
- final List<String> row = cells.get(i);
- for (int j = 0; j < table.getColumns().size(); j++) {
- record.put(table.getColumns().get(j).getInternalName(), row.get(j));
+ final List<String> row = rows.get(k);
+ for (int i = 0; i < table.getColumns().size(); i++) {
+ if (i == table.getColumns().size() - 1 && TableUtils.needsPrimaryKey(table)) {
+ record.put("id", null);
+ continue;
+ }
+ record.put(table.getColumns().get(i).getInternalName(), row.get(i));
}
/* when the nullElement itself is null, nothing to do */
+ record.replaceAll((key, value) -> value != null && value.equals("") ? null : value);
if (data.getNullElement() != null) {
- record.replaceAll((key, value) -> value.equals(data.getNullElement()) ? null : value);
+ record.replaceAll((key, value) -> value != null && value.equals(data.getNullElement()) ? null : value);
+ }
+ /* replace values for true and/or false, todo move to mapper class, test it with true=true and false=null */
+ if (data.getTrueElement() != null || data.getFalseElement() != null) {
+ record.replaceAll((key, value) -> {
+ if (value == null) {
+ return null;
+ }
+ if (booleanColumns.size() == 0) {
+ return value;
+ }
+ if (data.getTrueElement() != null && booleanColumns.contains(key) &&
+ value.equals(data.getTrueElement())) {
+ return true;
+ } else if (data.getFalseElement() != null && booleanColumns.contains(key) &&
+ value.equals(data.getFalseElement())) {
+ return false;
+ }
+ return value;
+ });
}
records.add(record);
}
- if (headers == null || headers.size() == 0) {
- log.warn("No header check possible, possibly csv without header line or skipHeader=false provided");
- }
log.debug("first row is {}", records.size() > 0 ? records.get(0) : null);
return TableCsvDto.builder()
.data(records)
@@ -203,14 +248,16 @@ public class MariaDataService extends JdbcConnector implements DataService {
@Override
@Transactional
public QueryResultDto selectAll(@NonNull Long databaseId, @NonNull Long tableId, Instant timestamp,
- Long page, Long size) throws TableNotFoundException,
- DatabaseNotFoundException, ImageNotSupportedException, DatabaseConnectionException,
- TableMalformedException {
- if (page != null && page < 0) {
- throw new TableMalformedException("page cannot be lower than zero");
+ @NonNull Long page, @NonNull Long size) throws TableNotFoundException,
+ DatabaseNotFoundException, ImageNotSupportedException, DatabaseConnectionException, TableMalformedException {
+ if(timestamp == null) {
+ timestamp = Instant.now();
+ }
+ if (page < 0) {
+ throw new TableMalformedException("Page number cannot be lower than 0");
}
- if (size != null && (size <= 0 || page == null)) {
- throw new TableMalformedException("size cannot be lower than zero or page is null");
+ if (size <= 0) {
+ throw new TableMalformedException("Page number cannot be lower or equal to 0");
}
final Table table = findById(databaseId, tableId);
try {
@@ -221,18 +268,16 @@ public class MariaDataService extends JdbcConnector implements DataService {
StringBuilder stringBuilder = new StringBuilder()
.append("SELECT * FROM ")
.append(table.getInternalName());
- if (timestamp != null) {
- stringBuilder.append(" FOR SYSTEM_TIME AS OF TIMESTAMP'")
- .append(LocalDateTime.ofInstant(timestamp, ZoneId.of("Europe/Vienna")))
- .append("'");
- }
- if (page != null && size != null) {
- stringBuilder.append(" LIMIT ")
- .append(size)
- .append(" OFFSET ")
- .append(page * size)
- .append(";");
- }
+ stringBuilder.append(" FOR SYSTEM_TIME AS OF TIMESTAMP'")
+ .append(LocalDateTime.ofInstant(timestamp, ZoneId.of("Europe/Vienna")))
+ .append("'");
+ page = Math.abs(page);
+ size = Math.abs(size);
+ stringBuilder.append(" LIMIT ")
+ .append(size)
+ .append(" OFFSET ")
+ .append(page * size)
+ .append(";");
return queryMapper.recordListToQueryResultDto(context.fetch(stringBuilder.toString()));
} else {
log.debug("Not MariaDB, can only provide legacy pagination");
@@ -246,4 +291,5 @@ public class MariaDataService extends JdbcConnector implements DataService {
}
}
+
}
diff --git a/fda-table-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java b/fda-table-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java
index 1b1f6cbb82eef0bc1deec256a4b94c0fb6d98be4..aa00f0a56116b6ebceb062a64ec8fc1fe4df74ef 100644
--- a/fda-table-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java
+++ b/fda-table-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java
@@ -6,6 +6,7 @@ import at.tuwien.api.database.table.TableInsertDto;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.table.Table;
import at.tuwien.entities.database.table.columns.TableColumn;
+import at.tuwien.entities.database.table.columns.TableColumnType;
import at.tuwien.exception.*;
import at.tuwien.mapper.AmqpMapper;
import at.tuwien.mapper.ImageMapper;
@@ -102,6 +103,10 @@ public class TableServiceImpl extends JdbcConnector implements TableService {
@Transactional
public Table createTable(Long databaseId, TableCreateDto createDto) throws ImageNotSupportedException,
DatabaseNotFoundException, DataProcessingException, ArbitraryPrimaryKeysException, TableMalformedException {
+ if (createDto.getName().contains("-")) {
+ log.error("Table name cannot contain -");
+ throw new TableMalformedException("Table name cannot contain -");
+ }
log.trace("create table in db {} with request {}", databaseId, createDto);
final Database database = findDatabase(databaseId);
/* create database in container */
@@ -133,6 +138,20 @@ public class TableServiceImpl extends JdbcConnector implements TableService {
table.getColumns()
.add(column);
}
+ /* if no primary key is yet assigned, we generate an invisible auto-generated sequence */
+ if (table.getColumns().stream().noneMatch(TableColumn::getIsPrimaryKey)) {
+ table.getColumns()
+ .add(TableColumn.builder()
+ .name("ID")
+ .internalName("id")
+ .columnType(TableColumnType.NUMBER)
+ .autoGenerated(true)
+ .isPrimaryKey(true)
+ .isUnique(true)
+ .isNullAllowed(false)
+ .ordinalPosition(table.getColumns().size())
+ .build());
+ }
/* update table in metadata db */
final Table out;
try {
@@ -146,7 +165,8 @@ public class TableServiceImpl extends JdbcConnector implements TableService {
return out;
}
- protected Database findDatabase(Long id) throws DatabaseNotFoundException {
+ @Override
+ public Database findDatabase(Long id) throws DatabaseNotFoundException {
final Optional<Database> database = databaseRepository.findById(id);
if (database.isEmpty()) {
log.error("Could not find database with id {} in metadata database", id);
@@ -155,6 +175,7 @@ public class TableServiceImpl extends JdbcConnector implements TableService {
return database.get();
}
+ @Override
public TableCsvDto readCsv(Table table, TableInsertDto data, MultipartFile file) throws IOException, CsvException,
ArrayIndexOutOfBoundsException {
final CSVParser csvParser = new CSVParserBuilder()
diff --git a/fda-table-service/services/src/main/java/at/tuwien/utils/TableUtils.java b/fda-table-service/services/src/main/java/at/tuwien/utils/TableUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..0327b8419f2f6464ecceeba34b8cf9fdb14c156b
--- /dev/null
+++ b/fda-table-service/services/src/main/java/at/tuwien/utils/TableUtils.java
@@ -0,0 +1,30 @@
+package at.tuwien.utils;
+
+import at.tuwien.entities.database.table.Table;
+import at.tuwien.entities.database.table.columns.TableColumnType;
+import lombok.extern.log4j.Log4j2;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import static java.util.Objects.nonNull;
+
+@Log4j2
+public class TableUtils {
+
+ public static List<String> fill(int start, int end) {
+ final List<String> list = new LinkedList<>();
+ for (int i = start; i < end; i++) {
+ list.add("col_" + i);
+ }
+ return list;
+ }
+
+ public static boolean needsPrimaryKey(Table table) {
+ return table.getColumns()
+ .stream()
+ .filter(c -> nonNull(c.getAutoGenerated()))
+ .anyMatch(c -> c.getAutoGenerated() && c.getColumnType().equals(TableColumnType.NUMBER));
+ }
+
+}
diff --git a/fda-ui/assets/globals.scss b/fda-ui/assets/globals.scss
index 6388294e998ff5cf776d575ef86e94e4b84d9b41..d8e8d603c29c68c14598b1a5e2737b1d5e2405ea 100644
--- a/fda-ui/assets/globals.scss
+++ b/fda-ui/assets/globals.scss
@@ -2,6 +2,6 @@
font-family: Roboto;
}
-.v-main {
+.theme--light .v-main {
background-color: #eeeeee;
}
diff --git a/fda-ui/assets/img/zenodo-logo.png b/fda-ui/assets/img/zenodo-logo.png
deleted file mode 100644
index d84adb8ed7016dfbfc297eb71cc24afbbf174693..0000000000000000000000000000000000000000
Binary files a/fda-ui/assets/img/zenodo-logo.png and /dev/null differ
diff --git a/fda-ui/components/query/Builder.vue b/fda-ui/components/query/Builder.vue
index c7f54bc1c94b2fea1ce9e7d1aa4407c2278d958f..b79cf3b209b6b57bf35ebb84f9bbfc399fe014bc 100644
--- a/fda-ui/components/query/Builder.vue
+++ b/fda-ui/components/query/Builder.vue
@@ -29,6 +29,17 @@
required />
</v-col>
</v-row>
+ <v-row class="mt-2">
+ <v-col cols="6">
+ <v-textarea
+ v-model="description"
+ :rules="[rules.required]"
+ rows="3"
+ class="pa-0"
+ label="Query Description"
+ required />
+ </v-col>
+ </v-row>
<v-row class="mt-2">
<v-col cols="6">
<v-select
@@ -95,6 +106,7 @@ export default {
table: null,
tables: [],
title: null,
+ description: null,
tableDetails: null,
queryId: null,
query: {
@@ -162,7 +174,7 @@ export default {
this.loading = false
this.queryId = res.data.id
this.result.headers = this.select.map((s) => {
- return { text: s.name, value: 'mdb_' + s.name, sortable: false }
+ return { text: s.name, value: s.name, sortable: false }
})
this.result.rows = res.data.result
} catch (err) {
@@ -196,7 +208,7 @@ export default {
const url = '/server-middleware/query/build'
const data = {
table: this.table.internalName,
- select: this.select.map(s => 'mdb_' + s.name),
+ select: this.select.map(s => s.name),
clauses: this.clauses
}
try {
diff --git a/fda-ui/layouts/default.vue b/fda-ui/layouts/default.vue
index 049bed75995c0ae5d27ea3f91b076910e3b42b64..b5c49da718124385317cb2d60bb9c60109538493 100644
--- a/fda-ui/layouts/default.vue
+++ b/fda-ui/layouts/default.vue
@@ -1,6 +1,14 @@
<template>
<v-app dark>
<v-navigation-drawer v-model="drawer" fixed app>
+ <v-img
+ contain
+ class="tu-logo"
+ src="/tu_logo_512.png" />
+ <v-img
+ contain
+ class="univie-logo"
+ src="/univie_logo_512.png" />
<v-list>
<v-list-item
v-for="(item, i) in filteredItems"
@@ -21,9 +29,9 @@
<v-toolbar-title v-text="title" />
<v-spacer />
<v-btn
+ class="mr-2 white--text"
color="blue-grey"
- @click="authenticate"
- class="mr-2 white--text">
+ @click="authenticate">
<v-icon left>mdi-login</v-icon> Login
</v-btn>
<v-menu bottom offset-y left>
@@ -42,6 +50,10 @@
:to="switchLocalePath(locale.code)">
<v-list-item-title>{{ locale.name }}</v-list-item-title>
</v-list-item>
+ <v-list-item
+ @click="switchTheme()">
+ {{ nextTheme }} Theme
+ </v-list-item>
</v-list>
</v-menu>
</v-app-bar>
@@ -50,14 +62,15 @@
<nuxt />
</v-container>
</v-main>
- <v-footer padless v-if="sandbox">
+ <v-footer v-if="sandbox" padless>
<v-card
flat
tile
width="100%"
- class="amber lighten-3 text-center">
- <v-card-text>
- <strong>Sandbox Environment</strong> — Reset in {{ timer }} — <a href="//github.com/fair-data-austria/dbrepo/issues/new">Report a bug</a>
+ class="primary text-center">
+ <v-card-text class="white--text">
+ <strong>Sandbox Environment</strong> — Reset in {{ timer }} —
+ <a href="//github.com/fair-data-austria/dbrepo/issues/new" class="white--text">Report a bug</a>
</v-card-text>
</v-card>
</v-footer>
@@ -119,6 +132,9 @@ export default {
sandbox () {
return true
},
+ nextTheme () {
+ return this.$vuetify.theme.dark ? 'Light' : 'Dark'
+ },
container () {
return this.$store.state.container
},
@@ -152,6 +168,9 @@ export default {
authenticate () {
window.location.href = '/api/auth'
},
+ switchTheme () {
+ this.$vuetify.theme.dark = !this.$vuetify.theme.dark
+ },
initDownTimer () {
const two = new Date()
two.setDate(new Date().getDate() + 1)
@@ -180,4 +199,10 @@ export default {
}
</script>
<style scoped>
+.tu-logo {
+ margin: 1em 1em 0;
+}
+.univie-logo {
+ margin: 1em 1em .5em;
+}
</style>
diff --git a/fda-ui/nuxt.config.js b/fda-ui/nuxt.config.js
index 2f06eef8cef5ce0a8ea3b795cfee66a733913791..ae0deb02642bbea6df36abdf0a239e48ea530e67 100644
--- a/fda-ui/nuxt.config.js
+++ b/fda-ui/nuxt.config.js
@@ -1,4 +1,3 @@
-import fs from 'fs'
import path from 'path'
import colors from 'vuetify/es5/util/colors'
@@ -11,17 +10,21 @@ if (!process.env.API) {
Have you passed env vars from docker-compose or defined them in your .env file?`)
}
+if (process.env.SANDBOX) {
+ console.info('[FDA] Running in sandbox environment')
+}
+
let serv = {
- port: 3000,
- host: '0.0.0.0',
- timing: false
+ https: {
+ key: process.env.KEY,
+ cert: process.env.CERT
+ }
}
-if (process.env.SECURE) {
+if (!process.env.KEY || !process.env.CERT) {
serv = {
- https: {
- key: fs.readFileSync('/certs/privkey.pem'),
- cert: fs.readFileSync('/certs/cert.pem')
- }
+ port: 3000,
+ host: '0.0.0.0',
+ timing: false
}
}
@@ -91,7 +94,7 @@ export default {
vuetify: {
customVariables: ['~/assets/variables.scss'],
theme: {
- light: true,
+ dark: false,
themes: {
light: {
primary: colors.blue.darken2,
diff --git a/fda-ui/pages/databases/_database_id/admin.vue b/fda-ui/pages/databases/_database_id/admin.vue
index 04fd981323c7b078847ba705283da30e355cb768..c625034ada6d09ac32f2ccfc7291849564b06fc8 100644
--- a/fda-ui/pages/databases/_database_id/admin.vue
+++ b/fda-ui/pages/databases/_database_id/admin.vue
@@ -11,6 +11,7 @@
</v-card-text>
</v-card>
</v-tabs-items>
+ <v-breadcrumbs :items="items" class="pa-0 mt-2" />
<v-dialog v-model="dialogDelete" max-width="500">
<v-card>
<v-card-title class="headline">
@@ -45,7 +46,11 @@ export default {
data () {
return {
dialogDelete: false,
- confirm: null
+ confirm: null,
+ items: [
+ { text: 'Databases', href: '/databases' },
+ { text: `${this.$route.params.database_id}`, href: `/databases/${this.$route.params.database_id}/info` }
+ ]
}
},
computed: {
diff --git a/fda-ui/pages/databases/_database_id/info.vue b/fda-ui/pages/databases/_database_id/info.vue
index ebe17517db3b69a97921d402bbdad71cf1b61494..f74557fc63c632385dfcaaafc430b9cd392bd670 100644
--- a/fda-ui/pages/databases/_database_id/info.vue
+++ b/fda-ui/pages/databases/_database_id/info.vue
@@ -1,7 +1,7 @@
<template>
<div v-if="db">
<DBToolbar />
- <v-tabs-items v-model="tab">
+ <v-tabs-items v-if="!loading" v-model="tab">
<v-tab-item>
<v-card flat>
<v-card-title>
@@ -16,17 +16,19 @@
<p>{{ description }}</p>
</blockquote>
<span>
- Created {{ db.created }}
+ Created {{ formatDate(db.created) }}
</span>
</v-card-text>
</v-card>
</v-tab-item>
</v-tabs-items>
+ <v-breadcrumbs :items="items" class="pa-0 mt-2" />
</div>
</template>
<script>
import DBToolbar from '@/components/DBToolbar'
+import { format } from 'date-fns'
export default {
components: {
@@ -34,7 +36,11 @@ export default {
},
data () {
return {
- loading: false
+ loading: false,
+ items: [
+ { text: 'Databases', href: '/databases' },
+ { text: `${this.$route.params.database_id}`, href: `/databases/${this.$route.params.database_id}/info` }
+ ]
}
},
computed: {
@@ -56,11 +62,12 @@ export default {
},
methods: {
async init () {
- if (this.db != null) {
+ this.loading = true
+ if (this.db != null && this.db.id === this.$route.params.database_id) {
+ this.loading = false
return
}
try {
- this.loading = true
const res = await this.$axios.get(`/api/database/${this.$route.params.database_id}`)
console.debug('database', res.data)
this.$store.commit('SET_DATABASE', res.data)
@@ -69,6 +76,9 @@ export default {
this.$toast.error('Could not load database.')
this.loading = false
}
+ },
+ formatDate (d) {
+ return format(new Date(d), 'dd.MM.yyyy HH:mm:ss.SSS')
}
}
}
diff --git a/fda-ui/pages/databases/_database_id/queries/_query_id/index.vue b/fda-ui/pages/databases/_database_id/queries/_query_id/index.vue
index 2c11191e2dde71d015b4ad135da090d49efd07e0..06b7c72ce60c8a3c23517fa31f91b41a9476d152 100644
--- a/fda-ui/pages/databases/_database_id/queries/_query_id/index.vue
+++ b/fda-ui/pages/databases/_database_id/queries/_query_id/index.vue
@@ -3,10 +3,15 @@
<DBToolbar v-model="$store.state.db" />
<v-card>
<v-card-title v-if="!loading">
- Result of Query #{{ id }}
+ {{ query.title }}
</v-card-title>
<v-card-subtitle v-if="!loading">
- <code v-if="hash">{{ hash }}</code>
+ <span v-if="query.execution_timestamp != null">
+ Executed {{ query.execution_timestamp }}, result hash <code>{{ query.result_hash }}</code>
+ </span>
+ <span v-if="query.execution_timestamp == null">
+ Query was never executed
+ </span>
</v-card-subtitle>
<v-data-table
:headers="headers"
@@ -24,8 +29,17 @@ export default {
},
data () {
return {
- id: this.$route.params.query_id,
- hash: null,
+ query: {
+ id: this.$route.params.query_id,
+ title: null,
+ description: null,
+ query_hash: null,
+ result_hash: null,
+ result_number: null,
+ doi: null,
+ execution_timestamp: null,
+ created: null
+ },
loading: true,
table: null,
headers: [],
@@ -33,19 +47,37 @@ export default {
}
},
mounted () {
- this.loadData()
+ this.loadMetadata()
+ // this.reExecute()
},
methods: {
- async loadData () {
+ async loadMetadata () {
+ this.loading = true
try {
- const res = await this.$axios.get(`/api/database/${this.$route.params.database_id}/query/${this.$route.params.query_id}`)
+ const res = await this.$axios.get(`/api/database/${this.$route.params.database_id}/metadata/query/${this.$route.params.query_id}`)
+ console.debug('query metadata', res.data)
+ this.query = res.data
+ } catch (err) {
+ console.error('Could not load query metadata', err)
+ this.$toast.error('Could not load query metadata')
+ this.loading = false
+ }
+ this.loading = false
+ },
+ async reExecute () {
+ this.loading = true
+ try {
+ const res = await this.$axios.put(`/api/database/${this.$route.params.database_id}/store/table/1/execute/${this.$route.params.query_id}`)
this.headers = Object.keys(res.data.result[0]).map((c) => {
return { text: c, value: c }
})
this.rows = res.data.result
console.debug('query data', res.data)
+ this.query = res.data
} catch (err) {
- this.$toast.error('Could not load table data.')
+ console.error('Could not load query data', err)
+ this.$toast.error('Could not load query data')
+ this.loading = false
}
this.loading = false
}
diff --git a/fda-ui/pages/databases/_database_id/queries/_query_id/metadata.vue b/fda-ui/pages/databases/_database_id/queries/_query_id/metadata.vue
deleted file mode 100644
index a4693e0b98ba79f1c6b8c1e49ac2a5049aa40d69..0000000000000000000000000000000000000000
--- a/fda-ui/pages/databases/_database_id/queries/_query_id/metadata.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
- <div>
- <v-progress-linear v-if="loading" :color="loadingColor" :indeterminate="!error" />
- <v-toolbar flat>
- <v-btn id="zenodo-logo" class="mr-2" :style="`background-image:url(${zenodoLogo});`" disabled />
- <v-toolbar-title>Cite Query No. {{ queryId }}</v-toolbar-title>
- <v-spacer />
- <v-toolbar-title>
- <v-btn color="primary" :disabled="!valid" @click="submit()">
- <v-icon left>mdi-publish</v-icon>
- Publish
- </v-btn>
- </v-toolbar-title>
- </v-toolbar>
- <v-form
- ref="form"
- v-model="valid"
- lazy-validation>
- <v-card flat>
- <v-card-subtitle v-if="!loading">
- Executed {{ query.execution_timestamp }}
- </v-card-subtitle>
- <v-card-text>
- <v-alert
- v-if="query.query"
- border="left"
- class="mb-6"
- color="amber lighten-4">
- <pre>{{ query.query }}</pre>
- </v-alert>
- <v-select
- v-model="data.metadata.access_right"
- :items="accessRights"
- item-text="name"
- item-value="value"
- class="col-lg-6 col-md-8 pa-0"
- label="Access Right" />
- <v-text-field
- v-model="data.metadata.title"
- class="pa-0"
- :rules="[rules.required]"
- disabled
- label="Query Title"
- required />
- <v-textarea
- v-model="data.metadata.description"
- class="pa-0 mt-4"
- :rules="[rules.required, rules.descriptionMin]"
- label="Query Description"
- counter
- rows="4"
- hint="Minimum 100 Characters"
- required />
- </v-card-text>
- </v-card>
- <v-card class="space mt-4" flat>
- <v-card-text>
- <v-row v-for="(author,i) in data.metadata.creators" :key="i">
- <v-col
- cols="12"
- md="4">
- <v-text-field
- v-model="author.name"
- :rules="[rules.required]"
- class="pa-0"
- label="Firstname Surname"
- required />
- </v-col>
- <v-col
- cols="12"
- md="4">
- <v-text-field
- v-model="author.affiliation"
- :rules="[rules.required]"
- class="pa-0"
- label="Affiliation"
- required />
- </v-col>
- <v-col
- cols="12"
- :md="i !== 0 ? 3 : 4">
- <v-text-field
- v-model="author.orcid"
- class="pa-0"
- label="ORCiD"
- required />
- </v-col>
- <v-col
- v-if="i !== 0"
- cols="12"
- md="1">
- <v-btn @click="removeAuthor(i)">Remove</v-btn>
- </v-col>
- </v-row>
- </v-card-text>
- </v-card>
- <v-btn color="blue-grey" class="mt-4 mb-4 white--text" @click="addAuthor()">
- <v-icon left>mdi-plus</v-icon>
- Add Author
- </v-btn>
- </v-form>
- </div>
-</template>
-<script>
-export default {
- name: 'QueryDoiMetadata',
- components: {},
- data () {
- return {
- loading: false,
- error: false,
- valid: false,
- data: {
- metadata: {
- access_right: 'open',
- creators: [{
- name: null,
- affiliation: null,
- orcid: null
- }],
- title: null,
- description: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum',
- upload_type: 'dataset'
- }
- },
- query: {
- hash: null,
- query: null,
- execution_timestamp: null,
- result_hash: null,
- result_number: null,
- doi: null
- },
- rules: {
- required: value => !!value || 'Required',
- descriptionMin: value => (value || '').length >= 100 || 'Minimum 100 characters'
- }
- }
- },
- computed: {
- databaseId () {
- return this.$route.params.database_id
- },
- queryId () {
- return this.$route.params.query_id
- },
- accessRights () {
- return [
- { name: 'Open', value: 'open', disabled: false },
- { name: 'Closed', value: 'closed', disabled: true },
- { name: 'Restricted', value: 'restricted', disabled: true },
- { name: 'Embargoed', value: 'embargoed', disabled: true }
- ]
- },
- zenodoLogo () {
- return require('assets/img/zenodo-logo.png')
- },
- loadingColor () {
- return this.error ? 'red lighten-2' : 'primary'
- }
- },
- mounted () {
- this.loadData()
- },
- methods: {
- async loadData () {
- try {
- this.loading = true
- const res = await this.$axios.get(`/api/database/${this.databaseId}/metadata/query/${this.queryId}`)
- this.query = res.data
- console.debug('query data', res.data)
- this.data.metadata.title = res.data.title
- this.loading = false
- } catch (err) {
- this.error = true
- this.$toast.error('Could not load table data.')
- }
- },
- async submit () {
- this.$refs.form.validate()
- console.debug('form', this.data)
- try {
- this.loading = true
- this.error = false
- const res = await this.$axios.post(`/api/database/${this.databaseId}/cite/metadata`)
- console.debug('create deposit', res.data)
- this.loading = false
- } catch (err) {
- this.error = true
- console.error('create deposit', err)
- }
- try {
- this.loading = true
- this.error = false
- const res = await this.$axios.put(`/api/database/${this.databaseId}/cite/metadata/${this.queryId}`, {
- metadata: this.data.metadata
- })
- console.debug('update deposit', res.data)
- this.loading = false
- } catch (err) {
- this.error = true
- console.error('update deposit', err)
- }
- },
- addAuthor () {
- this.data.metadata.creators.push({
- name: null,
- affiliation: null,
- orcid: null
- })
- },
- removeAuthor (index) {
- this.data.metadata.creators.splice(index, 1)
- }
- }
-}
-</script>
-
-<style lang="scss" scoped>
-/* these are taked from solarized-light (plugins/vendors.js), to override the
-main.scss file from vuetify, because it paints it red */
-::v-deep code {
- background: #fdf6e3;
- color: #657b83;
-}
-
-.spacer {
- display: flex;
- flex: 0 1;
-}
-
-#zenodo-logo {
- background-size: cover;
- background-position: center center;
- background-color: #0656b4;
- width: 5rem;
-}
-</style>
diff --git a/fda-ui/pages/databases/_database_id/queries/create.vue b/fda-ui/pages/databases/_database_id/queries/create.vue
index 9f2f763b51d2eebf70501ebd323a10a640abe01b..d7881bf21697c6cfe299ff2a481138d8d260e463 100644
--- a/fda-ui/pages/databases/_database_id/queries/create.vue
+++ b/fda-ui/pages/databases/_database_id/queries/create.vue
@@ -19,7 +19,7 @@ export default {
return {
items: [
{ text: 'Databases', href: '/databases' },
- { text: `${this.$route.params.database_id}`, href: `/databases/${this.$route.params.database_id}` },
+ { text: `${this.$route.params.database_id}`, href: `/databases/${this.$route.params.database_id}/info` },
{ text: 'Tables', href: `/databases/${this.$route.params.database_id}/tables` }
]
}
diff --git a/fda-ui/pages/databases/_database_id/queries/index.vue b/fda-ui/pages/databases/_database_id/queries/index.vue
index ff90d731ff4275336480f3eb528518a66b4b00f0..76117479ec34b39d66c2d14dd177d661117c0978 100644
--- a/fda-ui/pages/databases/_database_id/queries/index.vue
+++ b/fda-ui/pages/databases/_database_id/queries/index.vue
@@ -2,13 +2,19 @@
<div>
<DBToolbar v-model="db" />
<QueryList />
+ <v-breadcrumbs :items="items" class="pa-0 mt-2" />
</div>
</template>
<script>
+
export default {
data () {
return {
+ items: [
+ { text: 'Databases', href: '/databases' },
+ { text: `${this.$route.params.database_id}`, href: `/databases/${this.$route.params.database_id}/queries` }
+ ]
}
},
computed: {
diff --git a/fda-ui/pages/databases/_database_id/tables/_table_id/index.vue b/fda-ui/pages/databases/_database_id/tables/_table_id/index.vue
index eaba85fe05547825dee6fb7ed738de012a3d5a9c..dfc2ea2a72e13822e7ea7ad5784230e20bbe5fd5 100644
--- a/fda-ui/pages/databases/_database_id/tables/_table_id/index.vue
+++ b/fda-ui/pages/databases/_database_id/tables/_table_id/index.vue
@@ -8,10 +8,11 @@
{{ table.description }}
</v-card-subtitle>
<v-data-table
+ dense
:headers="headers"
:items="rows"
:loading="loading"
- :items-per-page="30"
+ :items-per-page="15"
class="elevation-1" />
</v-card>
<div class="mt-3">
@@ -26,6 +27,7 @@
† Unique Column
</v-chip>
</div>
+ <v-breadcrumbs :items="items" class="pa-0 mt-2" />
</div>
</template>
<script>
@@ -36,7 +38,16 @@ export default {
data () {
return {
loading: true,
- table: null,
+ table: {
+ name: null,
+ description: null
+ },
+ items: [
+ { text: 'Databases', href: '/databases' },
+ { text: `${this.$route.params.database_id}`, href: `/databases/${this.$route.params.database_id}/info` },
+ { text: 'Tables', href: `/databases/${this.$route.params.database_id}/tables` },
+ { text: `${this.$route.params.table_id}`, href: `/databases/${this.$route.params.database_id}/tables/${this.$route.params.table_id}` }
+ ],
headers: [],
rows: []
}
diff --git a/fda-ui/pages/databases/_database_id/tables/index.vue b/fda-ui/pages/databases/_database_id/tables/index.vue
index f1bb967f814045c19c407576947fe4e74837d2b1..bee2942de946767296c83897c4c85a09c93b610a 100644
--- a/fda-ui/pages/databases/_database_id/tables/index.vue
+++ b/fda-ui/pages/databases/_database_id/tables/index.vue
@@ -4,6 +4,7 @@
<v-tabs-items v-model="tab">
<TableList />
</v-tabs-items>
+ <v-breadcrumbs :items="items" class="pa-0 mt-2" />
</div>
</template>
<script>
@@ -18,7 +19,11 @@ export default {
},
data () {
return {
- db: null
+ db: null,
+ items: [
+ { text: 'Databases', href: '/databases' },
+ { text: `${this.$route.params.database_id}`, href: `/databases/${this.$route.params.database_id}/tables` }
+ ]
}
},
computed: {
diff --git a/fda-ui/pages/databases/index.vue b/fda-ui/pages/databases/index.vue
index 84d7eb82d3ad5ceb986e20f4eaed8246ac3fdf74..08151c3805aed1e4c59d797e35c6b8b3cf2cafea 100644
--- a/fda-ui/pages/databases/index.vue
+++ b/fda-ui/pages/databases/index.vue
@@ -40,7 +40,7 @@
</td>
<td>{{ item.description }}</td>
<td>{{ item.engine }}</td>
- <td>{{ item.created }}</td>
+ <td>{{ formatDate(item.created) }}</td>
</tr>
</tbody>
</template>
@@ -100,7 +100,7 @@ export default {
return s.slice(0, 12)
},
formatDate (d) {
- return format(new Date(d), 'dd/MM/yyyy HH:mm')
+ return format(new Date(d), 'dd.MM.yyyy HH:mm')
},
relativeDate (d) {
let options = { addSuffix: true }
diff --git a/fda-ui/pages/index.vue b/fda-ui/pages/index.vue
index 34eaae9bde767c6c94d8cc6a9c3f056c7fecb224..aaee19063d586a27e5a29109198a7499744285ae 100644
--- a/fda-ui/pages/index.vue
+++ b/fda-ui/pages/index.vue
@@ -1,15 +1,29 @@
<template>
<div>
- <v-toolbar flat>
- <v-toolbar-title>Welcome</v-toolbar-title>
- </v-toolbar>
<v-card flat>
- <v-card-title>FAIR Data</v-card-title>
+ <v-card-title>FDA-DBRepo: A Data Preservation Repository Supporting FAIR Principles, Data Versioning and Reproducible Queries</v-card-title>
<v-card-subtitle>
- Findable, Accessible, Interoperable, Reusable
+ Proceedings of the 17th International Conference on Digital Preservation
</v-card-subtitle>
<v-card-text>
- text
+ <h3>Authors</h3>
+ <p>
+ M. Weise, C. Michlits, M. Staudinger, G. Eva, K. Stytsenko, R. Ganguly, A. Rauber
+ </p>
+ <h3>Abstract</h3>
+ <p>
+ Database preservation frequently happens post-factum: databases are transferred and migrated into preservation formats and environments after a project has ended.
+ This increases the risks concerning incompatibility and pushes the preservation burden after the initial lifetime and use of the data.
+ We propose a database repository infrastructure, where databases are created, used and preserved directly in the data curation environment. This increases the FAIRness of the data curated as professional data stewardship activities accompany the databases right from the onset. We present the FAIR Data Austria Database Repository (FDA-DBRepo) infrastructure and provide a first version of an open-source reference implementation.
+ </p>
+ <h3>Venue</h3>
+ <p>iPRES 2021, Beijing, China; 19.10.2021 - 21.10.2021</p>
+ <v-btn
+ color="primary"
+ href="https://publik.tuwien.ac.at/files/publik_298296.pdf"
+ target="_blank">
+ View
+ </v-btn>
</v-card-text>
</v-card>
</div>
diff --git a/fda-ui/static/favicon.ico b/fda-ui/static/favicon.ico
index 3632d0c89129045dc4103e84e59e426c57b8f51a..6ace63385e87933d192eb4cb33051236b69bed26 100644
Binary files a/fda-ui/static/favicon.ico and b/fda-ui/static/favicon.ico differ
diff --git a/fda-ui/static/favicon.png b/fda-ui/static/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b24de7f0525b3d186e1d36f8b8939fb111ea92bc
Binary files /dev/null and b/fda-ui/static/favicon.png differ
diff --git a/fda-ui/static/tu_logo.png b/fda-ui/static/tu_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..37a75599fbab338c284a0f7fff92d7f37c64a130
Binary files /dev/null and b/fda-ui/static/tu_logo.png differ
diff --git a/fda-ui/static/tu_logo_512.png b/fda-ui/static/tu_logo_512.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba1b77f58ff652c99347cfbc67244b9b2ab5e021
Binary files /dev/null and b/fda-ui/static/tu_logo_512.png differ
diff --git a/fda-ui/static/univie_logo.png b/fda-ui/static/univie_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..895d8097b09f8463b539d723e9cc5026478f8c15
Binary files /dev/null and b/fda-ui/static/univie_logo.png differ
diff --git a/fda-ui/static/univie_logo_512.png b/fda-ui/static/univie_logo_512.png
new file mode 100644
index 0000000000000000000000000000000000000000..74e07daa4bbc79679b3d6a5a755a7c03ad0d6c23
Binary files /dev/null and b/fda-ui/static/univie_logo_512.png differ
diff --git a/fda-ui/test/e2e/index.js b/fda-ui/test/e2e/index.js
index 6c1367b0a4f5cb2f466340d65daacd517f606f72..ee391d1d6d52aa4d5a364a6da3c4ac4675dbb2c4 100644
--- a/fda-ui/test/e2e/index.js
+++ b/fda-ui/test/e2e/index.js
@@ -6,5 +6,5 @@ test.after(after)
test('visit homepage', pageMacro, async (t, page) => {
await page.go('/')
- t.is(await page.title(), 'fda-ui - fda-ui')
+ t.is(await page.title(), 'FAIR Data Austria - Database Repository (Sandbox)')
})
diff --git a/fda-ui/yarn.lock b/fda-ui/yarn.lock
index 31dcd208e937faeed12a5ae9100e93489dede6a8..a449d83bf9881412a4f7cea917452133a22c06d7 100644
--- a/fda-ui/yarn.lock
+++ b/fda-ui/yarn.lock
@@ -34,12 +34,12 @@
"resolved" "https://registry.npmjs.org/@ava/require-precompiled/-/require-precompiled-1.0.0.tgz"
"version" "1.0.0"
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5":
- "integrity" "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw=="
- "resolved" "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0":
+ "integrity" "sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA=="
+ "resolved" "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/highlight" "^7.14.5"
+ "@babel/highlight" "^7.16.0"
"@babel/code-frame@7.12.11":
"integrity" "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="
@@ -48,25 +48,25 @@
dependencies:
"@babel/highlight" "^7.10.4"
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.0", "@babel/compat-data@^7.14.7", "@babel/compat-data@^7.15.0":
- "integrity" "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA=="
- "resolved" "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz"
- "version" "7.15.0"
-
-"@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.1.0", "@babel/core@^7.12.0", "@babel/core@^7.12.16", "@babel/core@^7.13.0", "@babel/core@^7.14.0", "@babel/core@^7.14.3", "@babel/core@^7.4.0-0", "@babel/core@^7.4.4", "@babel/core@^7.7.2", "@babel/core@^7.7.5", "@babel/core@^7.8.0", "@babel/core@^7.8.4", "@babel/core@>=7.11.0":
- "integrity" "sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw=="
- "resolved" "https://registry.npmjs.org/@babel/core/-/core-7.15.0.tgz"
- "version" "7.15.0"
- dependencies:
- "@babel/code-frame" "^7.14.5"
- "@babel/generator" "^7.15.0"
- "@babel/helper-compilation-targets" "^7.15.0"
- "@babel/helper-module-transforms" "^7.15.0"
- "@babel/helpers" "^7.14.8"
- "@babel/parser" "^7.15.0"
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.15.0"
- "@babel/types" "^7.15.0"
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.0", "@babel/compat-data@^7.16.0":
+ "integrity" "sha512-DGjt2QZse5SGd9nfOSqO4WLJ8NN/oHkijbXbPrxuoJO3oIPJL3TciZs9FX+cOHNiY9E9l0opL8g7BmLe3T+9ew=="
+ "resolved" "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.0.tgz"
+ "version" "7.16.0"
+
+"@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.1.0", "@babel/core@^7.12.0", "@babel/core@^7.12.16", "@babel/core@^7.12.3", "@babel/core@^7.13.0", "@babel/core@^7.14.0", "@babel/core@^7.14.3", "@babel/core@^7.4.0-0", "@babel/core@^7.4.4", "@babel/core@^7.7.2", "@babel/core@^7.7.5", "@babel/core@^7.8.0", "@babel/core@^7.8.4", "@babel/core@>=7.11.0":
+ "integrity" "sha512-mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ=="
+ "resolved" "https://registry.npmjs.org/@babel/core/-/core-7.16.0.tgz"
+ "version" "7.16.0"
+ dependencies:
+ "@babel/code-frame" "^7.16.0"
+ "@babel/generator" "^7.16.0"
+ "@babel/helper-compilation-targets" "^7.16.0"
+ "@babel/helper-module-transforms" "^7.16.0"
+ "@babel/helpers" "^7.16.0"
+ "@babel/parser" "^7.16.0"
+ "@babel/template" "^7.16.0"
+ "@babel/traverse" "^7.16.0"
+ "@babel/types" "^7.16.0"
"convert-source-map" "^1.7.0"
"debug" "^4.1.0"
"gensync" "^1.0.0-beta.2"
@@ -75,72 +75,72 @@
"source-map" "^0.5.0"
"@babel/eslint-parser@^7.12.16":
- "integrity" "sha512-+gSPtjSBxOZz4Uh8Ggqu7HbfpB8cT1LwW0DnVVLZEJvzXauiD0Di3zszcBkRmfGGrLdYeHUwcflG7i3tr9kQlw=="
- "resolved" "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.15.0.tgz"
- "version" "7.15.0"
+ "integrity" "sha512-c+AsYOHjI+FgCa+ifLd8sDXp4U4mjkfFgL9NdQWhuA731kAUJs0WdJIXET4A14EJAR9Jv9FFF/MzPWJfV9Oirw=="
+ "resolved" "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"eslint-scope" "^5.1.1"
"eslint-visitor-keys" "^2.1.0"
"semver" "^6.3.0"
-"@babel/generator@^7.0.0", "@babel/generator@^7.15.0", "@babel/generator@^7.7.2", "@babel/generator@^7.8.4":
- "integrity" "sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ=="
- "resolved" "https://registry.npmjs.org/@babel/generator/-/generator-7.15.0.tgz"
- "version" "7.15.0"
+"@babel/generator@^7.0.0", "@babel/generator@^7.16.0", "@babel/generator@^7.7.2", "@babel/generator@^7.8.4":
+ "integrity" "sha512-RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew=="
+ "resolved" "https://registry.npmjs.org/@babel/generator/-/generator-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/types" "^7.15.0"
+ "@babel/types" "^7.16.0"
"jsesc" "^2.5.1"
"source-map" "^0.5.0"
-"@babel/helper-annotate-as-pure@^7.14.5":
- "integrity" "sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA=="
- "resolved" "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/helper-annotate-as-pure@^7.16.0":
+ "integrity" "sha512-ItmYF9vR4zA8cByDocY05o0LGUkp1zhbTQOH1NFyl5xXEqlTJQCEJjieriw+aFpxo16swMxUnUiKS7a/r4vtHg=="
+ "resolved" "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.16.0"
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.14.5":
- "integrity" "sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w=="
- "resolved" "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.0":
+ "integrity" "sha512-9KuleLT0e77wFUku6TUkqZzCEymBdtuQQ27MhEKzf9UOOJu3cYj98kyaDAzxpC7lV6DGiZFuC8XqDsq8/Kl6aQ=="
+ "resolved" "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-explode-assignable-expression" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/helper-explode-assignable-expression" "^7.16.0"
+ "@babel/types" "^7.16.0"
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.14.5", "@babel/helper-compilation-targets@^7.15.0":
- "integrity" "sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A=="
- "resolved" "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz"
- "version" "7.15.0"
+"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.16.0":
+ "integrity" "sha512-S7iaOT1SYlqK0sQaCi21RX4+13hmdmnxIEAnQUB/eh7GeAnRjOUgTYpLkUOiRXzD+yog1JxP0qyAQZ7ZxVxLVg=="
+ "resolved" "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/compat-data" "^7.15.0"
+ "@babel/compat-data" "^7.16.0"
"@babel/helper-validator-option" "^7.14.5"
"browserslist" "^4.16.6"
"semver" "^6.3.0"
-"@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.15.0":
- "integrity" "sha512-MdmDXgvTIi4heDVX/e9EFfeGpugqm9fobBVg/iioE8kueXrOHdRDe36FAY7SnE9xXLVeYCoJR/gdrBEIHRC83Q=="
- "resolved" "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.0.tgz"
- "version" "7.15.0"
- dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
- "@babel/helper-function-name" "^7.14.5"
- "@babel/helper-member-expression-to-functions" "^7.15.0"
- "@babel/helper-optimise-call-expression" "^7.14.5"
- "@babel/helper-replace-supers" "^7.15.0"
- "@babel/helper-split-export-declaration" "^7.14.5"
-
-"@babel/helper-create-regexp-features-plugin@^7.14.5":
- "integrity" "sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A=="
- "resolved" "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/helper-create-class-features-plugin@^7.16.0":
+ "integrity" "sha512-XLwWvqEaq19zFlF5PTgOod4bUA+XbkR4WLQBct1bkzmxJGB0ZEJaoKF4c8cgH9oBtCDuYJ8BP5NB9uFiEgO5QA=="
+ "resolved" "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.0.tgz"
+ "version" "7.16.0"
+ dependencies:
+ "@babel/helper-annotate-as-pure" "^7.16.0"
+ "@babel/helper-function-name" "^7.16.0"
+ "@babel/helper-member-expression-to-functions" "^7.16.0"
+ "@babel/helper-optimise-call-expression" "^7.16.0"
+ "@babel/helper-replace-supers" "^7.16.0"
+ "@babel/helper-split-export-declaration" "^7.16.0"
+
+"@babel/helper-create-regexp-features-plugin@^7.16.0":
+ "integrity" "sha512-3DyG0zAFAZKcOp7aVr33ddwkxJ0Z0Jr5V99y3I690eYLpukJsJvAbzTy1ewoCqsML8SbIrjH14Jc/nSQ4TvNPA=="
+ "resolved" "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
+ "@babel/helper-annotate-as-pure" "^7.16.0"
"regexpu-core" "^4.7.1"
-"@babel/helper-define-polyfill-provider@^0.2.2":
- "integrity" "sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew=="
- "resolved" "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz"
- "version" "0.2.3"
+"@babel/helper-define-polyfill-provider@^0.2.4":
+ "integrity" "sha512-OrpPZ97s+aPi6h2n1OXzdhVis1SGSsMU2aMHgLcOKfsp4/v1NWpx3CWT3lBj5eeBq9cDkPkh+YCfdF7O12uNDQ=="
+ "resolved" "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.4.tgz"
+ "version" "0.2.4"
dependencies:
"@babel/helper-compilation-targets" "^7.13.0"
"@babel/helper-module-imports" "^7.12.13"
@@ -151,303 +151,310 @@
"resolve" "^1.14.2"
"semver" "^6.1.2"
-"@babel/helper-explode-assignable-expression@^7.14.5":
- "integrity" "sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ=="
- "resolved" "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/helper-explode-assignable-expression@^7.16.0":
+ "integrity" "sha512-Hk2SLxC9ZbcOhLpg/yMznzJ11W++lg5GMbxt1ev6TXUiJB0N42KPC+7w8a+eWGuqDnUYuwStJoZHM7RgmIOaGQ=="
+ "resolved" "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.16.0"
-"@babel/helper-function-name@^7.14.5":
- "integrity" "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ=="
- "resolved" "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/helper-function-name@^7.16.0":
+ "integrity" "sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog=="
+ "resolved" "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-get-function-arity" "^7.14.5"
- "@babel/template" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/helper-get-function-arity" "^7.16.0"
+ "@babel/template" "^7.16.0"
+ "@babel/types" "^7.16.0"
-"@babel/helper-get-function-arity@^7.14.5":
- "integrity" "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg=="
- "resolved" "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/helper-get-function-arity@^7.16.0":
+ "integrity" "sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ=="
+ "resolved" "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.16.0"
-"@babel/helper-hoist-variables@^7.14.5":
- "integrity" "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ=="
- "resolved" "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/helper-hoist-variables@^7.16.0":
+ "integrity" "sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg=="
+ "resolved" "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.16.0"
-"@babel/helper-member-expression-to-functions@^7.15.0":
- "integrity" "sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg=="
- "resolved" "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz"
- "version" "7.15.0"
+"@babel/helper-member-expression-to-functions@^7.16.0":
+ "integrity" "sha512-bsjlBFPuWT6IWhl28EdrQ+gTvSvj5tqVP5Xeftp07SEuz5pLnsXZuDkDD3Rfcxy0IsHmbZ+7B2/9SHzxO0T+sQ=="
+ "resolved" "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/types" "^7.15.0"
+ "@babel/types" "^7.16.0"
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.13.12", "@babel/helper-module-imports@^7.14.5":
- "integrity" "sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ=="
- "resolved" "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.13.12", "@babel/helper-module-imports@^7.16.0":
+ "integrity" "sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg=="
+ "resolved" "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/types" "^7.14.5"
-
-"@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.0":
- "integrity" "sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg=="
- "resolved" "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz"
- "version" "7.15.0"
- dependencies:
- "@babel/helper-module-imports" "^7.14.5"
- "@babel/helper-replace-supers" "^7.15.0"
- "@babel/helper-simple-access" "^7.14.8"
- "@babel/helper-split-export-declaration" "^7.14.5"
- "@babel/helper-validator-identifier" "^7.14.9"
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.15.0"
- "@babel/types" "^7.15.0"
-
-"@babel/helper-optimise-call-expression@^7.14.5":
- "integrity" "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA=="
- "resolved" "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz"
- "version" "7.14.5"
+ "@babel/types" "^7.16.0"
+
+"@babel/helper-module-transforms@^7.16.0":
+ "integrity" "sha512-My4cr9ATcaBbmaEa8M0dZNA74cfI6gitvUAskgDtAFmAqyFKDSHQo5YstxPbN+lzHl2D9l/YOEFqb2mtUh4gfA=="
+ "resolved" "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/helper-module-imports" "^7.16.0"
+ "@babel/helper-replace-supers" "^7.16.0"
+ "@babel/helper-simple-access" "^7.16.0"
+ "@babel/helper-split-export-declaration" "^7.16.0"
+ "@babel/helper-validator-identifier" "^7.15.7"
+ "@babel/template" "^7.16.0"
+ "@babel/traverse" "^7.16.0"
+ "@babel/types" "^7.16.0"
+
+"@babel/helper-optimise-call-expression@^7.16.0":
+ "integrity" "sha512-SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw=="
+ "resolved" "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz"
+ "version" "7.16.0"
+ dependencies:
+ "@babel/types" "^7.16.0"
"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
"integrity" "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ=="
"resolved" "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz"
"version" "7.14.5"
-"@babel/helper-remap-async-to-generator@^7.14.5":
- "integrity" "sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A=="
- "resolved" "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/helper-remap-async-to-generator@^7.16.0":
+ "integrity" "sha512-MLM1IOMe9aQBqMWxcRw8dcb9jlM86NIw7KA0Wri91Xkfied+dE0QuBFSBjMNvqzmS0OSIDsMNC24dBEkPUi7ew=="
+ "resolved" "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
- "@babel/helper-wrap-function" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/helper-annotate-as-pure" "^7.16.0"
+ "@babel/helper-wrap-function" "^7.16.0"
+ "@babel/types" "^7.16.0"
-"@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.0":
- "integrity" "sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA=="
- "resolved" "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz"
- "version" "7.15.0"
+"@babel/helper-replace-supers@^7.16.0":
+ "integrity" "sha512-TQxuQfSCdoha7cpRNJvfaYxxxzmbxXw/+6cS7V02eeDYyhxderSoMVALvwupA54/pZcOTtVeJ0xccp1nGWladA=="
+ "resolved" "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-member-expression-to-functions" "^7.15.0"
- "@babel/helper-optimise-call-expression" "^7.14.5"
- "@babel/traverse" "^7.15.0"
- "@babel/types" "^7.15.0"
+ "@babel/helper-member-expression-to-functions" "^7.16.0"
+ "@babel/helper-optimise-call-expression" "^7.16.0"
+ "@babel/traverse" "^7.16.0"
+ "@babel/types" "^7.16.0"
-"@babel/helper-simple-access@^7.14.8":
- "integrity" "sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg=="
- "resolved" "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz"
- "version" "7.14.8"
+"@babel/helper-simple-access@^7.16.0":
+ "integrity" "sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw=="
+ "resolved" "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/types" "^7.14.8"
+ "@babel/types" "^7.16.0"
-"@babel/helper-skip-transparent-expression-wrappers@^7.14.5":
- "integrity" "sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ=="
- "resolved" "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
+ "integrity" "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw=="
+ "resolved" "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.16.0"
-"@babel/helper-split-export-declaration@^7.14.5":
- "integrity" "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA=="
- "resolved" "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/helper-split-export-declaration@^7.16.0":
+ "integrity" "sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw=="
+ "resolved" "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.16.0"
-"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9":
- "integrity" "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g=="
- "resolved" "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz"
- "version" "7.14.9"
+"@babel/helper-validator-identifier@^7.15.7":
+ "integrity" "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w=="
+ "resolved" "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz"
+ "version" "7.15.7"
"@babel/helper-validator-option@^7.14.5":
"integrity" "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="
"resolved" "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz"
"version" "7.14.5"
-"@babel/helper-wrap-function@^7.14.5":
- "integrity" "sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ=="
- "resolved" "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/helper-wrap-function@^7.16.0":
+ "integrity" "sha512-VVMGzYY3vkWgCJML+qVLvGIam902mJW0FvT7Avj1zEe0Gn7D93aWdLblYARTxEw+6DhZmtzhBM2zv0ekE5zg1g=="
+ "resolved" "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-function-name" "^7.14.5"
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/helper-function-name" "^7.16.0"
+ "@babel/template" "^7.16.0"
+ "@babel/traverse" "^7.16.0"
+ "@babel/types" "^7.16.0"
-"@babel/helpers@^7.14.8":
- "integrity" "sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g=="
- "resolved" "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.3.tgz"
- "version" "7.15.3"
+"@babel/helpers@^7.16.0":
+ "integrity" "sha512-dVRM0StFMdKlkt7cVcGgwD8UMaBfWJHl3A83Yfs8GQ3MO0LHIIIMvK7Fa0RGOGUQ10qikLaX6D7o5htcQWgTMQ=="
+ "resolved" "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.15.0"
- "@babel/types" "^7.15.0"
+ "@babel/template" "^7.16.0"
+ "@babel/traverse" "^7.16.0"
+ "@babel/types" "^7.16.0"
-"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5":
- "integrity" "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg=="
- "resolved" "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/highlight@^7.10.4", "@babel/highlight@^7.16.0":
+ "integrity" "sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g=="
+ "resolved" "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-validator-identifier" "^7.14.5"
+ "@babel/helper-validator-identifier" "^7.15.7"
"chalk" "^2.0.0"
"js-tokens" "^4.0.0"
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.14.5", "@babel/parser@^7.14.9", "@babel/parser@^7.15.0", "@babel/parser@^7.7.0", "@babel/parser@^7.7.2", "@babel/parser@^7.9.6":
- "integrity" "sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA=="
- "resolved" "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz"
- "version" "7.15.3"
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.14.9", "@babel/parser@^7.16.0", "@babel/parser@^7.7.0", "@babel/parser@^7.7.2", "@babel/parser@^7.9.6":
+ "integrity" "sha512-RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw=="
+ "resolved" "https://registry.npmjs.org/@babel/parser/-/parser-7.16.2.tgz"
+ "version" "7.16.2"
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5":
- "integrity" "sha512-ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.0":
+ "integrity" "sha512-h37CvpLSf8gb2lIJ2CgC3t+EjFbi0t8qS7LCS1xcJIlEXE4czlofwaW7W1HA8zpgOCzI9C1nmoqNR1zWkk0pQg=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2.tgz"
+ "version" "7.16.2"
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.0":
+ "integrity" "sha512-4tcFwwicpWTrpl9qjf7UsoosaArgImF85AxqCRZlgc3IQDvkUHjJpruXAL58Wmj+T6fypWTC/BakfEkwIL/pwA=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
- "@babel/plugin-proposal-optional-chaining" "^7.14.5"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+ "@babel/plugin-proposal-optional-chaining" "^7.16.0"
-"@babel/plugin-proposal-async-generator-functions@^7.14.9":
- "integrity" "sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz"
- "version" "7.14.9"
+"@babel/plugin-proposal-async-generator-functions@^7.16.0":
+ "integrity" "sha512-nyYmIo7ZqKsY6P4lnVmBlxp9B3a96CscbLotlsNuktMHahkDwoPYEjXrZHU0Tj844Z9f1IthVxQln57mhkcExw=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-remap-async-to-generator" "^7.14.5"
+ "@babel/helper-remap-async-to-generator" "^7.16.0"
"@babel/plugin-syntax-async-generators" "^7.8.4"
-"@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.14.5":
- "integrity" "sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.16.0":
+ "integrity" "sha512-mCF3HcuZSY9Fcx56Lbn+CGdT44ioBMMvjNVldpKtj8tpniETdLjnxdHI1+sDWXIM1nNt+EanJOZ3IG9lzVjs7A=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.14.5"
+ "@babel/helper-create-class-features-plugin" "^7.16.0"
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-proposal-class-static-block@^7.14.5":
- "integrity" "sha512-KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-proposal-class-static-block@^7.16.0":
+ "integrity" "sha512-mAy3sdcY9sKAkf3lQbDiv3olOfiLqI51c9DR9b19uMoR2Z6r5pmGl7dfNFqEvqOyqbf1ta4lknK4gc5PJn3mfA=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.14.5"
+ "@babel/helper-create-class-features-plugin" "^7.16.0"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-class-static-block" "^7.14.5"
"@babel/plugin-proposal-decorators@^7.13.15":
- "integrity" "sha512-LYz5nvQcvYeRVjui1Ykn28i+3aUiXwQ/3MGoEy0InTaz1pJo/lAzmIDXX+BQny/oufgHzJ6vnEEiXQ8KZjEVFg=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.14.5.tgz"
- "version" "7.14.5"
+ "integrity" "sha512-ttvhKuVnQwoNQrcTd1oe6o49ahaZ1kns1fsJKzTVOaS/FJDJoK4qzgVS68xzJhYUMgTnbXW6z/T6rlP3lL7tJw=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.14.5"
+ "@babel/helper-create-class-features-plugin" "^7.16.0"
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/plugin-syntax-decorators" "^7.14.5"
+ "@babel/plugin-syntax-decorators" "^7.16.0"
-"@babel/plugin-proposal-dynamic-import@^7.14.5", "@babel/plugin-proposal-dynamic-import@^7.8.3":
- "integrity" "sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-proposal-dynamic-import@^7.16.0", "@babel/plugin-proposal-dynamic-import@^7.8.3":
+ "integrity" "sha512-QGSA6ExWk95jFQgwz5GQ2Dr95cf7eI7TKutIXXTb7B1gCLTCz5hTjFTQGfLFBBiC5WSNi7udNwWsqbbMh1c4yQ=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-dynamic-import" "^7.8.3"
-"@babel/plugin-proposal-export-namespace-from@^7.14.5":
- "integrity" "sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-proposal-export-namespace-from@^7.16.0":
+ "integrity" "sha512-CjI4nxM/D+5wCnhD11MHB1AwRSAYeDT+h8gCdcVJZ/OK7+wRzFsf7PFPWVpVpNRkHMmMkQWAHpTq+15IXQ1diA=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-"@babel/plugin-proposal-json-strings@^7.14.5":
- "integrity" "sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-proposal-json-strings@^7.16.0":
+ "integrity" "sha512-kouIPuiv8mSi5JkEhzApg5Gn6hFyKPnlkO0a9YSzqRurH8wYzSlf6RJdzluAsbqecdW5pBvDJDfyDIUR/vLxvg=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-json-strings" "^7.8.3"
-"@babel/plugin-proposal-logical-assignment-operators@^7.14.5":
- "integrity" "sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-proposal-logical-assignment-operators@^7.16.0":
+ "integrity" "sha512-pbW0fE30sVTYXXm9lpVQQ/Vc+iTeQKiXlaNRZPPN2A2VdlWyAtsUrsQ3xydSlDW00TFMK7a8m3cDTkBF5WnV3Q=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8", "@babel/plugin-proposal-nullish-coalescing-operator@^7.14.5", "@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
- "integrity" "sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8", "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
+ "integrity" "sha512-3bnHA8CAFm7cG93v8loghDYyQ8r97Qydf63BeYiGgYbjKKB/XP53W15wfRC7dvKfoiJ34f6Rbyyx2btExc8XsQ=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-"@babel/plugin-proposal-numeric-separator@^7.14.5":
- "integrity" "sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-proposal-numeric-separator@^7.16.0":
+ "integrity" "sha512-FAhE2I6mjispy+vwwd6xWPyEx3NYFS13pikDBWUAFGZvq6POGs5eNchw8+1CYoEgBl9n11I3NkzD7ghn25PQ9Q=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-numeric-separator" "^7.10.4"
-"@babel/plugin-proposal-object-rest-spread@^7.14.7":
- "integrity" "sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz"
- "version" "7.14.7"
+"@babel/plugin-proposal-object-rest-spread@^7.16.0":
+ "integrity" "sha512-LU/+jp89efe5HuWJLmMmFG0+xbz+I2rSI7iLc1AlaeSMDMOGzWlc5yJrMN1d04osXN4sSfpo4O+azkBNBes0jg=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/compat-data" "^7.14.7"
- "@babel/helper-compilation-targets" "^7.14.5"
+ "@babel/compat-data" "^7.16.0"
+ "@babel/helper-compilation-targets" "^7.16.0"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-object-rest-spread" "^7.8.3"
- "@babel/plugin-transform-parameters" "^7.14.5"
+ "@babel/plugin-transform-parameters" "^7.16.0"
-"@babel/plugin-proposal-optional-catch-binding@^7.14.5":
- "integrity" "sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-proposal-optional-catch-binding@^7.16.0":
+ "integrity" "sha512-kicDo0A/5J0nrsCPbn89mTG3Bm4XgYi0CZtvex9Oyw7gGZE3HXGD0zpQNH+mo+tEfbo8wbmMvJftOwpmPy7aVw=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-"@babel/plugin-proposal-optional-chaining@^7.13.12", "@babel/plugin-proposal-optional-chaining@^7.14.5", "@babel/plugin-proposal-optional-chaining@^7.8.3":
- "integrity" "sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-proposal-optional-chaining@^7.13.12", "@babel/plugin-proposal-optional-chaining@^7.16.0", "@babel/plugin-proposal-optional-chaining@^7.8.3":
+ "integrity" "sha512-Y4rFpkZODfHrVo70Uaj6cC1JJOt3Pp0MdWSwIKtb8z1/lsjl9AmnB7ErRFV+QNGIfcY1Eruc2UMx5KaRnXjMyg=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
"@babel/plugin-syntax-optional-chaining" "^7.8.3"
-"@babel/plugin-proposal-private-methods@^7.13.0", "@babel/plugin-proposal-private-methods@^7.14.5":
- "integrity" "sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-proposal-private-methods@^7.13.0", "@babel/plugin-proposal-private-methods@^7.16.0":
+ "integrity" "sha512-IvHmcTHDFztQGnn6aWq4t12QaBXTKr1whF/dgp9kz84X6GUcwq9utj7z2wFCUfeOup/QKnOlt2k0zxkGFx9ubg=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.14.5"
+ "@babel/helper-create-class-features-plugin" "^7.16.0"
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-proposal-private-property-in-object@^7.14.5":
- "integrity" "sha512-62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-proposal-private-property-in-object@^7.16.0":
+ "integrity" "sha512-3jQUr/HBbMVZmi72LpjQwlZ55i1queL8KcDTQEkAHihttJnAPrcvG9ZNXIfsd2ugpizZo595egYV6xy+pv4Ofw=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
- "@babel/helper-create-class-features-plugin" "^7.14.5"
+ "@babel/helper-annotate-as-pure" "^7.16.0"
+ "@babel/helper-create-class-features-plugin" "^7.16.0"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-"@babel/plugin-proposal-unicode-property-regex@^7.14.5", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
- "integrity" "sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-proposal-unicode-property-regex@^7.16.0", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+ "integrity" "sha512-ti7IdM54NXv29cA4+bNNKEMS4jLMCbJgl+Drv+FgYy0erJLAxNAIXcNjNjrRZEcWq0xJHsNVwQezskMFpF8N9g=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+ "@babel/helper-create-regexp-features-plugin" "^7.16.0"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-async-generators@^7.8.4":
@@ -478,10 +485,10 @@
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-syntax-decorators@^7.14.5":
- "integrity" "sha512-c4sZMRWL4GSvP1EXy0woIP7m4jkVcEuG8R1TOZxPBPtp4FSM/kiPZub9UIs/Jrb5ZAOzvTUSGYrWsrSu1JvoPw=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-syntax-decorators@^7.16.0":
+ "integrity" "sha512-nxnnngZClvlY13nHJAIDow0S7Qzhq64fQ/NlqS+VER3kjW/4F0jLhXjeL8jcwSwz6Ca3rotT5NJD2T9I7lcv7g=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
@@ -514,9 +521,9 @@
"@babel/helper-plugin-utils" "^7.8.0"
"@babel/plugin-syntax-jsx@^7.2.0":
- "integrity" "sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz"
- "version" "7.14.5"
+ "integrity" "sha512-8zv2+xiPHwly31RK4RmnEYY5zziuF3O7W2kIDW+07ewWDh6Oi0dRq8kwvulRkFgt6DB97RlKs5c1y068iPlCUg=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
@@ -576,307 +583,308 @@
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-syntax-typescript@^7.14.5", "@babel/plugin-syntax-typescript@^7.7.2":
- "integrity" "sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-syntax-typescript@^7.16.0", "@babel/plugin-syntax-typescript@^7.7.2":
+ "integrity" "sha512-Xv6mEXqVdaqCBfJFyeab0fH2DnUoMsDmhamxsSi4j8nLd4Vtw213WMJr55xxqipC/YVWyPY3K0blJncPYji+dQ=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-arrow-functions@^7.14.5":
- "integrity" "sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-arrow-functions@^7.16.0":
+ "integrity" "sha512-vIFb5250Rbh7roWARvCLvIJ/PtAU5Lhv7BtZ1u24COwpI9Ypjsh+bZcKk6rlIyalK+r0jOc1XQ8I4ovNxNrWrA=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-async-to-generator@^7.14.5":
- "integrity" "sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-async-to-generator@^7.16.0":
+ "integrity" "sha512-PbIr7G9kR8tdH6g8Wouir5uVjklETk91GMVSUq+VaOgiinbCkBP6Q7NN/suM/QutZkMJMvcyAriogcYAdhg8Gw=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-module-imports" "^7.14.5"
+ "@babel/helper-module-imports" "^7.16.0"
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-remap-async-to-generator" "^7.14.5"
+ "@babel/helper-remap-async-to-generator" "^7.16.0"
-"@babel/plugin-transform-block-scoped-functions@^7.14.5":
- "integrity" "sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-block-scoped-functions@^7.16.0":
+ "integrity" "sha512-V14As3haUOP4ZWrLJ3VVx5rCnrYhMSHN/jX7z6FAt5hjRkLsb0snPCmJwSOML5oxkKO4FNoNv7V5hw/y2bjuvg=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-block-scoping@^7.14.5":
- "integrity" "sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz"
- "version" "7.15.3"
+"@babel/plugin-transform-block-scoping@^7.16.0":
+ "integrity" "sha512-27n3l67/R3UrXfizlvHGuTwsRIFyce3D/6a37GRxn28iyTPvNXaW4XvznexRh1zUNLPjbLL22Id0XQElV94ruw=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-classes@^7.14.9":
- "integrity" "sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz"
- "version" "7.14.9"
+"@babel/plugin-transform-classes@^7.16.0":
+ "integrity" "sha512-HUxMvy6GtAdd+GKBNYDWCIA776byUQH8zjnfjxwT1P1ARv/wFu8eBDpmXQcLS/IwRtrxIReGiplOwMeyO7nsDQ=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
- "@babel/helper-function-name" "^7.14.5"
- "@babel/helper-optimise-call-expression" "^7.14.5"
+ "@babel/helper-annotate-as-pure" "^7.16.0"
+ "@babel/helper-function-name" "^7.16.0"
+ "@babel/helper-optimise-call-expression" "^7.16.0"
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-replace-supers" "^7.14.5"
- "@babel/helper-split-export-declaration" "^7.14.5"
+ "@babel/helper-replace-supers" "^7.16.0"
+ "@babel/helper-split-export-declaration" "^7.16.0"
"globals" "^11.1.0"
-"@babel/plugin-transform-computed-properties@^7.14.5":
- "integrity" "sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-computed-properties@^7.16.0":
+ "integrity" "sha512-63l1dRXday6S8V3WFY5mXJwcRAnPYxvFfTlt67bwV1rTyVTM5zrp0DBBb13Kl7+ehkCVwIZPumPpFP/4u70+Tw=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-destructuring@^7.14.7":
- "integrity" "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz"
- "version" "7.14.7"
+"@babel/plugin-transform-destructuring@^7.16.0":
+ "integrity" "sha512-Q7tBUwjxLTsHEoqktemHBMtb3NYwyJPTJdM+wDwb0g8PZ3kQUIzNvwD5lPaqW/p54TXBc/MXZu9Jr7tbUEUM8Q=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-dotall-regex@^7.14.5", "@babel/plugin-transform-dotall-regex@^7.4.4":
- "integrity" "sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-dotall-regex@^7.16.0", "@babel/plugin-transform-dotall-regex@^7.4.4":
+ "integrity" "sha512-FXlDZfQeLILfJlC6I1qyEwcHK5UpRCFkaoVyA1nk9A1L1Yu583YO4un2KsLBsu3IJb4CUbctZks8tD9xPQubLw=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+ "@babel/helper-create-regexp-features-plugin" "^7.16.0"
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-duplicate-keys@^7.14.5":
- "integrity" "sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-duplicate-keys@^7.16.0":
+ "integrity" "sha512-LIe2kcHKAZOJDNxujvmp6z3mfN6V9lJxubU4fJIGoQCkKe3Ec2OcbdlYP+vW++4MpxwG0d1wSDOJtQW5kLnkZQ=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-exponentiation-operator@^7.14.5":
- "integrity" "sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-exponentiation-operator@^7.16.0":
+ "integrity" "sha512-OwYEvzFI38hXklsrbNivzpO3fh87skzx8Pnqi4LoSYeav0xHlueSoCJrSgTPfnbyzopo5b3YVAJkFIcUpK2wsw=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-builder-binary-assignment-operator-visitor" "^7.14.5"
+ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.0"
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-for-of@^7.14.5":
- "integrity" "sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-for-of@^7.16.0":
+ "integrity" "sha512-5QKUw2kO+GVmKr2wMYSATCTTnHyscl6sxFRAY+rvN7h7WB0lcG0o4NoV6ZQU32OZGVsYUsfLGgPQpDFdkfjlJQ=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-function-name@^7.14.5":
- "integrity" "sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-function-name@^7.16.0":
+ "integrity" "sha512-lBzMle9jcOXtSOXUpc7tvvTpENu/NuekNJVova5lCCWCV9/U1ho2HH2y0p6mBg8fPm/syEAbfaaemYGOHCY3mg=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-function-name" "^7.14.5"
+ "@babel/helper-function-name" "^7.16.0"
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-literals@^7.14.5":
- "integrity" "sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-literals@^7.16.0":
+ "integrity" "sha512-gQDlsSF1iv9RU04clgXqRjrPyyoJMTclFt3K1cjLmTKikc0s/6vE3hlDeEVC71wLTRu72Fq7650kABrdTc2wMQ=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-member-expression-literals@^7.14.5":
- "integrity" "sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-member-expression-literals@^7.16.0":
+ "integrity" "sha512-WRpw5HL4Jhnxw8QARzRvwojp9MIE7Tdk3ez6vRyUk1MwgjJN0aNpRoXainLR5SgxmoXx/vsXGZ6OthP6t/RbUg=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-modules-amd@^7.14.5":
- "integrity" "sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-modules-amd@^7.16.0":
+ "integrity" "sha512-rWFhWbCJ9Wdmzln1NmSCqn7P0RAD+ogXG/bd9Kg5c7PKWkJtkiXmYsMBeXjDlzHpVTJ4I/hnjs45zX4dEv81xw=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-module-transforms" "^7.14.5"
+ "@babel/helper-module-transforms" "^7.16.0"
"@babel/helper-plugin-utils" "^7.14.5"
"babel-plugin-dynamic-import-node" "^2.3.3"
-"@babel/plugin-transform-modules-commonjs@^7.15.0", "@babel/plugin-transform-modules-commonjs@^7.8.3":
- "integrity" "sha512-3H/R9s8cXcOGE8kgMlmjYYC9nqr5ELiPkJn4q0mypBrjhYQoc+5/Maq69vV4xRPWnkzZuwJPf5rArxpB/35Cig=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz"
- "version" "7.15.0"
+"@babel/plugin-transform-modules-commonjs@^7.16.0", "@babel/plugin-transform-modules-commonjs@^7.8.3":
+ "integrity" "sha512-Dzi+NWqyEotgzk/sb7kgQPJQf7AJkQBWsVp1N6JWc1lBVo0vkElUnGdr1PzUBmfsCCN5OOFya3RtpeHk15oLKQ=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-module-transforms" "^7.15.0"
+ "@babel/helper-module-transforms" "^7.16.0"
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-simple-access" "^7.14.8"
+ "@babel/helper-simple-access" "^7.16.0"
"babel-plugin-dynamic-import-node" "^2.3.3"
-"@babel/plugin-transform-modules-systemjs@^7.14.5":
- "integrity" "sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-modules-systemjs@^7.16.0":
+ "integrity" "sha512-yuGBaHS3lF1m/5R+6fjIke64ii5luRUg97N2wr+z1sF0V+sNSXPxXDdEEL/iYLszsN5VKxVB1IPfEqhzVpiqvg=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-hoist-variables" "^7.14.5"
- "@babel/helper-module-transforms" "^7.14.5"
+ "@babel/helper-hoist-variables" "^7.16.0"
+ "@babel/helper-module-transforms" "^7.16.0"
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-validator-identifier" "^7.14.5"
+ "@babel/helper-validator-identifier" "^7.15.7"
"babel-plugin-dynamic-import-node" "^2.3.3"
-"@babel/plugin-transform-modules-umd@^7.14.5":
- "integrity" "sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-modules-umd@^7.16.0":
+ "integrity" "sha512-nx4f6no57himWiHhxDM5pjwhae5vLpTK2zCnDH8+wNLJy0TVER/LJRHl2bkt6w9Aad2sPD5iNNoUpY3X9sTGDg=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-module-transforms" "^7.14.5"
+ "@babel/helper-module-transforms" "^7.16.0"
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-named-capturing-groups-regex@^7.14.9":
- "integrity" "sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz"
- "version" "7.14.9"
+"@babel/plugin-transform-named-capturing-groups-regex@^7.16.0":
+ "integrity" "sha512-LogN88uO+7EhxWc8WZuQ8vxdSyVGxhkh8WTC3tzlT8LccMuQdA81e9SGV6zY7kY2LjDhhDOFdQVxdGwPyBCnvg=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+ "@babel/helper-create-regexp-features-plugin" "^7.16.0"
-"@babel/plugin-transform-new-target@^7.14.5":
- "integrity" "sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-new-target@^7.16.0":
+ "integrity" "sha512-fhjrDEYv2DBsGN/P6rlqakwRwIp7rBGLPbrKxwh7oVt5NNkIhZVOY2GRV+ULLsQri1bDqwDWnU3vhlmx5B2aCw=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-object-super@^7.14.5":
- "integrity" "sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-object-super@^7.16.0":
+ "integrity" "sha512-fds+puedQHn4cPLshoHcR1DTMN0q1V9ou0mUjm8whx9pGcNvDrVVrgw+KJzzCaiTdaYhldtrUps8DWVMgrSEyg=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-replace-supers" "^7.14.5"
+ "@babel/helper-replace-supers" "^7.16.0"
-"@babel/plugin-transform-parameters@^7.14.5":
- "integrity" "sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-parameters@^7.16.0":
+ "integrity" "sha512-XgnQEm1CevKROPx+udOi/8f8TiGhrUWiHiaUCIp47tE0tpFDjzXNTZc9E5CmCwxNjXTWEVqvRfWZYOTFvMa/ZQ=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-property-literals@^7.14.5":
- "integrity" "sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-property-literals@^7.16.0":
+ "integrity" "sha512-XLldD4V8+pOqX2hwfWhgwXzGdnDOThxaNTgqagOcpBgIxbUvpgU2FMvo5E1RyHbk756WYgdbS0T8y0Cj9FKkWQ=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-regenerator@^7.14.5":
- "integrity" "sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-regenerator@^7.16.0":
+ "integrity" "sha512-JAvGxgKuwS2PihiSFaDrp94XOzzTUeDeOQlcKzVAyaPap7BnZXK/lvMDiubkPTdotPKOIZq9xWXWnggUMYiExg=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"regenerator-transform" "^0.14.2"
-"@babel/plugin-transform-reserved-words@^7.14.5":
- "integrity" "sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-reserved-words@^7.16.0":
+ "integrity" "sha512-Dgs8NNCehHSvXdhEhln8u/TtJxfVwGYCgP2OOr5Z3Ar+B+zXicEOKNTyc+eca2cuEOMtjW6m9P9ijOt8QdqWkg=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-transform-runtime@^7.13.15", "@babel/plugin-transform-runtime@^7.13.9":
- "integrity" "sha512-sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz"
- "version" "7.15.0"
+ "integrity" "sha512-zlPf1/XFn5+vWdve3AAhf+Sxl+MVa5VlwTwWgnLx23u4GlatSRQJ3Eoo9vllf0a9il3woQsT4SK+5Z7c06h8ag=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-module-imports" "^7.14.5"
+ "@babel/helper-module-imports" "^7.16.0"
"@babel/helper-plugin-utils" "^7.14.5"
- "babel-plugin-polyfill-corejs2" "^0.2.2"
- "babel-plugin-polyfill-corejs3" "^0.2.2"
- "babel-plugin-polyfill-regenerator" "^0.2.2"
+ "babel-plugin-polyfill-corejs2" "^0.2.3"
+ "babel-plugin-polyfill-corejs3" "^0.3.0"
+ "babel-plugin-polyfill-regenerator" "^0.2.3"
"semver" "^6.3.0"
-"@babel/plugin-transform-shorthand-properties@^7.14.5":
- "integrity" "sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-shorthand-properties@^7.16.0":
+ "integrity" "sha512-iVb1mTcD8fuhSv3k99+5tlXu5N0v8/DPm2mO3WACLG6al1CGZH7v09HJyUb1TtYl/Z+KrM6pHSIJdZxP5A+xow=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-spread@^7.14.6":
- "integrity" "sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz"
- "version" "7.14.6"
+"@babel/plugin-transform-spread@^7.16.0":
+ "integrity" "sha512-Ao4MSYRaLAQczZVp9/7E7QHsCuK92yHRrmVNRe/SlEJjhzivq0BSn8mEraimL8wizHZ3fuaHxKH0iwzI13GyGg=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
-"@babel/plugin-transform-sticky-regex@^7.14.5":
- "integrity" "sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-sticky-regex@^7.16.0":
+ "integrity" "sha512-/ntT2NljR9foobKk4E/YyOSwcGUXtYWv5tinMK/3RkypyNBNdhHUaq6Orw5DWq9ZcNlS03BIlEALFeQgeVAo4Q=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-template-literals@^7.14.5":
- "integrity" "sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-template-literals@^7.16.0":
+ "integrity" "sha512-Rd4Ic89hA/f7xUSJQk5PnC+4so50vBoBfxjdQAdvngwidM8jYIBVxBZ/sARxD4e0yMXRbJVDrYf7dyRtIIKT6Q=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-typeof-symbol@^7.14.5":
- "integrity" "sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-typeof-symbol@^7.16.0":
+ "integrity" "sha512-++V2L8Bdf4vcaHi2raILnptTBjGEFxn5315YU+e8+EqXIucA+q349qWngCLpUYqqv233suJ6NOienIVUpS9cqg=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-typescript@^7.15.0":
- "integrity" "sha512-WIIEazmngMEEHDaPTx0IZY48SaAmjVWe3TRSX7cmJXn0bEv9midFzAjxiruOWYIVf5iQ10vFx7ASDpgEO08L5w=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.0.tgz"
- "version" "7.15.0"
+"@babel/plugin-transform-typescript@^7.16.0":
+ "integrity" "sha512-NO4XoryBng06jjw/qWEU2LhcLJr1tWkhpMam/H4eas/CDKMX/b2/Ylb6EI256Y7+FVPCawwSM1rrJNOpDiz+Lg=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.1.tgz"
+ "version" "7.16.1"
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.15.0"
+ "@babel/helper-create-class-features-plugin" "^7.16.0"
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/plugin-syntax-typescript" "^7.14.5"
+ "@babel/plugin-syntax-typescript" "^7.16.0"
-"@babel/plugin-transform-unicode-escapes@^7.14.5":
- "integrity" "sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-unicode-escapes@^7.16.0":
+ "integrity" "sha512-VFi4dhgJM7Bpk8lRc5CMaRGlKZ29W9C3geZjt9beuzSUrlJxsNwX7ReLwaL6WEvsOf2EQkyIJEPtF8EXjB/g2A=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-unicode-regex@^7.14.5":
- "integrity" "sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw=="
- "resolved" "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz"
- "version" "7.14.5"
+"@babel/plugin-transform-unicode-regex@^7.16.0":
+ "integrity" "sha512-jHLK4LxhHjvCeZDWyA9c+P9XH1sOxRd1RO9xMtDVRAOND/PczPqizEtVdx4TQF/wyPaewqpT+tgQFYMnN/P94A=="
+ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+ "@babel/helper-create-regexp-features-plugin" "^7.16.0"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/preset-env@^7.14.1", "@babel/preset-env@^7.14.4", "@babel/preset-env@^7.4.4":
- "integrity" "sha512-FhEpCNFCcWW3iZLg0L2NPE9UerdtsCR6ZcsGHUX6Om6kbCQeL5QZDqFDmeNHC6/fy6UH3jEge7K4qG5uC9In0Q=="
- "resolved" "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.0.tgz"
- "version" "7.15.0"
+ "integrity" "sha512-cdTu/W0IrviamtnZiTfixPfIncr2M1VqRrkjzZWlr1B4TVYimCFK5jkyOdP4qw2MrlKHi+b3ORj6x8GoCew8Dg=="
+ "resolved" "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/compat-data" "^7.15.0"
- "@babel/helper-compilation-targets" "^7.15.0"
+ "@babel/compat-data" "^7.16.0"
+ "@babel/helper-compilation-targets" "^7.16.0"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/helper-validator-option" "^7.14.5"
- "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.14.5"
- "@babel/plugin-proposal-async-generator-functions" "^7.14.9"
- "@babel/plugin-proposal-class-properties" "^7.14.5"
- "@babel/plugin-proposal-class-static-block" "^7.14.5"
- "@babel/plugin-proposal-dynamic-import" "^7.14.5"
- "@babel/plugin-proposal-export-namespace-from" "^7.14.5"
- "@babel/plugin-proposal-json-strings" "^7.14.5"
- "@babel/plugin-proposal-logical-assignment-operators" "^7.14.5"
- "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
- "@babel/plugin-proposal-numeric-separator" "^7.14.5"
- "@babel/plugin-proposal-object-rest-spread" "^7.14.7"
- "@babel/plugin-proposal-optional-catch-binding" "^7.14.5"
- "@babel/plugin-proposal-optional-chaining" "^7.14.5"
- "@babel/plugin-proposal-private-methods" "^7.14.5"
- "@babel/plugin-proposal-private-property-in-object" "^7.14.5"
- "@babel/plugin-proposal-unicode-property-regex" "^7.14.5"
+ "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.0"
+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.0"
+ "@babel/plugin-proposal-async-generator-functions" "^7.16.0"
+ "@babel/plugin-proposal-class-properties" "^7.16.0"
+ "@babel/plugin-proposal-class-static-block" "^7.16.0"
+ "@babel/plugin-proposal-dynamic-import" "^7.16.0"
+ "@babel/plugin-proposal-export-namespace-from" "^7.16.0"
+ "@babel/plugin-proposal-json-strings" "^7.16.0"
+ "@babel/plugin-proposal-logical-assignment-operators" "^7.16.0"
+ "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.0"
+ "@babel/plugin-proposal-numeric-separator" "^7.16.0"
+ "@babel/plugin-proposal-object-rest-spread" "^7.16.0"
+ "@babel/plugin-proposal-optional-catch-binding" "^7.16.0"
+ "@babel/plugin-proposal-optional-chaining" "^7.16.0"
+ "@babel/plugin-proposal-private-methods" "^7.16.0"
+ "@babel/plugin-proposal-private-property-in-object" "^7.16.0"
+ "@babel/plugin-proposal-unicode-property-regex" "^7.16.0"
"@babel/plugin-syntax-async-generators" "^7.8.4"
"@babel/plugin-syntax-class-properties" "^7.12.13"
"@babel/plugin-syntax-class-static-block" "^7.14.5"
@@ -891,50 +899,50 @@
"@babel/plugin-syntax-optional-chaining" "^7.8.3"
"@babel/plugin-syntax-private-property-in-object" "^7.14.5"
"@babel/plugin-syntax-top-level-await" "^7.14.5"
- "@babel/plugin-transform-arrow-functions" "^7.14.5"
- "@babel/plugin-transform-async-to-generator" "^7.14.5"
- "@babel/plugin-transform-block-scoped-functions" "^7.14.5"
- "@babel/plugin-transform-block-scoping" "^7.14.5"
- "@babel/plugin-transform-classes" "^7.14.9"
- "@babel/plugin-transform-computed-properties" "^7.14.5"
- "@babel/plugin-transform-destructuring" "^7.14.7"
- "@babel/plugin-transform-dotall-regex" "^7.14.5"
- "@babel/plugin-transform-duplicate-keys" "^7.14.5"
- "@babel/plugin-transform-exponentiation-operator" "^7.14.5"
- "@babel/plugin-transform-for-of" "^7.14.5"
- "@babel/plugin-transform-function-name" "^7.14.5"
- "@babel/plugin-transform-literals" "^7.14.5"
- "@babel/plugin-transform-member-expression-literals" "^7.14.5"
- "@babel/plugin-transform-modules-amd" "^7.14.5"
- "@babel/plugin-transform-modules-commonjs" "^7.15.0"
- "@babel/plugin-transform-modules-systemjs" "^7.14.5"
- "@babel/plugin-transform-modules-umd" "^7.14.5"
- "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.9"
- "@babel/plugin-transform-new-target" "^7.14.5"
- "@babel/plugin-transform-object-super" "^7.14.5"
- "@babel/plugin-transform-parameters" "^7.14.5"
- "@babel/plugin-transform-property-literals" "^7.14.5"
- "@babel/plugin-transform-regenerator" "^7.14.5"
- "@babel/plugin-transform-reserved-words" "^7.14.5"
- "@babel/plugin-transform-shorthand-properties" "^7.14.5"
- "@babel/plugin-transform-spread" "^7.14.6"
- "@babel/plugin-transform-sticky-regex" "^7.14.5"
- "@babel/plugin-transform-template-literals" "^7.14.5"
- "@babel/plugin-transform-typeof-symbol" "^7.14.5"
- "@babel/plugin-transform-unicode-escapes" "^7.14.5"
- "@babel/plugin-transform-unicode-regex" "^7.14.5"
- "@babel/preset-modules" "^0.1.4"
- "@babel/types" "^7.15.0"
- "babel-plugin-polyfill-corejs2" "^0.2.2"
- "babel-plugin-polyfill-corejs3" "^0.2.2"
- "babel-plugin-polyfill-regenerator" "^0.2.2"
- "core-js-compat" "^3.16.0"
+ "@babel/plugin-transform-arrow-functions" "^7.16.0"
+ "@babel/plugin-transform-async-to-generator" "^7.16.0"
+ "@babel/plugin-transform-block-scoped-functions" "^7.16.0"
+ "@babel/plugin-transform-block-scoping" "^7.16.0"
+ "@babel/plugin-transform-classes" "^7.16.0"
+ "@babel/plugin-transform-computed-properties" "^7.16.0"
+ "@babel/plugin-transform-destructuring" "^7.16.0"
+ "@babel/plugin-transform-dotall-regex" "^7.16.0"
+ "@babel/plugin-transform-duplicate-keys" "^7.16.0"
+ "@babel/plugin-transform-exponentiation-operator" "^7.16.0"
+ "@babel/plugin-transform-for-of" "^7.16.0"
+ "@babel/plugin-transform-function-name" "^7.16.0"
+ "@babel/plugin-transform-literals" "^7.16.0"
+ "@babel/plugin-transform-member-expression-literals" "^7.16.0"
+ "@babel/plugin-transform-modules-amd" "^7.16.0"
+ "@babel/plugin-transform-modules-commonjs" "^7.16.0"
+ "@babel/plugin-transform-modules-systemjs" "^7.16.0"
+ "@babel/plugin-transform-modules-umd" "^7.16.0"
+ "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.0"
+ "@babel/plugin-transform-new-target" "^7.16.0"
+ "@babel/plugin-transform-object-super" "^7.16.0"
+ "@babel/plugin-transform-parameters" "^7.16.0"
+ "@babel/plugin-transform-property-literals" "^7.16.0"
+ "@babel/plugin-transform-regenerator" "^7.16.0"
+ "@babel/plugin-transform-reserved-words" "^7.16.0"
+ "@babel/plugin-transform-shorthand-properties" "^7.16.0"
+ "@babel/plugin-transform-spread" "^7.16.0"
+ "@babel/plugin-transform-sticky-regex" "^7.16.0"
+ "@babel/plugin-transform-template-literals" "^7.16.0"
+ "@babel/plugin-transform-typeof-symbol" "^7.16.0"
+ "@babel/plugin-transform-unicode-escapes" "^7.16.0"
+ "@babel/plugin-transform-unicode-regex" "^7.16.0"
+ "@babel/preset-modules" "^0.1.5"
+ "@babel/types" "^7.16.0"
+ "babel-plugin-polyfill-corejs2" "^0.2.3"
+ "babel-plugin-polyfill-corejs3" "^0.3.0"
+ "babel-plugin-polyfill-regenerator" "^0.2.3"
+ "core-js-compat" "^3.19.0"
"semver" "^6.3.0"
-"@babel/preset-modules@^0.1.4":
- "integrity" "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg=="
- "resolved" "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz"
- "version" "0.1.4"
+"@babel/preset-modules@^0.1.5":
+ "integrity" "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA=="
+ "resolved" "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz"
+ "version" "0.1.5"
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
@@ -943,18 +951,18 @@
"esutils" "^2.0.2"
"@babel/preset-typescript@^7.13.0":
- "integrity" "sha512-lt0Y/8V3y06Wq/8H/u0WakrqciZ7Fz7mwPDHWUJAXlABL5hiUG42BNlRXiELNjeWjO5rWmnNKlx+yzJvxezHow=="
- "resolved" "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.15.0.tgz"
- "version" "7.15.0"
+ "integrity" "sha512-txegdrZYgO9DlPbv+9QOVpMnKbOtezsLHWsnsRF4AjbSIsVaujrq1qg8HK0mxQpWv0jnejt0yEoW1uWpvbrDTg=="
+ "resolved" "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/helper-validator-option" "^7.14.5"
- "@babel/plugin-transform-typescript" "^7.15.0"
+ "@babel/plugin-transform-typescript" "^7.16.0"
"@babel/register@^7.13.16":
- "integrity" "sha512-mj4IY1ZJkorClxKTImccn4T81+UKTo4Ux0+OFSV9hME1ooqS9UV+pJ6BjD0qXPK4T3XW/KNa79XByjeEMZz+fw=="
- "resolved" "https://registry.npmjs.org/@babel/register/-/register-7.15.3.tgz"
- "version" "7.15.3"
+ "integrity" "sha512-lzl4yfs0zVXnooeLE0AAfYaT7F3SPA8yB2Bj4W1BiZwLbMS3MZH35ZvCWSRHvneUugwuM+Wsnrj7h0F7UmU3NQ=="
+ "resolved" "https://registry.npmjs.org/@babel/register/-/register-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"clone-deep" "^4.0.1"
"find-cache-dir" "^2.0.0"
@@ -962,43 +970,43 @@
"pirates" "^4.0.0"
"source-map-support" "^0.5.16"
-"@babel/runtime@^7.14.0", "@babel/runtime@^7.8.4":
- "integrity" "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA=="
- "resolved" "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz"
- "version" "7.15.3"
+"@babel/runtime@^7.14.0", "@babel/runtime@^7.15.4", "@babel/runtime@^7.8.4":
+ "integrity" "sha512-Nht8L0O8YCktmsDV6FqFue7vQLRx3Hb0B37lS5y0jDRqRxlBG4wIJHnf9/bgSE2UyipKFA01YtS+npRdTWBUyw=="
+ "resolved" "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
"regenerator-runtime" "^0.13.4"
-"@babel/template@^7.14.5", "@babel/template@^7.3.3":
- "integrity" "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g=="
- "resolved" "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz"
- "version" "7.14.5"
- dependencies:
- "@babel/code-frame" "^7.14.5"
- "@babel/parser" "^7.14.5"
- "@babel/types" "^7.14.5"
-
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.14.9", "@babel/traverse@^7.15.0", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
- "integrity" "sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw=="
- "resolved" "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.0.tgz"
- "version" "7.15.0"
- dependencies:
- "@babel/code-frame" "^7.14.5"
- "@babel/generator" "^7.15.0"
- "@babel/helper-function-name" "^7.14.5"
- "@babel/helper-hoist-variables" "^7.14.5"
- "@babel/helper-split-export-declaration" "^7.14.5"
- "@babel/parser" "^7.15.0"
- "@babel/types" "^7.15.0"
+"@babel/template@^7.16.0", "@babel/template@^7.3.3":
+ "integrity" "sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A=="
+ "resolved" "https://registry.npmjs.org/@babel/template/-/template-7.16.0.tgz"
+ "version" "7.16.0"
+ dependencies:
+ "@babel/code-frame" "^7.16.0"
+ "@babel/parser" "^7.16.0"
+ "@babel/types" "^7.16.0"
+
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.9", "@babel/traverse@^7.16.0", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
+ "integrity" "sha512-qQ84jIs1aRQxaGaxSysII9TuDaguZ5yVrEuC0BN2vcPlalwfLovVmCjbFDPECPXcYM/wLvNFfp8uDOliLxIoUQ=="
+ "resolved" "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.0.tgz"
+ "version" "7.16.0"
+ dependencies:
+ "@babel/code-frame" "^7.16.0"
+ "@babel/generator" "^7.16.0"
+ "@babel/helper-function-name" "^7.16.0"
+ "@babel/helper-hoist-variables" "^7.16.0"
+ "@babel/helper-split-export-declaration" "^7.16.0"
+ "@babel/parser" "^7.16.0"
+ "@babel/types" "^7.16.0"
"debug" "^4.1.0"
"globals" "^11.1.0"
-"@babel/types@^7.0.0", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.15.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
- "integrity" "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ=="
- "resolved" "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz"
- "version" "7.15.0"
+"@babel/types@^7.0.0", "@babel/types@^7.16.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+ "integrity" "sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg=="
+ "resolved" "https://registry.npmjs.org/@babel/types/-/types-7.16.0.tgz"
+ "version" "7.16.0"
dependencies:
- "@babel/helper-validator-identifier" "^7.14.9"
+ "@babel/helper-validator-identifier" "^7.15.7"
"to-fast-properties" "^2.0.0"
"@bcoe/v8-coverage@^0.2.3":
@@ -1033,6 +1041,11 @@
"minimatch" "^3.0.4"
"strip-json-comments" "^3.1.1"
+"@gar/promisify@^1.0.1":
+ "integrity" "sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw=="
+ "resolved" "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz"
+ "version" "1.1.2"
+
"@highlightjs/vue-plugin@^1.0.2":
"integrity" "sha512-4VVPeUZL6/NZ7J6/23RQIYLm9HR9rnOdz+cxx7/ISgtMVaf0vHAAwgHKmB54GNs5VvJlWMnKOuiLVcy30elz8g=="
"resolved" "https://registry.npmjs.org/@highlightjs/vue-plugin/-/vue-plugin-1.0.2.tgz"
@@ -1050,14 +1063,14 @@
"minimatch" "^3.0.4"
"@humanwhocodes/object-schema@^1.2.0":
- "integrity" "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w=="
- "resolved" "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz"
- "version" "1.2.0"
+ "integrity" "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
+ "resolved" "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"
+ "version" "1.2.1"
"@intlify/shared@^9.0.0":
- "integrity" "sha512-zt0zlUdalumvT9AjQNxPXA36UgOndUyvBMplh8uRZU0fhWHAwhnJTcf0NaG9Qvr8I1n3HPSs96+kLb/YdwTavQ=="
- "resolved" "https://registry.npmjs.org/@intlify/shared/-/shared-9.1.7.tgz"
- "version" "9.1.7"
+ "integrity" "sha512-xKGM1d0EAxdDFCWedcYXOm6V5Pfw/TMudd6/qCdEb4tv0hk9EKeg7lwQF1azE0dP2phvx0yXxrt7UQK+IZjNdw=="
+ "resolved" "https://registry.npmjs.org/@intlify/shared/-/shared-9.1.9.tgz"
+ "version" "9.1.9"
"@intlify/vue-i18n-extensions@^1.0.2":
"integrity" "sha512-rnfA0ScyBXyp9xsSD4EAMGeOh1yv/AE7fhqdAdSOr5X8N39azz257umfRtzNT9sHXAKSSzpCVhIbMAkp5c/gjQ=="
@@ -1091,94 +1104,94 @@
"resolved" "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz"
"version" "0.1.3"
-"@jest/console@^27.0.6":
- "integrity" "sha512-fMlIBocSHPZ3JxgWiDNW/KPj6s+YRd0hicb33IrmelCcjXo/pXPwvuiKFmZz+XuqI/1u7nbUK10zSsWL/1aegg=="
- "resolved" "https://registry.npmjs.org/@jest/console/-/console-27.0.6.tgz"
- "version" "27.0.6"
+"@jest/console@^27.3.1":
+ "integrity" "sha512-RkFNWmv0iui+qsOr/29q9dyfKTTT5DCuP31kUwg7rmOKPT/ozLeGLKJKVIiOfbiKyleUZKIrHwhmiZWVe8IMdw=="
+ "resolved" "https://registry.npmjs.org/@jest/console/-/console-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
- "@jest/types" "^27.0.6"
+ "@jest/types" "^27.2.5"
"@types/node" "*"
"chalk" "^4.0.0"
- "jest-message-util" "^27.0.6"
- "jest-util" "^27.0.6"
+ "jest-message-util" "^27.3.1"
+ "jest-util" "^27.3.1"
"slash" "^3.0.0"
-"@jest/core@^27.0.6":
- "integrity" "sha512-SsYBm3yhqOn5ZLJCtccaBcvD/ccTLCeuDv8U41WJH/V1MW5eKUkeMHT9U+Pw/v1m1AIWlnIW/eM2XzQr0rEmow=="
- "resolved" "https://registry.npmjs.org/@jest/core/-/core-27.0.6.tgz"
- "version" "27.0.6"
+"@jest/core@^27.3.1":
+ "integrity" "sha512-DMNE90RR5QKx0EA+wqe3/TNEwiRpOkhshKNxtLxd4rt3IZpCt+RSL+FoJsGeblRZmqdK4upHA/mKKGPPRAifhg=="
+ "resolved" "https://registry.npmjs.org/@jest/core/-/core-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
- "@jest/console" "^27.0.6"
- "@jest/reporters" "^27.0.6"
- "@jest/test-result" "^27.0.6"
- "@jest/transform" "^27.0.6"
- "@jest/types" "^27.0.6"
+ "@jest/console" "^27.3.1"
+ "@jest/reporters" "^27.3.1"
+ "@jest/test-result" "^27.3.1"
+ "@jest/transform" "^27.3.1"
+ "@jest/types" "^27.2.5"
"@types/node" "*"
"ansi-escapes" "^4.2.1"
"chalk" "^4.0.0"
"emittery" "^0.8.1"
"exit" "^0.1.2"
"graceful-fs" "^4.2.4"
- "jest-changed-files" "^27.0.6"
- "jest-config" "^27.0.6"
- "jest-haste-map" "^27.0.6"
- "jest-message-util" "^27.0.6"
+ "jest-changed-files" "^27.3.0"
+ "jest-config" "^27.3.1"
+ "jest-haste-map" "^27.3.1"
+ "jest-message-util" "^27.3.1"
"jest-regex-util" "^27.0.6"
- "jest-resolve" "^27.0.6"
- "jest-resolve-dependencies" "^27.0.6"
- "jest-runner" "^27.0.6"
- "jest-runtime" "^27.0.6"
- "jest-snapshot" "^27.0.6"
- "jest-util" "^27.0.6"
- "jest-validate" "^27.0.6"
- "jest-watcher" "^27.0.6"
+ "jest-resolve" "^27.3.1"
+ "jest-resolve-dependencies" "^27.3.1"
+ "jest-runner" "^27.3.1"
+ "jest-runtime" "^27.3.1"
+ "jest-snapshot" "^27.3.1"
+ "jest-util" "^27.3.1"
+ "jest-validate" "^27.3.1"
+ "jest-watcher" "^27.3.1"
"micromatch" "^4.0.4"
- "p-each-series" "^2.1.0"
"rimraf" "^3.0.0"
"slash" "^3.0.0"
"strip-ansi" "^6.0.0"
-"@jest/environment@^27.0.6":
- "integrity" "sha512-4XywtdhwZwCpPJ/qfAkqExRsERW+UaoSRStSHCCiQTUpoYdLukj+YJbQSFrZjhlUDRZeNiU9SFH0u7iNimdiIg=="
- "resolved" "https://registry.npmjs.org/@jest/environment/-/environment-27.0.6.tgz"
- "version" "27.0.6"
+"@jest/environment@^27.3.1":
+ "integrity" "sha512-BCKCj4mOVLme6Tanoyc9k0ultp3pnmuyHw73UHRPeeZxirsU/7E3HC4le/VDb/SMzE1JcPnto+XBKFOcoiJzVw=="
+ "resolved" "https://registry.npmjs.org/@jest/environment/-/environment-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
- "@jest/fake-timers" "^27.0.6"
- "@jest/types" "^27.0.6"
+ "@jest/fake-timers" "^27.3.1"
+ "@jest/types" "^27.2.5"
"@types/node" "*"
- "jest-mock" "^27.0.6"
+ "jest-mock" "^27.3.0"
-"@jest/fake-timers@^27.0.6":
- "integrity" "sha512-sqd+xTWtZ94l3yWDKnRTdvTeZ+A/V7SSKrxsrOKSqdyddb9CeNRF8fbhAU0D7ZJBpTTW2nbp6MftmKJDZfW2LQ=="
- "resolved" "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.0.6.tgz"
- "version" "27.0.6"
+"@jest/fake-timers@^27.3.1":
+ "integrity" "sha512-M3ZFgwwlqJtWZ+QkBG5NmC23A9w+A6ZxNsO5nJxJsKYt4yguBd3i8TpjQz5NfCX91nEve1KqD9RA2Q+Q1uWqoA=="
+ "resolved" "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
- "@jest/types" "^27.0.6"
- "@sinonjs/fake-timers" "^7.0.2"
+ "@jest/types" "^27.2.5"
+ "@sinonjs/fake-timers" "^8.0.1"
"@types/node" "*"
- "jest-message-util" "^27.0.6"
- "jest-mock" "^27.0.6"
- "jest-util" "^27.0.6"
+ "jest-message-util" "^27.3.1"
+ "jest-mock" "^27.3.0"
+ "jest-util" "^27.3.1"
-"@jest/globals@^27.0.6":
- "integrity" "sha512-DdTGCP606rh9bjkdQ7VvChV18iS7q0IMJVP1piwTWyWskol4iqcVwthZmoJEf7obE1nc34OpIyoVGPeqLC+ryw=="
- "resolved" "https://registry.npmjs.org/@jest/globals/-/globals-27.0.6.tgz"
- "version" "27.0.6"
+"@jest/globals@^27.3.1":
+ "integrity" "sha512-Q651FWiWQAIFiN+zS51xqhdZ8g9b88nGCobC87argAxA7nMfNQq0Q0i9zTfQYgLa6qFXk2cGANEqfK051CZ8Pg=="
+ "resolved" "https://registry.npmjs.org/@jest/globals/-/globals-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
- "@jest/environment" "^27.0.6"
- "@jest/types" "^27.0.6"
- "expect" "^27.0.6"
+ "@jest/environment" "^27.3.1"
+ "@jest/types" "^27.2.5"
+ "expect" "^27.3.1"
-"@jest/reporters@^27.0.6":
- "integrity" "sha512-TIkBt09Cb2gptji3yJXb3EE+eVltW6BjO7frO7NEfjI9vSIYoISi5R3aI3KpEDXlB1xwB+97NXIqz84qYeYsfA=="
- "resolved" "https://registry.npmjs.org/@jest/reporters/-/reporters-27.0.6.tgz"
- "version" "27.0.6"
+"@jest/reporters@^27.3.1":
+ "integrity" "sha512-m2YxPmL9Qn1emFVgZGEiMwDntDxRRQ2D58tiDQlwYTg5GvbFOKseYCcHtn0WsI8CG4vzPglo3nqbOiT8ySBT/w=="
+ "resolved" "https://registry.npmjs.org/@jest/reporters/-/reporters-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
"@bcoe/v8-coverage" "^0.2.3"
- "@jest/console" "^27.0.6"
- "@jest/test-result" "^27.0.6"
- "@jest/transform" "^27.0.6"
- "@jest/types" "^27.0.6"
+ "@jest/console" "^27.3.1"
+ "@jest/test-result" "^27.3.1"
+ "@jest/transform" "^27.3.1"
+ "@jest/types" "^27.2.5"
+ "@types/node" "*"
"chalk" "^4.0.0"
"collect-v8-coverage" "^1.0.0"
"exit" "^0.1.2"
@@ -1189,15 +1202,15 @@
"istanbul-lib-report" "^3.0.0"
"istanbul-lib-source-maps" "^4.0.0"
"istanbul-reports" "^3.0.2"
- "jest-haste-map" "^27.0.6"
- "jest-resolve" "^27.0.6"
- "jest-util" "^27.0.6"
- "jest-worker" "^27.0.6"
+ "jest-haste-map" "^27.3.1"
+ "jest-resolve" "^27.3.1"
+ "jest-util" "^27.3.1"
+ "jest-worker" "^27.3.1"
"slash" "^3.0.0"
"source-map" "^0.6.0"
"string-length" "^4.0.1"
"terminal-link" "^2.0.0"
- "v8-to-istanbul" "^8.0.0"
+ "v8-to-istanbul" "^8.1.0"
"@jest/source-map@^27.0.6":
"integrity" "sha512-Fek4mi5KQrqmlY07T23JRi0e7Z9bXTOOD86V/uS0EIW4PClvPDqZOyFlLpNJheS6QI0FNX1CgmPjtJ4EA/2M+g=="
@@ -1208,51 +1221,51 @@
"graceful-fs" "^4.2.4"
"source-map" "^0.6.0"
-"@jest/test-result@^27.0.6":
- "integrity" "sha512-ja/pBOMTufjX4JLEauLxE3LQBPaI2YjGFtXexRAjt1I/MbfNlMx0sytSX3tn5hSLzQsR3Qy2rd0hc1BWojtj9w=="
- "resolved" "https://registry.npmjs.org/@jest/test-result/-/test-result-27.0.6.tgz"
- "version" "27.0.6"
+"@jest/test-result@^27.3.1":
+ "integrity" "sha512-mLn6Thm+w2yl0opM8J/QnPTqrfS4FoXsXF2WIWJb2O/GBSyResL71BRuMYbYRsGt7ELwS5JGcEcGb52BNrumgg=="
+ "resolved" "https://registry.npmjs.org/@jest/test-result/-/test-result-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
- "@jest/console" "^27.0.6"
- "@jest/types" "^27.0.6"
+ "@jest/console" "^27.3.1"
+ "@jest/types" "^27.2.5"
"@types/istanbul-lib-coverage" "^2.0.0"
"collect-v8-coverage" "^1.0.0"
-"@jest/test-sequencer@^27.0.6":
- "integrity" "sha512-bISzNIApazYOlTHDum9PwW22NOyDa6VI31n6JucpjTVM0jD6JDgqEZ9+yn575nDdPF0+4csYDxNNW13NvFQGZA=="
- "resolved" "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.0.6.tgz"
- "version" "27.0.6"
+"@jest/test-sequencer@^27.3.1":
+ "integrity" "sha512-siySLo07IMEdSjA4fqEnxfIX8lB/lWYsBPwNFtkOvsFQvmBrL3yj3k3uFNZv/JDyApTakRpxbKLJ3CT8UGVCrA=="
+ "resolved" "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
- "@jest/test-result" "^27.0.6"
+ "@jest/test-result" "^27.3.1"
"graceful-fs" "^4.2.4"
- "jest-haste-map" "^27.0.6"
- "jest-runtime" "^27.0.6"
+ "jest-haste-map" "^27.3.1"
+ "jest-runtime" "^27.3.1"
-"@jest/transform@^27.0.6":
- "integrity" "sha512-rj5Dw+mtIcntAUnMlW/Vju5mr73u8yg+irnHwzgtgoeI6cCPOvUwQ0D1uQtc/APmWgvRweEb1g05pkUpxH3iCA=="
- "resolved" "https://registry.npmjs.org/@jest/transform/-/transform-27.0.6.tgz"
- "version" "27.0.6"
+"@jest/transform@^27.3.1":
+ "integrity" "sha512-3fSvQ02kuvjOI1C1ssqMVBKJpZf6nwoCiSu00zAKh5nrp3SptNtZy/8s5deayHnqxhjD9CWDJ+yqQwuQ0ZafXQ=="
+ "resolved" "https://registry.npmjs.org/@jest/transform/-/transform-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
"@babel/core" "^7.1.0"
- "@jest/types" "^27.0.6"
+ "@jest/types" "^27.2.5"
"babel-plugin-istanbul" "^6.0.0"
"chalk" "^4.0.0"
"convert-source-map" "^1.4.0"
"fast-json-stable-stringify" "^2.0.0"
"graceful-fs" "^4.2.4"
- "jest-haste-map" "^27.0.6"
+ "jest-haste-map" "^27.3.1"
"jest-regex-util" "^27.0.6"
- "jest-util" "^27.0.6"
+ "jest-util" "^27.3.1"
"micromatch" "^4.0.4"
"pirates" "^4.0.1"
"slash" "^3.0.0"
"source-map" "^0.6.1"
"write-file-atomic" "^3.0.0"
-"@jest/types@^27.0.6":
- "integrity" "sha512-aSquT1qa9Pik26JK5/3rvnYb4bGtm1VFNesHKmNTwmPIgOrixvhL2ghIvFRNEpzy3gU+rUgjIF/KodbkFAl++g=="
- "resolved" "https://registry.npmjs.org/@jest/types/-/types-27.0.6.tgz"
- "version" "27.0.6"
+"@jest/types@^27.2.5":
+ "integrity" "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ=="
+ "resolved" "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz"
+ "version" "27.2.5"
dependencies:
"@types/istanbul-lib-coverage" "^2.0.0"
"@types/istanbul-reports" "^3.0.0"
@@ -1286,6 +1299,14 @@
"@nodelib/fs.scandir" "2.1.5"
"fastq" "^1.6.0"
+"@npmcli/fs@^1.0.0":
+ "integrity" "sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ=="
+ "resolved" "https://registry.npmjs.org/@npmcli/fs/-/fs-1.0.0.tgz"
+ "version" "1.0.0"
+ dependencies:
+ "@gar/promisify" "^1.0.1"
+ "semver" "^7.3.5"
+
"@npmcli/move-file@^1.0.1":
"integrity" "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="
"resolved" "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz"
@@ -1418,14 +1439,14 @@
"consola" "^2.9.0"
"@nuxt/friendly-errors-webpack-plugin@^2.5.1":
- "integrity" "sha512-mKN0Mbb1PjJYBzrswsyWvSEZw5Jxi0fQZPMA0ssrTmkz9lvtxtXq4luhX31OpULUvbc0jLaBu/SL0ExlxIbTlw=="
- "resolved" "https://registry.npmjs.org/@nuxt/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-2.5.1.tgz"
- "version" "2.5.1"
+ "integrity" "sha512-LLc+90lnxVbpKkMqk5z1EWpXoODhc6gRkqqXJCInJwF5xabHAE7biFvbULfvTRmtaTzAaP8IV4HQDLUgeAUTTw=="
+ "resolved" "https://registry.npmjs.org/@nuxt/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-2.5.2.tgz"
+ "version" "2.5.2"
dependencies:
"chalk" "^2.3.2"
"consola" "^2.6.0"
"error-stack-parser" "^2.0.0"
- "string-width" "^2.0.0"
+ "string-width" "^4.2.3"
"@nuxt/generator@2.15.8":
"integrity" "sha512-hreLdYbBIe3SWcP8LsMG7OlDTx2ZVucX8+f8Vrjft3Q4r8iCwLMYC1s1N5etxeHAZfS2kZiLmF92iscOdfbgMQ=="
@@ -1690,10 +1711,10 @@
"mustache" "^2.3.0"
"stack-trace" "0.0.10"
-"@polka/url@^1.0.0-next.17":
- "integrity" "sha512-0p1rCgM3LLbAdwBnc7gqgnvjHg9KpbhcSphergHShlkWz8EdPawoMJ3/VbezI0mGC5eKCDzMaPgF9Yca6cKvrg=="
- "resolved" "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.17.tgz"
- "version" "1.0.0-next.17"
+"@polka/url@^1.0.0-next.20":
+ "integrity" "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g=="
+ "resolved" "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz"
+ "version" "1.0.0-next.21"
"@sindresorhus/is@^0.14.0":
"integrity" "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="
@@ -1701,9 +1722,9 @@
"version" "0.14.0"
"@sindresorhus/is@^4.0.0":
- "integrity" "sha512-Qm9hBEBu18wt1PO2flE7LPb30BHMQt1eQgbV76YntdNk73XZGpn3izvGTYxbGgzXKgbCjiia0uxTd3aTNQrY/g=="
- "resolved" "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz"
- "version" "4.0.1"
+ "integrity" "sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw=="
+ "resolved" "https://registry.npmjs.org/@sindresorhus/is/-/is-4.2.0.tgz"
+ "version" "4.2.0"
"@sinonjs/commons@^1.7.0":
"integrity" "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ=="
@@ -1712,10 +1733,10 @@
dependencies:
"type-detect" "4.0.8"
-"@sinonjs/fake-timers@^7.0.2":
- "integrity" "sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg=="
- "resolved" "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz"
- "version" "7.1.2"
+"@sinonjs/fake-timers@^8.0.1":
+ "integrity" "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg=="
+ "resolved" "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz"
+ "version" "8.1.0"
dependencies:
"@sinonjs/commons" "^1.7.0"
@@ -1739,9 +1760,9 @@
"version" "1.1.2"
"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14":
- "integrity" "sha512-bxlMKPDbY8x5h6HBwVzEOk2C8fb6SLfYQ5Jw3uBYuYF1lfWk/kbLd81la82vrIkBb0l+JdmrZaDikPrNxpS/Ew=="
- "resolved" "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.15.tgz"
- "version" "7.1.15"
+ "integrity" "sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ=="
+ "resolved" "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.16.tgz"
+ "version" "7.1.16"
dependencies:
"@babel/parser" "^7.1.0"
"@babel/types" "^7.0.0"
@@ -1835,16 +1856,16 @@
"version" "0.0.29"
"@types/keyv@*":
- "integrity" "sha512-/FvAK2p4jQOaJ6CGDHJTqZcUtbZe820qIeTg7o0Shg7drB4JHeL+V/dhSaly7NXx6u8eSee+r7coT+yuJEvDLg=="
- "resolved" "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.2.tgz"
- "version" "3.1.2"
+ "integrity" "sha512-FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg=="
+ "resolved" "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.3.tgz"
+ "version" "3.1.3"
dependencies:
"@types/node" "*"
"@types/node@*":
- "integrity" "sha512-ncRdc45SoYJ2H4eWU9ReDfp3vtFqDYhjOsKlFFUDEn8V1Bgr2RjYal8YT5byfadWIRluhPFU6JiDOl0H6Sl87A=="
- "resolved" "https://registry.npmjs.org/@types/node/-/node-16.7.1.tgz"
- "version" "16.7.1"
+ "integrity" "sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w=="
+ "resolved" "https://registry.npmjs.org/@types/node/-/node-16.11.6.tgz"
+ "version" "16.11.6"
"@types/normalize-package-data@^2.4.0":
"integrity" "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw=="
@@ -1852,9 +1873,9 @@
"version" "2.4.1"
"@types/prettier@^2.1.5":
- "integrity" "sha512-eI5Yrz3Qv4KPUa/nSIAi0h+qX0XyewOliug5F2QAtuRg6Kjg6jfmxe1GIwoIRhZspD1A0RP8ANrPwvEXXtRFog=="
- "resolved" "https://registry.npmjs.org/@types/prettier/-/prettier-2.3.2.tgz"
- "version" "2.3.2"
+ "integrity" "sha512-Fo79ojj3vdEZOHg3wR9ksAMRz4P3S5fDB5e/YWZiFnyFQI1WY2Vftu9XoXVVtJfxB7Bpce/QTqWSSntkz2Znrw=="
+ "resolved" "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.1.tgz"
+ "version" "2.4.1"
"@types/q@^1.5.1":
"integrity" "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="
@@ -1900,9 +1921,9 @@
"source-map" "^0.7.3"
"@types/webpack@^4.41.8":
- "integrity" "sha512-GUHyY+pfuQ6haAfzu4S14F+R5iGRwN6b2FRNJY7U0NilmFAqbsOfK6j1HwuLBAqwRIT+pVdNDJGJ6e8rpp0KHA=="
- "resolved" "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.30.tgz"
- "version" "4.41.30"
+ "integrity" "sha512-/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ=="
+ "resolved" "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.31.tgz"
+ "version" "4.41.31"
dependencies:
"@types/node" "*"
"@types/tapable" "^1"
@@ -2049,9 +2070,9 @@
"vue-template-es2015-compiler" "^1.9.0"
"@vue/component-compiler-utils@^3.1.0":
- "integrity" "sha512-rAYMLmgMuqJFWAOb3Awjqqv5X3Q3hVr4jH/kgrFJpiU0j3a90tnNBplqbj+snzrgZhC9W128z+dtgMifOiMfJg=="
- "resolved" "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.2.2.tgz"
- "version" "3.2.2"
+ "integrity" "sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ=="
+ "resolved" "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz"
+ "version" "3.3.0"
dependencies:
"consolidate" "^0.15.1"
"hash-sum" "^1.0.2"
@@ -2062,7 +2083,7 @@
"source-map" "~0.6.1"
"vue-template-es2015-compiler" "^1.9.0"
optionalDependencies:
- "prettier" "^1.18.2"
+ "prettier" "^1.18.2 || ^2.0.0"
"@vue/test-utils@^1.2.0":
"integrity" "sha512-P+yiAsszoy8z1TqXiVUnAZaJj0WGGz5fCxm4bOSI6Cpwy1+PNYwYxDv0ROAA/SUtOPppV+aD8tp/QWwxf8ROJw=="
@@ -2265,9 +2286,9 @@
"version" "7.2.0"
"acorn-walk@^8.0.0":
- "integrity" "sha512-FbJdceMlPHEAWJOILDk1fXD8lnTlEIWFkqtfk+MvmL5q/qlHfN7GEHcsFZWt/Tea9jRNPWUZG4G976nqAAmU9w=="
- "resolved" "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.1.tgz"
- "version" "8.1.1"
+ "integrity" "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="
+ "resolved" "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz"
+ "version" "8.2.0"
"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", "acorn@^7.1.1", "acorn@^7.4.0":
"integrity" "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
@@ -2280,16 +2301,16 @@
"version" "6.4.2"
"acorn@^8.0.4":
- "integrity" "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA=="
- "resolved" "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz"
- "version" "8.4.1"
+ "integrity" "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q=="
+ "resolved" "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz"
+ "version" "8.5.0"
"acorn@^8.2.4":
- "integrity" "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA=="
- "resolved" "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz"
- "version" "8.4.1"
+ "integrity" "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q=="
+ "resolved" "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz"
+ "version" "8.5.0"
-"agent-base@6":
+"agent-base@^6.0.2", "agent-base@6":
"integrity" "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="
"resolved" "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"
"version" "6.0.2"
@@ -2325,9 +2346,9 @@
"uri-js" "^4.2.2"
"ajv@^8.0.1":
- "integrity" "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w=="
- "resolved" "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz"
- "version" "8.6.2"
+ "integrity" "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw=="
+ "resolved" "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz"
+ "version" "8.6.3"
dependencies:
"fast-deep-equal" "^3.1.1"
"json-schema-traverse" "^1.0.0"
@@ -2340,11 +2361,11 @@
"version" "1.0.2"
"ansi-align@^3.0.0":
- "integrity" "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw=="
- "resolved" "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz"
- "version" "3.0.0"
+ "integrity" "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w=="
+ "resolved" "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz"
+ "version" "3.0.1"
dependencies:
- "string-width" "^3.0.0"
+ "string-width" "^4.1.0"
"ansi-colors@^4.1.1":
"integrity" "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="
@@ -2358,30 +2379,20 @@
dependencies:
"type-fest" "^0.21.3"
-"ansi-html@0.0.7":
- "integrity" "sha1-gTWEAhliqenm/QOflA0S9WynhZ4="
- "resolved" "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz"
- "version" "0.0.7"
+"ansi-html-community@0.0.8":
+ "integrity" "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw=="
+ "resolved" "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz"
+ "version" "0.0.8"
"ansi-regex@^2.0.0":
"integrity" "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
"resolved" "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
"version" "2.1.1"
-"ansi-regex@^3.0.0":
- "integrity" "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
- "resolved" "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"
- "version" "3.0.0"
-
-"ansi-regex@^4.1.0":
- "integrity" "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
- "resolved" "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"
- "version" "4.1.0"
-
-"ansi-regex@^5.0.0":
- "integrity" "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
- "resolved" "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz"
- "version" "5.0.0"
+"ansi-regex@^5.0.1":
+ "integrity" "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+ "resolved" "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
+ "version" "5.0.1"
"ansi-styles@^2.2.1":
"integrity" "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
@@ -2488,15 +2499,15 @@
"version" "1.1.1"
"array-includes@^3.1.1":
- "integrity" "sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A=="
- "resolved" "https://registry.npmjs.org/array-includes/-/array-includes-3.1.3.tgz"
- "version" "3.1.3"
+ "integrity" "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw=="
+ "resolved" "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz"
+ "version" "3.1.4"
dependencies:
"call-bind" "^1.0.2"
"define-properties" "^1.1.3"
- "es-abstract" "^1.18.0-next.2"
+ "es-abstract" "^1.19.1"
"get-intrinsic" "^1.1.1"
- "is-string" "^1.0.5"
+ "is-string" "^1.0.7"
"array-union@^2.1.0":
"integrity" "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
@@ -2509,13 +2520,13 @@
"version" "0.3.2"
"array.prototype.flat@^1.2.3":
- "integrity" "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg=="
- "resolved" "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz"
- "version" "1.2.4"
+ "integrity" "sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg=="
+ "resolved" "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz"
+ "version" "1.2.5"
dependencies:
- "call-bind" "^1.0.0"
+ "call-bind" "^1.0.2"
"define-properties" "^1.1.3"
- "es-abstract" "^1.18.0-next.1"
+ "es-abstract" "^1.19.0"
"arrgv@^1.0.2":
"integrity" "sha512-a4eg4yhp7mmruZDQFqVMlxNRFGi/i1r87pt8SDHy0/I8PqSXoUTlWZRdAZo0VXgvEARcujbtTk8kiZRi1uDGRw=="
@@ -2581,15 +2592,15 @@
"version" "2.1.2"
"autoprefixer@^9.6.1":
- "integrity" "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg=="
- "resolved" "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz"
- "version" "9.8.6"
+ "integrity" "sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA=="
+ "resolved" "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.8.tgz"
+ "version" "9.8.8"
dependencies:
"browserslist" "^4.12.0"
"caniuse-lite" "^1.0.30001109"
- "colorette" "^1.2.1"
"normalize-range" "^0.1.2"
"num2fraction" "^1.2.2"
+ "picocolors" "^0.2.1"
"postcss" "^7.0.32"
"postcss-value-parser" "^4.1.0"
@@ -2656,18 +2667,19 @@
"yargs" "^16.2.0"
"axios-retry@^3.1.9":
- "integrity" "sha512-NFCoNIHq8lYkJa6ku4m+V1837TP6lCa7n79Iuf8/AqATAHYB0ISaAS1eyIenDOfHOLtym34W65Sjke2xjg2fsA=="
- "resolved" "https://registry.npmjs.org/axios-retry/-/axios-retry-3.1.9.tgz"
- "version" "3.1.9"
+ "integrity" "sha512-Co3UXiv4npi6lM963mfnuH90/YFLKWWDmoBYfxkHT5xtkSSWNqK9zdG3fw5/CP/dsoKB5aMMJCsgab+tp1OxLQ=="
+ "resolved" "https://registry.npmjs.org/axios-retry/-/axios-retry-3.2.4.tgz"
+ "version" "3.2.4"
dependencies:
- "is-retry-allowed" "^1.1.0"
+ "@babel/runtime" "^7.15.4"
+ "is-retry-allowed" "^2.2.0"
"axios@^0.21.1":
- "integrity" "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA=="
- "resolved" "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz"
- "version" "0.21.1"
+ "integrity" "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="
+ "resolved" "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz"
+ "version" "0.21.4"
dependencies:
- "follow-redirects" "^1.10.0"
+ "follow-redirects" "^1.14.0"
"babel-eslint@^10.1.0":
"integrity" "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg=="
@@ -2681,24 +2693,24 @@
"eslint-visitor-keys" "^1.0.0"
"resolve" "^1.12.0"
-"babel-jest@^27.0.2", "babel-jest@^27.0.6":
- "integrity" "sha512-iTJyYLNc4wRofASmofpOc5NK9QunwMk+TLFgGXsTFS8uEqmd8wdI7sga0FPe2oVH3b5Agt/EAK1QjPEuKL8VfA=="
- "resolved" "https://registry.npmjs.org/babel-jest/-/babel-jest-27.0.6.tgz"
- "version" "27.0.6"
+"babel-jest@^27.0.2", "babel-jest@^27.3.1":
+ "integrity" "sha512-SjIF8hh/ir0peae2D6S6ZKRhUy7q/DnpH7k/V6fT4Bgs/LXXUztOpX4G2tCgq8mLo5HA9mN6NmlFMeYtKmIsTQ=="
+ "resolved" "https://registry.npmjs.org/babel-jest/-/babel-jest-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
- "@jest/transform" "^27.0.6"
- "@jest/types" "^27.0.6"
+ "@jest/transform" "^27.3.1"
+ "@jest/types" "^27.2.5"
"@types/babel__core" "^7.1.14"
"babel-plugin-istanbul" "^6.0.0"
- "babel-preset-jest" "^27.0.6"
+ "babel-preset-jest" "^27.2.0"
"chalk" "^4.0.0"
"graceful-fs" "^4.2.4"
"slash" "^3.0.0"
"babel-loader@^8.2.2":
- "integrity" "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g=="
- "resolved" "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz"
- "version" "8.2.2"
+ "integrity" "sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw=="
+ "resolved" "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.3.tgz"
+ "version" "8.2.3"
dependencies:
"find-cache-dir" "^3.3.1"
"loader-utils" "^1.4.0"
@@ -2726,20 +2738,20 @@
"estraverse" "^4.1.1"
"babel-plugin-istanbul@^6.0.0":
- "integrity" "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ=="
- "resolved" "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz"
- "version" "6.0.0"
+ "integrity" "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA=="
+ "resolved" "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz"
+ "version" "6.1.1"
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
"@istanbuljs/load-nyc-config" "^1.0.0"
"@istanbuljs/schema" "^0.1.2"
- "istanbul-lib-instrument" "^4.0.0"
+ "istanbul-lib-instrument" "^5.0.4"
"test-exclude" "^6.0.0"
-"babel-plugin-jest-hoist@^27.0.6":
- "integrity" "sha512-CewFeM9Vv2gM7Yr9n5eyyLVPRSiBnk6lKZRjgwYnGKSl9M14TMn2vkN02wTF04OGuSDLEzlWiMzvjXuW9mB6Gw=="
- "resolved" "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.0.6.tgz"
- "version" "27.0.6"
+"babel-plugin-jest-hoist@^27.2.0":
+ "integrity" "sha512-TOux9khNKdi64mW+0OIhcmbAn75tTlzKhxmiNXevQaPbrBYK7YKjP1jl6NHTJ6XR5UgUrJbCnWlKVnJn29dfjw=="
+ "resolved" "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.2.0.tgz"
+ "version" "27.2.0"
dependencies:
"@babel/template" "^7.3.3"
"@babel/types" "^7.3.3"
@@ -2757,29 +2769,29 @@
"reselect" "^4.0.0"
"resolve" "^1.13.1"
-"babel-plugin-polyfill-corejs2@^0.2.2":
- "integrity" "sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ=="
- "resolved" "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz"
- "version" "0.2.2"
+"babel-plugin-polyfill-corejs2@^0.2.3":
+ "integrity" "sha512-NDZ0auNRzmAfE1oDDPW2JhzIMXUk+FFe2ICejmt5T4ocKgiQx3e0VCRx9NCAidcMtL2RUZaWtXnmjTCkx0tcbA=="
+ "resolved" "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.3.tgz"
+ "version" "0.2.3"
dependencies:
"@babel/compat-data" "^7.13.11"
- "@babel/helper-define-polyfill-provider" "^0.2.2"
+ "@babel/helper-define-polyfill-provider" "^0.2.4"
"semver" "^6.1.1"
-"babel-plugin-polyfill-corejs3@^0.2.2":
- "integrity" "sha512-z3HnJE5TY/j4EFEa/qpQMSbcUJZ5JQi+3UFjXzn6pQCmIKc5Ug5j98SuYyH+m4xQnvKlMDIW4plLfgyVnd0IcQ=="
- "resolved" "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz"
- "version" "0.2.4"
+"babel-plugin-polyfill-corejs3@^0.3.0":
+ "integrity" "sha512-JLwi9vloVdXLjzACL80j24bG6/T1gYxwowG44dg6HN/7aTPdyPbJJidf6ajoA3RPHHtW0j9KMrSOLpIZpAnPpg=="
+ "resolved" "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.3.0.tgz"
+ "version" "0.3.0"
dependencies:
- "@babel/helper-define-polyfill-provider" "^0.2.2"
- "core-js-compat" "^3.14.0"
+ "@babel/helper-define-polyfill-provider" "^0.2.4"
+ "core-js-compat" "^3.18.0"
-"babel-plugin-polyfill-regenerator@^0.2.2":
- "integrity" "sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg=="
- "resolved" "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz"
- "version" "0.2.2"
+"babel-plugin-polyfill-regenerator@^0.2.3":
+ "integrity" "sha512-JVE78oRZPKFIeUqFGrSORNzQnrDwZR16oiWeGM8ZyjBn2XAT5OjP+wXx5ESuo33nUsFUEJYjtklnsKbxW5L+7g=="
+ "resolved" "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.3.tgz"
+ "version" "0.2.3"
dependencies:
- "@babel/helper-define-polyfill-provider" "^0.2.2"
+ "@babel/helper-define-polyfill-provider" "^0.2.4"
"babel-preset-current-node-syntax@^1.0.0":
"integrity" "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ=="
@@ -2799,12 +2811,12 @@
"@babel/plugin-syntax-optional-chaining" "^7.8.3"
"@babel/plugin-syntax-top-level-await" "^7.8.3"
-"babel-preset-jest@^27.0.6":
- "integrity" "sha512-WObA0/Biw2LrVVwZkF/2GqbOdzhKD6Fkdwhoy9ASIrOWr/zodcSpQh72JOkEn6NWyjmnPDjNSqaGN4KnpKzhXw=="
- "resolved" "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.0.6.tgz"
- "version" "27.0.6"
+"babel-preset-jest@^27.2.0":
+ "integrity" "sha512-z7MgQ3peBwN5L5aCqBKnF6iqdlvZvFUQynEhu0J+X9nHLU72jO3iY331lcYrg+AssJ8q7xsv5/3AICzVmJ/wvg=="
+ "resolved" "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.2.0.tgz"
+ "version" "27.2.0"
dependencies:
- "babel-plugin-jest-hoist" "^27.0.6"
+ "babel-plugin-jest-hoist" "^27.2.0"
"babel-preset-current-node-syntax" "^1.0.0"
"balanced-match@^1.0.0":
@@ -2865,9 +2877,9 @@
"version" "3.7.2"
"blueimp-md5@^2.10.0":
- "integrity" "sha512-vE52okJvzsVWhcgUHOv+69OG3Mdg151xyn41aVQN/5W5S+S43qZhxECtYLAEHMSFWX6Mv5IZrzj3T5+JqXfj5Q=="
- "resolved" "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.18.0.tgz"
- "version" "2.18.0"
+ "integrity" "sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w=="
+ "resolved" "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.19.0.tgz"
+ "version" "2.19.0"
"bn.js@^4.0.0":
"integrity" "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
@@ -2911,15 +2923,15 @@
"version" "1.0.0"
"boxen@^5.0.0", "boxen@^5.0.1":
- "integrity" "sha512-49VBlw+PrWEF51aCmy7QIteYPIFZxSpvqBdP/2itCPPlJ49kj9zg/XPRFrdkne2W+CfwXUls8exMvu1RysZpKA=="
- "resolved" "https://registry.npmjs.org/boxen/-/boxen-5.0.1.tgz"
- "version" "5.0.1"
+ "integrity" "sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ=="
+ "resolved" "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz"
+ "version" "5.1.2"
dependencies:
"ansi-align" "^3.0.0"
"camelcase" "^6.2.0"
"chalk" "^4.1.0"
"cli-boxes" "^2.2.1"
- "string-width" "^4.2.0"
+ "string-width" "^4.2.2"
"type-fest" "^0.20.2"
"widest-line" "^3.1.0"
"wrap-ansi" "^7.0.0"
@@ -3026,16 +3038,16 @@
dependencies:
"pako" "~1.0.5"
-"browserslist@^4.0.0", "browserslist@^4.12.0", "browserslist@^4.16.6", "browserslist@^4.16.8", "browserslist@^4.6.4":
- "integrity" "sha512-sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ=="
- "resolved" "https://registry.npmjs.org/browserslist/-/browserslist-4.16.8.tgz"
- "version" "4.16.8"
+"browserslist@^4.0.0", "browserslist@^4.12.0", "browserslist@^4.16.6", "browserslist@^4.17.6", "browserslist@^4.6.4":
+ "integrity" "sha512-uPgz3vyRTlEiCv4ee9KlsKgo2V6qPk7Jsn0KAn2OBqbqKo3iNcPEC1Ti6J4dwnz+aIRfEEEuOzC9IBk8tXUomw=="
+ "resolved" "https://registry.npmjs.org/browserslist/-/browserslist-4.17.6.tgz"
+ "version" "4.17.6"
dependencies:
- "caniuse-lite" "^1.0.30001251"
- "colorette" "^1.3.0"
- "electron-to-chromium" "^1.3.811"
+ "caniuse-lite" "^1.0.30001274"
+ "electron-to-chromium" "^1.3.886"
"escalade" "^3.1.1"
- "node-releases" "^1.1.75"
+ "node-releases" "^2.0.1"
+ "picocolors" "^1.0.0"
"bser@2.1.1":
"integrity" "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ=="
@@ -3134,10 +3146,11 @@
"y18n" "^4.0.0"
"cacache@^15.0.5":
- "integrity" "sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw=="
- "resolved" "https://registry.npmjs.org/cacache/-/cacache-15.2.0.tgz"
- "version" "15.2.0"
+ "integrity" "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ=="
+ "resolved" "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz"
+ "version" "15.3.0"
dependencies:
+ "@npmcli/fs" "^1.0.0"
"@npmcli/move-file" "^1.0.1"
"chownr" "^2.0.0"
"fs-minipass" "^2.0.0"
@@ -3317,10 +3330,10 @@
"lodash.memoize" "^4.1.2"
"lodash.uniq" "^4.5.0"
-"caniuse-lite@^1.0.0", "caniuse-lite@^1.0.30000981", "caniuse-lite@^1.0.30001109", "caniuse-lite@^1.0.30001228", "caniuse-lite@^1.0.30001251":
- "integrity" "sha512-HOe1r+9VkU4TFmnU70z+r7OLmtR+/chB1rdcJUeQlAinjEeb0cKL20tlAtOagNZhbrtLnCvV19B4FmF1rgzl6A=="
- "resolved" "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001251.tgz"
- "version" "1.0.30001251"
+"caniuse-lite@^1.0.0", "caniuse-lite@^1.0.30000981", "caniuse-lite@^1.0.30001109", "caniuse-lite@^1.0.30001228", "caniuse-lite@^1.0.30001274":
+ "integrity" "sha512-J2WtYj2Pl6LBEG214XmbGw1gzZEsYuinQFPqYtpZDB3/vm49qNlrcbJrTMkHKmdRDdmXYwkG0tgOBJsuI+J12Q=="
+ "resolved" "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001277.tgz"
+ "version" "1.0.30001277"
"chalk@^1.1.3":
"integrity" "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg="
@@ -3443,7 +3456,7 @@
"resolved" "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz"
"version" "2.0.0"
-"ci-info@^3.0.0", "ci-info@^3.1.1":
+"ci-info@^3.1.1", "ci-info@^3.2.0":
"integrity" "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A=="
"resolved" "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz"
"version" "3.2.0"
@@ -3477,9 +3490,9 @@
"static-extend" "^0.1.1"
"clean-css@^4.2.1", "clean-css@^4.2.3":
- "integrity" "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="
- "resolved" "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz"
- "version" "4.2.3"
+ "integrity" "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A=="
+ "resolved" "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz"
+ "version" "4.2.4"
dependencies:
"source-map" "~0.6.0"
@@ -3513,9 +3526,9 @@
"restore-cursor" "^3.1.0"
"cli-spinners@^2.5.0":
- "integrity" "sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q=="
- "resolved" "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz"
- "version" "2.6.0"
+ "integrity" "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g=="
+ "resolved" "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz"
+ "version" "2.6.1"
"cli-truncate@^2.1.0":
"integrity" "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg=="
@@ -3643,15 +3656,15 @@
"color-convert" "^1.9.3"
"color-string" "^1.6.0"
-"colorette@^1.2.1", "colorette@^1.2.2", "colorette@^1.3.0":
- "integrity" "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w=="
- "resolved" "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz"
- "version" "1.3.0"
+"colorette@^1.2.2":
+ "integrity" "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g=="
+ "resolved" "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz"
+ "version" "1.4.0"
-"colorette@1.2.1":
- "integrity" "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw=="
- "resolved" "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz"
- "version" "1.2.1"
+"colorette@2.0.16":
+ "integrity" "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g=="
+ "resolved" "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz"
+ "version" "2.0.16"
"combined-stream@^1.0.8":
"integrity" "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="
@@ -3675,21 +3688,16 @@
"resolved" "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz"
"version" "4.1.1"
-"commander@^6.1.0":
- "integrity" "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA=="
- "resolved" "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz"
- "version" "6.2.1"
-
-"commander@^6.2.0":
- "integrity" "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA=="
- "resolved" "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz"
- "version" "6.2.1"
-
-"commander@^7.1.0":
+"commander@^7.1.0", "commander@^7.2.0":
"integrity" "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="
"resolved" "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"
"version" "7.2.0"
+"commander@^8.2.0":
+ "integrity" "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="
+ "resolved" "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz"
+ "version" "8.3.0"
+
"common-path-prefix@^3.0.0":
"integrity" "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w=="
"resolved" "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz"
@@ -3898,12 +3906,12 @@
"resolved" "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz"
"version" "0.1.1"
-"core-js-compat@^3.12.1", "core-js-compat@^3.14.0", "core-js-compat@^3.16.0":
- "integrity" "sha512-A/OtSfSJQKLAFRVd4V0m6Sep9lPdjD8bpN8v3tCCGwE0Tmh0hOiVDm9tw6mXmWOKOSZIyr3EkywPo84cJjGvIQ=="
- "resolved" "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.3.tgz"
- "version" "3.16.3"
+"core-js-compat@^3.12.1", "core-js-compat@^3.18.0", "core-js-compat@^3.19.0":
+ "integrity" "sha512-Q/VJ7jAF/y68+aUsQJ/afPOewdsGkDtcMb40J8MbuWKlK3Y+wtHq8bTHKPj2WKWLIqmS5JhHs4CzHtz6pT2W6g=="
+ "resolved" "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.1.tgz"
+ "version" "3.19.1"
dependencies:
- "browserslist" "^4.16.8"
+ "browserslist" "^4.17.6"
"semver" "7.0.0"
"core-js@^2.0.0":
@@ -3917,14 +3925,14 @@
"version" "2.6.12"
"core-js@^3.6.5":
- "integrity" "sha512-lM3GftxzHNtPNUJg0v4pC2RC6puwMd6VZA7vXUczi+SKmCWSf4JwO89VJGMqbzmB7jlK7B5hr3S64PqwFL49cA=="
- "resolved" "https://registry.npmjs.org/core-js/-/core-js-3.16.3.tgz"
- "version" "3.16.3"
+ "integrity" "sha512-Tnc7E9iKd/b/ff7GFbhwPVzJzPztGrChB8X8GLqoYGdEOG8IpLnK1xPyo3ZoO3HsK6TodJS58VGPOxA+hLHQMg=="
+ "resolved" "https://registry.npmjs.org/core-js/-/core-js-3.19.1.tgz"
+ "version" "3.19.1"
"core-util-is@~1.0.0":
- "integrity" "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
- "resolved" "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
- "version" "1.0.2"
+ "integrity" "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+ "resolved" "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"
+ "version" "1.0.3"
"cosmiconfig@^5.0.0":
"integrity" "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA=="
@@ -4142,9 +4150,9 @@
"version" "3.4.2"
"css-what@^5.0.0":
- "integrity" "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg=="
- "resolved" "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz"
- "version" "5.0.1"
+ "integrity" "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw=="
+ "resolved" "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz"
+ "version" "5.1.0"
"cssdb@^4.4.0":
"integrity" "sha512-LsTAR1JPEM9TpGhl/0p3nQecC2LJ0kD8X5YARu1hk/9I1gril5vDtMZyNxcEpxxDj34YNck/ucjuoUd66K03oQ=="
@@ -4280,9 +4288,9 @@
"whatwg-url" "^8.0.0"
"date-fns@^2.16.1":
- "integrity" "sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA=="
- "resolved" "https://registry.npmjs.org/date-fns/-/date-fns-2.23.0.tgz"
- "version" "2.23.0"
+ "integrity" "sha512-ovYRFnTrbGPD4nqaEqescPEv1mNwvt+UTqI3Ay9SzNtey9NZnYu6E2qCcBBgJ6/2VF1zGGygpyTDITqpQQ5e+w=="
+ "resolved" "https://registry.npmjs.org/date-fns/-/date-fns-2.25.0.tgz"
+ "version" "2.25.0"
"date-time@^2.1.0":
"integrity" "sha512-/9+C44X7lot0IeiyfgJmETtRMhBidBYM2QFFIkGa0U1k+hSyY87Nw7PY3eDqpvCBm7I3WCSfPeZskW/YYq6m4g=="
@@ -4404,9 +4412,9 @@
"version" "0.6.0"
"deep-is@^0.1.3", "deep-is@~0.1.3":
- "integrity" "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
- "resolved" "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"
- "version" "0.1.3"
+ "integrity" "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
+ "resolved" "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"
+ "version" "0.1.4"
"deepmerge@^4.2.2":
"integrity" "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
@@ -4639,9 +4647,9 @@
"webidl-conversions" "^5.0.0"
"domhandler@^4.0.0", "domhandler@^4.2.0":
- "integrity" "sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA=="
- "resolved" "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz"
- "version" "4.2.0"
+ "integrity" "sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w=="
+ "resolved" "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz"
+ "version" "4.2.2"
dependencies:
"domelementtype" "^2.2.0"
@@ -4654,18 +4662,18 @@
"domelementtype" "1"
"domutils@^2.5.2":
- "integrity" "sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg=="
- "resolved" "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz"
- "version" "2.7.0"
+ "integrity" "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="
+ "resolved" "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz"
+ "version" "2.8.0"
dependencies:
"dom-serializer" "^1.0.1"
"domelementtype" "^2.2.0"
"domhandler" "^4.2.0"
"domutils@^2.6.0":
- "integrity" "sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg=="
- "resolved" "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz"
- "version" "2.7.0"
+ "integrity" "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="
+ "resolved" "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz"
+ "version" "2.8.0"
dependencies:
"dom-serializer" "^1.0.1"
"domelementtype" "^2.2.0"
@@ -4731,10 +4739,10 @@
"resolved" "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"
"version" "1.1.1"
-"electron-to-chromium@^1.3.811":
- "integrity" "sha512-Vw0Faepf2Id9Kf2e97M/c99qf168xg86JLKDxivvlpBQ9KDtjSeX0v+TiuSE25PqeQfTz+NJs375b64ca3XOIQ=="
- "resolved" "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.817.tgz"
- "version" "1.3.817"
+"electron-to-chromium@^1.3.886":
+ "integrity" "sha512-suEUoPTD1mExjL9TdmH7cvEiWJVM2oEiAi+Y1p0QKxI2HcRlT44qDTP2c1aZmVwRemIPYOpxmV7CxQCOWcm4XQ=="
+ "resolved" "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.889.tgz"
+ "version" "1.3.889"
"elliptic@^6.5.3":
"integrity" "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ=="
@@ -4754,11 +4762,6 @@
"resolved" "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz"
"version" "0.8.1"
-"emoji-regex@^7.0.1":
- "integrity" "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
- "resolved" "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"
- "version" "7.0.3"
-
"emoji-regex@^8.0.0":
"integrity" "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
"resolved" "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
@@ -4841,22 +4844,25 @@
dependencies:
"stackframe" "^1.1.1"
-"es-abstract@^1.17.2", "es-abstract@^1.18.0-next.1", "es-abstract@^1.18.0-next.2", "es-abstract@^1.18.2":
- "integrity" "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA=="
- "resolved" "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz"
- "version" "1.18.5"
+"es-abstract@^1.17.2", "es-abstract@^1.19.0", "es-abstract@^1.19.1":
+ "integrity" "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w=="
+ "resolved" "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz"
+ "version" "1.19.1"
dependencies:
"call-bind" "^1.0.2"
"es-to-primitive" "^1.2.1"
"function-bind" "^1.1.1"
"get-intrinsic" "^1.1.1"
+ "get-symbol-description" "^1.0.0"
"has" "^1.0.3"
"has-symbols" "^1.0.2"
"internal-slot" "^1.0.3"
- "is-callable" "^1.2.3"
+ "is-callable" "^1.2.4"
"is-negative-zero" "^2.0.1"
- "is-regex" "^1.1.3"
- "is-string" "^1.0.6"
+ "is-regex" "^1.1.4"
+ "is-shared-array-buffer" "^1.0.1"
+ "is-string" "^1.0.7"
+ "is-weakref" "^1.0.1"
"object-inspect" "^1.11.0"
"object-keys" "^1.1.1"
"object.assign" "^4.1.2"
@@ -4953,11 +4959,12 @@
"schema-utils" "^2.6.5"
"eslint-module-utils@^2.6.0":
- "integrity" "sha512-QG8pcgThYOuqxupd06oYTZoNOGaUdTY1PqK+oS6ElF6vs4pBdk/aYxFVQQXzcrAqp9m7cl7lb2ubazX+g16k2Q=="
- "resolved" "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.2.tgz"
- "version" "2.6.2"
+ "integrity" "sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ=="
+ "resolved" "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz"
+ "version" "2.7.1"
dependencies:
"debug" "^3.2.7"
+ "find-up" "^2.1.0"
"pkg-dir" "^2.0.0"
"eslint-plugin-es@^3.0.0":
@@ -5107,7 +5114,7 @@
"resolved" "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"
"version" "2.1.0"
-"eslint@*", "eslint@^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0", "eslint@^5.0.0 || ^6.0.0", "eslint@^6.0.0 || ^7.0.0", "eslint@^7.27.0", "eslint@^7.5.0", "eslint@>= 4.12.1", "eslint@>=4.19.1", "eslint@>=5", "eslint@>=5.0.0", "eslint@>=5.16.0", "eslint@>=6", "eslint@>=6.2.2", "eslint@>=7.0.0", "eslint@>=7.3.0", "eslint@>=7.5.0":
+"eslint@*", "eslint@^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0", "eslint@^5.0.0 || ^6.0.0", "eslint@^6.0.0 || ^7.0.0", "eslint@^7.27.0", "eslint@^7.5.0", "eslint@^7.5.0 || ^8.0.0", "eslint@>= 4.12.1", "eslint@>=4.19.1", "eslint@>=5", "eslint@>=5.0.0", "eslint@>=5.16.0", "eslint@>=6", "eslint@>=6.2.2", "eslint@>=7.0.0", "eslint@>=7.3.0":
"integrity" "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA=="
"resolved" "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz"
"version" "7.32.0"
@@ -5218,14 +5225,14 @@
"version" "4.3.0"
"estraverse@^5.1.0":
- "integrity" "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="
- "resolved" "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz"
- "version" "5.2.0"
+ "integrity" "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
+ "resolved" "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
+ "version" "5.3.0"
"estraverse@^5.2.0":
- "integrity" "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="
- "resolved" "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz"
- "version" "5.2.0"
+ "integrity" "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
+ "resolved" "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
+ "version" "5.3.0"
"esutils@^2.0.2", "esutils@^2.0.3":
"integrity" "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
@@ -5293,16 +5300,16 @@
"snapdragon" "^0.8.1"
"to-regex" "^3.0.1"
-"expect@^27.0.6":
- "integrity" "sha512-psNLt8j2kwg42jGBDSfAlU49CEZxejN1f1PlANWDZqIhBOVU/c2Pm888FcjWJzFewhIsNWfZJeLjUjtKGiPuSw=="
- "resolved" "https://registry.npmjs.org/expect/-/expect-27.0.6.tgz"
- "version" "27.0.6"
+"expect@^27.3.1":
+ "integrity" "sha512-MrNXV2sL9iDRebWPGOGFdPQRl2eDQNu/uhxIMShjjx74T6kC6jFIkmQ6OqXDtevjGUkyB2IT56RzDBqXf/QPCg=="
+ "resolved" "https://registry.npmjs.org/expect/-/expect-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
- "@jest/types" "^27.0.6"
+ "@jest/types" "^27.2.5"
"ansi-styles" "^5.0.0"
- "jest-get-type" "^27.0.6"
- "jest-matcher-utils" "^27.0.6"
- "jest-message-util" "^27.0.6"
+ "jest-get-type" "^27.3.1"
+ "jest-matcher-utils" "^27.3.1"
+ "jest-message-util" "^27.3.1"
"jest-regex-util" "^27.0.6"
"express@^4.17.1":
@@ -5437,9 +5444,9 @@
"version" "1.1.2"
"fastq@^1.6.0":
- "integrity" "sha512-VNX0QkHK3RsXVKr9KrlUv/FoTa0NdbYoHHl7uXHv2rzyHSlxjdNAKug2twd9luJxpcyNeAgf5iPPMutJO67Dfg=="
- "resolved" "https://registry.npmjs.org/fastq/-/fastq-1.12.0.tgz"
- "version" "1.12.0"
+ "integrity" "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw=="
+ "resolved" "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz"
+ "version" "1.13.0"
dependencies:
"reusify" "^1.0.4"
@@ -5546,9 +5553,9 @@
"pkg-dir" "^3.0.0"
"find-cache-dir@^3.0.0", "find-cache-dir@^3.2.0", "find-cache-dir@^3.3.1":
- "integrity" "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ=="
- "resolved" "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz"
- "version" "3.3.1"
+ "integrity" "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig=="
+ "resolved" "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz"
+ "version" "3.3.2"
dependencies:
"commondir" "^1.0.1"
"make-dir" "^3.0.2"
@@ -5614,10 +5621,10 @@
"inherits" "^2.0.3"
"readable-stream" "^2.3.6"
-"follow-redirects@^1.0.0", "follow-redirects@^1.10.0":
- "integrity" "sha512-yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA=="
- "resolved" "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.2.tgz"
- "version" "1.14.2"
+"follow-redirects@^1.0.0", "follow-redirects@^1.14.0":
+ "integrity" "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA=="
+ "resolved" "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz"
+ "version" "1.14.5"
"for-in@^1.0.2":
"integrity" "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
@@ -5794,6 +5801,14 @@
"resolved" "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz"
"version" "6.0.1"
+"get-symbol-description@^1.0.0":
+ "integrity" "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="
+ "resolved" "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz"
+ "version" "1.0.0"
+ dependencies:
+ "call-bind" "^1.0.2"
+ "get-intrinsic" "^1.1.1"
+
"get-value@^2.0.3", "get-value@^2.0.6":
"integrity" "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
"resolved" "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"
@@ -5818,9 +5833,9 @@
"parse-url" "^6.0.0"
"git-url-parse@^11.4.4":
- "integrity" "sha512-TZYSMDeM37r71Lqg1mbnMlOqlHd7BSij9qN7XwTkRqSAYFMihGLGhfHwgqQob3GUhEneKnV4nskN9rbQw2KGxA=="
- "resolved" "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.5.0.tgz"
- "version" "11.5.0"
+ "integrity" "sha512-WWUxvJs5HsyHL6L08wOusa/IXYtMuCAhrMmnTjQPpBU0TTHyDhnOATNH3xNQz7YOQUsqIIPTGr4xiVti1Hsk5g=="
+ "resolved" "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.6.0.tgz"
+ "version" "11.6.0"
dependencies:
"git-up" "^4.0.0"
@@ -5840,9 +5855,9 @@
"is-glob" "^4.0.1"
"glob@^7.1.1", "glob@^7.1.2", "glob@^7.1.3", "glob@^7.1.4", "glob@^7.1.6", "glob@^7.1.7":
- "integrity" "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ=="
- "resolved" "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"
- "version" "7.1.7"
+ "integrity" "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="
+ "resolved" "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz"
+ "version" "7.2.0"
dependencies:
"fs.realpath" "^1.0.0"
"inflight" "^1.0.4"
@@ -5864,16 +5879,16 @@
"version" "11.12.0"
"globals@^13.6.0":
- "integrity" "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g=="
- "resolved" "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz"
- "version" "13.11.0"
+ "integrity" "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg=="
+ "resolved" "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz"
+ "version" "13.12.0"
dependencies:
"type-fest" "^0.20.2"
"globals@^13.9.0":
- "integrity" "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g=="
- "resolved" "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz"
- "version" "13.11.0"
+ "integrity" "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg=="
+ "resolved" "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz"
+ "version" "13.12.0"
dependencies:
"type-fest" "^0.20.2"
@@ -6122,10 +6137,10 @@
dependencies:
"whatwg-encoding" "^1.0.5"
-"html-entities@^1.2.0":
- "integrity" "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA=="
- "resolved" "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz"
- "version" "1.4.0"
+"html-entities@^2.1.0":
+ "integrity" "sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ=="
+ "resolved" "https://registry.npmjs.org/html-entities/-/html-entities-2.3.2.tgz"
+ "version" "2.3.2"
"html-escaper@^2.0.0":
"integrity" "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
@@ -6304,19 +6319,19 @@
"version" "4.0.6"
"ignore@^5.1.1":
- "integrity" "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="
- "resolved" "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz"
- "version" "5.1.8"
+ "integrity" "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ=="
+ "resolved" "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz"
+ "version" "5.1.9"
"ignore@^5.1.4":
- "integrity" "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="
- "resolved" "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz"
- "version" "5.1.8"
+ "integrity" "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ=="
+ "resolved" "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz"
+ "version" "5.1.9"
"ignore@^5.1.8":
- "integrity" "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="
- "resolved" "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz"
- "version" "5.1.8"
+ "integrity" "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ=="
+ "resolved" "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz"
+ "version" "5.1.9"
"import-cwd@^2.0.0":
"integrity" "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk="
@@ -6354,9 +6369,9 @@
"version" "2.1.0"
"import-local@^3.0.2":
- "integrity" "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA=="
- "resolved" "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz"
- "version" "3.0.2"
+ "integrity" "sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA=="
+ "resolved" "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz"
+ "version" "3.0.3"
dependencies:
"pkg-dir" "^4.2.0"
"resolve-cwd" "^3.0.0"
@@ -6538,7 +6553,7 @@
"resolved" "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"
"version" "1.1.6"
-"is-callable@^1.1.4", "is-callable@^1.2.3":
+"is-callable@^1.1.4", "is-callable@^1.2.4":
"integrity" "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
"resolved" "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz"
"version" "1.2.4"
@@ -6550,13 +6565,6 @@
dependencies:
"ci-info" "^2.0.0"
-"is-ci@^3.0.0":
- "integrity" "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ=="
- "resolved" "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz"
- "version" "3.0.0"
- dependencies:
- "ci-info" "^3.1.1"
-
"is-color-stop@^1.0.0":
"integrity" "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U="
"resolved" "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz"
@@ -6570,9 +6578,9 @@
"rgba-regex" "^1.0.0"
"is-core-module@^2.2.0":
- "integrity" "sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ=="
- "resolved" "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz"
- "version" "2.6.0"
+ "integrity" "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw=="
+ "resolved" "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz"
+ "version" "2.8.0"
dependencies:
"has" "^1.0.3"
@@ -6656,11 +6664,6 @@
"resolved" "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"
"version" "2.1.1"
-"is-fullwidth-code-point@^2.0.0":
- "integrity" "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
- "resolved" "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"
- "version" "2.0.0"
-
"is-fullwidth-code-point@^3.0.0":
"integrity" "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
"resolved" "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
@@ -6679,9 +6682,9 @@
"is-extglob" "^2.1.0"
"is-glob@^4.0.0", "is-glob@^4.0.1", "is-glob@~4.0.1":
- "integrity" "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="
- "resolved" "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"
- "version" "4.0.1"
+ "integrity" "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="
+ "resolved" "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"
+ "version" "4.0.3"
dependencies:
"is-extglob" "^2.1.1"
@@ -6784,7 +6787,7 @@
"resolved" "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz"
"version" "4.0.0"
-"is-regex@^1.0.4", "is-regex@^1.1.3":
+"is-regex@^1.0.4", "is-regex@^1.1.4":
"integrity" "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="
"resolved" "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"
"version" "1.1.4"
@@ -6797,10 +6800,15 @@
"resolved" "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz"
"version" "1.1.0"
-"is-retry-allowed@^1.1.0":
- "integrity" "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg=="
- "resolved" "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz"
- "version" "1.2.0"
+"is-retry-allowed@^2.2.0":
+ "integrity" "sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg=="
+ "resolved" "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz"
+ "version" "2.2.0"
+
+"is-shared-array-buffer@^1.0.1":
+ "integrity" "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA=="
+ "resolved" "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz"
+ "version" "1.0.1"
"is-ssh@^1.3.0":
"integrity" "sha512-NKzJmQzJfEEma3w5cJNcUMxoXfDjz0Zj0eyCalHn2E6VOwlzjZo0yuO2fcBSf8zhFuVCL/82/r5gRcoi6aEPVQ=="
@@ -6814,7 +6822,7 @@
"resolved" "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"
"version" "2.0.1"
-"is-string@^1.0.5", "is-string@^1.0.6":
+"is-string@^1.0.5", "is-string@^1.0.7":
"integrity" "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg=="
"resolved" "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz"
"version" "1.0.7"
@@ -6848,6 +6856,13 @@
"resolved" "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"
"version" "0.2.1"
+"is-weakref@^1.0.1":
+ "integrity" "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ=="
+ "resolved" "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz"
+ "version" "1.0.1"
+ dependencies:
+ "call-bind" "^1.0.0"
+
"is-whitespace@^0.3.0":
"integrity" "sha1-Fjnssb4DauxppUy7QBz77XEUq38="
"resolved" "https://registry.npmjs.org/is-whitespace/-/is-whitespace-0.3.0.tgz"
@@ -6905,10 +6920,10 @@
"resolved" "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"
"version" "3.0.1"
-"istanbul-lib-coverage@^3.0.0", "istanbul-lib-coverage@^3.0.0-alpha.1":
- "integrity" "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg=="
- "resolved" "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz"
- "version" "3.0.0"
+"istanbul-lib-coverage@^3.0.0", "istanbul-lib-coverage@^3.0.0-alpha.1", "istanbul-lib-coverage@^3.2.0":
+ "integrity" "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw=="
+ "resolved" "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz"
+ "version" "3.2.0"
"istanbul-lib-hook@^3.0.0":
"integrity" "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ=="
@@ -6917,7 +6932,17 @@
dependencies:
"append-transform" "^2.0.0"
-"istanbul-lib-instrument@^4.0.0", "istanbul-lib-instrument@^4.0.3":
+"istanbul-lib-instrument@^4.0.0":
+ "integrity" "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ=="
+ "resolved" "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz"
+ "version" "4.0.3"
+ dependencies:
+ "@babel/core" "^7.7.5"
+ "@istanbuljs/schema" "^0.1.2"
+ "istanbul-lib-coverage" "^3.0.0"
+ "semver" "^6.3.0"
+
+"istanbul-lib-instrument@^4.0.3":
"integrity" "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ=="
"resolved" "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz"
"version" "4.0.3"
@@ -6927,6 +6952,17 @@
"istanbul-lib-coverage" "^3.0.0"
"semver" "^6.3.0"
+"istanbul-lib-instrument@^5.0.4":
+ "integrity" "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q=="
+ "resolved" "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz"
+ "version" "5.1.0"
+ dependencies:
+ "@babel/core" "^7.12.3"
+ "@babel/parser" "^7.14.7"
+ "@istanbuljs/schema" "^0.1.2"
+ "istanbul-lib-coverage" "^3.2.0"
+ "semver" "^6.3.0"
+
"istanbul-lib-processinfo@^2.0.2":
"integrity" "sha512-kOwpa7z9hme+IBPZMzQ5vdQj8srYgAtaRqeI48NGmAQ+/5yKiHLV0QbYqQpxsdEF0+w14SoB8YbnHKcXE2KnYw=="
"resolved" "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.2.tgz"
@@ -6950,110 +6986,110 @@
"supports-color" "^7.1.0"
"istanbul-lib-source-maps@^4.0.0":
- "integrity" "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg=="
- "resolved" "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz"
- "version" "4.0.0"
+ "integrity" "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw=="
+ "resolved" "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz"
+ "version" "4.0.1"
dependencies:
"debug" "^4.1.1"
"istanbul-lib-coverage" "^3.0.0"
"source-map" "^0.6.1"
"istanbul-reports@^3.0.2":
- "integrity" "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw=="
- "resolved" "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz"
- "version" "3.0.2"
+ "integrity" "sha512-5+19PlhnGabNWB7kOFnuxT8H3T/iIyQzIbQMxXsURmmvKg86P2sbkrGOT77VnHw0Qr0gc2XzRaRfMZYYbSQCJQ=="
+ "resolved" "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.5.tgz"
+ "version" "3.0.5"
dependencies:
"html-escaper" "^2.0.0"
"istanbul-lib-report" "^3.0.0"
-"jest-changed-files@^27.0.6":
- "integrity" "sha512-BuL/ZDauaq5dumYh5y20sn4IISnf1P9A0TDswTxUi84ORGtVa86ApuBHqICL0vepqAnZiY6a7xeSPWv2/yy4eA=="
- "resolved" "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.0.6.tgz"
- "version" "27.0.6"
+"jest-changed-files@^27.3.0":
+ "integrity" "sha512-9DJs9garMHv4RhylUMZgbdCJ3+jHSkpL9aaVKp13xtXAD80qLTLrqcDZL1PHA9dYA0bCI86Nv2BhkLpLhrBcPg=="
+ "resolved" "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.3.0.tgz"
+ "version" "27.3.0"
dependencies:
- "@jest/types" "^27.0.6"
+ "@jest/types" "^27.2.5"
"execa" "^5.0.0"
"throat" "^6.0.1"
-"jest-circus@^27.0.6":
- "integrity" "sha512-OJlsz6BBeX9qR+7O9lXefWoc2m9ZqcZ5Ohlzz0pTEAG4xMiZUJoacY8f4YDHxgk0oKYxj277AfOk9w6hZYvi1Q=="
- "resolved" "https://registry.npmjs.org/jest-circus/-/jest-circus-27.0.6.tgz"
- "version" "27.0.6"
+"jest-circus@^27.3.1":
+ "integrity" "sha512-v1dsM9II6gvXokgqq6Yh2jHCpfg7ZqV4jWY66u7npz24JnhP3NHxI0sKT7+ZMQ7IrOWHYAaeEllOySbDbWsiXw=="
+ "resolved" "https://registry.npmjs.org/jest-circus/-/jest-circus-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
- "@jest/environment" "^27.0.6"
- "@jest/test-result" "^27.0.6"
- "@jest/types" "^27.0.6"
+ "@jest/environment" "^27.3.1"
+ "@jest/test-result" "^27.3.1"
+ "@jest/types" "^27.2.5"
"@types/node" "*"
"chalk" "^4.0.0"
"co" "^4.6.0"
"dedent" "^0.7.0"
- "expect" "^27.0.6"
+ "expect" "^27.3.1"
"is-generator-fn" "^2.0.0"
- "jest-each" "^27.0.6"
- "jest-matcher-utils" "^27.0.6"
- "jest-message-util" "^27.0.6"
- "jest-runtime" "^27.0.6"
- "jest-snapshot" "^27.0.6"
- "jest-util" "^27.0.6"
- "pretty-format" "^27.0.6"
+ "jest-each" "^27.3.1"
+ "jest-matcher-utils" "^27.3.1"
+ "jest-message-util" "^27.3.1"
+ "jest-runtime" "^27.3.1"
+ "jest-snapshot" "^27.3.1"
+ "jest-util" "^27.3.1"
+ "pretty-format" "^27.3.1"
"slash" "^3.0.0"
"stack-utils" "^2.0.3"
"throat" "^6.0.1"
-"jest-cli@^27.0.6":
- "integrity" "sha512-qUUVlGb9fdKir3RDE+B10ULI+LQrz+MCflEH2UJyoUjoHHCbxDrMxSzjQAPUMsic4SncI62ofYCcAvW6+6rhhg=="
- "resolved" "https://registry.npmjs.org/jest-cli/-/jest-cli-27.0.6.tgz"
- "version" "27.0.6"
+"jest-cli@^27.3.1":
+ "integrity" "sha512-WHnCqpfK+6EvT62me6WVs8NhtbjAS4/6vZJnk7/2+oOr50cwAzG4Wxt6RXX0hu6m1169ZGMlhYYUNeKBXCph/Q=="
+ "resolved" "https://registry.npmjs.org/jest-cli/-/jest-cli-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
- "@jest/core" "^27.0.6"
- "@jest/test-result" "^27.0.6"
- "@jest/types" "^27.0.6"
+ "@jest/core" "^27.3.1"
+ "@jest/test-result" "^27.3.1"
+ "@jest/types" "^27.2.5"
"chalk" "^4.0.0"
"exit" "^0.1.2"
"graceful-fs" "^4.2.4"
"import-local" "^3.0.2"
- "jest-config" "^27.0.6"
- "jest-util" "^27.0.6"
- "jest-validate" "^27.0.6"
+ "jest-config" "^27.3.1"
+ "jest-util" "^27.3.1"
+ "jest-validate" "^27.3.1"
"prompts" "^2.0.1"
- "yargs" "^16.0.3"
+ "yargs" "^16.2.0"
-"jest-config@^27.0.6":
- "integrity" "sha512-JZRR3I1Plr2YxPBhgqRspDE2S5zprbga3swYNrvY3HfQGu7p/GjyLOqwrYad97tX3U3mzT53TPHVmozacfP/3w=="
- "resolved" "https://registry.npmjs.org/jest-config/-/jest-config-27.0.6.tgz"
- "version" "27.0.6"
+"jest-config@^27.3.1":
+ "integrity" "sha512-KY8xOIbIACZ/vdYCKSopL44I0xboxC751IX+DXL2+Wx6DKNycyEfV3rryC3BPm5Uq/BBqDoMrKuqLEUNJmMKKg=="
+ "resolved" "https://registry.npmjs.org/jest-config/-/jest-config-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
"@babel/core" "^7.1.0"
- "@jest/test-sequencer" "^27.0.6"
- "@jest/types" "^27.0.6"
- "babel-jest" "^27.0.6"
+ "@jest/test-sequencer" "^27.3.1"
+ "@jest/types" "^27.2.5"
+ "babel-jest" "^27.3.1"
"chalk" "^4.0.0"
+ "ci-info" "^3.2.0"
"deepmerge" "^4.2.2"
"glob" "^7.1.1"
"graceful-fs" "^4.2.4"
- "is-ci" "^3.0.0"
- "jest-circus" "^27.0.6"
- "jest-environment-jsdom" "^27.0.6"
- "jest-environment-node" "^27.0.6"
- "jest-get-type" "^27.0.6"
- "jest-jasmine2" "^27.0.6"
+ "jest-circus" "^27.3.1"
+ "jest-environment-jsdom" "^27.3.1"
+ "jest-environment-node" "^27.3.1"
+ "jest-get-type" "^27.3.1"
+ "jest-jasmine2" "^27.3.1"
"jest-regex-util" "^27.0.6"
- "jest-resolve" "^27.0.6"
- "jest-runner" "^27.0.6"
- "jest-util" "^27.0.6"
- "jest-validate" "^27.0.6"
+ "jest-resolve" "^27.3.1"
+ "jest-runner" "^27.3.1"
+ "jest-util" "^27.3.1"
+ "jest-validate" "^27.3.1"
"micromatch" "^4.0.4"
- "pretty-format" "^27.0.6"
+ "pretty-format" "^27.3.1"
-"jest-diff@^27.0.6":
- "integrity" "sha512-Z1mqgkTCSYaFgwTlP/NUiRzdqgxmmhzHY1Tq17zL94morOHfHu3K4bgSgl+CR4GLhpV8VxkuOYuIWnQ9LnFqmg=="
- "resolved" "https://registry.npmjs.org/jest-diff/-/jest-diff-27.0.6.tgz"
- "version" "27.0.6"
+"jest-diff@^27.3.1":
+ "integrity" "sha512-PCeuAH4AWUo2O5+ksW4pL9v5xJAcIKPUPfIhZBcG1RKv/0+dvaWTQK1Nrau8d67dp65fOqbeMdoil+6PedyEPQ=="
+ "resolved" "https://registry.npmjs.org/jest-diff/-/jest-diff-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
"chalk" "^4.0.0"
"diff-sequences" "^27.0.6"
- "jest-get-type" "^27.0.6"
- "pretty-format" "^27.0.6"
+ "jest-get-type" "^27.3.1"
+ "pretty-format" "^27.3.1"
"jest-docblock@^27.0.6":
"integrity" "sha512-Fid6dPcjwepTFraz0YxIMCi7dejjJ/KL9FBjPYhBp4Sv1Y9PdhImlKZqYU555BlN4TQKaTc+F2Av1z+anVyGkA=="
@@ -7062,53 +7098,53 @@
dependencies:
"detect-newline" "^3.0.0"
-"jest-each@^27.0.6":
- "integrity" "sha512-m6yKcV3bkSWrUIjxkE9OC0mhBZZdhovIW5ergBYirqnkLXkyEn3oUUF/QZgyecA1cF1QFyTE8bRRl8Tfg1pfLA=="
- "resolved" "https://registry.npmjs.org/jest-each/-/jest-each-27.0.6.tgz"
- "version" "27.0.6"
+"jest-each@^27.3.1":
+ "integrity" "sha512-E4SwfzKJWYcvOYCjOxhZcxwL+AY0uFMvdCOwvzgutJiaiodFjkxQQDxHm8FQBeTqDnSmKsQWn7ldMRzTn2zJaQ=="
+ "resolved" "https://registry.npmjs.org/jest-each/-/jest-each-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
- "@jest/types" "^27.0.6"
+ "@jest/types" "^27.2.5"
"chalk" "^4.0.0"
- "jest-get-type" "^27.0.6"
- "jest-util" "^27.0.6"
- "pretty-format" "^27.0.6"
-
-"jest-environment-jsdom@^27.0.6":
- "integrity" "sha512-FvetXg7lnXL9+78H+xUAsra3IeZRTiegA3An01cWeXBspKXUhAwMM9ycIJ4yBaR0L7HkoMPaZsozCLHh4T8fuw=="
- "resolved" "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.0.6.tgz"
- "version" "27.0.6"
- dependencies:
- "@jest/environment" "^27.0.6"
- "@jest/fake-timers" "^27.0.6"
- "@jest/types" "^27.0.6"
+ "jest-get-type" "^27.3.1"
+ "jest-util" "^27.3.1"
+ "pretty-format" "^27.3.1"
+
+"jest-environment-jsdom@^27.3.1":
+ "integrity" "sha512-3MOy8qMzIkQlfb3W1TfrD7uZHj+xx8Olix5vMENkj5djPmRqndMaXtpnaZkxmxM+Qc3lo+yVzJjzuXbCcZjAlg=="
+ "resolved" "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.3.1.tgz"
+ "version" "27.3.1"
+ dependencies:
+ "@jest/environment" "^27.3.1"
+ "@jest/fake-timers" "^27.3.1"
+ "@jest/types" "^27.2.5"
"@types/node" "*"
- "jest-mock" "^27.0.6"
- "jest-util" "^27.0.6"
+ "jest-mock" "^27.3.0"
+ "jest-util" "^27.3.1"
"jsdom" "^16.6.0"
-"jest-environment-node@^27.0.6":
- "integrity" "sha512-+Vi6yLrPg/qC81jfXx3IBlVnDTI6kmRr08iVa2hFCWmJt4zha0XW7ucQltCAPhSR0FEKEoJ3i+W4E6T0s9is0w=="
- "resolved" "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.0.6.tgz"
- "version" "27.0.6"
+"jest-environment-node@^27.3.1":
+ "integrity" "sha512-T89F/FgkE8waqrTSA7/ydMkcc52uYPgZZ6q8OaZgyiZkJb5QNNCF6oPZjH9IfPFfcc9uBWh1574N0kY0pSvTXw=="
+ "resolved" "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
- "@jest/environment" "^27.0.6"
- "@jest/fake-timers" "^27.0.6"
- "@jest/types" "^27.0.6"
+ "@jest/environment" "^27.3.1"
+ "@jest/fake-timers" "^27.3.1"
+ "@jest/types" "^27.2.5"
"@types/node" "*"
- "jest-mock" "^27.0.6"
- "jest-util" "^27.0.6"
+ "jest-mock" "^27.3.0"
+ "jest-util" "^27.3.1"
-"jest-get-type@^27.0.6":
- "integrity" "sha512-XTkK5exIeUbbveehcSR8w0bhH+c0yloW/Wpl+9vZrjzztCPWrxhHwkIFpZzCt71oRBsgxmuUfxEqOYoZI2macg=="
- "resolved" "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.0.6.tgz"
- "version" "27.0.6"
+"jest-get-type@^27.3.1":
+ "integrity" "sha512-+Ilqi8hgHSAdhlQ3s12CAVNd8H96ZkQBfYoXmArzZnOfAtVAJEiPDBirjByEblvG/4LPJmkL+nBqPO3A1YJAEg=="
+ "resolved" "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.3.1.tgz"
+ "version" "27.3.1"
-"jest-haste-map@^27.0.6":
- "integrity" "sha512-4ldjPXX9h8doB2JlRzg9oAZ2p6/GpQUNAeiYXqcpmrKbP0Qev0wdZlxSMOmz8mPOEnt4h6qIzXFLDi8RScX/1w=="
- "resolved" "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.0.6.tgz"
- "version" "27.0.6"
+"jest-haste-map@^27.3.1":
+ "integrity" "sha512-lYfNZIzwPccDJZIyk9Iz5iQMM/MH56NIIcGj7AFU1YyA4ewWFBl8z+YPJuSCRML/ee2cCt2y3W4K3VXPT6Nhzg=="
+ "resolved" "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
- "@jest/types" "^27.0.6"
+ "@jest/types" "^27.2.5"
"@types/graceful-fs" "^4.1.2"
"@types/node" "*"
"anymatch" "^3.0.3"
@@ -7116,76 +7152,76 @@
"graceful-fs" "^4.2.4"
"jest-regex-util" "^27.0.6"
"jest-serializer" "^27.0.6"
- "jest-util" "^27.0.6"
- "jest-worker" "^27.0.6"
+ "jest-util" "^27.3.1"
+ "jest-worker" "^27.3.1"
"micromatch" "^4.0.4"
"walker" "^1.0.7"
optionalDependencies:
"fsevents" "^2.3.2"
-"jest-jasmine2@^27.0.6":
- "integrity" "sha512-cjpH2sBy+t6dvCeKBsHpW41mjHzXgsavaFMp+VWRf0eR4EW8xASk1acqmljFtK2DgyIECMv2yCdY41r2l1+4iA=="
- "resolved" "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.0.6.tgz"
- "version" "27.0.6"
+"jest-jasmine2@^27.3.1":
+ "integrity" "sha512-WK11ZUetDQaC09w4/j7o4FZDUIp+4iYWH/Lik34Pv7ukL+DuXFGdnmmi7dT58J2ZYKFB5r13GyE0z3NPeyJmsg=="
+ "resolved" "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
"@babel/traverse" "^7.1.0"
- "@jest/environment" "^27.0.6"
+ "@jest/environment" "^27.3.1"
"@jest/source-map" "^27.0.6"
- "@jest/test-result" "^27.0.6"
- "@jest/types" "^27.0.6"
+ "@jest/test-result" "^27.3.1"
+ "@jest/types" "^27.2.5"
"@types/node" "*"
"chalk" "^4.0.0"
"co" "^4.6.0"
- "expect" "^27.0.6"
+ "expect" "^27.3.1"
"is-generator-fn" "^2.0.0"
- "jest-each" "^27.0.6"
- "jest-matcher-utils" "^27.0.6"
- "jest-message-util" "^27.0.6"
- "jest-runtime" "^27.0.6"
- "jest-snapshot" "^27.0.6"
- "jest-util" "^27.0.6"
- "pretty-format" "^27.0.6"
+ "jest-each" "^27.3.1"
+ "jest-matcher-utils" "^27.3.1"
+ "jest-message-util" "^27.3.1"
+ "jest-runtime" "^27.3.1"
+ "jest-snapshot" "^27.3.1"
+ "jest-util" "^27.3.1"
+ "pretty-format" "^27.3.1"
"throat" "^6.0.1"
-"jest-leak-detector@^27.0.6":
- "integrity" "sha512-2/d6n2wlH5zEcdctX4zdbgX8oM61tb67PQt4Xh8JFAIy6LRKUnX528HulkaG6nD5qDl5vRV1NXejCe1XRCH5gQ=="
- "resolved" "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.0.6.tgz"
- "version" "27.0.6"
+"jest-leak-detector@^27.3.1":
+ "integrity" "sha512-78QstU9tXbaHzwlRlKmTpjP9k4Pvre5l0r8Spo4SbFFVy/4Abg9I6ZjHwjg2QyKEAMg020XcjP+UgLZIY50yEg=="
+ "resolved" "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
- "jest-get-type" "^27.0.6"
- "pretty-format" "^27.0.6"
+ "jest-get-type" "^27.3.1"
+ "pretty-format" "^27.3.1"
-"jest-matcher-utils@^27.0.6":
- "integrity" "sha512-OFgF2VCQx9vdPSYTHWJ9MzFCehs20TsyFi6bIHbk5V1u52zJOnvF0Y/65z3GLZHKRuTgVPY4Z6LVePNahaQ+tA=="
- "resolved" "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.0.6.tgz"
- "version" "27.0.6"
+"jest-matcher-utils@^27.3.1":
+ "integrity" "sha512-hX8N7zXS4k+8bC1Aj0OWpGb7D3gIXxYvPNK1inP5xvE4ztbz3rc4AkI6jGVaerepBnfWB17FL5lWFJT3s7qo8w=="
+ "resolved" "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
"chalk" "^4.0.0"
- "jest-diff" "^27.0.6"
- "jest-get-type" "^27.0.6"
- "pretty-format" "^27.0.6"
+ "jest-diff" "^27.3.1"
+ "jest-get-type" "^27.3.1"
+ "pretty-format" "^27.3.1"
-"jest-message-util@^27.0.6":
- "integrity" "sha512-rBxIs2XK7rGy+zGxgi+UJKP6WqQ+KrBbD1YMj517HYN3v2BG66t3Xan3FWqYHKZwjdB700KiAJ+iES9a0M+ixw=="
- "resolved" "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.0.6.tgz"
- "version" "27.0.6"
+"jest-message-util@^27.3.1":
+ "integrity" "sha512-bh3JEmxsTZ/9rTm0jQrPElbY2+y48Rw2t47uMfByNyUVR+OfPh4anuyKsGqsNkXk/TI4JbLRZx+7p7Hdt6q1yg=="
+ "resolved" "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
"@babel/code-frame" "^7.12.13"
- "@jest/types" "^27.0.6"
+ "@jest/types" "^27.2.5"
"@types/stack-utils" "^2.0.0"
"chalk" "^4.0.0"
"graceful-fs" "^4.2.4"
"micromatch" "^4.0.4"
- "pretty-format" "^27.0.6"
+ "pretty-format" "^27.3.1"
"slash" "^3.0.0"
"stack-utils" "^2.0.3"
-"jest-mock@^27.0.6":
- "integrity" "sha512-lzBETUoK8cSxts2NYXSBWT+EJNzmUVtVVwS1sU9GwE1DLCfGsngg+ZVSIe0yd0ZSm+y791esiuo+WSwpXJQ5Bw=="
- "resolved" "https://registry.npmjs.org/jest-mock/-/jest-mock-27.0.6.tgz"
- "version" "27.0.6"
+"jest-mock@^27.3.0":
+ "integrity" "sha512-ziZiLk0elZOQjD08bLkegBzv5hCABu/c8Ytx45nJKkysQwGaonvmTxwjLqEA4qGdasq9o2I8/HtdGMNnVsMTGw=="
+ "resolved" "https://registry.npmjs.org/jest-mock/-/jest-mock-27.3.0.tgz"
+ "version" "27.3.0"
dependencies:
- "@jest/types" "^27.0.6"
+ "@jest/types" "^27.2.5"
"@types/node" "*"
"jest-pnp-resolver@^1.2.2":
@@ -7198,89 +7234,90 @@
"resolved" "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.0.6.tgz"
"version" "27.0.6"
-"jest-resolve-dependencies@^27.0.6":
- "integrity" "sha512-mg9x9DS3BPAREWKCAoyg3QucCr0n6S8HEEsqRCKSPjPcu9HzRILzhdzY3imsLoZWeosEbJZz6TKasveczzpJZA=="
- "resolved" "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.6.tgz"
- "version" "27.0.6"
+"jest-resolve-dependencies@^27.3.1":
+ "integrity" "sha512-X7iLzY8pCiYOnvYo2YrK3P9oSE8/3N2f4pUZMJ8IUcZnT81vlSonya1KTO9ZfKGuC+svE6FHK/XOb8SsoRUV1A=="
+ "resolved" "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
- "@jest/types" "^27.0.6"
+ "@jest/types" "^27.2.5"
"jest-regex-util" "^27.0.6"
- "jest-snapshot" "^27.0.6"
+ "jest-snapshot" "^27.3.1"
-"jest-resolve@*", "jest-resolve@^27.0.6":
- "integrity" "sha512-yKmIgw2LgTh7uAJtzv8UFHGF7Dm7XfvOe/LQ3Txv101fLM8cx2h1QVwtSJ51Q/SCxpIiKfVn6G2jYYMDNHZteA=="
- "resolved" "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.0.6.tgz"
- "version" "27.0.6"
+"jest-resolve@*", "jest-resolve@^27.3.1":
+ "integrity" "sha512-Dfzt25CFSPo3Y3GCbxynRBZzxq9AdyNN+x/v2IqYx6KVT5Z6me2Z/PsSGFSv3cOSUZqJ9pHxilao/I/m9FouLw=="
+ "resolved" "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
- "@jest/types" "^27.0.6"
+ "@jest/types" "^27.2.5"
"chalk" "^4.0.0"
- "escalade" "^3.1.1"
"graceful-fs" "^4.2.4"
+ "jest-haste-map" "^27.3.1"
"jest-pnp-resolver" "^1.2.2"
- "jest-util" "^27.0.6"
- "jest-validate" "^27.0.6"
+ "jest-util" "^27.3.1"
+ "jest-validate" "^27.3.1"
"resolve" "^1.20.0"
+ "resolve.exports" "^1.1.0"
"slash" "^3.0.0"
-"jest-runner@^27.0.6":
- "integrity" "sha512-W3Bz5qAgaSChuivLn+nKOgjqNxM7O/9JOJoKDCqThPIg2sH/d4A/lzyiaFgnb9V1/w29Le11NpzTJSzga1vyYQ=="
- "resolved" "https://registry.npmjs.org/jest-runner/-/jest-runner-27.0.6.tgz"
- "version" "27.0.6"
+"jest-runner@^27.3.1":
+ "integrity" "sha512-r4W6kBn6sPr3TBwQNmqE94mPlYVn7fLBseeJfo4E2uCTmAyDFm2O5DYAQAFP7Q3YfiA/bMwg8TVsciP7k0xOww=="
+ "resolved" "https://registry.npmjs.org/jest-runner/-/jest-runner-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
- "@jest/console" "^27.0.6"
- "@jest/environment" "^27.0.6"
- "@jest/test-result" "^27.0.6"
- "@jest/transform" "^27.0.6"
- "@jest/types" "^27.0.6"
+ "@jest/console" "^27.3.1"
+ "@jest/environment" "^27.3.1"
+ "@jest/test-result" "^27.3.1"
+ "@jest/transform" "^27.3.1"
+ "@jest/types" "^27.2.5"
"@types/node" "*"
"chalk" "^4.0.0"
"emittery" "^0.8.1"
"exit" "^0.1.2"
"graceful-fs" "^4.2.4"
"jest-docblock" "^27.0.6"
- "jest-environment-jsdom" "^27.0.6"
- "jest-environment-node" "^27.0.6"
- "jest-haste-map" "^27.0.6"
- "jest-leak-detector" "^27.0.6"
- "jest-message-util" "^27.0.6"
- "jest-resolve" "^27.0.6"
- "jest-runtime" "^27.0.6"
- "jest-util" "^27.0.6"
- "jest-worker" "^27.0.6"
+ "jest-environment-jsdom" "^27.3.1"
+ "jest-environment-node" "^27.3.1"
+ "jest-haste-map" "^27.3.1"
+ "jest-leak-detector" "^27.3.1"
+ "jest-message-util" "^27.3.1"
+ "jest-resolve" "^27.3.1"
+ "jest-runtime" "^27.3.1"
+ "jest-util" "^27.3.1"
+ "jest-worker" "^27.3.1"
"source-map-support" "^0.5.6"
"throat" "^6.0.1"
-"jest-runtime@^27.0.6":
- "integrity" "sha512-BhvHLRVfKibYyqqEFkybsznKwhrsu7AWx2F3y9G9L95VSIN3/ZZ9vBpm/XCS2bS+BWz3sSeNGLzI3TVQ0uL85Q=="
- "resolved" "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.0.6.tgz"
- "version" "27.0.6"
+"jest-runtime@^27.3.1":
+ "integrity" "sha512-qtO6VxPbS8umqhEDpjA4pqTkKQ1Hy4ZSi9mDVeE9Za7LKBo2LdW2jmT+Iod3XFaJqINikZQsn2wEi0j9wPRbLg=="
+ "resolved" "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
- "@jest/console" "^27.0.6"
- "@jest/environment" "^27.0.6"
- "@jest/fake-timers" "^27.0.6"
- "@jest/globals" "^27.0.6"
+ "@jest/console" "^27.3.1"
+ "@jest/environment" "^27.3.1"
+ "@jest/globals" "^27.3.1"
"@jest/source-map" "^27.0.6"
- "@jest/test-result" "^27.0.6"
- "@jest/transform" "^27.0.6"
- "@jest/types" "^27.0.6"
+ "@jest/test-result" "^27.3.1"
+ "@jest/transform" "^27.3.1"
+ "@jest/types" "^27.2.5"
"@types/yargs" "^16.0.0"
"chalk" "^4.0.0"
"cjs-module-lexer" "^1.0.0"
"collect-v8-coverage" "^1.0.0"
+ "execa" "^5.0.0"
"exit" "^0.1.2"
"glob" "^7.1.3"
"graceful-fs" "^4.2.4"
- "jest-haste-map" "^27.0.6"
- "jest-message-util" "^27.0.6"
- "jest-mock" "^27.0.6"
+ "jest-haste-map" "^27.3.1"
+ "jest-message-util" "^27.3.1"
+ "jest-mock" "^27.3.0"
"jest-regex-util" "^27.0.6"
- "jest-resolve" "^27.0.6"
- "jest-snapshot" "^27.0.6"
- "jest-util" "^27.0.6"
- "jest-validate" "^27.0.6"
+ "jest-resolve" "^27.3.1"
+ "jest-snapshot" "^27.3.1"
+ "jest-util" "^27.3.1"
+ "jest-validate" "^27.3.1"
"slash" "^3.0.0"
"strip-bom" "^4.0.0"
- "yargs" "^16.0.3"
+ "yargs" "^16.2.0"
"jest-serializer@^27.0.6":
"integrity" "sha512-PtGdVK9EGC7dsaziskfqaAPib6wTViY3G8E5wz9tLVPhHyiDNTZn/xjZ4khAw+09QkoOVpn7vF5nPSN6dtBexA=="
@@ -7290,10 +7327,10 @@
"@types/node" "*"
"graceful-fs" "^4.2.4"
-"jest-snapshot@^27.0.6":
- "integrity" "sha512-NTHaz8He+ATUagUgE7C/UtFcRoHqR2Gc+KDfhQIyx+VFgwbeEMjeP+ILpUTLosZn/ZtbNdCF5LkVnN/l+V751A=="
- "resolved" "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.0.6.tgz"
- "version" "27.0.6"
+"jest-snapshot@^27.3.1":
+ "integrity" "sha512-APZyBvSgQgOT0XumwfFu7X3G5elj6TGhCBLbBdn3R1IzYustPGPE38F51dBWMQ8hRXa9je0vAdeVDtqHLvB6lg=="
+ "resolved" "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
"@babel/core" "^7.7.2"
"@babel/generator" "^7.7.2"
@@ -7301,60 +7338,60 @@
"@babel/plugin-syntax-typescript" "^7.7.2"
"@babel/traverse" "^7.7.2"
"@babel/types" "^7.0.0"
- "@jest/transform" "^27.0.6"
- "@jest/types" "^27.0.6"
+ "@jest/transform" "^27.3.1"
+ "@jest/types" "^27.2.5"
"@types/babel__traverse" "^7.0.4"
"@types/prettier" "^2.1.5"
"babel-preset-current-node-syntax" "^1.0.0"
"chalk" "^4.0.0"
- "expect" "^27.0.6"
+ "expect" "^27.3.1"
"graceful-fs" "^4.2.4"
- "jest-diff" "^27.0.6"
- "jest-get-type" "^27.0.6"
- "jest-haste-map" "^27.0.6"
- "jest-matcher-utils" "^27.0.6"
- "jest-message-util" "^27.0.6"
- "jest-resolve" "^27.0.6"
- "jest-util" "^27.0.6"
+ "jest-diff" "^27.3.1"
+ "jest-get-type" "^27.3.1"
+ "jest-haste-map" "^27.3.1"
+ "jest-matcher-utils" "^27.3.1"
+ "jest-message-util" "^27.3.1"
+ "jest-resolve" "^27.3.1"
+ "jest-util" "^27.3.1"
"natural-compare" "^1.4.0"
- "pretty-format" "^27.0.6"
+ "pretty-format" "^27.3.1"
"semver" "^7.3.2"
-"jest-util@^27.0.6":
- "integrity" "sha512-1JjlaIh+C65H/F7D11GNkGDDZtDfMEM8EBXsvd+l/cxtgQ6QhxuloOaiayt89DxUvDarbVhqI98HhgrM1yliFQ=="
- "resolved" "https://registry.npmjs.org/jest-util/-/jest-util-27.0.6.tgz"
- "version" "27.0.6"
+"jest-util@^27.3.1":
+ "integrity" "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw=="
+ "resolved" "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
- "@jest/types" "^27.0.6"
+ "@jest/types" "^27.2.5"
"@types/node" "*"
"chalk" "^4.0.0"
+ "ci-info" "^3.2.0"
"graceful-fs" "^4.2.4"
- "is-ci" "^3.0.0"
"picomatch" "^2.2.3"
-"jest-validate@^27.0.6":
- "integrity" "sha512-yhZZOaMH3Zg6DC83n60pLmdU1DQE46DW+KLozPiPbSbPhlXXaiUTDlhHQhHFpaqIFRrInko1FHXjTRpjWRuWfA=="
- "resolved" "https://registry.npmjs.org/jest-validate/-/jest-validate-27.0.6.tgz"
- "version" "27.0.6"
+"jest-validate@^27.3.1":
+ "integrity" "sha512-3H0XCHDFLA9uDII67Bwi1Vy7AqwA5HqEEjyy934lgVhtJ3eisw6ShOF1MDmRPspyikef5MyExvIm0/TuLzZ86Q=="
+ "resolved" "https://registry.npmjs.org/jest-validate/-/jest-validate-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
- "@jest/types" "^27.0.6"
+ "@jest/types" "^27.2.5"
"camelcase" "^6.2.0"
"chalk" "^4.0.0"
- "jest-get-type" "^27.0.6"
+ "jest-get-type" "^27.3.1"
"leven" "^3.1.0"
- "pretty-format" "^27.0.6"
+ "pretty-format" "^27.3.1"
-"jest-watcher@^27.0.6":
- "integrity" "sha512-/jIoKBhAP00/iMGnTwUBLgvxkn7vsOweDrOTSPzc7X9uOyUtJIDthQBTI1EXz90bdkrxorUZVhJwiB69gcHtYQ=="
- "resolved" "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.0.6.tgz"
- "version" "27.0.6"
+"jest-watcher@^27.3.1":
+ "integrity" "sha512-9/xbV6chABsGHWh9yPaAGYVVKurWoP3ZMCv6h+O1v9/+pkOroigs6WzZ0e9gLP/njokUwM7yQhr01LKJVMkaZA=="
+ "resolved" "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
- "@jest/test-result" "^27.0.6"
- "@jest/types" "^27.0.6"
+ "@jest/test-result" "^27.3.1"
+ "@jest/types" "^27.2.5"
"@types/node" "*"
"ansi-escapes" "^4.2.1"
"chalk" "^4.0.0"
- "jest-util" "^27.0.6"
+ "jest-util" "^27.3.1"
"string-length" "^4.0.1"
"jest-worker@^26.5.0":
@@ -7366,28 +7403,28 @@
"merge-stream" "^2.0.0"
"supports-color" "^7.0.0"
-"jest-worker@^27.0.6":
- "integrity" "sha512-qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA=="
- "resolved" "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.6.tgz"
- "version" "27.0.6"
+"jest-worker@^27.3.1":
+ "integrity" "sha512-ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g=="
+ "resolved" "https://registry.npmjs.org/jest-worker/-/jest-worker-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
"@types/node" "*"
"merge-stream" "^2.0.0"
"supports-color" "^8.0.0"
"jest@^27.0.2":
- "integrity" "sha512-EjV8aETrsD0wHl7CKMibKwQNQc3gIRBXlTikBmmHUeVMKaPFxdcUIBfoDqTSXDoGJIivAYGqCWVlzCSaVjPQsA=="
- "resolved" "https://registry.npmjs.org/jest/-/jest-27.0.6.tgz"
- "version" "27.0.6"
+ "integrity" "sha512-U2AX0AgQGd5EzMsiZpYt8HyZ+nSVIh5ujQ9CPp9EQZJMjXIiSZpJNweZl0swatKRoqHWgGKM3zaSwm4Zaz87ng=="
+ "resolved" "https://registry.npmjs.org/jest/-/jest-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
- "@jest/core" "^27.0.6"
+ "@jest/core" "^27.3.1"
"import-local" "^3.0.2"
- "jest-cli" "^27.0.6"
+ "jest-cli" "^27.3.1"
"jiti@^1.9.2":
- "integrity" "sha512-/2c7e61hxxTIN34UeHBB0LCJ5Tq64kgJDV7GR+++e8XRxCKRIKmB8tH6ww1W+Z6Kgd6By+C3RSCu1lXjbPT68A=="
- "resolved" "https://registry.npmjs.org/jiti/-/jiti-1.11.0.tgz"
- "version" "1.11.0"
+ "integrity" "sha512-TdcJywkQtcwLxogc4rSMAi479G2eDPzfW0fLySks7TPhgZZ4s/tM6stnzayIh3gS/db3zExWJyUx4cNWrwAmoQ=="
+ "resolved" "https://registry.npmjs.org/jiti/-/jiti-1.12.9.tgz"
+ "version" "1.12.9"
"jpeg-js@^0.4.2":
"integrity" "sha512-ru1HWKek8octvUHFHvE5ZzQ1yAsJmIvRdGWvSoKV52XKyuyYA437QWDttXT8eZXDSbuMpHlLzPDZUPd6idIz+Q=="
@@ -7410,9 +7447,9 @@
"nopt" "^5.0.0"
"js-cookie@^3.0.0":
- "integrity" "sha512-oUbbplKuH07/XX2YD2+Q+GMiPpnVXaRz8npE7suhBH9QEkJe2W7mQ6rwuMXHue3fpfcftQwzgyvGzIHyfCSngQ=="
- "resolved" "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.0.tgz"
- "version" "3.0.0"
+ "integrity" "sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw=="
+ "resolved" "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.1.tgz"
+ "version" "3.0.1"
"js-string-escape@^1.0.1":
"integrity" "sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8="
@@ -7563,9 +7600,9 @@
"json-buffer" "3.0.0"
"keyv@^4.0.0":
- "integrity" "sha512-zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA=="
- "resolved" "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz"
- "version" "4.0.3"
+ "integrity" "sha512-vqNHbAc8BBsxk+7QBYLW0Y219rWcClspR6WSeoHYKG5mnsSoOH+BL1pWq02DDCVdvvuUny5rkBlzMRzoqc+GIg=="
+ "resolved" "https://registry.npmjs.org/keyv/-/keyv-4.0.4.tgz"
+ "version" "4.0.4"
dependencies:
"json-buffer" "3.0.1"
@@ -7613,16 +7650,16 @@
"version" "3.0.3"
"klona@^2.0.4":
- "integrity" "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA=="
- "resolved" "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz"
- "version" "2.0.4"
+ "integrity" "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ=="
+ "resolved" "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz"
+ "version" "2.0.5"
"knex@^0.95.6":
- "integrity" "sha512-I60A8TXcMdeJlE6h7DSgEYyY37S7kgLObz1qlJ7QvPMD6vnKO5dtuLEht5pMia9Qf5BomqVgkWCdVTqcC/ImOA=="
- "resolved" "https://registry.npmjs.org/knex/-/knex-0.95.10.tgz"
- "version" "0.95.10"
+ "integrity" "sha512-XagG/iYA4RabYy1BmgY607Q00kBduOgb/Nej3+UDcCNdmuzDvZcfFo/726BYhfxv5amTBtGjewodZrTNbO63VA=="
+ "resolved" "https://registry.npmjs.org/knex/-/knex-0.95.13.tgz"
+ "version" "0.95.13"
dependencies:
- "colorette" "1.2.1"
+ "colorette" "2.0.16"
"commander" "^7.1.0"
"debug" "4.3.2"
"escalade" "^3.1.1"
@@ -7770,9 +7807,9 @@
"json5" "^1.0.1"
"loader-utils@^2.0.0":
- "integrity" "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ=="
- "resolved" "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz"
- "version" "2.0.0"
+ "integrity" "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A=="
+ "resolved" "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz"
+ "version" "2.0.2"
dependencies:
"big.js" "^5.2.2"
"emojis-list" "^3.0.0"
@@ -7963,12 +8000,12 @@
dependencies:
"semver" "^6.0.0"
-"makeerror@1.0.x":
- "integrity" "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw="
- "resolved" "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz"
- "version" "1.0.11"
+"makeerror@1.0.12":
+ "integrity" "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg=="
+ "resolved" "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz"
+ "version" "1.0.12"
dependencies:
- "tmpl" "1.0.x"
+ "tmpl" "1.0.5"
"map-age-cleaner@^0.1.3":
"integrity" "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w=="
@@ -8048,9 +8085,9 @@
"mimic-fn" "^3.1.0"
"memfs@^3.2.2":
- "integrity" "sha512-RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q=="
- "resolved" "https://registry.npmjs.org/memfs/-/memfs-3.2.2.tgz"
- "version" "3.2.2"
+ "integrity" "sha512-BEE62uMfKOavX3iG7GYX43QJ+hAeeWnwIAuJ/R6q96jaMtiLzhsxHJC8B1L7fK7Pt/vXDRwb3SG/yBpNGDPqzg=="
+ "resolved" "https://registry.npmjs.org/memfs/-/memfs-3.3.0.tgz"
+ "version" "3.3.0"
dependencies:
"fs-monkey" "1.0.3"
@@ -8132,27 +8169,27 @@
"bn.js" "^4.0.0"
"brorand" "^1.0.1"
-"mime-db@>= 1.43.0 < 2", "mime-db@1.49.0":
- "integrity" "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA=="
- "resolved" "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz"
- "version" "1.49.0"
+"mime-db@>= 1.43.0 < 2", "mime-db@1.50.0":
+ "integrity" "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A=="
+ "resolved" "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz"
+ "version" "1.50.0"
"mime-types@^2.1.12", "mime-types@^2.1.19", "mime-types@^2.1.27", "mime-types@^2.1.30", "mime-types@~2.1.24":
- "integrity" "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A=="
- "resolved" "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz"
- "version" "2.1.32"
+ "integrity" "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g=="
+ "resolved" "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz"
+ "version" "2.1.33"
dependencies:
- "mime-db" "1.49.0"
+ "mime-db" "1.50.0"
"mime@^2.3.1":
- "integrity" "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg=="
- "resolved" "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz"
- "version" "2.5.2"
+ "integrity" "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="
+ "resolved" "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz"
+ "version" "2.6.0"
"mime@^2.4.6":
- "integrity" "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg=="
- "resolved" "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz"
- "version" "2.5.2"
+ "integrity" "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="
+ "resolved" "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz"
+ "version" "2.6.0"
"mime@1.6.0":
"integrity" "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
@@ -8223,9 +8260,9 @@
"minipass" "^3.0.0"
"minipass@^3.0.0", "minipass@^3.1.1":
- "integrity" "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg=="
- "resolved" "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz"
- "version" "3.1.3"
+ "integrity" "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw=="
+ "resolved" "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz"
+ "version" "3.1.5"
dependencies:
"yallist" "^4.0.0"
@@ -8339,10 +8376,10 @@
"resolved" "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"
"version" "0.0.8"
-"nanoid@^3.1.23":
- "integrity" "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q=="
- "resolved" "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz"
- "version" "3.1.25"
+"nanoid@^3.1.23", "nanoid@^3.1.30":
+ "integrity" "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ=="
+ "resolved" "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz"
+ "version" "3.1.30"
"nanomatch@^1.2.9":
"integrity" "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="
@@ -8392,9 +8429,11 @@
"tslib" "^2.0.3"
"node-fetch@^2.6.1":
- "integrity" "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
- "resolved" "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz"
- "version" "2.6.1"
+ "integrity" "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA=="
+ "resolved" "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz"
+ "version" "2.6.6"
+ dependencies:
+ "whatwg-url" "^5.0.0"
"node-html-parser@^3.2.0":
"integrity" "sha512-VkWDHvNgFGB3mbQGMyzqRE1i/BG7TKX9wRXC8e/v8kL0kZR/Oy6RjYxXH91K6/+m3g8iQ8dTqRy75lTYoA2Cjg=="
@@ -8455,10 +8494,10 @@
dependencies:
"process-on-spawn" "^1.0.0"
-"node-releases@^1.1.75":
- "integrity" "sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw=="
- "resolved" "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz"
- "version" "1.1.75"
+"node-releases@^2.0.1":
+ "integrity" "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA=="
+ "resolved" "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz"
+ "version" "2.0.1"
"node-res@^5.0.1":
"integrity" "sha512-YOleO9c7MAqoHC+Ccu2vzvV1fL6Ku49gShq3PIMKWHRgrMSih3XcwL05NbLBi6oU2J471gTBfdpVVxwT6Pfhxg=="
@@ -8550,9 +8589,9 @@
"boolbase" "~1.0.0"
"nth-check@^2.0.0":
- "integrity" "sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q=="
- "resolved" "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz"
- "version" "2.0.0"
+ "integrity" "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w=="
+ "resolved" "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz"
+ "version" "2.0.1"
dependencies:
"boolbase" "^1.0.0"
@@ -8693,13 +8732,13 @@
"object-keys" "^1.1.1"
"object.getownpropertydescriptors@^2.0.3", "object.getownpropertydescriptors@^2.1.0":
- "integrity" "sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ=="
- "resolved" "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz"
- "version" "2.1.2"
+ "integrity" "sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw=="
+ "resolved" "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz"
+ "version" "2.1.3"
dependencies:
"call-bind" "^1.0.2"
"define-properties" "^1.1.3"
- "es-abstract" "^1.18.0-next.2"
+ "es-abstract" "^1.19.1"
"object.pick@^1.3.0":
"integrity" "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c="
@@ -8709,13 +8748,13 @@
"isobject" "^3.0.1"
"object.values@^1.1.0", "object.values@^1.1.1":
- "integrity" "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg=="
- "resolved" "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz"
- "version" "1.1.4"
+ "integrity" "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg=="
+ "resolved" "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz"
+ "version" "1.1.5"
dependencies:
"call-bind" "^1.0.2"
"define-properties" "^1.1.3"
- "es-abstract" "^1.18.2"
+ "es-abstract" "^1.19.1"
"on-finished@^2.3.0", "on-finished@~2.3.0":
"integrity" "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc="
@@ -8820,11 +8859,6 @@
"resolved" "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz"
"version" "1.0.0"
-"p-each-series@^2.1.0":
- "integrity" "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA=="
- "resolved" "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz"
- "version" "2.2.0"
-
"p-event@^4.2.0":
"integrity" "sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ=="
"resolved" "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz"
@@ -9131,6 +9165,16 @@
"resolved" "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz"
"version" "2.5.0"
+"picocolors@^0.2.1":
+ "integrity" "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
+ "resolved" "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz"
+ "version" "0.2.1"
+
+"picocolors@^1.0.0":
+ "integrity" "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+ "resolved" "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
+ "version" "1.0.0"
+
"picomatch@^2.0.4", "picomatch@^2.2.1", "picomatch@^2.2.2", "picomatch@^2.2.3":
"integrity" "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="
"resolved" "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz"
@@ -9204,12 +9248,12 @@
dependencies:
"find-up" "^3.0.0"
-"playwright@^1.14.0":
- "integrity" "sha512-JYNjhwWcfsBkg0FMGLbFO9e58FVdmICE4k97/glIQV7cBULL7oxNjRQC7Ffe+Y70XVNnP0HSJLaA0W5SukyftQ=="
- "resolved" "https://registry.npmjs.org/playwright/-/playwright-1.14.1.tgz"
- "version" "1.14.1"
+"playwright-core@=1.16.3":
+ "integrity" "sha512-16hF27IvQheJee+DbhC941AUZLjbJgfZFWi9YPS4LKEk/lKFhZI+9TiFD0sboYqb9eaEWvul47uR5xxTVbE4iw=="
+ "resolved" "https://registry.npmjs.org/playwright-core/-/playwright-core-1.16.3.tgz"
+ "version" "1.16.3"
dependencies:
- "commander" "^6.1.0"
+ "commander" "^8.2.0"
"debug" "^4.1.1"
"extract-zip" "^2.0.1"
"https-proxy-agent" "^5.0.0"
@@ -9220,10 +9264,19 @@
"proper-lockfile" "^4.1.1"
"proxy-from-env" "^1.1.0"
"rimraf" "^3.0.2"
+ "socks-proxy-agent" "^6.1.0"
"stack-utils" "^2.0.3"
"ws" "^7.4.6"
+ "yauzl" "^2.10.0"
"yazl" "^2.5.1"
+"playwright@^1.14.0":
+ "integrity" "sha512-nfJx/OpIb/8OexL3rYGxNN687hGyaM3XNpfuMzoPlrekURItyuiHHsNhC9oQCx3JDmCn5O3EyyyFCnrZjH6MpA=="
+ "resolved" "https://registry.npmjs.org/playwright/-/playwright-1.16.3.tgz"
+ "version" "1.16.3"
+ dependencies:
+ "playwright-core" "=1.16.3"
+
"plur@^4.0.0":
"integrity" "sha512-4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg=="
"resolved" "https://registry.npmjs.org/plur/-/plur-4.0.0.tgz"
@@ -9988,21 +10041,20 @@
"supports-color" "^5.4.0"
"postcss@^7.0.0", "postcss@^7.0.1", "postcss@^7.0.14", "postcss@^7.0.17", "postcss@^7.0.2", "postcss@^7.0.27", "postcss@^7.0.32", "postcss@^7.0.36", "postcss@^7.0.5", "postcss@^7.0.6":
- "integrity" "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw=="
- "resolved" "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz"
- "version" "7.0.36"
+ "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
+ "resolved" "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz"
+ "version" "7.0.39"
dependencies:
- "chalk" "^2.4.2"
+ "picocolors" "^0.2.1"
"source-map" "^0.6.1"
- "supports-color" "^6.1.0"
"postcss@^8.1.0", "postcss@^8.2.15":
- "integrity" "sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A=="
- "resolved" "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz"
- "version" "8.3.6"
+ "integrity" "sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA=="
+ "resolved" "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz"
+ "version" "8.3.11"
dependencies:
- "colorette" "^1.2.2"
- "nanoid" "^3.1.23"
+ "nanoid" "^3.1.30"
+ "picocolors" "^1.0.0"
"source-map-js" "^0.6.2"
"prelude-ls@^1.2.1":
@@ -10025,10 +10077,10 @@
"resolved" "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz"
"version" "2.0.0"
-"prettier@^1.18.2":
- "integrity" "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew=="
- "resolved" "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz"
- "version" "1.19.1"
+"prettier@^1.18.2 || ^2.0.0":
+ "integrity" "sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA=="
+ "resolved" "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz"
+ "version" "2.4.1"
"prettier@1.16.3":
"integrity" "sha512-kn/GU6SMRYPxUakNXhpP0EedT/KmaPzr0H5lIsDogrykbaxOpOfAFfk5XA7DZrJyMAv1wlMV3CPcZruGXVVUZw=="
@@ -10048,13 +10100,13 @@
"lodash" "^4.17.20"
"renderkid" "^2.0.4"
-"pretty-format@^27.0.6":
- "integrity" "sha512-8tGD7gBIENgzqA+UBzObyWqQ5B778VIFZA/S66cclyd5YkFLYs2Js7gxDKf0MXtTc9zcS7t1xhdfcElJ3YIvkQ=="
- "resolved" "https://registry.npmjs.org/pretty-format/-/pretty-format-27.0.6.tgz"
- "version" "27.0.6"
+"pretty-format@^27.3.1":
+ "integrity" "sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA=="
+ "resolved" "https://registry.npmjs.org/pretty-format/-/pretty-format-27.3.1.tgz"
+ "version" "27.3.1"
dependencies:
- "@jest/types" "^27.0.6"
- "ansi-regex" "^5.0.0"
+ "@jest/types" "^27.2.5"
+ "ansi-regex" "^5.0.1"
"ansi-styles" "^5.0.0"
"react-is" "^17.0.1"
@@ -10107,9 +10159,9 @@
"version" "1.0.1"
"prompts@^2.0.1":
- "integrity" "sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ=="
- "resolved" "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz"
- "version" "2.4.1"
+ "integrity" "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q=="
+ "resolved" "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz"
+ "version" "2.4.2"
dependencies:
"kleur" "^3.0.3"
"sisteransi" "^1.0.5"
@@ -10527,14 +10579,14 @@
dependencies:
"resolve" "^1.9.0"
-"regenerate-unicode-properties@^8.2.0":
- "integrity" "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA=="
- "resolved" "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"
- "version" "8.2.0"
+"regenerate-unicode-properties@^9.0.0":
+ "integrity" "sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA=="
+ "resolved" "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz"
+ "version" "9.0.0"
dependencies:
- "regenerate" "^1.4.0"
+ "regenerate" "^1.4.2"
-"regenerate@^1.4.0":
+"regenerate@^1.4.2":
"integrity" "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
"resolved" "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz"
"version" "1.4.2"
@@ -10560,9 +10612,9 @@
"safe-regex" "^1.1.0"
"regexp-tree@^0.1.21", "regexp-tree@~0.1.1":
- "integrity" "sha512-+7HWfb4Bvu8Rs2eQTUIpX9I/PlQkYOuTNbRpKLJlQpSgwSkzFYh+pUj0gtvglnOZLKB6YgnIgRuJ2/IlpL48qw=="
- "resolved" "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.23.tgz"
- "version" "0.1.23"
+ "integrity" "sha512-s2aEVuLhvnVJW6s/iPgEGK6R+/xngd2jNQ+xy4bXNDKxZKJH6jpPHY6kVeVv1IeLCHgswRj+Kl3ELaDjG6V1iw=="
+ "resolved" "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.24.tgz"
+ "version" "0.1.24"
"regexp.prototype.flags@^1.2.0":
"integrity" "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA=="
@@ -10578,16 +10630,16 @@
"version" "3.2.0"
"regexpu-core@^4.7.1":
- "integrity" "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ=="
- "resolved" "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz"
- "version" "4.7.1"
+ "integrity" "sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg=="
+ "resolved" "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.8.0.tgz"
+ "version" "4.8.0"
dependencies:
- "regenerate" "^1.4.0"
- "regenerate-unicode-properties" "^8.2.0"
- "regjsgen" "^0.5.1"
- "regjsparser" "^0.6.4"
- "unicode-match-property-ecmascript" "^1.0.4"
- "unicode-match-property-value-ecmascript" "^1.2.0"
+ "regenerate" "^1.4.2"
+ "regenerate-unicode-properties" "^9.0.0"
+ "regjsgen" "^0.5.2"
+ "regjsparser" "^0.7.0"
+ "unicode-match-property-ecmascript" "^2.0.0"
+ "unicode-match-property-value-ecmascript" "^2.0.0"
"registry-auth-token@^4.0.0":
"integrity" "sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw=="
@@ -10603,15 +10655,15 @@
dependencies:
"rc" "^1.2.8"
-"regjsgen@^0.5.1":
+"regjsgen@^0.5.2":
"integrity" "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="
"resolved" "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz"
"version" "0.5.2"
-"regjsparser@^0.6.4":
- "integrity" "sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ=="
- "resolved" "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz"
- "version" "0.6.9"
+"regjsparser@^0.7.0":
+ "integrity" "sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ=="
+ "resolved" "https://registry.npmjs.org/regjsparser/-/regjsparser-0.7.0.tgz"
+ "version" "0.7.0"
dependencies:
"jsesc" "~0.5.0"
@@ -10704,9 +10756,9 @@
"version" "1.0.0"
"reselect@^4.0.0":
- "integrity" "sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA=="
- "resolved" "https://registry.npmjs.org/reselect/-/reselect-4.0.0.tgz"
- "version" "4.0.0"
+ "integrity" "sha512-wg60ebcPOtxcptIUfrr7Jt3h4BR86cCW3R7y4qt65lnNb4yz4QgrXcbSioVsIOYguyz42+XTHIyJ5TEruzkFgQ=="
+ "resolved" "https://registry.npmjs.org/reselect/-/reselect-4.1.2.tgz"
+ "version" "4.1.2"
"reserved-words@^0.1.2":
"integrity" "sha1-AKCUD5jNUBrqqsMWQR2a3FKzGrE="
@@ -10714,9 +10766,9 @@
"version" "0.1.2"
"resolve-alpn@^1.0.0":
- "integrity" "sha512-e4FNQs+9cINYMO5NMFc6kOUCdohjqFPSgMuwuZAOUWqrfWsen+Yjy5qZFkV5K7VO7tFSLKcUL97olkED7sCBHA=="
- "resolved" "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.0.tgz"
- "version" "1.2.0"
+ "integrity" "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="
+ "resolved" "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz"
+ "version" "1.2.1"
"resolve-cwd@^3.0.0":
"integrity" "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg=="
@@ -10745,6 +10797,11 @@
"resolved" "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"
"version" "0.2.1"
+"resolve.exports@^1.1.0":
+ "integrity" "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ=="
+ "resolved" "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz"
+ "version" "1.1.0"
+
"resolve@^1.1.7", "resolve@^1.10.0", "resolve@^1.10.1", "resolve@^1.12.0", "resolve@^1.13.1", "resolve@^1.14.2", "resolve@^1.17.0", "resolve@^1.2.0", "resolve@^1.20.0", "resolve@^1.9.0":
"integrity" "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="
"resolved" "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz"
@@ -11128,9 +11185,9 @@
"version" "3.0.0"
"shell-quote@^1.6.1":
- "integrity" "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg=="
- "resolved" "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz"
- "version" "1.7.2"
+ "integrity" "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="
+ "resolved" "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz"
+ "version" "1.7.3"
"side-channel@^1.0.4":
"integrity" "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="
@@ -11147,9 +11204,9 @@
"version" "1.0.1"
"signal-exit@^3.0.2", "signal-exit@^3.0.3":
- "integrity" "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
- "resolved" "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"
- "version" "3.0.3"
+ "integrity" "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ=="
+ "resolved" "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz"
+ "version" "3.0.5"
"simple-swizzle@^0.2.2":
"integrity" "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo="
@@ -11159,11 +11216,11 @@
"is-arrayish" "^0.3.1"
"sirv@^1.0.7":
- "integrity" "sha512-czTFDFjK9lXj0u9mJ3OmJoXFztoilYS+NdRPcJoT182w44wSEkHSiO7A2517GLJ8wKM4GjCm2OXE66Dhngbzjg=="
- "resolved" "https://registry.npmjs.org/sirv/-/sirv-1.0.14.tgz"
- "version" "1.0.14"
+ "integrity" "sha512-f2AOPogZmXgJ9Ma2M22ZEhc1dNtRIzcEkiflMFeVTRq+OViOZMvH1IPMVOwrKaxpSaHioBJiDR0SluRqGa7atA=="
+ "resolved" "https://registry.npmjs.org/sirv/-/sirv-1.0.18.tgz"
+ "version" "1.0.18"
dependencies:
- "@polka/url" "^1.0.0-next.17"
+ "@polka/url" "^1.0.0-next.20"
"mime" "^2.3.1"
"totalist" "^1.0.0"
@@ -11195,6 +11252,11 @@
"astral-regex" "^2.0.0"
"is-fullwidth-code-point" "^3.0.0"
+"smart-buffer@^4.1.0":
+ "integrity" "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="
+ "resolved" "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz"
+ "version" "4.2.0"
+
"snapdragon-node@^2.0.1":
"integrity" "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw=="
"resolved" "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"
@@ -11225,6 +11287,23 @@
"source-map-resolve" "^0.5.0"
"use" "^3.1.0"
+"socks-proxy-agent@^6.1.0":
+ "integrity" "sha512-57e7lwCN4Tzt3mXz25VxOErJKXlPfXmkMLnk310v/jwW20jWRVcgsOit+xNkN3eIEdB47GwnfAEBLacZ/wVIKg=="
+ "resolved" "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.1.0.tgz"
+ "version" "6.1.0"
+ dependencies:
+ "agent-base" "^6.0.2"
+ "debug" "^4.3.1"
+ "socks" "^2.6.1"
+
+"socks@^2.6.1":
+ "integrity" "sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA=="
+ "resolved" "https://registry.npmjs.org/socks/-/socks-2.6.1.tgz"
+ "version" "2.6.1"
+ dependencies:
+ "ip" "^1.1.5"
+ "smart-buffer" "^4.1.0"
+
"sort-keys@^1.0.0":
"integrity" "sha1-RBttTTRnmPG05J6JIK37oOVD+a0="
"resolved" "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz"
@@ -11260,10 +11339,10 @@
"source-map-url" "^0.4.0"
"urix" "^0.1.0"
-"source-map-support@^0.5.10", "source-map-support@^0.5.16", "source-map-support@^0.5.19", "source-map-support@^0.5.6", "source-map-support@~0.5.12", "source-map-support@~0.5.19":
- "integrity" "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="
- "resolved" "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz"
- "version" "0.5.19"
+"source-map-support@^0.5.10", "source-map-support@^0.5.16", "source-map-support@^0.5.19", "source-map-support@^0.5.6", "source-map-support@~0.5.12", "source-map-support@~0.5.20":
+ "integrity" "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw=="
+ "resolved" "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz"
+ "version" "0.5.20"
dependencies:
"buffer-from" "^1.0.0"
"source-map" "^0.6.0"
@@ -11400,9 +11479,9 @@
"version" "0.0.10"
"stack-utils@^2.0.3":
- "integrity" "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw=="
- "resolved" "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz"
- "version" "2.0.3"
+ "integrity" "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA=="
+ "resolved" "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz"
+ "version" "2.0.5"
dependencies:
"escape-string-regexp" "^2.0.0"
@@ -11425,11 +11504,11 @@
"version" "1.5.0"
"std-env@^2.2.1", "std-env@^2.3.0":
- "integrity" "sha512-4qT5B45+Kjef2Z6pE0BkskzsH0GO7GrND0wGlTM1ioUe3v0dGYx9ZJH0Aro/YyA8fqQ5EyIKDRjZojJYMFTflw=="
- "resolved" "https://registry.npmjs.org/std-env/-/std-env-2.3.0.tgz"
- "version" "2.3.0"
+ "integrity" "sha512-eOsoKTWnr6C8aWrqJJ2KAReXoa7Vn5Ywyw6uCXgA/xDhxPoaIsBa5aNJmISY04dLwXPBnDHW4diGM7Sn5K4R/g=="
+ "resolved" "https://registry.npmjs.org/std-env/-/std-env-2.3.1.tgz"
+ "version" "2.3.1"
dependencies:
- "ci-info" "^3.0.0"
+ "ci-info" "^3.1.1"
"stream-browserify@^2.0.1":
"integrity" "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg=="
@@ -11517,31 +11596,14 @@
"char-regex" "^1.0.2"
"strip-ansi" "^6.0.0"
-"string-width@^2.0.0":
- "integrity" "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="
- "resolved" "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"
- "version" "2.1.1"
- dependencies:
- "is-fullwidth-code-point" "^2.0.0"
- "strip-ansi" "^4.0.0"
-
-"string-width@^3.0.0":
- "integrity" "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="
- "resolved" "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"
- "version" "3.1.0"
- dependencies:
- "emoji-regex" "^7.0.1"
- "is-fullwidth-code-point" "^2.0.0"
- "strip-ansi" "^5.1.0"
-
-"string-width@^4.0.0", "string-width@^4.1.0", "string-width@^4.2.0":
- "integrity" "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA=="
- "resolved" "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz"
- "version" "4.2.2"
+"string-width@^4.0.0", "string-width@^4.1.0", "string-width@^4.2.0", "string-width@^4.2.2", "string-width@^4.2.3":
+ "integrity" "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="
+ "resolved" "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
+ "version" "4.2.3"
dependencies:
"emoji-regex" "^8.0.0"
"is-fullwidth-code-point" "^3.0.0"
- "strip-ansi" "^6.0.0"
+ "strip-ansi" "^6.0.1"
"string.prototype.trimend@^1.0.4":
"integrity" "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A=="
@@ -11573,26 +11635,12 @@
dependencies:
"ansi-regex" "^2.0.0"
-"strip-ansi@^4.0.0":
- "integrity" "sha1-qEeQIusaw2iocTibY1JixQXuNo8="
- "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"
- "version" "4.0.0"
- dependencies:
- "ansi-regex" "^3.0.0"
-
-"strip-ansi@^5.1.0":
- "integrity" "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="
- "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"
- "version" "5.2.0"
- dependencies:
- "ansi-regex" "^4.1.0"
-
-"strip-ansi@^6.0.0":
- "integrity" "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="
- "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz"
- "version" "6.0.0"
+"strip-ansi@^6.0.0", "strip-ansi@^6.0.1":
+ "integrity" "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="
+ "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
+ "version" "6.0.1"
dependencies:
- "ansi-regex" "^5.0.0"
+ "ansi-regex" "^5.0.1"
"strip-bom-buf@^2.0.0":
"integrity" "sha512-gLFNHucd6gzb8jMsl5QmZ3QgnUJmp7qn4uUSHNwEXumAp7YizoGYw19ZUVfuq4aBOQUtyn2k8X/CwzWB73W2lQ=="
@@ -11674,13 +11722,6 @@
dependencies:
"has-flag" "^3.0.0"
-"supports-color@^6.1.0":
- "integrity" "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ=="
- "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz"
- "version" "6.1.0"
- dependencies:
- "has-flag" "^3.0.0"
-
"supports-color@^7.0.0":
"integrity" "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
"resolved" "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
@@ -11740,16 +11781,15 @@
"version" "3.2.4"
"table@^6.0.9":
- "integrity" "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg=="
- "resolved" "https://registry.npmjs.org/table/-/table-6.7.1.tgz"
- "version" "6.7.1"
+ "integrity" "sha512-5DkIxeA7XERBqMwJq0aHZOdMadBx4e6eDoFRuyT5VR82J0Ycg2DwM6GfA/EQAhJ+toRTaS1lIdSQCqgrmhPnlw=="
+ "resolved" "https://registry.npmjs.org/table/-/table-6.7.3.tgz"
+ "version" "6.7.3"
dependencies:
"ajv" "^8.0.1"
- "lodash.clonedeep" "^4.5.0"
"lodash.truncate" "^4.4.2"
"slice-ansi" "^4.0.0"
- "string-width" "^4.2.0"
- "strip-ansi" "^6.0.0"
+ "string-width" "^4.2.3"
+ "strip-ansi" "^6.0.1"
"tapable@^1.0.0", "tapable@^1.0.0-beta.5", "tapable@^1.1.3":
"integrity" "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="
@@ -11757,9 +11797,9 @@
"version" "1.1.3"
"tar@^6.0.2":
- "integrity" "sha512-kvvfiVvjGMxeUNB6MyYv5z7vhfFRwbwCXJAeL0/lnbrttBVqcMOnpHUf0X42LrPMR8mMpgapkJMchFH4FSHzNA=="
- "resolved" "https://registry.npmjs.org/tar/-/tar-6.1.10.tgz"
- "version" "6.1.10"
+ "integrity" "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="
+ "resolved" "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz"
+ "version" "6.1.11"
dependencies:
"chownr" "^2.0.0"
"fs-minipass" "^2.0.0"
@@ -11826,13 +11866,13 @@
"source-map-support" "~0.5.12"
"terser@^5.3.4":
- "integrity" "sha512-0Omye+RD4X7X69O0eql3lC4Heh/5iLj3ggxR/B5ketZLOtLiOqukUgjw3q4PDnNQbsrkKr3UMypqStQG3XKRvw=="
- "resolved" "https://registry.npmjs.org/terser/-/terser-5.7.2.tgz"
- "version" "5.7.2"
+ "integrity" "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ=="
+ "resolved" "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz"
+ "version" "5.9.0"
dependencies:
"commander" "^2.20.0"
"source-map" "~0.7.2"
- "source-map-support" "~0.5.19"
+ "source-map-support" "~0.5.20"
"test-exclude@^6.0.0":
"integrity" "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w=="
@@ -11911,10 +11951,10 @@
dependencies:
"os-tmpdir" "~1.0.2"
-"tmpl@1.0.x":
- "integrity" "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE="
- "resolved" "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz"
- "version" "1.0.4"
+"tmpl@1.0.5":
+ "integrity" "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
+ "resolved" "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz"
+ "version" "1.0.5"
"to-arraybuffer@^1.0.0":
"integrity" "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M="
@@ -11989,10 +12029,15 @@
dependencies:
"punycode" "^2.1.1"
+"tr46@~0.0.3":
+ "integrity" "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+ "resolved" "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"
+ "version" "0.0.3"
+
"trim-off-newlines@^1.0.1":
- "integrity" "sha1-n5up2e+odkw4dpi8v+sshI8RrbM="
- "resolved" "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz"
- "version" "1.0.1"
+ "integrity" "sha512-kh6Tu6GbeSNMGfrrZh6Bb/4ZEHV1QlB4xNDBeog8Y9/QwFlKTRyWvY3Fs9tRDAMZliVUwieMgEdIeL/FtqjkJg=="
+ "resolved" "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.3.tgz"
+ "version" "1.0.3"
"ts-pnp@^1.1.6":
"integrity" "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw=="
@@ -12111,14 +12156,14 @@
"version" "0.0.6"
"typescript@^4.3.2", "typescript@>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta":
- "integrity" "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA=="
- "resolved" "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz"
- "version" "4.3.5"
+ "integrity" "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA=="
+ "resolved" "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz"
+ "version" "4.4.4"
"ua-parser-js@^0.7.28":
- "integrity" "sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g=="
- "resolved" "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.28.tgz"
- "version" "0.7.28"
+ "integrity" "sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ=="
+ "resolved" "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.31.tgz"
+ "version" "0.7.31"
"ufo@^0.7.4", "ufo@^0.7.7":
"integrity" "sha512-6t9LrLk3FhqTS+GW3IqlITtfRB5JAVr5MMNjpBECfK827W+Vh5Ilw/LhTcHWrt6b3hkeBvcbjx4Ti7QVFzmcww=="
@@ -12126,9 +12171,9 @@
"version" "0.7.9"
"uglify-js@^3.5.1":
- "integrity" "sha512-JhS3hmcVaXlp/xSo3PKY5R0JqKs5M3IV+exdLHW99qKvKivPO4Z8qbej6mte17SOPqAOVMjt/XGgWacnFSzM3g=="
- "resolved" "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.1.tgz"
- "version" "3.14.1"
+ "integrity" "sha512-mic3aOdiq01DuSVx0TseaEzMIVqebMZ0Z3vaeDhFEh9bsc24hV1TFvN74reA2vs08D0ZWfNjAcJ3UbVLaBss+g=="
+ "resolved" "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.3.tgz"
+ "version" "3.14.3"
"unbox-primitive@^1.0.1":
"integrity" "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw=="
@@ -12145,28 +12190,28 @@
"resolved" "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz"
"version" "4.2.0"
-"unicode-canonical-property-names-ecmascript@^1.0.4":
- "integrity" "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ=="
- "resolved" "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"
- "version" "1.0.4"
+"unicode-canonical-property-names-ecmascript@^2.0.0":
+ "integrity" "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="
+ "resolved" "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"
+ "version" "2.0.0"
-"unicode-match-property-ecmascript@^1.0.4":
- "integrity" "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg=="
- "resolved" "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"
- "version" "1.0.4"
+"unicode-match-property-ecmascript@^2.0.0":
+ "integrity" "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q=="
+ "resolved" "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz"
+ "version" "2.0.0"
dependencies:
- "unicode-canonical-property-names-ecmascript" "^1.0.4"
- "unicode-property-aliases-ecmascript" "^1.0.4"
+ "unicode-canonical-property-names-ecmascript" "^2.0.0"
+ "unicode-property-aliases-ecmascript" "^2.0.0"
-"unicode-match-property-value-ecmascript@^1.2.0":
- "integrity" "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ=="
- "resolved" "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"
- "version" "1.2.0"
+"unicode-match-property-value-ecmascript@^2.0.0":
+ "integrity" "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="
+ "resolved" "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz"
+ "version" "2.0.0"
-"unicode-property-aliases-ecmascript@^1.0.4":
- "integrity" "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg=="
- "resolved" "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"
- "version" "1.1.0"
+"unicode-property-aliases-ecmascript@^2.0.0":
+ "integrity" "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ=="
+ "resolved" "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz"
+ "version" "2.0.0"
"union-value@^1.0.0":
"integrity" "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg=="
@@ -12370,10 +12415,10 @@
"resolved" "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"
"version" "2.3.0"
-"v8-to-istanbul@^8.0.0":
- "integrity" "sha512-LkmXi8UUNxnCC+JlH7/fsfsKr5AU110l+SYGJimWNkWhxbN5EyeOtm1MJ0hhvqMMOhGwBj1Fp70Yv9i+hX0QAg=="
- "resolved" "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.0.0.tgz"
- "version" "8.0.0"
+"v8-to-istanbul@^8.1.0":
+ "integrity" "sha512-/PRhfd8aTNp9Ggr62HPzXg2XasNFGy5PBt0Rp04du7/8GNNSgxFL6WBTkgMKSL9bFjH+8kKEG3f37FmxiTqUUA=="
+ "resolved" "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz"
+ "version" "8.1.0"
dependencies:
"@types/istanbul-lib-coverage" "^2.0.1"
"convert-source-map" "^1.6.0"
@@ -12408,9 +12453,9 @@
"version" "2.1.0"
"vue-eslint-parser@^7.0.0":
- "integrity" "sha512-7tc/ewS9Vq9Bn741pvpg8op2fWJPH3k32aL+jcIcWGCTzh/zXSdh7pZ5FV3W2aJancP9+ftPAv292zY5T5IPCg=="
- "resolved" "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.10.0.tgz"
- "version" "7.10.0"
+ "integrity" "sha512-qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg=="
+ "resolved" "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz"
+ "version" "7.11.0"
dependencies:
"debug" "^4.1.1"
"eslint-scope" "^5.1.1"
@@ -12426,9 +12471,9 @@
"version" "2.3.4"
"vue-i18n@^8.25.0":
- "integrity" "sha512-ynhcL+PmTxuuSE1T10htiSXzjBozxYIE3ffbM1RfgAkVbr/v1SP+9Mi/7/uv8ZVV1yGuKjFAYp9BXq+X7op6MQ=="
- "resolved" "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.25.0.tgz"
- "version" "8.25.0"
+ "integrity" "sha512-7apa5PvRg1YCLoraE3lOgpCG8hJGupLCtywQWedWsgBbvF0TOgFvhitqK9xRH0PBGG1G8aiJz9oklyNDFfDxLg=="
+ "resolved" "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.26.7.tgz"
+ "version" "8.26.7"
"vue-loader@^15.9.7":
"integrity" "sha512-GwSkxPrihfLR69/dSV3+5CdMQ0D+jXg8Ma1S4nQXKJAznYFX14vHdc/NetQc34Dw+rBbIJyP7JOuVb9Fhprvog=="
@@ -12454,9 +12499,9 @@
"version" "1.1.1"
"vue-router@^3.5.1":
- "integrity" "sha512-807gn82hTnjCYGrnF3eNmIw/dk7/GE4B5h69BlyCK9KHASwSloD1Sjcn06zg9fVG4fYH2DrsNBZkpLtb25WtaQ=="
- "resolved" "https://registry.npmjs.org/vue-router/-/vue-router-3.5.2.tgz"
- "version" "3.5.2"
+ "integrity" "sha512-FUlILrW3DGitS2h+Xaw8aRNvGTwtuaxrRkNSHWTizOfLUie7wuYwezeZ50iflRn8YPV5kxmU2LQuu3nM/b3Zsg=="
+ "resolved" "https://registry.npmjs.org/vue-router/-/vue-router-3.5.3.tgz"
+ "version" "3.5.3"
"vue-server-renderer@^2.6.12":
"integrity" "sha512-HifYRa/LW7cKywg9gd4ZtvtRuBlstQBao5ZCWlg40fyB4OPoGfEXAzxb0emSLv4pBDOHYx0UjpqvxpiQFEuoLA=="
@@ -12504,18 +12549,18 @@
"version" "2.6.14"
"vuetify-loader@^1.7.2":
- "integrity" "sha512-2GSo4KvRAOThBsj8mvtIEeIoyBAZx38GDfh8D90e/or7Hzx4813krJKvcQAllyLO/Ln0eQWrq2IuvBXnZ55cSA=="
- "resolved" "https://registry.npmjs.org/vuetify-loader/-/vuetify-loader-1.7.2.tgz"
- "version" "1.7.2"
+ "integrity" "sha512-1Kt6Rfvuw3i9BBlxC9WTMnU3WEU7IBWQmDX+fYGAVGpzWCX7oHythUIwPCZGShHSYcPMKSDbXTPP8UvT5RNw8Q=="
+ "resolved" "https://registry.npmjs.org/vuetify-loader/-/vuetify-loader-1.7.3.tgz"
+ "version" "1.7.3"
dependencies:
"decache" "^4.6.0"
"file-loader" "^6.2.0"
"loader-utils" "^2.0.0"
"vuetify@^1.3.0 || ^2.0.0", "vuetify@^2.5.3":
- "integrity" "sha512-paLmNhKTYFD41+14rIHnCo+P1jHbUzwBiMowxs5qXVq8RdRMqRmcy05Sfse1WUu90amPGK2fIFQq5rL2N8zqZg=="
- "resolved" "https://registry.npmjs.org/vuetify/-/vuetify-2.5.8.tgz"
- "version" "2.5.8"
+ "integrity" "sha512-5ZdGON0AgMIhi9iokbLPuPLHFnXYSdEDg0o8tZlrSmKMRcMqAzuDOLzln+uTyde+/BKQ1g/qStKVvmdFhj2/zg=="
+ "resolved" "https://registry.npmjs.org/vuetify/-/vuetify-2.5.11.tgz"
+ "version" "2.5.11"
"vuex-persist@^3.1.3":
"integrity" "sha512-QWOpP4SxmJDC5Y1+0+Yl/F4n7z27syd1St/oP+IYCGe0X0GFio0Zan6kngZFufdIhJm+5dFGDo3VG5kdkCGeRQ=="
@@ -12545,11 +12590,11 @@
"xml-name-validator" "^3.0.0"
"walker@^1.0.7":
- "integrity" "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs="
- "resolved" "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz"
- "version" "1.0.7"
+ "integrity" "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ=="
+ "resolved" "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz"
+ "version" "1.0.8"
dependencies:
- "makeerror" "1.0.x"
+ "makeerror" "1.0.12"
"watchpack-chokidar2@^2.0.1":
"integrity" "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww=="
@@ -12576,6 +12621,11 @@
dependencies:
"defaults" "^1.0.3"
+"webidl-conversions@^3.0.0":
+ "integrity" "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+ "resolved" "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"
+ "version" "3.0.1"
+
"webidl-conversions@^5.0.0":
"integrity" "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="
"resolved" "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz"
@@ -12587,14 +12637,14 @@
"version" "6.1.0"
"webpack-bundle-analyzer@^4.4.1":
- "integrity" "sha512-PIagMYhlEzFfhMYOzs5gFT55DkUdkyrJi/SxJp8EF3YMWhS+T9vvs2EoTetpk5qb6VsCq02eXTlRDOydRhDFAQ=="
- "resolved" "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.2.tgz"
- "version" "4.4.2"
+ "integrity" "sha512-GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ=="
+ "resolved" "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.5.0.tgz"
+ "version" "4.5.0"
dependencies:
"acorn" "^8.0.4"
"acorn-walk" "^8.0.0"
"chalk" "^4.1.0"
- "commander" "^6.2.0"
+ "commander" "^7.2.0"
"gzip-size" "^6.0.0"
"lodash" "^4.17.20"
"opener" "^1.5.2"
@@ -12614,14 +12664,14 @@
"schema-utils" "^3.0.0"
"webpack-hot-middleware@^2.25.0":
- "integrity" "sha512-xs5dPOrGPCzuRXNi8F6rwhawWvQQkeli5Ro48PRuQh8pYPCPmNnltP9itiUPT4xI8oW+y0m59lyyeQk54s5VgA=="
- "resolved" "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.25.0.tgz"
- "version" "2.25.0"
+ "integrity" "sha512-Koh0KyU/RPYwel/khxbsDz9ibDivmUbrRuKSSQvW42KSDdO4w23WI3SkHpSUKHE76LrFnnM/L7JCrpBwu8AXYw=="
+ "resolved" "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.25.1.tgz"
+ "version" "2.25.1"
dependencies:
- "ansi-html" "0.0.7"
- "html-entities" "^1.2.0"
+ "ansi-html-community" "0.0.8"
+ "html-entities" "^2.1.0"
"querystring" "^0.2.0"
- "strip-ansi" "^3.0.0"
+ "strip-ansi" "^6.0.0"
"webpack-node-externals@^3.0.0":
"integrity" "sha512-LnL6Z3GGDPht/AigwRh2dvL9PQPFQ8skEpVrWZXLWBYmqcaojHNN0onvHzie6rq7EWKrrBfPYqNEzTJgiwEQDQ=="
@@ -12696,7 +12746,24 @@
"resolved" "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz"
"version" "2.3.0"
-"whatwg-url@^8.0.0", "whatwg-url@^8.5.0":
+"whatwg-url@^5.0.0":
+ "integrity" "sha1-lmRU6HZUYuN2RNNib2dCzotwll0="
+ "resolved" "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"
+ "version" "5.0.0"
+ dependencies:
+ "tr46" "~0.0.3"
+ "webidl-conversions" "^3.0.0"
+
+"whatwg-url@^8.0.0":
+ "integrity" "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg=="
+ "resolved" "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz"
+ "version" "8.7.0"
+ dependencies:
+ "lodash" "^4.7.0"
+ "tr46" "^2.1.0"
+ "webidl-conversions" "^6.1.0"
+
+"whatwg-url@^8.5.0":
"integrity" "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg=="
"resolved" "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz"
"version" "8.7.0"
@@ -12822,9 +12889,9 @@
"write-file-atomic" "^2.0.0"
"ws@^7.3.1", "ws@^7.4.6":
- "integrity" "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg=="
- "resolved" "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz"
- "version" "7.5.3"
+ "integrity" "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w=="
+ "resolved" "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz"
+ "version" "7.5.5"
"xdg-basedir@^4.0.0":
"integrity" "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="
@@ -12908,7 +12975,7 @@
"y18n" "^4.0.0"
"yargs-parser" "^18.1.2"
-"yargs@^16.0.3", "yargs@^16.2.0":
+"yargs@^16.2.0":
"integrity" "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="
"resolved" "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"
"version" "16.2.0"
@@ -12922,9 +12989,9 @@
"yargs-parser" "^20.2.2"
"yarn@^1.22.11":
- "integrity" "sha512-AWje4bzqO9RUn3sdnM5N8n4ZJ0BqCc/kqFJvpOI5/EVkINXui0yuvU7NDCEF//+WaxHuNay2uOHxA4+tq1P3cg=="
- "resolved" "https://registry.npmjs.org/yarn/-/yarn-1.22.11.tgz"
- "version" "1.22.11"
+ "integrity" "sha512-H0p241BXaH0UN9IeH//RT82tl5PfNraVpSpEoW+ET7lmopNC61eZ+A+IDvU8FM6Go5vx162SncDL8J1ZjRBriQ=="
+ "resolved" "https://registry.npmjs.org/yarn/-/yarn-1.22.17.tgz"
+ "version" "1.22.17"
"yauzl@^2.10.0":
"integrity" "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk="