new example. Create database from Maxmind GeoLite2 City

Author: ddrv

README.md

@@ -18,6 +18,7 @@ php composer.phar install
 # Create your IP addresses database
 See examples for create database:
 * Geo from Maxmind GeoLite2 Country `examples/geoFromMaxmindCountry.php`
+* Geo from Maxmind GeoLite2 City `examples/geoFromMaxmindCity.php`
 
 # Use
 ```php

examples/data/iptool.geo.city.dat

@@ -0,0 +1,102 @@
+<?php
+ini_set("memory_limit", "64M");
+require_once(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'Converter.php');
+require_once(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'Iptool.php');
+$tmpDir = __DIR__.DIRECTORY_SEPARATOR.'tmp';
+$converter = new \Ddrv\Iptool\Converter($tmpDir);
+$dbFile = __DIR__.DIRECTORY_SEPARATOR.'data'.DIRECTORY_SEPARATOR.'iptool.geo.city.dat';
+
+$url = 'http://geolite.maxmind.com/download/geoip/database/GeoLiteCity_CSV/GeoLiteCity-latest.zip';
+$tmpFile = $tmpDir . DIRECTORY_SEPARATOR . 'geolite2city.zip';
+copy($url,$tmpFile);
+$zip = new ZipArchive();
+if ($zip->open($tmpFile) !== true) die;
+$i = -1;
+$zipPath = null;
+do {
+    $i++;
+    $csv = $zip->getNameIndex($i);
+    preg_match('/(?<file>(?<zipPath>.*)\/GeoLiteCity\-Blocks\.csv)$/ui', $csv, $m);
+} while ($i < $zip->numFiles && empty($m['file']));
+$zipPath = $m['zipPath'];
+$zip->close();
+
+$locations = 'zip://' . $tmpFile . '#'.$zipPath.DIRECTORY_SEPARATOR.'GeoLiteCity-Location.csv';
+$networks = 'zip://' . $tmpFile . '#' . $m['file'];
+
+/**
+ * Set author.
+ */
+$converter->setAuthor('Ivan Dudarev');
+
+/**
+ * Set license.
+ */
+$converter->setLicense('MIT');
+
+/**
+ * Add source files.
+ */
+$converter->addCSV('locations',$locations,2);
+$converter->addCSV('networks',$networks,2);
+
+/**
+ * Add register Geo.
+ **/
+$geo = array(
+    'geonames' => array(
+        'type' => 'int',
+        'column' => 0,
+    ),
+    'country' => array(
+        'type' => 'string',
+        'column' => 1,
+        'transform' => 'low',
+    ),
+    'region' => array(
+        'type' => 'string',
+        'column' => 2,
+    ),
+    'city' => array(
+        'type' => 'string',
+        'column' => 3,
+    ),
+    'latitude' => array(
+        'type' => 'double',
+        'column' => 5,
+    ),
+    'longitude' => array(
+        'type' => 'double',
+        'column' => 6,
+    ),
+);
+$converter->addRegister('geo','locations',0, $geo);
+
+/**
+ * Add networks.
+ */
+$data = array(
+     'geo' => 2,
+);
+$converter->addNetworks('networks', 'long', 0, 1, $data);
+
+/**
+ * Create Database.
+ */
+$converter->create($dbFile);
+
+/**
+ * Delete temporary file
+ */
+unlink($tmpFile);
+
+/**
+ * Get information about created database
+ */
+$iptool = new \Ddrv\Iptool\Iptool($dbFile);
+print_r($iptool->about());
+
+/**
+ * Search IP Address data
+ */
+print_r($iptool->find('95.215.84.0'));

examples/data/iptool.geo.country.dat

@@ -7,7 +7,7 @@
 $dbFile = __DIR__.DIRECTORY_SEPARATOR.'data'.DIRECTORY_SEPARATOR.'iptool.geo.country.dat';
 
 $url = 'http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country-CSV.zip';
-$tmpFile = $tmpDir . DIRECTORY_SEPARATOR . 'tmp.zip';
+$tmpFile = $tmpDir . DIRECTORY_SEPARATOR . 'geolite2country.zip';
 copy($url,$tmpFile);
 $zip = new ZipArchive();
 if ($zip->open($tmpFile) !== true) die;
@@ -16,13 +16,13 @@
 do {
     $i++;
     $csv = $zip->getNameIndex($i);
-    preg_match('/(?<file>(?<zipPath>.*)\/GeoLite2-Country-Blocks-IPv4\.csv)$/ui', $csv, $m);
+    preg_match('/(?<file>(?<zipPath>.*)\/GeoLite2\-Country\-Blocks\-IPv4\.csv)$/ui', $csv, $m);
 } while ($i < $zip->numFiles && empty($m['file']));
 $zipPath = $m['zipPath'];
 $zip->close();
 
 $locations = 'zip://' . $tmpFile . '#'.$zipPath.DIRECTORY_SEPARATOR.'GeoLite2-Country-Locations-en.csv';
-$geo = 'zip://' . $tmpFile . '#' . $m['file'];
+$networks = 'zip://' . $tmpFile . '#' . $m['file'];
 
 /**
  * Set author.
@@ -37,8 +37,8 @@
 /**
  * Add source files.
  */
-$converter->addCSV('locations',$locations);
-$converter->addCSV('geo',$geo);
+$converter->addCSV('locations',$locations,1);
+$converter->addCSV('networks',$networks,1);
 
 /**
  * Add register Country.
@@ -59,10 +59,10 @@
 /**
  * Add networks.
  */
-$geo = array(
+$data = array(
      'country' => 1,
 );
-$converter->addNetworks('geo', 'inetnum', 0, 0, $geo);
+$converter->addNetworks('networks', 'inetnum', 0, 0, $data);
 
 /**
  * Create Database.
@@ -83,4 +83,4 @@
 /**
  * Search IP Address data
  */
-print_r($iptool->find('81.32.17.89'));
+print_r($iptool->find('95.215.84.0'));