summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2021-10-20 10:02:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-20 10:02:42 +0000
commitad1b5836a949eb73644cf42f7c3ac98fbd6774bb (patch)
treef479c2d61bab6022f54e84e607f266491e50591e
parent8514499054c271d1eb5ab861d70413944090b6d4 (diff)
parent2ed2cc4e1491d47111fd6c78880b4ffb9cefc0d4 (diff)
downloadgeonames-ad1b5836a949eb73644cf42f7c3ac98fbd6774bb.tar.gz
Refresh the geonames data from upstream am: a4233dc044 am: 2ed2cc4e14
Original change: https://android-review.googlesource.com/c/platform/external/geonames/+/1862849 Change-Id: Icd6c18cd76414e59fac1a6f7b6c36b1f4bfb56c7
-rw-r--r--METADATA14
-rw-r--r--android/version_info/cities1000.zip.headers8
-rw-r--r--android/version_info/cities15000.zip.headers8
-rw-r--r--android/version_info/cities500.zip.headers8
-rw-r--r--android/version_info/cities5000.zip.headers8
-rw-r--r--android/version_info/readme.txt.headers6
-rw-r--r--export/dump/cities1000.zipbin8010495 -> 8022207 bytes
-rw-r--r--export/dump/cities15000.zipbin2354204 -> 2357148 bytes
-rw-r--r--export/dump/cities500.zipbin10363171 -> 10376835 bytes
-rw-r--r--export/dump/cities5000.zipbin3890180 -> 3895009 bytes
10 files changed, 26 insertions, 26 deletions
diff --git a/METADATA b/METADATA
index 844839e..d5535ca 100644
--- a/METADATA
+++ b/METADATA
@@ -11,25 +11,25 @@ third_party {
}
url {
type: OTHER
- value: "Downloaded from https://download.geonames.org/export/dump/cities1000.zip on 2020-11-10, SHA1=f293844bc9bec4638dfa60ed28a4cfd2562e0244, see android/version_info/cities1000.zip.headers"
+ value: "Downloaded from https://download.geonames.org/export/dump/cities1000.zip on 2021-06-10, SHA1=9d2798c6df86ffc98a91dda49178f17ea3e5b4fe, see android/version_info/cities1000.zip.headers"
}
url {
type: OTHER
- value: "Downloaded from https://download.geonames.org/export/dump/cities15000.zip on 2020-11-10, SHA1=c9a6e27be706285e93f074906248802e6e8cc737, see android/version_info/cities15000.zip.headers"
+ value: "Downloaded from https://download.geonames.org/export/dump/cities15000.zip on 2021-06-10, SHA1=fd558dbef046cbd37cef249fe258035865bc49a1, see android/version_info/cities15000.zip.headers"
}
url {
type: OTHER
- value: "Downloaded from https://download.geonames.org/export/dump/cities500.zip on 2020-11-10, SHA1=69a244fc1d97b637596752c6aa8b860c731667d8, see android/version_info/cities500.zip.headers"
+ value: "Downloaded from https://download.geonames.org/export/dump/cities500.zip on 2021-06-10, SHA1=5c4dc4a07e043b2e6eeb6ac7621e20960992a21f, see android/version_info/cities500.zip.headers"
}
url {
type: OTHER
- value: "Downloaded from https://download.geonames.org/export/dump/cities5000.zip on 2020-11-10, SHA1=9da4ddf0bd4802794c946484ce578780a2b60c44, see android/version_info/cities5000.zip.headers"
+ value: "Downloaded from https://download.geonames.org/export/dump/cities5000.zip on 2021-06-10, SHA1=83ecb0d47f8a15db6ea746f7e54d8dfba4d3404e, see android/version_info/cities5000.zip.headers"
}
url {
type: OTHER
- value: "Downloaded from https://download.geonames.org/export/dump/readme.txt on 2020-11-10, SHA1=7dc17472faed8f71aebc3e4cf22af181ef2002fe, see android/version_info/readme.txt.headers"
+ value: "Downloaded from https://download.geonames.org/export/dump/readme.txt on 2021-06-10, SHA1=7dc17472faed8f71aebc3e4cf22af181ef2002fe, see android/version_info/readme.txt.headers"
}
- version: "As of 2020-11-10"
- last_upgrade_date { year: 2020 month: 11 day: 10 }
+ version: "As of 2021-06-10"
+ last_upgrade_date { year: 2021 month: 6 day: 10 }
license_type: NOTICE
}
diff --git a/android/version_info/cities1000.zip.headers b/android/version_info/cities1000.zip.headers
index 2776a7a..e733c2e 100644
--- a/android/version_info/cities1000.zip.headers
+++ b/android/version_info/cities1000.zip.headers
@@ -1,9 +1,9 @@
HTTP/1.1 200 OK
-Date: Tue, 10 Nov 2020 15:08:16 GMT
+Date: Thu, 10 Jun 2021 13:01:17 GMT
Server: Apache/2.4.6 (CentOS) mod_jk/1.2.41 OpenSSL/1.0.1e-fips
-Last-Modified: Tue, 10 Nov 2020 02:08:56 GMT
-ETag: "7a3aff-5b3b7294a00ab"
+Last-Modified: Thu, 10 Jun 2021 01:03:04 GMT
+ETag: "7a68bf-5c45ef40d9a7b"
Accept-Ranges: bytes
-Content-Length: 8010495
+Content-Length: 8022207
Content-Type: application/zip
diff --git a/android/version_info/cities15000.zip.headers b/android/version_info/cities15000.zip.headers
index fdf8095..6d94e99 100644
--- a/android/version_info/cities15000.zip.headers
+++ b/android/version_info/cities15000.zip.headers
@@ -1,9 +1,9 @@
HTTP/1.1 200 OK
-Date: Tue, 10 Nov 2020 15:08:17 GMT
+Date: Thu, 10 Jun 2021 13:01:18 GMT
Server: Apache/2.4.6 (CentOS) mod_jk/1.2.41 OpenSSL/1.0.1e-fips
-Last-Modified: Tue, 10 Nov 2020 02:08:56 GMT
-ETag: "23ec1c-5b3b7294a00ab"
+Last-Modified: Thu, 10 Jun 2021 01:03:04 GMT
+ETag: "23f79c-5c45ef40d9a7b"
Accept-Ranges: bytes
-Content-Length: 2354204
+Content-Length: 2357148
Content-Type: application/zip
diff --git a/android/version_info/cities500.zip.headers b/android/version_info/cities500.zip.headers
index 5aecd07..ff23e2c 100644
--- a/android/version_info/cities500.zip.headers
+++ b/android/version_info/cities500.zip.headers
@@ -1,9 +1,9 @@
HTTP/1.1 200 OK
-Date: Tue, 10 Nov 2020 15:08:17 GMT
+Date: Thu, 10 Jun 2021 13:01:18 GMT
Server: Apache/2.4.6 (CentOS) mod_jk/1.2.41 OpenSSL/1.0.1e-fips
-Last-Modified: Tue, 10 Nov 2020 02:08:56 GMT
-ETag: "9e2123-5b3b72949fcc3"
+Last-Modified: Thu, 10 Jun 2021 01:03:04 GMT
+ETag: "9e5683-5c45ef40d9a7b"
Accept-Ranges: bytes
-Content-Length: 10363171
+Content-Length: 10376835
Content-Type: application/zip
diff --git a/android/version_info/cities5000.zip.headers b/android/version_info/cities5000.zip.headers
index 905c76e..1d32027 100644
--- a/android/version_info/cities5000.zip.headers
+++ b/android/version_info/cities5000.zip.headers
@@ -1,9 +1,9 @@
HTTP/1.1 200 OK
-Date: Tue, 10 Nov 2020 15:08:17 GMT
+Date: Thu, 10 Jun 2021 13:01:18 GMT
Server: Apache/2.4.6 (CentOS) mod_jk/1.2.41 OpenSSL/1.0.1e-fips
-Last-Modified: Tue, 10 Nov 2020 02:08:56 GMT
-ETag: "3b5c04-5b3b7294a00ab"
+Last-Modified: Thu, 10 Jun 2021 01:03:04 GMT
+ETag: "3b6ee1-5c45ef40d9a7b"
Accept-Ranges: bytes
-Content-Length: 3890180
+Content-Length: 3895009
Content-Type: application/zip
diff --git a/android/version_info/readme.txt.headers b/android/version_info/readme.txt.headers
index 1e3520b..815d9c7 100644
--- a/android/version_info/readme.txt.headers
+++ b/android/version_info/readme.txt.headers
@@ -1,8 +1,8 @@
HTTP/1.1 200 OK
-Date: Tue, 10 Nov 2020 15:08:18 GMT
+Date: Thu, 10 Jun 2021 13:01:19 GMT
Server: Apache/2.4.6 (CentOS) mod_jk/1.2.41 OpenSSL/1.0.1e-fips
-Last-Modified: Tue, 10 Nov 2020 01:57:35 GMT
-ETag: "220c-5b3b700af88b1"
+Last-Modified: Thu, 10 Jun 2021 00:51:55 GMT
+ETag: "220c-5c45ecc2da39d"
Accept-Ranges: bytes
Content-Length: 8716
Content-Type: text/plain; charset=utf-8
diff --git a/export/dump/cities1000.zip b/export/dump/cities1000.zip
index 9c5eb6c..dc3e9e7 100644
--- a/export/dump/cities1000.zip
+++ b/export/dump/cities1000.zip
Binary files differ
diff --git a/export/dump/cities15000.zip b/export/dump/cities15000.zip
index ef529ab..316213b 100644
--- a/export/dump/cities15000.zip
+++ b/export/dump/cities15000.zip
Binary files differ
diff --git a/export/dump/cities500.zip b/export/dump/cities500.zip
index 2caf6bc..877bf39 100644
--- a/export/dump/cities500.zip
+++ b/export/dump/cities500.zip
Binary files differ
diff --git a/export/dump/cities5000.zip b/export/dump/cities5000.zip
index 14edffa..54ed100 100644
--- a/export/dump/cities5000.zip
+++ b/export/dump/cities5000.zip
Binary files differ