Skip to content

Commit

Permalink
Merge pull request #1 from yappabe/psr7-http
Browse files Browse the repository at this point in the history
Implemented PSR-7 spec for service calls
  • Loading branch information
jverdeyen authored Jul 18, 2016
2 parents b88f9de + 249d2ef commit d0fba39
Show file tree
Hide file tree
Showing 55 changed files with 240 additions and 241 deletions.
68 changes: 34 additions & 34 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,43 +10,43 @@ controls, overlays, events & services through the Google Map API v3.

## Documentation

1. [Installation](http://github.com/egeloen/ivory-google-map/blob/master/doc/installation.md)
2. [Usage](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage.md)
- [Map](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/map.md)
- [Overlays](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/overlays/index.md)
- [Marker](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/overlays/marker.md)
- [Info window](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/overlays/info_window.md)
- [Info box](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/overlays/info_box.md)
- [Polyline](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/overlays/polyline.md)
- [Encoded Polyline](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/overlays/encoded_polyline.md)
- [Polygon](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/overlays/polygon.md)
- [Rectangle](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/overlays/rectangle.md)
- [Circle](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/overlays/circle.md)
- [Ground overlay](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/overlays/ground_overlay.md)
- [Marker cluster](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/overlays/marker_cluster.md)
- [Controls](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/controls/index.md)
- [Map type](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/controls/map_type.md)
- [Overview](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/controls/overview.md)
- [Pan](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/controls/pan.md)
- [Rotate](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/controls/rotate.md)
- [Scale](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/controls/scale.md)
- [Street view](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/controls/street_view.md)
- [Zoom](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/controls/zoom.md)
- [Layers](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/layers/index.md)
- [KML Layer](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/layers/kml_layer.md)
- [Events](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/events.md)
- [Places](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/places/index.md)
- [Autocomplete](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/places/autocomplete.md)
- [Services](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/services/index.md)
- [Geocoding API](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/services/geocoding/geocoder.md)
- [Directions API](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/services/directions/directions.md)
- [Distance Matrix API](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/services/distance_matrix/distance_matrix.md)
- [Business Account](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/services/business_account.md)
1. [Installation](https://github.com/yappabe/ivory-google-map/blob/master/doc/installation.md)
2. [Usage](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage.md)
- [Map](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/map.md)
- [Overlays](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/overlays/index.md)
- [Marker](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/overlays/marker.md)
- [Info window](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/overlays/info_window.md)
- [Info box](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/overlays/info_box.md)
- [Polyline](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/overlays/polyline.md)
- [Encoded Polyline](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/overlays/encoded_polyline.md)
- [Polygon](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/overlays/polygon.md)
- [Rectangle](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/overlays/rectangle.md)
- [Circle](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/overlays/circle.md)
- [Ground overlay](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/overlays/ground_overlay.md)
- [Marker cluster](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/overlays/marker_cluster.md)
- [Controls](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/controls/index.md)
- [Map type](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/controls/map_type.md)
- [Overview](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/controls/overview.md)
- [Pan](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/controls/pan.md)
- [Rotate](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/controls/rotate.md)
- [Scale](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/controls/scale.md)
- [Street view](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/controls/street_view.md)
- [Zoom](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/controls/zoom.md)
- [Layers](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/layers/index.md)
- [KML Layer](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/layers/kml_layer.md)
- [Events](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/events.md)
- [Places](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/places/index.md)
- [Autocomplete](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/places/autocomplete.md)
- [Services](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/services/index.md)
- [Geocoding API](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/services/geocoding/geocoder.md)
- [Directions API](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/services/directions/directions.md)
- [Distance Matrix API](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/services/distance_matrix/distance_matrix.md)
- [Business Account](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/services/business_account.md)

## Testing

The library is fully unit tested by [PHPUnit](http://www.phpunit.de/) with a code coverage close to **100%**. To execute
the test suite, check the travis [configuration](https://github.com/egeloen/ivory-google-map/blob/master/.travis.yml).
the test suite, check the travis [configuration](https://github.com/yappabe/ivory-google-map/blob/master/.travis.yml).

## Contribution

Expand All @@ -55,5 +55,5 @@ We love contributors! Ivory is an open source project. If you'd like to contribu
## License

The Ivory Google Map is under the MIT license. For the full copyright and license information, please read the
[LICENSE](https://github.com/egeloen/ivory-google-map/blob/master/LICENSE) file that was distributed with this source
[LICENSE](https://github.com/yappabe/ivory-google-map/blob/master/LICENSE) file that was distributed with this source
code.
12 changes: 7 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,19 @@
],
"require": {
"php": ">=5.3.0",
"egeloen/json-builder": "~1.0.0"
"php-http/client-implementation": "^1.0",
"egeloen/json-builder": "~1.0.0",
"php-http/message": "^1.3"
},
"require-dev": {
"phpunit/phpunit": "~4.0",
"widop/http-adapter": "~1.1.0",
"willdurand/geocoder": "~2.0",
"satooshi/php-coveralls": "~0.6"
"satooshi/php-coveralls": "~0.6",
"php-http/guzzle6-adapter": "^1.0"
},
"suggest": {
"widop/http-adapter": "Allows to use services",
"willdurand/geocoder": "Allows to use geocoding service"
"willdurand/geocoder": "Allows you to use geocoding service",
"php-http/guzzle6-adapter": "Allows you to use services"
},
"autoload": {
"psr-4": { "Ivory\\GoogleMap\\": "src/" }
Expand Down
5 changes: 2 additions & 3 deletions doc/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,12 @@ If you want to use Geocoding stuff, you will need [Geocoder](http://github.com/w
}
```

If you want to use Directions or Distance Matrix stuff, you will need an
[http adapter](http://github.com/widop/http-adapter):
If you want to use Directions or Distance Matrix stuff, you will need a psr7 compatible client:

```
{
"require": {
"widop/http-adapter": "1.0.*"
"php-http/guzzle6-adapter": "~1.0"
}
}
```
Expand Down
42 changes: 21 additions & 21 deletions doc/usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,43 +21,43 @@ zoom of 3 & using the default controls.
## Configure your map

Now, you have a map, you can configure it easily. The complete map configuration is available
[here](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/map.md).
[here](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/map.md).

### Configure overlays

Overlays are objects on the map that are tied to latitude/longitude coordinates, so they move when you drag or zoom
the map. Overlays reflect objects that you "add" to the map to designate points, lines, areas, or collections of
objects.

1. [Marker](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/overlays/marker.md)
2. [Info window](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/overlays/info_window.md)
3. [Info box](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/overlays/info_box.md)
4. [Polyline](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/overlays/polyline.md)
5. [Encoded Polyline](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/overlays/encoded_polyline.md)
6. [Polygon](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/overlays/polygon.md)
7. [Rectangle](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/overlays/rectangle.md)
8. [Circle](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/overlays/circle.md)
9. [Ground overlay](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/overlays/ground_overlay.md)
10. [Marker cluster](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/overlays/marker_cluster.md)
1. [Marker](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/overlays/marker.md)
2. [Info window](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/overlays/info_window.md)
3. [Info box](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/overlays/info_box.md)
4. [Polyline](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/overlays/polyline.md)
5. [Encoded Polyline](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/overlays/encoded_polyline.md)
6. [Polygon](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/overlays/polygon.md)
7. [Rectangle](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/overlays/rectangle.md)
8. [Circle](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/overlays/circle.md)
9. [Ground overlay](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/overlays/ground_overlay.md)
10. [Marker cluster](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/overlays/marker_cluster.md)

### Configure controls

The maps on Google Maps contain UI elements for allowing user interaction through the map. These elements are known as
``controls`` and you can include variations of these controls in your Google Maps API application. Alternatively, you
can do nothing and let the Google Maps API handle all control behavior.

1. [Map type control](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/controls/map_type.md)
2. [Overview](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/controls/overview.md)
3. [Pan](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/controls/pan.md)
4. [Rotate](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/controls/rotate.md)
5. [Scale](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/controls/scale.md)
6. [Street view](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/controls/street_view.md)
7. [Zoom](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/controls/zoom.md)
1. [Map type control](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/controls/map_type.md)
2. [Overview](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/controls/overview.md)
3. [Pan](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/controls/pan.md)
4. [Rotate](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/controls/rotate.md)
5. [Scale](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/controls/scale.md)
6. [Street view](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/controls/street_view.md)
7. [Zoom](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/controls/zoom.md)

### Configure events

The complete events configuration is available
[here](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/events.md).
[here](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/events.md).

### Configure additional libraries

Expand Down Expand Up @@ -109,11 +109,11 @@ This function renders an html javascript block with all code needed for displayi
```

The generated code is organized to be reusable in the client side. If you want to learn more, you can read this
[documentation](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/helper/container.md).
[documentation](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/helper/container.md).

Additionally, the library allows you to add/render your own javascript libraires and append some code just before or
after the generated code through extensions. If you want to learn more about that, you can read this
[documentation](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/helper/extension.md).
[documentation](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/helper/extension.md).

### Render the CSS (Optional)

Expand Down
14 changes: 7 additions & 7 deletions doc/usage/controls/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ The maps on Google Maps contain UI elements for allowing user interaction throug
controls and you can include variations of these controls in your Google Maps API application. Alternatively, you can
do nothing and let the Google Maps API handle all control behavior.

1. [Map type](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/controls/map_type.md)
2. [Overview](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/controls/overview.md)
3. [Pan](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/controls/pan.md)
4. [Rotate](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/controls/rotate.md)
5. [Scale](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/controls/scale.md)
6. [Street view](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/controls/street_view.md)
7. [Zoom](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/controls/zoom.md)
1. [Map type](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/controls/map_type.md)
2. [Overview](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/controls/overview.md)
3. [Pan](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/controls/pan.md)
4. [Rotate](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/controls/rotate.md)
5. [Scale](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/controls/scale.md)
6. [Street view](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/controls/street_view.md)
7. [Zoom](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/controls/zoom.md)
2 changes: 1 addition & 1 deletion doc/usage/layers/index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Google Map Layers

1. [KML Layer](http://github.com/egeloen/ivory-google-map/blob/master/doc/usage/layers/kml_layer.md)
1. [KML Layer](https://github.com/yappabe/ivory-google-map/blob/master/doc/usage/layers/kml_layer.md)
2. Fusion Table Layer
3. Traffic Layer
4. Bicycling Layer
Expand Down
Loading

0 comments on commit d0fba39

Please sign in to comment.