Merge pull request #1601 from mtmail/spheric-distance-on-details-page

details page: differentiate between spheric distance and distance in meters

diff --git a/data-sources/wikipedia-wikidata/import_wikipedia.sh b/data-sources/wikipedia-wikidata/import_wikipedia.sh
index 8b8ba52a52f80f9c57d8a86a38720be2426ae81e..9cc9b1dfc7900ce9da9ac643ef48d34bead3f91f 100755 (executable)
--- a/data-sources/wikipedia-wikidata/import_wikipedia.sh
+++ b/data-sources/wikipedia-wikidata/import_wikipedia.sh
@@ -52,6 +52,10 @@ do
     echo "insert into wikipedia_redirect select '${i}',page_title,rd_title from ${i}redirect join ${i}page on (rd_from = page_id) where page_namespace = 0 and rd_namespace = 0;" | psqlcmd
     echo "alter table ${i}pagelinkcount add column othercount integer;" | psqlcmd
     echo "update ${i}pagelinkcount set othercount = 0;" | psqlcmd
+done
+
+for i in "${language[@]}"
+do
     for j in "${language[@]}"
     do
         echo "update ${i}pagelinkcount set othercount = ${i}pagelinkcount.othercount + x.count from (select page_title as title,count from ${i}langlinks join ${i}page on (ll_from = page_id) join ${j}pagelinkcount on (ll_lang = '${j}' and ll_title = title)) as x where x.title = ${i}pagelinkcount.title;" | psqlcmd

diff --git a/osm2pgsql b/osm2pgsql
index 8d9087f1111f4a062158e8e6b10bfbceed90899b..3a045d7f15adc05d34a719da4266418e9663b322 160000 (submodule)
--- a/osm2pgsql
+++ b/osm2pgsql
@@ -1 +1 @@
-Subproject commit 8d9087f1111f4a062158e8e6b10bfbceed90899b
+Subproject commit 3a045d7f15adc05d34a719da4266418e9663b322

diff --git a/settings/import-address.style b/settings/import-address.style
index 0a866c95d10ff5aff3783c47db040ca3a55fdf1b..8d622ec177025ef084ec8e77f4560eb8fdc3ed84 100644 (file)
--- a/settings/import-address.style
+++ b/settings/import-address.style
@@ -73,8 +73,8 @@
     }
 },
 {
-    "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in_country",
-              "addr:country", "addr:country", "addr:country_code"],
+    "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in:country",
+              "addr:country", "addr:country_code"],
     "values" : {
         "" : "country"
     }

diff --git a/settings/import-admin.style b/settings/import-admin.style
index 02a54f12a04fcb90d64c3b85ff1acbec8fedb5eb..2ad6cec8d86d2ea0ec62da086c18363e2127e64a 100644 (file)
--- a/settings/import-admin.style
+++ b/settings/import-admin.style
@@ -42,8 +42,8 @@
     }
 },
 {
-    "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in_country",
-              "addr:country", "addr:country", "addr:country_code"],
+    "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in:country",
+              "addr:country", "addr:country_code"],
     "values" : {
         "" : "country"
     }

diff --git a/settings/import-full.style b/settings/import-full.style
index de91fd9c3d793642aec438f8e22300de0261e8e1..9069c78069087fb83597b4852e82982c45ca1ebe 100644 (file)
--- a/settings/import-full.style
+++ b/settings/import-full.style
@@ -186,8 +186,8 @@
     }
 },
 {
-    "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in_country",
-              "addr:country", "addr:country", "addr:country_code"],
+    "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in:country",
+              "addr:country", "addr:country_code"],
     "values" : {
         "" : "country"
     }

diff --git a/settings/import-street.style b/settings/import-street.style
index 424192756a04582915e2d3d37865677b0655bdc6..088c1155cdb7f7cc91178ffbda5b89ca9dc7b330 100644 (file)
--- a/settings/import-street.style
+++ b/settings/import-street.style
@@ -42,8 +42,8 @@
     }
 },
 {
-    "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in_country",
-              "addr:country", "addr:country", "addr:country_code"],
+    "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in:country",
+              "addr:country", "addr:country_code"],
     "values" : {
         "" : "country"
     }