Merge remote-tracking branch 'upstream/master'

[nominatim.git] / wikidata / parse.php

diff --git a/wikidata/parse.php b/wikidata/parse.php
index 11b30fe1fae654c8d5dbff8f0fde44d134ce6d89..d8981c6c18ce87b151be056937af5047a82a73c9 100755 (executable)
--- a/wikidata/parse.php
+++ b/wikidata/parse.php
@@ -115,8 +115,21 @@ if ($hFile) {
                     } elseif ($aClaim['m'][2] == 'globecoordinate') {
                         //
                         if ($aClaim['m'][3]['globe'] != 'http://www.wikidata.org/entity/Q2') $bFail = true;
                     } elseif ($aClaim['m'][2] == 'globecoordinate') {
                         //
                         if ($aClaim['m'][3]['globe'] != 'http://www.wikidata.org/entity/Q2') $bFail = true;

-                        fputcsv($hFileEntityProperty, array($iID, $iClaim, $iPID, null, null, "SRID=4326;POINT(".((float) $aClaim['m'][3]['longitude'])." ".((float)$aClaim['m'][3]['latitude']).")", null));
-                        // echo "insert into entity_property values (nextval('seq_entity_property'),".$iID.",".$iPID.",null,null,ST_SetSRID(ST_MakePoint(".((float)$aClaim['m'][3]['longitude']).", ".((float)$aClaim['m'][3]['latitude'])."),4326));\n";
+                        fputcsv(
+                            $hFileEntityProperty,
+                            array(
+                             $iID,
+                             $iClaim,
+                             $iPID,
+                             null,
+                             null,
+                             "SRID=4326;POINT(".((float) $aClaim['m'][3]['longitude'])." ".((float)$aClaim['m'][3]['latitude']).")", null
+                            )
+                        );
+                        /* echo "insert into entity_property values (nextval('seq_entity_property'),";
+                         * echo $iID.",".$iPID.",null,null,ST_SetSRID(ST_MakePoint(".((float)$aClaim['m'][3]['longitude']);
+                         * echo ", ".((float)$aClaim['m'][3]['latitude'])."),4326));\n";
+                         */

                     } elseif ($aClaim['m'][2] == 'time') {
                         // TODO!
                         /*
                     } elseif ($aClaim['m'][2] == 'time') {
                         // TODO!
                         /*