Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OpenStreetMap typo fixed #187. #189

Merged
merged 1 commit into from
Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -256,10 +256,10 @@ google_maps|Paris, France|POINT(2.352222 48.856614)
google_maps|Copenhagen, Denmark|POINT(12.568337 55.676097)
google_maps|74.200.247.59|The GoogleMapsProvider does not support IP addresses.
google_maps|::ffff:66.147.244.214|The GoogleMapsProvider does not support IP addresses.
openstreetmaps|Paris, France|POINT(2.352133 48.856506)
openstreetmaps|Copenhagen, Denmark|POINT(12.570072 55.686724)
openstreetmaps|74.200.247.59|Could not execute query http://nominatim.openstreetmap.org/search?q=74.200.247.59&format=xml&addressdetails=1&limit=1
openstreetmaps|::ffff:66.147.244.214|The OpenStreetMapProvider does not support IPv6 addresses.
openstreetmap|Paris, France|POINT(2.352133 48.856506)
openstreetmap|Copenhagen, Denmark|POINT(12.570072 55.686724)
openstreetmap|74.200.247.59|Could not execute query http://nominatim.openstreetmap.org/search?q=74.200.247.59&format=xml&addressdetails=1&limit=1
openstreetmap|::ffff:66.147.244.214|The OpenStreetMapProvider does not support IPv6 addresses.
bing_maps|Paris, France|Could not execute query http://dev.virtualearth.net/REST/v1/Locations/?q=Paris%2C+France&key=<FAKE_API_KEY>
bing_maps|Copenhagen, Denmark|Could not execute query http://dev.virtualearth.net/REST/v1/Locations/?q=Copenhagen%2C+Denmark&key=<FAKE_API_KEY>
bing_maps|74.200.247.59|The BingMapsProvider does not support IP addresses.
Expand Down Expand Up @@ -502,7 +502,7 @@ $ php geotools geocoder:geocode Paris --dumper=wkt // POINT(2.352222 48.856614)
...
$ php geotools geocoder:reverse "48.8631507, 2.388911" // Avenue Gambetta 10, 75020 Paris
$ php geotools geocoder:reverse "48.8631507, 2.388911" --format="%L, %A1, %C" // Paris, Île-De-France, France
$ php geotools geocoder:reverse "48.8631507, 2.388911" --format="%L, %A1, %C" --provider="openstreetmaps"
$ php geotools geocoder:reverse "48.8631507, 2.388911" --format="%L, %A1, %C" --provider="openstreetmap"
// Paris, Île-De-France, France Métropolitaine
...
$ php geotools geocoder:geocode "Tagensvej 47, Copenhagen" --raw --args=da_DK --args=Denmark
Expand Down
2 changes: 1 addition & 1 deletion src/CLI/Command/Geocoder/Command.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Command extends \Symfony\Component\Console\Command\Command
'google_maps' => 'GoogleMaps',
'google_maps_business' => 'GoogleMapsBusiness',
'bing_maps' => 'BingMaps',
'openstreetmaps' => 'OpenStreetMap',
'openstreetmap' => 'OpenStreetMap',
'cloudmade' => 'CloudMade',
'geoip' => 'Geoip',
'map_quest' => 'MapQuest',
Expand Down
4 changes: 2 additions & 2 deletions src/CLI/Command/Geocoder/Geocode.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ protected function configure()

%command.full_name% paris <comment>--adapter=socket --dumper=wkt</comment>

<info>Use the OpenStreetMaps provider with the default adapter</info>:
<info>Use the OpenStreetMap provider with the default adapter</info>:

%command.full_name% paris <comment>--provider=openstreetmaps</comment>
%command.full_name% paris <comment>--provider=openstreetmap</comment>

<info>Use the FreeGeoIp provider with the socket adapter</info>

Expand Down
4 changes: 2 additions & 2 deletions src/CLI/Command/Geocoder/Reverse.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ protected function configure()

%command.full_name% "48.8631507, 2.388911" <comment>--format="%L, %R, %C" --adapter=socket</comment>

<info>Use the OpenStreetMaps provider with the default adapter</info>:
<info>Use the OpenStreetMap provider with the default adapter</info>:

%command.full_name% "48.8631507, 2.388911" <comment>--provider=openstreetmaps</comment>
%command.full_name% "48.8631507, 2.388911" <comment>--provider=openstreetmap</comment>
EOT
);
}
Expand Down
8 changes: 4 additions & 4 deletions tests/CLI/Command/Geocoder/ReverseTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,28 +85,28 @@ public function testExecuteReverseWithDefaultProviderAndSocketAdapterAndArgument
$this->assertMatchesRegularExpression('/Avenue Gambetta 1, 75020 Paris/', $this->commandTester->getDisplay());
}

public function testExecuteReverseAgainstOpenStreetMapsProviderWithDefaultAdapterAndDefaultFormatter()
public function testExecuteReverseAgainstOpenStreetMapProviderWithDefaultAdapterAndDefaultFormatter()
{
$this->markTestIncomplete();

$this->commandTester->execute(array(
'command' => $this->command->getName(),
'coordinate' => '48.8631507, 2.388911',
'--provider' => 'openstreetmaps',
'--provider' => 'openstreetmap',
));

$this->assertTrue(is_string($this->commandTester->getDisplay()));
$this->assertMatchesRegularExpression('/Avenue Gambetta 8, 75020 Paris/', $this->commandTester->getDisplay());
}

public function testExecuteReverseAgainstOpenStreetMapsProviderWithDefaultAdapterAndFormatter()
public function testExecuteReverseAgainstOpenStreetMapProviderWithDefaultAdapterAndFormatter()
{
$this->markTestIncomplete();

$this->commandTester->execute(array(
'command' => $this->command->getName(),
'coordinate' => '48.8631507, 2.388911',
'--provider' => 'openstreetmaps',
'--provider' => 'openstreetmap',
'--format' => '%L, %A1, %C',
));

Expand Down
Loading