summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2020-11-10 15:08:43 +0000
committerNeil Fuller <nfuller@google.com>2020-11-10 15:08:43 +0000
commit8514499054c271d1eb5ab861d70413944090b6d4 (patch)
tree8c222e34d9650416cfdb5fb234eb249229a815df
parentfba180a54ad74f827fe0cc2ec76e603652033cde (diff)
downloadgeonames-android12-mainline-conscrypt-release.tar.gz
Pull latest geonames dataandroid-vts-12.1_r9android-vts-12.1_r8android-vts-12.1_r7android-vts-12.1_r6android-vts-12.1_r5android-vts-12.1_r4android-vts-12.1_r3android-vts-12.1_r2android-vts-12.1_r10android-vts-12.1_r1android-platform-12.1.0_r9android-platform-12.1.0_r8android-platform-12.1.0_r7android-platform-12.1.0_r6android-platform-12.1.0_r5android-platform-12.1.0_r4android-platform-12.1.0_r3android-platform-12.1.0_r27android-platform-12.1.0_r26android-platform-12.1.0_r25android-platform-12.1.0_r24android-platform-12.1.0_r23android-platform-12.1.0_r22android-platform-12.1.0_r21android-platform-12.1.0_r20android-platform-12.1.0_r2android-platform-12.1.0_r19android-platform-12.1.0_r18android-platform-12.1.0_r17android-platform-12.1.0_r16android-platform-12.1.0_r15android-platform-12.1.0_r14android-platform-12.1.0_r13android-platform-12.1.0_r12android-platform-12.1.0_r11android-platform-12.1.0_r10android-platform-12.1.0_r1android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r97android-mainline-12.0.0_r96android-mainline-12.0.0_r95android-mainline-12.0.0_r94android-mainline-12.0.0_r93android-mainline-12.0.0_r92android-mainline-12.0.0_r91android-mainline-12.0.0_r90android-mainline-12.0.0_r9android-mainline-12.0.0_r89android-mainline-12.0.0_r88android-mainline-12.0.0_r87android-mainline-12.0.0_r86android-mainline-12.0.0_r85android-mainline-12.0.0_r84android-mainline-12.0.0_r83android-mainline-12.0.0_r82android-mainline-12.0.0_r81android-mainline-12.0.0_r80android-mainline-12.0.0_r8android-mainline-12.0.0_r79android-mainline-12.0.0_r78android-mainline-12.0.0_r77android-mainline-12.0.0_r76android-mainline-12.0.0_r75android-mainline-12.0.0_r74android-mainline-12.0.0_r73android-mainline-12.0.0_r72android-mainline-12.0.0_r71android-mainline-12.0.0_r70android-mainline-12.0.0_r7android-mainline-12.0.0_r69android-mainline-12.0.0_r68android-mainline-12.0.0_r67android-mainline-12.0.0_r66android-mainline-12.0.0_r65android-mainline-12.0.0_r64android-mainline-12.0.0_r63android-mainline-12.0.0_r62android-mainline-12.0.0_r61android-mainline-12.0.0_r60android-mainline-12.0.0_r6android-mainline-12.0.0_r59android-mainline-12.0.0_r58android-mainline-12.0.0_r57android-mainline-12.0.0_r56android-mainline-12.0.0_r53android-mainline-12.0.0_r52android-mainline-12.0.0_r51android-mainline-12.0.0_r50android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r48android-mainline-12.0.0_r47android-mainline-12.0.0_r46android-mainline-12.0.0_r45android-mainline-12.0.0_r44android-mainline-12.0.0_r43android-mainline-12.0.0_r42android-mainline-12.0.0_r41android-mainline-12.0.0_r40android-mainline-12.0.0_r4android-mainline-12.0.0_r39android-mainline-12.0.0_r38android-mainline-12.0.0_r37android-mainline-12.0.0_r36android-mainline-12.0.0_r35android-mainline-12.0.0_r34android-mainline-12.0.0_r33android-mainline-12.0.0_r32android-mainline-12.0.0_r31android-mainline-12.0.0_r30android-mainline-12.0.0_r3android-mainline-12.0.0_r29android-mainline-12.0.0_r28android-mainline-12.0.0_r27android-mainline-12.0.0_r26android-mainline-12.0.0_r25android-mainline-12.0.0_r24android-mainline-12.0.0_r23android-mainline-12.0.0_r22android-mainline-12.0.0_r21android-mainline-12.0.0_r20android-mainline-12.0.0_r2android-mainline-12.0.0_r19android-mainline-12.0.0_r18android-mainline-12.0.0_r17android-mainline-12.0.0_r16android-mainline-12.0.0_r15android-mainline-12.0.0_r14android-mainline-12.0.0_r13android-mainline-12.0.0_r126android-mainline-12.0.0_r125android-mainline-12.0.0_r124android-mainline-12.0.0_r123android-mainline-12.0.0_r122android-mainline-12.0.0_r121android-mainline-12.0.0_r120android-mainline-12.0.0_r12android-mainline-12.0.0_r119android-mainline-12.0.0_r118android-mainline-12.0.0_r117android-mainline-12.0.0_r116android-mainline-12.0.0_r115android-mainline-12.0.0_r114android-mainline-12.0.0_r113android-mainline-12.0.0_r110android-mainline-12.0.0_r11android-mainline-12.0.0_r109android-mainline-12.0.0_r108android-mainline-12.0.0_r107android-mainline-12.0.0_r106android-mainline-12.0.0_r105android-mainline-12.0.0_r104android-mainline-12.0.0_r103android-mainline-12.0.0_r102android-mainline-12.0.0_r101android-mainline-12.0.0_r100android-mainline-12.0.0_r10android-mainline-12.0.0_r1android-cts-12.1_r9android-cts-12.1_r8android-cts-12.1_r7android-cts-12.1_r6android-cts-12.1_r5android-cts-12.1_r4android-cts-12.1_r3android-cts-12.1_r2android-cts-12.1_r10android-cts-12.1_r1android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r6android-12.1.0_r5android-12.1.0_r4android-12.1.0_r3android-12.1.0_r27android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r2android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.1.0_r1android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16aml_wif_311811030aml_tz3_311312010aml_tet_311811050aml_sdk_311710000aml_pco_311011000aml_mpr_311911090aml_doc_310851020android12L-tests-releaseandroid12L-s1-releaseandroid12L-releaseandroid12L-platform-releaseandroid12L-gsiandroid12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-mainline-wifi-releaseandroid12-mainline-tethering-releaseandroid12-mainline-statsd-releaseandroid12-mainline-sdkext-releaseandroid12-mainline-resolv-releaseandroid12-mainline-permission-releaseandroid12-mainline-neuralnetworks-releaseandroid12-mainline-networkstack-releaseandroid12-mainline-mediaprovider-releaseandroid12-mainline-media-swcodec-releaseandroid12-mainline-media-releaseandroid12-mainline-ipsec-releaseandroid12-mainline-extservices-releaseandroid12-mainline-documentsui-releaseandroid12-mainline-conscrypt-releaseandroid12-mainline-cellbroadcast-releaseandroid12-mainline-captiveportallogin-releaseandroid12-mainline-art-releaseandroid12-mainline-adbd-releaseandroid12-devandroid12--mainline-release
This contains the result of running the android/download_latest.sh script. See METADATA for more information about versions. Bug: 163800751 Test: None Change-Id: Ifb926ce22c660cd59e8a57b7b6a86a6922f79b4d
-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.zipbin8001010 -> 8010495 bytes
-rw-r--r--export/dump/cities15000.zipbin2351486 -> 2354204 bytes
-rw-r--r--export/dump/cities500.zipbin10351482 -> 10363171 bytes
-rw-r--r--export/dump/cities5000.zipbin3885860 -> 3890180 bytes
10 files changed, 26 insertions, 26 deletions
diff --git a/METADATA b/METADATA
index 9c673d5..844839e 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-08-12, SHA1=433c51b5012460cc519ba45dec33298dc322b333, see android/version_info/cities1000.zip.headers"
+ value: "Downloaded from https://download.geonames.org/export/dump/cities1000.zip on 2020-11-10, SHA1=f293844bc9bec4638dfa60ed28a4cfd2562e0244, see android/version_info/cities1000.zip.headers"
}
url {
type: OTHER
- value: "Downloaded from https://download.geonames.org/export/dump/cities15000.zip on 2020-08-12, SHA1=14992b4363e470a3c57cade4713e6e445bbccf91, see android/version_info/cities15000.zip.headers"
+ value: "Downloaded from https://download.geonames.org/export/dump/cities15000.zip on 2020-11-10, SHA1=c9a6e27be706285e93f074906248802e6e8cc737, see android/version_info/cities15000.zip.headers"
}
url {
type: OTHER
- value: "Downloaded from https://download.geonames.org/export/dump/cities500.zip on 2020-08-12, SHA1=53c50f8c62456dfa5bca064ae8cf7743e7bf3fff, see android/version_info/cities500.zip.headers"
+ value: "Downloaded from https://download.geonames.org/export/dump/cities500.zip on 2020-11-10, SHA1=69a244fc1d97b637596752c6aa8b860c731667d8, see android/version_info/cities500.zip.headers"
}
url {
type: OTHER
- value: "Downloaded from https://download.geonames.org/export/dump/cities5000.zip on 2020-08-12, SHA1=3860b487c35d637db1dfb5dbbc3a65b63fe6206b, see android/version_info/cities5000.zip.headers"
+ value: "Downloaded from https://download.geonames.org/export/dump/cities5000.zip on 2020-11-10, SHA1=9da4ddf0bd4802794c946484ce578780a2b60c44, see android/version_info/cities5000.zip.headers"
}
url {
type: OTHER
- value: "Downloaded from https://download.geonames.org/export/dump/readme.txt on 2020-08-12, SHA1=7dc17472faed8f71aebc3e4cf22af181ef2002fe, see android/version_info/readme.txt.headers"
+ value: "Downloaded from https://download.geonames.org/export/dump/readme.txt on 2020-11-10, SHA1=7dc17472faed8f71aebc3e4cf22af181ef2002fe, see android/version_info/readme.txt.headers"
}
- version: "As of 2020-08-12"
- last_upgrade_date { year: 2020 month: 8 day: 12 }
+ version: "As of 2020-11-10"
+ last_upgrade_date { year: 2020 month: 11 day: 10 }
license_type: NOTICE
}
diff --git a/android/version_info/cities1000.zip.headers b/android/version_info/cities1000.zip.headers
index f1c95df..2776a7a 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: Wed, 12 Aug 2020 15:52:08 GMT
+Date: Tue, 10 Nov 2020 15:08:16 GMT
Server: Apache/2.4.6 (CentOS) mod_jk/1.2.41 OpenSSL/1.0.1e-fips
-Last-Modified: Wed, 12 Aug 2020 01:10:13 GMT
-ETag: "7a15f2-5aca3d98eec60"
+Last-Modified: Tue, 10 Nov 2020 02:08:56 GMT
+ETag: "7a3aff-5b3b7294a00ab"
Accept-Ranges: bytes
-Content-Length: 8001010
+Content-Length: 8010495
Content-Type: application/zip
diff --git a/android/version_info/cities15000.zip.headers b/android/version_info/cities15000.zip.headers
index 2dcd498..fdf8095 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: Wed, 12 Aug 2020 15:52:09 GMT
+Date: Tue, 10 Nov 2020 15:08:17 GMT
Server: Apache/2.4.6 (CentOS) mod_jk/1.2.41 OpenSSL/1.0.1e-fips
-Last-Modified: Wed, 12 Aug 2020 01:10:13 GMT
-ETag: "23e17e-5aca3d98eec60"
+Last-Modified: Tue, 10 Nov 2020 02:08:56 GMT
+ETag: "23ec1c-5b3b7294a00ab"
Accept-Ranges: bytes
-Content-Length: 2351486
+Content-Length: 2354204
Content-Type: application/zip
diff --git a/android/version_info/cities500.zip.headers b/android/version_info/cities500.zip.headers
index e942647..5aecd07 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: Wed, 12 Aug 2020 15:52:09 GMT
+Date: Tue, 10 Nov 2020 15:08:17 GMT
Server: Apache/2.4.6 (CentOS) mod_jk/1.2.41 OpenSSL/1.0.1e-fips
-Last-Modified: Wed, 12 Aug 2020 01:10:13 GMT
-ETag: "9df37a-5aca3d98ee878"
+Last-Modified: Tue, 10 Nov 2020 02:08:56 GMT
+ETag: "9e2123-5b3b72949fcc3"
Accept-Ranges: bytes
-Content-Length: 10351482
+Content-Length: 10363171
Content-Type: application/zip
diff --git a/android/version_info/cities5000.zip.headers b/android/version_info/cities5000.zip.headers
index 9322d3c..905c76e 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: Wed, 12 Aug 2020 15:52:09 GMT
+Date: Tue, 10 Nov 2020 15:08:17 GMT
Server: Apache/2.4.6 (CentOS) mod_jk/1.2.41 OpenSSL/1.0.1e-fips
-Last-Modified: Wed, 12 Aug 2020 01:10:13 GMT
-ETag: "3b4b24-5aca3d98eec60"
+Last-Modified: Tue, 10 Nov 2020 02:08:56 GMT
+ETag: "3b5c04-5b3b7294a00ab"
Accept-Ranges: bytes
-Content-Length: 3885860
+Content-Length: 3890180
Content-Type: application/zip
diff --git a/android/version_info/readme.txt.headers b/android/version_info/readme.txt.headers
index d9c14c9..1e3520b 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: Wed, 12 Aug 2020 15:52:10 GMT
+Date: Tue, 10 Nov 2020 15:08:18 GMT
Server: Apache/2.4.6 (CentOS) mod_jk/1.2.41 OpenSSL/1.0.1e-fips
-Last-Modified: Wed, 12 Aug 2020 00:58:37 GMT
-ETag: "220c-5aca3b01e0868"
+Last-Modified: Tue, 10 Nov 2020 01:57:35 GMT
+ETag: "220c-5b3b700af88b1"
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 8ad60f4..9c5eb6c 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 d206421..ef529ab 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 990c6d2..2caf6bc 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 39165c1..14edffa 100644
--- a/export/dump/cities5000.zip
+++ b/export/dump/cities5000.zip
Binary files differ